Extracted/used msgs

Author: adamlui

remove-json-keys/src/remove_json_keys/__main__.py

@@ -26,8 +26,8 @@ def main():
     keys_removed, keys_skipped, files_processed_cnt = data.json.remove_keys(cli.json_path, cli.config.keys)
 
     log.final_summary(cli.msgs, {
-        'removed': [f'{key} ({file_path})' for key, file_path in keys_removed],
-        'skipped': [f'{key} ({file_path})' for key, file_path in keys_skipped],
+        cli.msgs.log_REMOVED.lower(): [f'{key} ({file_path})' for key, file_path in keys_removed],
+        cli.msgs.log_SKIPPED.lower(): [f'{key} ({file_path})' for key, file_path in keys_skipped],
     })
     log.data(f'{cli.msgs.log_TOTAL_JSON_PROCESSED}: {files_processed_cnt}')
 

remove-json-keys/src/remove_json_keys/assets/data/messages.json

@@ -9,6 +9,8 @@
   "log_DIR_FOUND": { "message": "Directory found" },
   "log_ADDED": { "message": "Added" },
   "log_SKIPPING": { "message": "Skipping" },
+  "log_SKIPPED": { "message": "Skipped" },
+  "log_REMOVED": { "message": "Removed" },
   "log_KEYS": { "message": "Keys" },
   "log_KEYS_TO_REMOVE": { "message": "Current keys to remove" },
   "log_NO_NEW_KEYS_ADDED": { "message": "No new keys added (all already present)" },
@@ -17,6 +19,7 @@
   "log_TYPE": { "message": "Type" },
   "log_TO_CREATE_DEFAULT_CONFIG": { "message": "to create default config file" },
   "log_FOR_AVAIL_OPTIONS": { "message": "for available options" },
+  "log_VERSION": { "message": "version" },
   "tip_FOR_MORE_HELP_VISIT": { "message": "For more help, visit" },
   "tip_PASS_FORCE_TO_OVERWRITE": { "message": "Pass --force to overwrite" },
   "tip_MOVE_CONFIG_TO_ROOT": { "message": "Move config file to root of project you wish to use it in" },
@@ -26,6 +29,8 @@
   "warn_SPECIFIED_CONFIG": { "message": "Specified config" },
   "warn_NOT_FOUND": { "message": "Not found" },
   "err_UNRECOGNIZED_ARGS": { "message": "Unrecognized argument(s)" },
+  "err_INVALID_KEY": { "message": "Invalid key" },
+  "err_FOUND_IN": { "message": "found in" },
   "help_JSON_DIR": { "message": "Name of the folder containing JSON files (default: \"_locales\")" },
   "help_KEYS": { "message": "Keys to remove (e.g. \"app_NAME,author\")" },
   "help_CONFIG": { "message": "Use custom config file (e.g. \"path/to/file\")" },

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

@@ -47,7 +47,7 @@ def config_filepath(cli): # for settings.load()
             log.debug(f'Config file found: {cli.config_filepath}')
             return
         else:
