diff --git a/functions/combine_materials.py b/functions/combine_materials.py index 58fce78..d2fa56a 100644 --- a/functions/combine_materials.py +++ b/functions/combine_materials.py @@ -59,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 = t("Optimization.combinematerials.label") - bl_description = t("Optimization.combinematerials.desc") + bl_label = t("Optimization.combine_materials.label") + bl_description = t("Optimization.combine_materials.desc") bl_options = {'REGISTER', 'UNDO'} @classmethod diff --git a/functions/join_meshes.py b/functions/join_meshes.py index b2edfef..195870e 100644 --- a/functions/join_meshes.py +++ b/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 diff --git a/functions/resonite_functions.py b/functions/resonite_functions.py index adaeead..74a80be 100644 --- a/functions/resonite_functions.py +++ b/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 diff --git a/resources/translations/en_US.json b/resources/translations/en_US.json index bb29761..53554ed 100644 --- a/resources/translations/en_US.json +++ b/resources/translations/en_US.json @@ -1,19 +1,33 @@ { "messages": { - "Settings.label": "Settings", - "Settings.language.label": "Language", - "Settings.language.desc": "Select the language for the addon's UI", + "Quick_Access.label": "Quick Access", + "Quick_Access.import_export.label": "Import/Export", + "Quick_Access.options": "Quick Access Options", + "Quick_Access.import_export.txt": "Import/Export", + "Quick_Access.import_menu.label": "Import Menu", + "Quick_Access.import": "Import", + "Quick_Access.export": "Export", + "Quick_Access.import_pmx": "Import PMX", + "Quick_Access.import_pmd": "Import PMD", + "Quick_Access.export_menu.label": "Export Menu", + "Quick_Access.select_export.label": "Select Export Method", + "Quick_Access.select_export_resonite.label": "Resonite", "Export.resonite.label": "Export to Resonite", "Export.resonite.desc": "Export a GLB with all animations and materials. For animation data see:", - "Optimization.combinematerials.label": "Combine Materials", - "Optimization.combinematerials.desc": "Combine similar materials to optimize the model", - "QuickAccess.label": "Quick Access", - "QuickAcess.importexport.txt": "Import/Export", - "QuickAccess.options": "Quick Access Options", - "QuickAccess.importexport.txt": "Import/Export", - "QuickAccess.import": "Import", - "QuickAccess.export": "Export" + "Optimization.label": "Optimization", + "Optimization.options.label": "Optimization Options", + "Optimization.combine_materials.label": "Combine Materials", + "Optimization.combine_materials.desc": "Combine similar materials to optimize the model", + "Optimization.join_all_meshes.label": "Join All Meshes", + "Optimization.join_all_meshes.desc": "Join all meshes into one", + "Optimization.join_selected_meshes.label": "Join Selected Mehses", + "Optimization.join_selected_meshes.desc": "Join all currntly Selected Mehses into one", + "Tools.tools_title.label": "Tools", + "Tools.convert_to_resonite.label": "Convert to Resonite", + "Tools.convert_to_resonite.desc": "Converts bone names on a model to names compatable with Resonite", + "Settings.label": "Settings", + "Settings.language.label": "Language", + "Settings.language.desc": "Select the language for the addon's UI" } } - \ No newline at end of file diff --git a/resources/translations/ja_JP.json b/resources/translations/ja_JP.json index 625f13a..91d6509 100644 --- a/resources/translations/ja_JP.json +++ b/resources/translations/ja_JP.json @@ -1,17 +1,32 @@ { "messages": { - "Settings.label": "設定", - "Settings.language.label": "言語", - "Settings.language.desc": "アドオンのUI言語を選択してください", + "Quick_Access.label": "クイックアクセス", + "Quick_Access.import_export.label": "インポート/エクスポート", + "Quick_Access.options": "クイックアクセスオプション", + "Quick_Access.import_export.txt": "インポート/エクスポート", + "Quick_Access.import_menu.label": "インポートメニュー", + "Quick_Access.import": "インポート", + "Quick_Access.export": "エクスポート", + "Quick_Access.import_pmx": "PMXインポート", + "Quick_Access.import_pmd": "PMDインポート", + "Quick_Access.export_menu.label": "エクスポートメニュー", + "Quick_Access.select_export.label": "エクスポート方法を選択", + "Quick_Access.select_export_resonite.label": "Resonite", "Export.resonite.label": "Resoniteにエクスポート", "Export.resonite.desc": "すべてのアニメーションとマテリアルを含むGLBをエクスポートします。アニメーションデータについては以下を参照してください:", - "Optimization.combinematerials.label": "マテリアルを結合", - "Optimization.combinematerials.desc": "類似したマテリアルを結合してモデルを最適化します", - "QuickAccess.label": "クイックアクセス", - "QuickAcess.importexport.txt": "インポート/エクスポート", - "QuickAccess.options": "クイックアクセスオプション", - "QuickAccess.importexport.txt": "インポート/エクスポート", - "QuickAccess.import": "インポート", - "QuickAccess.export": "エクスポート" + "Optimization.label": "最適化", + "Optimization.options.label": "最適化オプション", + "Optimization.combine_materials.label": "マテリアルを結合", + "Optimization.combine_materials.desc": "類似したマテリアルを結合してモデルを最適化します", + "Optimization.join_all_meshes.label": "すべてのメッシュを結合", + "Optimization.join_all_meshes.desc": "すべてのメッシュを1つに結合します", + "Optimization.join_selected_meshes.label": "選択したメッシュを結合", + "Optimization.join_selected_meshes.desc": "現在選択されているすべてのメッシュを1つに結合します", + "Tools.tools_title.label": "ツール", + "Tools.convert_to_resonite.label": "Resoniteに変換", + "Tools.convert_to_resonite.desc": "モデルのボーン名をResoniteと互換性のある名前に変換します", + "Settings.label": "設定", + "Settings.language.label": "言語", + "Settings.language.desc": "アドオンのUI言語を選択してください" } } diff --git a/ui/optimization.py b/ui/optimization.py index 2f6e69a..674bfb7 100644 --- a/ui/optimization.py +++ b/ui/optimization.py @@ -1,10 +1,11 @@ import bpy from ..core.register import register_wrap from .panel import AvatarToolkitPanel +from ..functions.translations import t @register_wrap class AvatarToolkitOptimizationPanel(bpy.types.Panel): - bl_label = "Optimization" + bl_label = t("Optimization.label") bl_idname = "OBJECT_PT_avatar_toolkit_optimization" bl_space_type = 'VIEW_3D' bl_region_type = 'UI' @@ -13,18 +14,19 @@ class AvatarToolkitOptimizationPanel(bpy.types.Panel): def draw(self, context): layout = self.layout - layout.label(text="Optimization Options") + layout.label(text=t("Optimization.options.label")) row = layout.row() row.scale_y = 1.2 - row.operator("avatar_toolkit.combine_materials", text="Combine Materials") + row.operator("avatar_toolkit.combine_materials", text=t("Optimization.combine_materials.label")) + layout.separator(factor=0.5) row = layout.row(align=True) row.scale_y = 1.2 - row.operator("avatar_toolkit.join_all_meshes", text="Join All Meshes") - row.operator("avatar_toolkit.join_selected_meshes", text="Join Selected Meshes") + row.operator("avatar_toolkit.join_all_meshes", text=t("Optimization.join_all_meshes.label")) + row.operator("avatar_toolkit.join_selected_meshes", text=t("Optimization.join_selected_meshes.label")) # Add optimization options here diff --git a/ui/panel.py b/ui/panel.py index a987a28..29829de 100644 --- a/ui/panel.py +++ b/ui/panel.py @@ -1,5 +1,6 @@ import bpy from ..core.register import register_wrap +from ..functions.translations import t @register_wrap class AvatarToolkitPanel(bpy.types.Panel): diff --git a/ui/quick_access.py b/ui/quick_access.py index bb1a9b2..d317a64 100644 --- a/ui/quick_access.py +++ b/ui/quick_access.py @@ -9,7 +9,7 @@ from ..core.import_pmd import import_pmd @register_wrap class AvatarToolkitQuickAccessPanel(bpy.types.Panel): - bl_label = t("QuickAccesslabel") + bl_label = t("Quick_Access.label") bl_idname = "OBJECT_PT_avatar_toolkit_quick_access" bl_space_type = 'VIEW_3D' bl_region_type = 'UI' @@ -18,22 +18,22 @@ class AvatarToolkitQuickAccessPanel(bpy.types.Panel): def draw(self, context: Context): layout = self.layout - layout.label(text=t("QuickAccess.options")) + layout.label(text=t("Quick_Access.options")) row = layout.row() - row.label(text=t("QuickAccess.importexport.txt"), icon='IMPORT') + row.label(text=t("Quick_Access.import_export.label"), icon='IMPORT') layout.separator(factor=0.5) row = layout.row(align=True) row.scale_y = 1.5 - row.operator("avatar_toolkit.import_menu", text=t("QuickAccess.import")) - row.operator("avatar_toolkit.export_menu", text=t("QuickAccess.export")) + row.operator("avatar_toolkit.import_menu", text=t("Quick_Access.import")) + row.operator("avatar_toolkit.export_menu", text=t("Quick_Access.export")) @register_wrap class AVATAR_TOOLKIT_OT_import_menu(bpy.types.Operator): bl_idname = "avatar_toolkit.import_menu" - bl_label = "Import Menu" + bl_label = t("Quick_Access.import_menu.label") def execute(self, context: Context): return {'FINISHED'} @@ -45,13 +45,13 @@ class AVATAR_TOOLKIT_OT_import_menu(bpy.types.Operator): def draw(self, context: Context): layout = self.layout layout.label(text="Select Import Method") - layout.operator("avatar_toolkit.import_pmx", text="Import PMX") - layout.operator("avatar_toolkit.import_pmd", text="Import PMD") + layout.operator("avatar_toolkit.import_pmx", text=t("Quick_Access.import_pmx")) + layout.operator("avatar_toolkit.import_pmd", text=t("Quick_Access.import_pmd")) @register_wrap class AVATAR_TOOLKIT_OT_export_menu(bpy.types.Operator): bl_idname = "avatar_toolkit.export_menu" - bl_label = "Export Menu" + bl_label = t("Quick_Access.export_menu.label") def execute(self, context: Context): return {'FINISHED'} @@ -62,13 +62,13 @@ class AVATAR_TOOLKIT_OT_export_menu(bpy.types.Operator): def draw(self, context: Context): layout = self.layout - layout.label(text="Select Export Method") - layout.operator("avatar_toolkit.export_resonite", text="Export Resonite") + layout.label(text=t("Quick_Access.select_export.label")) + layout.operator("avatar_toolkit.export_resonite", text=t("Quick_Access.select_export_resonite.label")) @register_wrap class AVATAR_TOOLKIT_OT_import_pmx(bpy.types.Operator): bl_idname = "avatar_toolkit.import_pmx" - bl_label = "Import PMX" + bl_label = t("Quick_Access.import_pmx") filepath: bpy.props.StringProperty(subtype="FILE_PATH") @@ -83,7 +83,7 @@ class AVATAR_TOOLKIT_OT_import_pmx(bpy.types.Operator): @register_wrap class AVATAR_TOOLKIT_OT_import_pmd(bpy.types.Operator): bl_idname = "avatar_toolkit.import_pmd" - bl_label = "Import PMD" + bl_label = t("Quick_Access.import_pmd") filepath: bpy.props.StringProperty(subtype="FILE_PATH") diff --git a/ui/tools.py b/ui/tools.py index 408a95d..58bf61c 100644 --- a/ui/tools.py +++ b/ui/tools.py @@ -2,6 +2,7 @@ import bpy from ..core.register import register_wrap from .panel import AvatarToolkitPanel from bpy.types import Context +from ..functions.translations import t @register_wrap class AvatarToolkitToolsPanel(bpy.types.Panel): @@ -14,9 +15,9 @@ class AvatarToolkitToolsPanel(bpy.types.Panel): def draw(self, context: Context): layout = self.layout - layout.label(text="Tools") + layout.label(text=t("Tools.tools_title.label")) layout.separator(factor=0.5) row = layout.row(align=True) row.scale_y = 1.5 - row.operator("avatar_toolkit.convert_to_resonite", text="Translate to Resonite") \ No newline at end of file + row.operator("avatar_toolkit.convert_to_resonite", text=t("Tools.convert_to_resonite.label")) \ No newline at end of file