Merge branch 'main' into RemoveDoubles

functions/combine_materials.py

@@ -4,6 +4,7 @@ from typing import List, Tuple, Optional
 from bpy.types import Material, Operator, Context, Object
 from ..core.common import clean_material_names
 from ..core.register import register_wrap
+from ..functions.translations import t
 
 def textures_match(tex1: bpy.types.ImageTexture, tex2: bpy.types.ImageTexture) -> bool:
     return tex1.image == tex2.image and tex1.extension == tex2.extension
@@ -58,8 +59,8 @@ def report_consolidated(self: Operator, num_combined: int) -> None:
 @register_wrap
 class CombineMaterials(Operator):
     bl_idname = "avatar_toolkit.combine_materials"
-    bl_label = "Combine Materials"
-    bl_description = "Combine similar materials to optimize the model"
+    bl_label = t("Optimization.combine_materials.label")
+    bl_description = t("Optimization.combine_materials.desc")
     bl_options = {'REGISTER', 'UNDO'}
 
     @classmethod

functions/join_meshes.py

@@ -3,12 +3,13 @@ from typing import List, Optional
 from bpy.types import Operator, Context, Object
 from ..core.register import register_wrap
 from ..core.common import fix_uv_coordinates
+from ..functions.translations import t
 
 @register_wrap
 class JoinAllMeshes(Operator):
     bl_idname = "avatar_toolkit.join_all_meshes"
-    bl_label = "Join All Meshes"
-    bl_description = "Join all meshes in the scene"
+    bl_label = t("Optimization.join_all_meshes.label")
+    bl_description = t("Optimization.join_all_meshes.desc")
     bl_options = {'REGISTER', 'UNDO'}
 
     @classmethod
@@ -45,8 +46,8 @@ class JoinAllMeshes(Operator):
 @register_wrap
 class JoinSelectedMeshes(Operator):
     bl_idname = "avatar_toolkit.join_selected_meshes"
-    bl_label = "Join Selected Meshes"
-    bl_description = "Join selected meshes"
+    bl_label = t("Optimization.join_selected_meshes.label")
+    bl_description = t("Optimization.join_selected_meshes.desc")
     bl_options = {'REGISTER', 'UNDO'}
 
     @classmethod

functions/resonite_functions.py

@@ -5,12 +5,13 @@ import re
 from bpy.types import Operator, Context, Object
 from ..core.dictionaries import bone_names
 from ..core.common import get_armature, simplify_bonename
+from ..functions.translations import t
 
 @register_wrap
 class ConvertToResonite(Operator):
     bl_idname = 'avatar_toolkit.convert_to_resonite'
-    bl_label = "Convert to Resonite" #t('Tools.convert_to_resonite.label')
-    bl_description = "Converts bone names on a model to names compatable with Resonite" #t('Tools.convert_to_resonite.desc')
+    bl_label = t('Tools.convert_to_resonite.label')
+    bl_description = t('Tools.convert_to_resonite.desc')
     bl_options = {'REGISTER', 'UNDO'}
 
     @classmethod

functions/translations.py

@@ -0,0 +1,97 @@
+import os
+import json
+import bpy
+from bpy.app.translations import locale
+from typing import Dict, List, Tuple
+from ..core.addon_preferences import save_preference, get_preference
+
+# Use __file__ to get the current file's directory
+current_dir = os.path.dirname(os.path.abspath(__file__))
+main_dir = os.path.dirname(current_dir)
+resources_dir = os.path.join(main_dir, "resources")
+translations_dir = os.path.join(resources_dir, "translations")
+
+dictionary: Dict[str, str] = dict()
+languages: List[str] = []
+verbose: bool = True
+
+def load_translations() -> bool:
+    global dictionary, languages
+
+    old_dictionary = dictionary.copy()
+
+    dictionary = dict()
+    languages = ["auto"]
+
+    # Populate languages list
+    for i in os.listdir(translations_dir):
+        lang = i.split(".")[0]
+        if lang != "auto":
+            languages.append(lang)
+
+    language_index = get_preference("language", 0)
+    print(f"Loading translations for language index: {language_index}")  # Debug print
+
+    if language_index == 0:  # "auto"
+        language = bpy.context.preferences.view.language
+    else:
+        try:
+            language = languages[language_index]
+        except IndexError:
+            language = bpy.context.preferences.view.language
+
+    print(f"Selected language: {language}")  # Debug print
+
+    translation_file: str = os.path.join(translations_dir, language + ".json")
+    if os.path.exists(translation_file):
+        with open(translation_file, 'r', encoding='utf-8') as file:
+            dictionary = json.load(file)["messages"]
+        print(f"Loaded translations: {dictionary}")  # Debug print
+    else:
+        custom_language: str = language.split("_")[0]
+        custom_translation_file: str = os.path.join(translations_dir, custom_language + ".json")
+        if os.path.exists(custom_translation_file):
+            with open(custom_translation_file, 'r', encoding='utf-8') as file:
+                dictionary = json.load(file)["messages"]
+            print(f"Loaded custom translations: {dictionary}")  # Debug print
+        else:
+            print(f"Translation file not found for language: {language}")
+            default_file: str = os.path.join(translations_dir, "en_US.json")
+            if os.path.exists(default_file):
+                with open(default_file, 'r', encoding='utf-8') as file:
+                    dictionary = json.load(file)["messages"]
+                print(f"Loaded default translations: {dictionary}")  # Debug print
+            else:
+                print("Default translation file 'en_US.json' not found.")
+
+    return dictionary != old_dictionary
+
+def t(phrase: str, default: str = None) -> str:
+    output: str = dictionary.get(phrase)
+    if output is None:
+        if verbose:
+            print(f'Warning: Unknown phrase: {phrase}')
+        return default if default is not None else phrase
+    print(f"Translating '{phrase}' to '{output}'")  # Debug print
+    return output
+
+def get_language_display_name(lang: str) -> str:
+    if lang == "auto":
+        return t("Language.auto", "Automatic")
+    return t(f"Language.{lang}", lang)
+
+def get_languages_list(self, context) -> List[Tuple[str, str, str]]:
+    return [(str(i), get_language_display_name(lang), f"Use {lang} language") for i, lang in enumerate(languages)]
+
+def update_language(self, context):
+    print(f"Updating language to: {self.avatar_toolkit_language}")  # Debug print
+    save_preference("language", int(self.avatar_toolkit_language))
+    load_translations()
+    # Set a flag to indicate that a language change has occurred
+    context.scene.avatar_toolkit_language_changed = True
+    # Show popup after language change
+    bpy.ops.avatar_toolkit.translation_restart_popup('INVOKE_DEFAULT')
+
+# Initial load of translations
+print("Performing initial load of translations")  # Debug print
+load_translations()