Moved non-Latin locale check to internet block, dropped region check

Author: adamlui

remove-json-keys/src/remove_json_keys/lib/language.py

@@ -63,14 +63,14 @@ def get_msgs(cli: sn, lang_code: str = 'en') -> sn:
         return get_msgs.cached # don't re-fetch same msgs
 
     mod_root_path = Path(__file__).parent.parent
-    non_latin_locales = data.json.read(mod_root_path / 'assets/data/non_latin_locales.json')
     msgs = data.json.flatten(data.json.read( # local ones
         mod_root_path / '_locales/en/messages.json'))
 
-    if (
-        not lang_code.startswith('en') and
-        not (lang_code in non_latin_locales and not env.can_render_non_latin_scripts())
-    ): # fetch non-English msgs from jsDelivr
+    if not lang_code.startswith('en'): # fetch non-English msgs from jsDelivr
+        # Check if terminal supports non-Latin scripts
+        non_latin_locales = data.json.read(mod_root_path / 'assets/data/non_latin_locales.json')
+        if lang_code.split('-')[0] in non_latin_locales and not env.can_render_non_latin_scripts():
+            return sn(**msgs) # en ones
         msg_base_url = f'{jsdelivr.create_commit_url(cli, cli.commit_hashes.locales)}/src/remove_json_keys/_locales'
         msg_url = f'{msg_base_url}/{lang_code}/messages.json'
         for attempt in range(3):

translate-messages/src/translate_messages/lib/language.py

@@ -95,14 +95,14 @@ def get_msgs(cli: sn, lang_code: str = 'en') -> sn:
         return get_msgs.cached # don't re-fetch same msgs
 
     mod_root_path = Path(__file__).parent.parent
-    non_latin_locales = data.json.read(mod_root_path / 'assets/data/non_latin_locales.json')
     msgs = data.json.flatten(data.json.read( # local ones
         mod_root_path / '_locales/en/messages.json'))
 
-    if (
-        not lang_code.startswith('en') and
-        not (lang_code in non_latin_locales and not env.can_render_non_latin_scripts())
-    ): # fetch non-English msgs from jsDelivr
+    if not lang_code.startswith('en'): # fetch non-English msgs from jsDelivr
+        # Check if terminal supports non-Latin scripts
+        non_latin_locales = data.json.read(mod_root_path / 'assets/data/non_latin_locales.json')
+        if lang_code.split('-')[0] in non_latin_locales and not env.can_render_non_latin_scripts():
+            return sn(**msgs) # en ones
         msg_base_url = f'{jsdelivr.create_commit_url(cli, cli.commit_hashes.locales)}/src/remove_json_keys/_locales'
         msg_url = f'{msg_base_url}/{lang_code}/messages.json'
         for attempt in range(3):