From 0dbea5c01e7e53d86ef9e0e35b69fed55b6ac1c6 Mon Sep 17 00:00:00 2001 From: Marcel van der Veldt Date: Fri, 2 Oct 2020 01:33:49 +0200 Subject: [PATCH] fix typo --- music_assistant/constants.py | 2 +- music_assistant/helpers/util.py | 2 +- music_assistant/translations.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/music_assistant/constants.py b/music_assistant/constants.py index f5fcb890..5e9aab7f 100755 --- a/music_assistant/constants.py +++ b/music_assistant/constants.py @@ -1,6 +1,6 @@ """All constants for Music Assistant.""" -__version__ = "0.0.48" +__version__ = "0.0.49" REQUIRED_PYTHON_VER = "3.7" # configuration keys/attributes diff --git a/music_assistant/helpers/util.py b/music_assistant/helpers/util.py index 4c6c92d4..8a2c3f52 100755 --- a/music_assistant/helpers/util.py +++ b/music_assistant/helpers/util.py @@ -260,7 +260,7 @@ def compare_strings(str1, str2, strict=False): def merge_dict(base_dict: dict, new_dict: dict): """Merge dict without overwriting existing values.""" for key, value in new_dict.items(): - if isinstance(value, dict): + if base_dict.get(key) and isinstance(value, dict): base_dict[key] = merge_dict(base_dict[key], value) elif not base_dict.get(key): base_dict[key] = value diff --git a/music_assistant/translations.json b/music_assistant/translations.json index 576778fe..15aeb4fa 100644 --- a/music_assistant/translations.json +++ b/music_assistant/translations.json @@ -54,6 +54,6 @@ "desc_target_volume": "Selecteer het gewenste doelvolume in LUFS. De R128 standaard is -22 LUFS.", "desc_gain_correct": "Stel een fallback gain correctie in als er geen R128 meting beschikbaar is.", "desc_crossfade": "Crossfade inschakelen door het instellen van een crossfade duur in seconden.", - "desc_enable_provider": "Deze provider inschakelen.", + "desc_enable_provider": "Deze provider inschakelen." } } -- 2.34.1