-            log.warn(f'{cli.msgs.warn_SPECIFIED_CONFIG} {cli.config_filepath} not found')
+            log.warn(f'{cli.msgs.warn_SPECIFIED_CONFIG} {cli.config_filepath} {cli.msgs.warn_NOT_FOUND}')
 
     # Search upwards
     possible_config_filenames = [

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

@@ -29,7 +29,7 @@ def overwrite_print(msg, *args, **kwargs):
     sys.stdout.write('\r' + msg.format(*args, **kwargs).ljust(terminal_width)[:terminal_width])
 def success(msg, *args, **kwargs) : print(f'\n{colors.bg}{msg.format(*args, **kwargs)}{colors.nc}')
 def tip(msg, *args, **kwargs) : print(f'\n{colors.bc}TIP: {msg.format(*args, **kwargs)}{colors.nc}')
-def version(cli) : print(f'\n{colors.by}{cli.name}\n{colors.bw}version: {cli.version}{colors.nc}')
+def version(cli) : print(f'\n{colors.by}{cli.name}\n{colors.bw}{cli.msgs.log_VERSION}: {cli.version}{colors.nc}')
 def warn(msg, *args, **kwargs) : print(f'\n{colors.bo}WARNING: {msg.format(*args, **kwargs)}{colors.nc}')
 
 def debug(msg, cli=None, *args, **kwargs):
@@ -42,8 +42,10 @@ def debug(msg, cli=None, *args, **kwargs):
         debug_key = sys.argv[debug_argidx +1].replace('-', '_')
 
     if cli: # init data line
-        data_val = getattr(cli.config, debug_key, f'cli.config key "{debug_key}" not found') if debug_key \
-              else cli.config
+        if debug_key:
+            data_val = getattr(cli.config, debug_key, f'cli.config key "{debug_key}" {cli.msgs.warn_NOT_FOUND.lower()}')
+        else:
+            data_val = cli.config
         msg += f'\n{colors.gry}{data_val}{colors.nc}'
 
     if args: # use 'em
@@ -56,7 +58,7 @@ def final_summary(msgs, summary_dict):
     for name, file_set in summary_dict.items():
         if file_set:
             status = name.replace('_', ' ')
-            status_color = colors.by if status == 'removed' else colors.gry
+            status_color = colors.by if status == msgs.log_REMOVED.lower() else colors.gry
             data(f'{msgs.log_KEYS} {status}: {len(file_set)}')
             print(f'{status_color}[\n    ' + '\n    '.join(file_set) + f'\n]{colors.nc}')
 

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

@@ -67,7 +67,9 @@ def load(cli):
                     setattr(cli.config, key, val)
                 else:
                     log.init_cmd_docs_url_exit(cli,
-                        f"Invalid key '{key}' found in \n{log.colors.gry}{cli.config_filepath}")
+                        f"{cli.msgs.err_INVALID_KEY} '{key}' {cli.msgs.err_FOUND_IN}"
+                        f'\n{log.colors.gry}{cli.config_filepath}'
+                    )
         log.debug('Config file loaded!', cli)
     else:
         log.debug('No config file found.')

translate-messages/src/translate_messages/__main__.py

@@ -29,10 +29,10 @@ def main():
     langs_translated, langs_skipped, langs_added, langs_not_translated = language.write_translations(cli)
 
     log.final_summary(cli.msgs, {
-        'translated': langs_translated,
-        'skipped': langs_skipped,
-        'added': langs_added,
-        'not translated': langs_not_translated,
+        cli.msgs.log_TRANSLATED.lower(): langs_translated,
+        cli.msgs.log_SKIPPED.lower(): langs_skipped,
+        cli.msgs.log_ADDED.lower(): langs_added,
+        cli.msgs.log_NOT_TRANSLATED.lower(): langs_not_translated,
     })
 
 if __name__ == '__main__' : main()

translate-messages/src/translate_messages/assets/data/messages.json

@@ -11,13 +11,16 @@
   "log_SKIPPED": { "message": "Skipped" },
   "log_UPDATING": { "message": "Updating" },
   "log_UPDATED": { "message": "Updated" },
+  "log_TRANSLATED": { "message": "Translated" },
+  "log_NOT_TRANSLATED": { "message": "Not translated" },
   "log_LANGUAGES": { "message": "Languages" },
   "log_IGNORED_KEYS": { "message": "Ignored key(s)" },
   "log_NO_NEW_KEYS_ADDED": { "message": "No new keys added (all already present)" },
   "log_ALL_JSON_UPDATED": { "message": "All JSON files updated successfully" },
   "log_TYPE": { "message": "Type" },
   "log_TO_CREATE_DEFAULT_CONFIG": { "message": "to create default config file" },
   "log_FOR_AVAIL_OPTIONS": { "message": "for available options" },
+  "log_VERSION": { "message": "version" },
   "tip_FOR_MORE_HELP_VISIT": { "message": "For more help, visit" },
   "tip_PASS_FORCE_TO_OVERWRITE": { "message": "Pass --force to overwrite" },
   "tip_MOVE_CONFIG_TO_ROOT": { "message": "Move config file to root of project you wish to use it in" },
