From fa5cb4baa1867f2c67b00e0f108ed0d7f54be68b Mon Sep 17 00:00:00 2001 From: Kevin Date: Tue, 26 Jun 2018 23:06:41 +0200 Subject: [PATCH] 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