Moved non-config msg keys to cli root

Author: adamlui

translate-messages/src/translate_messages/__main__.py

@@ -36,14 +36,14 @@ def main():
         log.warn('Unable to locate directory.')
         sys.exit(1)
 
-    cli.config.msgs_filename = 'messages.json'
-    cli.config.en_msgs = data.json.read(os.path.join(cli.config.locales_dir, 'en', cli.config.msgs_filename))
+    cli.msgs_filename = 'messages.json'
+    cli.en_msgs = data.json.read(os.path.join(cli.config.locales_dir, 'en', cli.msgs_filename))
     cli.config.target_langs = list(set(cli.config.target_langs)) # remove dupes
 
     if not cli.config.target_langs: # merge discovered locales w/ target_langs
         for root, dirs, _ in os.walk(cli.config.locales_dir):
             for lang_folder in dirs:
-                msgs_path = os.path.join(root, lang_folder, cli.config.msgs_filename)
+                msgs_path = os.path.join(root, lang_folder, cli.msgs_filename)
                 discovered_lang = lang_folder.replace('_', '-')
                 if os.path.exists(msgs_path) and discovered_lang not in cli.config.target_langs:
                     cli.config.target_langs.append(discovered_lang)

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

@@ -5,26 +5,26 @@
 def create_translations(cli, target_msgs, lang_code):
 
     fail_flags = ['INVALID TARGET LANGUAGE', 'TOO MANY REQUESTS', 'MYMEMORY']
-    src_keys = cli.config.keys or cli.config.en_msgs
-    src_keys = [key for key in src_keys if key in cli.config.en_msgs]
+    src_keys = cli.config.keys or cli.en_msgs
+    src_keys = [key for key in src_keys if key in cli.en_msgs]
     translated_msgs = {}
 
     for key in src_keys:
 
         if key in cli.config.exclude_keys:
-            translated_msg = cli.config.en_msgs[key]['message']
+            translated_msg = cli.en_msgs[key]['message']
             translated_msgs[key] = { 'message': translated_msg }
             continue
 
         if key not in target_msgs:
-            original_msg = translated_msg = cli.config.en_msgs[key]['message']
+            original_msg = translated_msg = cli.en_msgs[key]['message']
             try:
                 translator = Translator(provider='', to_lang=lang_code)
                 translated_msg = translator.translate(original_msg).replace('"', "'").replace(''', "'")
                 if any(flag in translated_msg for flag in fail_flags):
                     translated_msg = original_msg
             except Exception as err:
-                log.trunc(f'Translation failed for key "{key}" in {lang_code}/{cli.config.msgs_filename}: {err}')
+                log.trunc(f'Translation failed for key "{key}" in {lang_code}/{cli.msgs_filename}: {err}')
                 translated_msg = original_msg
             translated_msgs[key] = { 'message': translated_msg }
 
@@ -40,7 +40,7 @@ def write_translations(cli):
         lang_folder = lang_code.replace('-', '_')
 
         if lang_code.startswith('en'): # skip EN locales
-            print(f'\n{log.colors.gry}Skipped {lang_folder}/{cli.config.msgs_filename}...{log.colors.nc}', end='')
+            print(f'\n{log.colors.gry}Skipped {lang_folder}/{cli.msgs_filename}...{log.colors.nc}', end='')
             langs_skipped.append(lang_code) ; langs_not_translated.append(lang_code) ; continue
 
         if '-' in lang_code: # cap suffix
@@ -50,10 +50,10 @@ def write_translations(cli):
         lang_folder_path = os.path.join(cli.config.locales_dir, lang_folder)
         if not os.path.exists(lang_folder_path): # create lang_folder if missing
             os.makedirs(lang_folder_path) ; langs_added.append(lang_code) ; lang_added = True
-        msgs_path = os.path.join(lang_folder_path, cli.config.msgs_filename)
+        msgs_path = os.path.join(lang_folder_path, cli.msgs_filename)
         msgs = data.json.read(msgs_path)
 
-        log.info(f"{ 'Adding' if not msgs else 'Updating' } {lang_folder}/{cli.config.msgs_filename}...", end='')
+        log.info(f"{ 'Adding' if not msgs else 'Updating' } {lang_folder}/{cli.msgs_filename}...", end='')
         sys.stdout.flush()
         translated_msgs = create_translations(cli, msgs, lang_code)
         data.json.write(translated_msgs, msgs_path)
@@ -66,6 +66,6 @@ def write_translations(cli):
             f"{log.colors.gry}Skipped" if lang_skipped else
             f"{log.colors.dy}Updated"
         )
-        log.overwrite_print(f"{status} {lang_folder}/{cli.config.msgs_filename}{log.colors.nc}")
+        log.overwrite_print(f"{status} {lang_folder}/{cli.msgs_filename}{log.colors.nc}")
 
     return langs_translated, langs_skipped, langs_added, langs_not_translated