@@ -33,6 +36,8 @@
   "err_PARSE_FAILED": { "message": "Failed to parse" },
   "err_TRANSLATE_FAILED_FOR_KEY": { "message": "Translation failed for key" },
   "err_EN_LOC_NOT_FOUND_AT": { "message": "English locale not found at" },
+  "err_INVALID_KEY": { "message": "Invalid key" },
+  "err_FOUND_IN": { "message": "found in" },
   "help_LOCALES_DIR": { "message": "Name of the folder containing locale files (default: \"_locales\")" },
   "help_TARGET_LANGS": { "message": "Languages to translate to (e.g. \"es,fr\") (default: all 100+ supported locales)" },
   "help_KEYS": { "message": "Keys to translate (e.g. \"app_DESC,err_NOT_FOUND\") (default: all found src keys missing in target files)" },

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

@@ -48,7 +48,7 @@ def config_filepath(cli): # for settings.load()
             log.debug(f'Config file found: {cli.config_filepath}')
             return
         else:
-            log.warn(f'{cli.msgs.warn_SPECIFIED_CONFIG} {cli.config_filepath} not found')
+            log.warn(f'{cli.msgs.warn_SPECIFIED_CONFIG} {cli.config_filepath} {cli.msgs.warn_NOT_FOUND}')
 
     # Search upwards
     possible_config_filenames = [

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

@@ -29,7 +29,7 @@ def overwrite_print(msg, *args, **kwargs):
     sys.stdout.write('\r' + msg.format(*args, **kwargs).ljust(terminal_width)[:terminal_width])
 def success(msg, *args, **kwargs) : print(f'\n{colors.bg}{msg.format(*args, **kwargs)}{colors.nc}')
 def tip(msg, *args, **kwargs) : print(f'\n{colors.bc}TIP: {msg.format(*args, **kwargs)}{colors.nc}')
-def version(cli) : print(f'\n{colors.by}{cli.name}\n{colors.bw}version: {cli.version}{colors.nc}')
+def version(cli) : print(f'\n{colors.by}{cli.name}\n{colors.bw}{cli.msgs.log_VERSION}: {cli.version}{colors.nc}')
 def warn(msg, *args, **kwargs) : print(f'\n{colors.bo}WARNING: {msg.format(*args, **kwargs)}{colors.nc}')
 
 def debug(msg, cli=None, *args, **kwargs):
@@ -42,8 +42,10 @@ def debug(msg, cli=None, *args, **kwargs):
         debug_key = sys.argv[debug_argidx +1].replace('-', '_')
 
     if cli: # init data line
-        data_val = getattr(cli.config, debug_key, f'cli.config key "{debug_key}" not found') if debug_key \
-              else cli.config
+        if debug_key:
+            data_val = getattr(cli.config, debug_key, f'cli.config key "{debug_key}" {cli.msgs.warn_NOT_FOUND.lower()}')
+        else:
+            data_val = cli.config
         msg += f'\n{colors.gry}{data_val}{colors.nc}'
 
     if args: # use 'em
@@ -56,7 +58,9 @@ def final_summary(msgs, summary_dict):
     for name, lang_set in summary_dict.items():
         if lang_set:
             status = name.replace('_', ' ')
-            status_color = colors.by if status == 'translated' else colors.bg if status == 'added' else colors.gry
+            status_color = colors.by if status == msgs.log_TRANSLATED.lower() \
+                      else colors.bg if status == msgs.log_ADDED.lower() \
+                      else colors.gry
             data(f'{msgs.log_LANGUAGES} {status}: {len(lang_set)}')
             print(f"{status_color}[ {', '.join(lang_set)} ]{colors.nc}")
 

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

@@ -77,7 +77,9 @@ def load(cli):
                     setattr(cli.config, key, val)
                 else:
                     log.init_cmd_docs_url_exit(cli,
-                        f"Invalid key '{key}' found in \n{log.colors.gry}{cli.config_filepath}")
+                        f"{cli.msgs.err_INVALID_KEY} '{key}' {cli.msgs.err_FOUND_IN}"
+                        f'\n{log.colors.gry}{cli.config_filepath}'
+                    )
         log.debug('Config file loaded!', cli)
     else:
         log.debug('No config file found.')