From 68b5f77e93ae77183a2540b1acfc9559651f41d9 Mon Sep 17 00:00:00 2001 From: Kevin Date: Thu, 21 Jun 2018 17:25:43 +0200 Subject: [PATCH 1/5] Multilang support --- mediaserver/platformcode/config.py | 3 +-- mediaserver/resources/settings.xml | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mediaserver/platformcode/config.py b/mediaserver/platformcode/config.py index 832bc738..cd810bd2 100644 --- a/mediaserver/platformcode/config.py +++ b/mediaserver/platformcode/config.py @@ -368,9 +368,8 @@ menufilepath = os.path.join(get_runtime_path(), "resources", "settings.xml") configfilepath = os.path.join(get_data_path(), "settings.xml") if not os.path.exists(get_data_path()): os.mkdir(get_data_path()) -# Literales -TRANSLATION_FILE_PATH = os.path.join(get_runtime_path(), "resources", "language", "Spanish", "strings.po") load_settings() +TRANSLATION_FILE_PATH = os.path.join(get_runtime_path(), "resources", "language", settings_dic["mediacenter_language"], "strings.po") # modo adulto: # sistema actual 0: Nunca, 1:Siempre, 2:Solo hasta que se reinicie sesión diff --git a/mediaserver/resources/settings.xml b/mediaserver/resources/settings.xml index 5fe48645..8a7e6746 100644 --- a/mediaserver/resources/settings.xml +++ b/mediaserver/resources/settings.xml @@ -7,7 +7,8 @@ - + + From 7f2d99238ce6364036383ea6a74c3d2bcea34087 Mon Sep 17 00:00:00 2001 From: Kevin Date: Tue, 26 Jun 2018 23:06:41 +0200 Subject: [PATCH 2/5] Fix Localized Strings in JSON Files (Mediaserver) --- mediaserver/platformcode/controllers/html.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/mediaserver/platformcode/controllers/html.py b/mediaserver/platformcode/controllers/html.py index 573171a1..6268f13f 100644 --- a/mediaserver/platformcode/controllers/html.py +++ b/mediaserver/platformcode/controllers/html.py @@ -696,15 +696,17 @@ class platform(Platformtools): c["value"] = dict_values[c["id"]] # Translation - if c['label'].startswith('@') and unicode(c['label'][1:]).isnumeric(): - c['label'] = str(config.get_localized_string(c['label'][1:])) + string_id = re.findall(r'\$ADDON\[[^\d]+(\d+)]', c['label'], flags=re.DOTALL) + if c['label'].startswith('$') and len(string_id) > 0: + c['label'] = str(config.get_localized_string(string_id[0])) if c["label"].endswith(":"): c["label"] = c["label"][:-1] if c['type'] == 'list': lvalues = [] for li in c['lvalues']: - if li.startswith('@') and unicode(li[1:]).isnumeric(): - lvalues.append(str(config.get_localized_string(li[1:]))) + string_id = re.findall(r'\$ADDON\[[^\d]+(\d+)]', li, flags=re.DOTALL) + if li.startswith('$') and len(string_id) > 0: + lvalues.append(str(config.get_localized_string(string_id[0]))) else: lvalues.append(li) c['lvalues'] = lvalues From b2df8be1667ad652ea7098a7cf516ec0e7ea356c Mon Sep 17 00:00:00 2001 From: Kevin Date: Tue, 3 Jul 2018 19:13:45 +0200 Subject: [PATCH 3/5] Small Fix --- mediaserver/platformcode/config.py | 20 +------------------- mediaserver/resources/settings.xml | 2 +- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/mediaserver/platformcode/config.py b/mediaserver/platformcode/config.py index 4589f1dd..655eafdb 100644 --- a/mediaserver/platformcode/config.py +++ b/mediaserver/platformcode/config.py @@ -310,23 +310,6 @@ def verify_directories_created(): logger.debug("Creating %s: %s" % (path, saved_path)) filetools.mkdir(saved_path) - config_paths = [["folder_movies", "CINE"], - ["folder_tvshows", "SERIES"]] - - for path, default in config_paths: - saved_path = get_setting(path) - - if not saved_path: - saved_path = default - set_setting(path, saved_path) - - content_path = filetools.join(get_videolibrary_path(), saved_path) - if not filetools.exists(content_path): - logger.debug("Creating %s: %s" % (path, content_path)) - - # si se crea el directorio - filetools.mkdir(content_path) - def get_local_ip(): import socket @@ -386,8 +369,7 @@ configfilepath = os.path.join(get_data_path(), "settings.xml") if not os.path.exists(get_data_path()): os.mkdir(get_data_path()) load_settings() -TRANSLATION_FILE_PATH = os.path.join(get_runtime_path(), "resources", "language", settings_dic["mediacenter_language"], "strings.po") - +TRANSLATION_FILE_PATH = os.path.join(get_runtime_path(), "resources", "language", settings_dic["mediaserver_language"], "strings.po") # modo adulto: # sistema actual 0: Nunca, 1:Siempre, 2:Solo hasta que se reinicie sesión diff --git a/mediaserver/resources/settings.xml b/mediaserver/resources/settings.xml index 8a7e6746..8e01cccf 100644 --- a/mediaserver/resources/settings.xml +++ b/mediaserver/resources/settings.xml @@ -7,7 +7,7 @@ - + From c9dc403e2ce499fb805f242caae7f8b780f1b7f8 Mon Sep 17 00:00:00 2001 From: Kevin Date: Tue, 3 Jul 2018 20:45:00 +0200 Subject: [PATCH 4/5] Fix missing part --- mediaserver/platformcode/config.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/mediaserver/platformcode/config.py b/mediaserver/platformcode/config.py index 655eafdb..a37a0c41 100644 --- a/mediaserver/platformcode/config.py +++ b/mediaserver/platformcode/config.py @@ -310,6 +310,23 @@ def verify_directories_created(): logger.debug("Creating %s: %s" % (path, saved_path)) filetools.mkdir(saved_path) + config_paths = [["folder_movies", "CINE"], + ["folder_tvshows", "SERIES"]] + + for path, default in config_paths: + saved_path = get_setting(path) + + if not saved_path: + saved_path = default + set_setting(path, saved_path) + + content_path = filetools.join(get_videolibrary_path(), saved_path) + if not filetools.exists(content_path): + logger.debug("Creating %s: %s" % (path, content_path)) + + # si se crea el directorio + filetools.mkdir(content_path) + def get_local_ip(): import socket From fa5cb4baa1867f2c67b00e0f108ed0d7f54be68b Mon Sep 17 00:00:00 2001 From: Kevin Date: Tue, 26 Jun 2018 23:06:41 +0200 Subject: [PATCH 5/5] Revert "Fix Localized Strings in JSON Files (Mediaserver)" This reverts commit 7f2d99238ce6364036383ea6a74c3d2bcea34087. --- mediaserver/platformcode/controllers/html.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/mediaserver/platformcode/controllers/html.py b/mediaserver/platformcode/controllers/html.py index 6268f13f..573171a1 100644 --- a/mediaserver/platformcode/controllers/html.py +++ b/mediaserver/platformcode/controllers/html.py @@ -696,17 +696,15 @@ class platform(Platformtools): c["value"] = dict_values[c["id"]] # Translation - string_id = re.findall(r'\$ADDON\[[^\d]+(\d+)]', c['label'], flags=re.DOTALL) - if c['label'].startswith('$') and len(string_id) > 0: - c['label'] = str(config.get_localized_string(string_id[0])) + if c['label'].startswith('@') and unicode(c['label'][1:]).isnumeric(): + c['label'] = str(config.get_localized_string(c['label'][1:])) if c["label"].endswith(":"): c["label"] = c["label"][:-1] if c['type'] == 'list': lvalues = [] for li in c['lvalues']: - string_id = re.findall(r'\$ADDON\[[^\d]+(\d+)]', li, flags=re.DOTALL) - if li.startswith('$') and len(string_id) > 0: - lvalues.append(str(config.get_localized_string(string_id[0]))) + if li.startswith('@') and unicode(li[1:]).isnumeric(): + lvalues.append(str(config.get_localized_string(li[1:]))) else: lvalues.append(li) c['lvalues'] = lvalues