Some renaming/cleanup in i18n tools.

7 files changed, 11 insertions, 9 deletions

diff --git a/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py b/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py
index 5e58bccc6a8..9be786f14c1 100644
--- a/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py
+++ b/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py
@@ -30,7 +30,7 @@ import re
 import sys
 
 # XXX Relative import does not work here when used from Blender...
-from bl_i18n_utils import settings as i18n_settings, utils
+from bl_i18n_utils import settings as settings_i18n, utils
 
 import bpy
 
@@ -43,10 +43,10 @@ filter_message = ignore_reg.match
 
 def init_spell_check(settings, lang="en_US"):
     try:
-        from bl_i18n_utils import spell_check_utils
-        return spell_check_utils.SpellChecker(settings, lang)
+        from bl_i18n_utils import utils_spell_check
+        return utils_spell_check.SpellChecker(settings, lang)
     except Exception as e:
-        print("Failed to import spell_check_utils ({})".format(str(e)))
+        print("Failed to import utils_spell_check ({})".format(str(e)))
         return None
 
 
@@ -901,7 +901,7 @@ def main():
                         help="Override (some) default settings. Either a JSon file name, or a JSon string.")
     args = parser.parse_args()
 
-    settings = i18n_settings.I18nSettings()
+    settings = settings_i18n.I18nSettings()
     settings.from_json(args.settings)
 
     if args.output:
diff --git a/release/scripts/modules/bl_i18n_utils/settings.py b/release/scripts/modules/bl_i18n_utils/settings.py
index b94f49b74a2..f38635510b2 100644
--- a/release/scripts/modules/bl_i18n_utils/settings.py
+++ b/release/scripts/modules/bl_i18n_utils/settings.py
@@ -441,13 +441,13 @@ INTERN_PY_SYS_PATHS = ""
 # Custom override settings must be one dir above i18n tools itself!
 sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), "..")))
 try:
-    from bl_i18n_override_settings import *
+    from bl_i18n_settings_override import *
 except ImportError:  # If no i18n_override_settings available, it’s no error!
     pass
 
 # Override with custom user settings, if available.
 try:
-    from user_settings import *
+    from settings_user import *
 except ImportError:  # If no user_settings available, it’s no error!
     pass
 
diff --git a/release/scripts/modules/bl_i18n_utils/user_settings.py b/release/scripts/modules/bl_i18n_utils/settings_user.py
index 23d9783cd0f..23d9783cd0f 100644
--- a/release/scripts/modules/bl_i18n_utils/user_settings.py
+++ b/release/scripts/modules/bl_i18n_utils/settings_user.py
diff --git a/release/scripts/modules/bl_i18n_utils/utils.py b/release/scripts/modules/bl_i18n_utils/utils.py
index f9890d79144..e9af87e0c81 100644
--- a/release/scripts/modules/bl_i18n_utils/utils.py
+++ b/release/scripts/modules/bl_i18n_utils/utils.py
@@ -31,7 +31,9 @@ import sys
 import tempfile
 #import time
 
-from bl_i18n_utils import settings, rtl_utils
+from bl_i18n_utils import (settings,
+                           utils_rtl,
+                          )
 
 import bpy
 
@@ -402,7 +404,7 @@ class I18nMessages:
         for k, m in self.msgs.items():
             keys.append(k)
             trans.append(m.msgstr)
-        trans = rtl_utils.log2vis(trans, self.settings)
+        trans = utils_rtl.log2vis(trans, self.settings)
         for k, t in zip(keys, trans):
             self.msgs[k].msgstr = t
 
diff --git a/release/scripts/modules/bl_i18n_utils/languages_menu_utils.py b/release/scripts/modules/bl_i18n_utils/utils_languages_menu.py
index 789b1315659..789b1315659 100755
--- a/release/scripts/modules/bl_i18n_utils/languages_menu_utils.py
+++ b/release/scripts/modules/bl_i18n_utils/utils_languages_menu.py
diff --git a/release/scripts/modules/bl_i18n_utils/rtl_utils.py b/release/scripts/modules/bl_i18n_utils/utils_rtl.py
index 0544f93a262..0544f93a262 100755
--- a/release/scripts/modules/bl_i18n_utils/rtl_utils.py
+++ b/release/scripts/modules/bl_i18n_utils/utils_rtl.py
diff --git a/release/scripts/modules/bl_i18n_utils/spell_check_utils.py b/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
index 925166a3d8b..925166a3d8b 100644
--- a/release/scripts/modules/bl_i18n_utils/spell_check_utils.py
+++ b/release/scripts/modules/bl_i18n_utils/utils_spell_check.py