Merge pull request #77 from anatawa12/internationalization

Internationalization
anatawa12 · Mar 26, 2023 · 3c68f7f · 3c68f7f
2 parents 362e18f + f5ab1b2
commit 3c68f7f
Show file tree

Hide file tree

Showing 33 changed files with 403 additions and 129 deletions.
diff --git a/CHANGELOG-PRERELEASE.md b/CHANGELOG-PRERELEASE.md
@@ -8,6 +8,10 @@ The format is based on [Keep a Changelog].
 
 ## [Unreleased]
 ### Added
+- Internationalization support `#77`
+  - This adds way to translate editor elements.
+  - However, no other language translation than English is not added yet.
+  - Please feel free to make PullRequest if you can maintain the translation.
 
 ### Changed
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,10 @@ The format is based on [Keep a Changelog].
 
 ## [Unreleased]
 ### Added
+- Internationalization support `#77`
+  - This adds way to translate editor elements. 
+  - However, no other language translation than English is not added yet. 
+  - Please feel free to make PullRequest if you can maintain the translation.
 
 ### Changed
 

diff --git a/Editor/AvatarTagComponentEditorBase.cs b/Editor/AvatarTagComponentEditorBase.cs
@@ -0,0 +1,46 @@
+using CustomLocalization4EditorExtension;
+using UnityEditor;
+
+namespace Anatawa12.AvatarOptimizer
+{
+    abstract class AvatarTagComponentEditorBase : Editor
+    {
+        private readonly SaveVersionDrawer _saveVersion = new SaveVersionDrawer();
+
+        public sealed override void OnInspectorGUI()
+        {
+            CL4EE.DrawLanguagePicker();
+
+            var description = Description;
+            if (!string.IsNullOrEmpty(description))
+                EditorGUILayout.HelpBox(description, MessageType.None);
+
+            _saveVersion.Draw(serializedObject);
+
+            OnInspectorGUIInner();
+        }
+
+        protected virtual string Description => null;
+        protected abstract void OnInspectorGUIInner();
+    }
+
+    [CustomEditor(typeof(AvatarTagComponent), true)]
+    class DefaultAvatarTagComponentEditor : AvatarTagComponentEditorBase
+    {
+        protected override void OnInspectorGUIInner()
+        {
+            serializedObject.UpdateIfRequiredOrScript();
+            var iterator = serializedObject.GetIterator();
+
+            var enterChildren = true;
+            while (iterator.NextVisible(enterChildren))
+            {
+                if ("m_Script" != iterator.propertyPath)
+                    EditorGUILayout.PropertyField(iterator, true);
+                enterChildren = false;
+            }
+
+            serializedObject.ApplyModifiedProperties();
+        }
+    }
+}
diff --git a/Editor/AvatarTagComponentEditorBase.cs.meta b/Editor/AvatarTagComponentEditorBase.cs.meta
diff --git a/Editor/AvatarTagComponentEditor.cs → Editor/AvatarTagComponentEditorImpl.cs b/Editor/AvatarTagComponentEditor.cs → Editor/AvatarTagComponentEditorImpl.cs
@@ -5,7 +5,7 @@
 namespace Anatawa12.AvatarOptimizer
 {
     [UsedImplicitly]
-    public class AvatarTagComponentEditor
+    public class AvatarTagComponentEditorImpl
     {
         [UsedImplicitly]
         public static void SetCurrentSaveVersion(AvatarTagComponent component)

diff --git a/Editor/AvatarTagComponentEditor.cs.meta → Editor/AvatarTagComponentEditorImpl.cs.meta b/Editor/AvatarTagComponentEditor.cs.meta → Editor/AvatarTagComponentEditorImpl.cs.meta
diff --git a/Editor/ClearEndpointPositionEditor.cs b/Editor/ClearEndpointPositionEditor.cs
@@ -1,22 +1,19 @@
 using Anatawa12.AvatarOptimizer.Processors;
+using CustomLocalization4EditorExtension;
 using UnityEditor;
 using UnityEngine;
 using VRC.Dynamics;
 
 namespace Anatawa12.AvatarOptimizer
 {
     [CustomEditor(typeof(ClearEndpointPosition))]
-    internal class ClearEndpointPositionEditor : Editor
+    internal class ClearEndpointPositionEditor : AvatarTagComponentEditorBase
     {
-        private readonly SaveVersionDrawer _saveVersion = new SaveVersionDrawer();
-        public override void OnInspectorGUI()
-        {
-            EditorGUILayout.LabelField("You clear Endpoint Position with _end bones.");
-            EditorGUILayout.LabelField("This can be useful for MergeBone component");
-
-            _saveVersion.Draw(serializedObject);
+        protected override string Description => CL4EE.Tr("ClearEndpointPosition:description");
 
-            if (GUILayout.Button("Apply and Remove Component"))
+        protected override void OnInspectorGUIInner()
+        {
+            if (GUILayout.Button(CL4EE.Tr("ClearEndpointPosition:button:Apply and Remove Component")))
             {
                 ClearEndpointPositionProcessor.Process(((Component)target).GetComponent<VRCPhysBoneBase>());
                 DestroyImmediate(target);

diff --git a/Editor/FreezeBlendShapeEditor.cs b/Editor/FreezeBlendShapeEditor.cs
@@ -1,12 +1,12 @@
+using CustomLocalization4EditorExtension;
 using UnityEditor;
 using UnityEngine;
 
 namespace Anatawa12.AvatarOptimizer
 {
     [CustomEditor(typeof(FreezeBlendShape))]
-    public class FreezeBlendShapeEditor : Editor
+    class FreezeBlendShapeEditor : AvatarTagComponentEditorBase
     {
-        private readonly SaveVersionDrawer _saveVersion = new SaveVersionDrawer();
         private PrefabSafeSet.EditorUtil<string> _shapeKeysSet;
 
         private void OnEnable()
@@ -19,16 +19,8 @@ private void OnEnable()
                 (x, v) => x.stringValue = v);
         }
 
-        public override void OnInspectorGUI()
+        protected override void OnInspectorGUIInner()
         {
-            if (targets.Length != 1)
-            {
-                EditorGUILayout.LabelField("MultiTarget Editing is not supported");
-                return;
-            }
-
-            _saveVersion.Draw(serializedObject);
-
             var component = (FreezeBlendShape)target;
 
             var shapes = EditSkinnedMeshComponentUtil.GetBlendShapes(component.GetComponent<SkinnedMeshRenderer>(), component);
@@ -47,13 +39,13 @@ public override void OnInspectorGUI()
 
             using (new GUILayout.HorizontalScope())
             {
-                if (GUILayout.Button("Check All"))
+                if (GUILayout.Button(CL4EE.Tr("FreezeBlendShape:button:Check All")))
                 {
                     foreach (var shapeKeyName in shapes)
                         _shapeKeysSet.GetElementOf(shapeKeyName).EnsureAdded();
                 }
 
-                if (GUILayout.Button("Invert All"))
+                if (GUILayout.Button(CL4EE.Tr("FreezeBlendShape:button:Invert All")))
                 {
                     foreach (var shapeKeyName in shapes)
                     {

diff --git a/Editor/Localizations.cs b/Editor/Localizations.cs
@@ -0,0 +1,11 @@
+using CustomLocalization4EditorExtension;
+
+namespace Anatawa12.AvatarOptimizer
+{
+    static class Localizations
+    {
+        [AssemblyCL4EELocalization]
+        public static Localization Localization { get; } = new Localization(
+            "8b53df9f2e18428bbba2165c4f2af9be", "en");
+    }
+}
diff --git a/Editor/Localizations.cs.meta b/Editor/Localizations.cs.meta
diff --git a/Editor/MakeChildrenEditor.cs b/Editor/MakeChildrenEditor.cs
@@ -1,24 +1,23 @@
 using System;
+using CustomLocalization4EditorExtension;
 using UnityEditor;
 
 namespace Anatawa12.AvatarOptimizer
 {
     [CustomEditor(typeof(MakeChildren))]
     [CanEditMultipleObjects]
-    internal class MakeChildrenEditor : Editor
+    internal class MakeChildrenEditor : AvatarTagComponentEditorBase
     {
-        private readonly SaveVersionDrawer _saveVersion = new SaveVersionDrawer();
+        protected override string Description => CL4EE.Tr("MakeChildren:description");
         private SerializedProperty _children;
 
         private void OnEnable()
         {
             _children = serializedObject.FindProperty(nameof(MakeChildren.children));
         }
 
-        public override void OnInspectorGUI()
+        protected override void OnInspectorGUIInner()
         {
-            EditorGUILayout.HelpBox("This component will make children at build time", MessageType.Info);
-            _saveVersion.Draw(serializedObject);
             EditorGUILayout.PropertyField(_children);
             serializedObject.ApplyModifiedProperties();
         }

diff --git a/Editor/MergeBoneEditor.cs b/Editor/MergeBoneEditor.cs
@@ -1,15 +1,15 @@
+using CustomLocalization4EditorExtension;
 using UnityEditor;
 
 namespace Anatawa12.AvatarOptimizer
 {
     [CustomEditor(typeof(MergeBone))]
-    public class MergeBoneEditor : Editor
+    class MergeBoneEditor : AvatarTagComponentEditorBase
     {
-        private SaveVersionDrawer _saveVersion = new SaveVersionDrawer();
-        public override void OnInspectorGUI()
+        protected override string Description => CL4EE.Tr("MergeBone:description");
+
+        protected override void OnInspectorGUIInner()
         {
-            EditorGUILayout.LabelField("You will remove this GameObject and merge bone to parent");
-            _saveVersion.Draw(serializedObject);
         }
     }
 }
diff --git a/Editor/MergePhysBoneEditor.cs b/Editor/MergePhysBoneEditor.cs
@@ -1,13 +1,14 @@
 using System;
 using System.Linq;
+using CustomLocalization4EditorExtension;
 using UnityEditor;
 using UnityEngine;
 using VRC.Dynamics;
 
 namespace Anatawa12.AvatarOptimizer
 {
     [CustomEditor(typeof(MergePhysBone))]
-    internal class MergePhysBoneEditor : Editor
+    internal class MergePhysBoneEditor : AvatarTagComponentEditorBase
     {
         private static class Style
         {
@@ -24,7 +25,6 @@ private static class Style
             };
         }
 
-        private readonly SaveVersionDrawer _saveVersion = new SaveVersionDrawer();
         private SerializedProperty _mergedComponentProp;
         private SerializedProperty _rootTransformProp;
         private SerializedProperty _forcesProp;
@@ -79,9 +79,8 @@ private void OnEnable()
                 (x, v) => x.objectReferenceValue = v);
         }
 
-        public override void OnInspectorGUI()
+        protected override void OnInspectorGUIInner()
         {
-            _saveVersion.Draw(serializedObject);
             EditorGUI.BeginDisabledGroup(_mergedComponentProp.objectReferenceValue != null);
             EditorGUILayout.PropertyField(_mergedComponentProp);
             EditorGUI.EndDisabledGroup();
@@ -116,7 +115,8 @@ public override void OnInspectorGUI()
                     break;
                 case VRCPhysBoneBase.LimitType.Angle:
                 case VRCPhysBoneBase.LimitType.Hinge:
-                    EditorGUILayout.PropertyField(_maxAngleXProp, new GUIContent("Max Angle"));
+                    EditorGUILayout.PropertyField(_maxAngleXProp,
+                        new GUIContent(CL4EE.Tr("MergePhysBone:prop:Max Angle")));
                     EditorGUILayout.PropertyField(_limitRotationProp);
                     break;
                 case VRCPhysBoneBase.LimitType.Polar:

diff --git a/Editor/MergeSkinnedMeshEditor.cs b/Editor/MergeSkinnedMeshEditor.cs
@@ -1,14 +1,13 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
+using CustomLocalization4EditorExtension;
 using UnityEditor;
 using UnityEngine;
-using Object = UnityEngine.Object;
 
 namespace Anatawa12.AvatarOptimizer
 {
     [CustomEditor(typeof(MergeSkinnedMesh))]
-    internal class MergeSkinnedMeshEditor : Editor
+    internal class MergeSkinnedMeshEditor : AvatarTagComponentEditorBase
     {
         private static class Style
         {
@@ -25,7 +24,6 @@ private static class Style
             };
         }
 
-        private readonly SaveVersionDrawer _saveVersion = new SaveVersionDrawer();
         SerializedProperty _renderersSetProp;
         SerializedProperty _staticRenderersSetProp;
         SerializedProperty _removeEmptyRendererObjectProp;
@@ -44,14 +42,11 @@ private void OnEnable()
                 (x, v) => x.objectReferenceValue = v);
         }
 
-        public override void OnInspectorGUI()
+        protected override void OnInspectorGUIInner()
         {
-            _saveVersion.Draw(serializedObject);
             if (((MergeSkinnedMesh)target).GetComponent<SkinnedMeshRenderer>().sharedMesh)
             {
-                GUILayout.Label($"Mesh of SkinnedMeshRenderer is not None!", Style.WarningStyle);
-                GUILayout.Label($"You should add MergeSkinnedMesh onto new GameObject with new SkinnedMeshRenderer!",
-                    Style.WarningStyle);
+                EditorGUILayout.HelpBox(CL4EE.Tr("MergeSkinnedMesh:warning:MeshIsNotNone"), MessageType.Warning);
             }
 
             EditorGUILayout.PropertyField(_renderersSetProp);
@@ -60,45 +55,13 @@ public override void OnInspectorGUI()
 
             serializedObject.ApplyModifiedProperties();
 
-            EditorGUILayout.LabelField("Merge Materials:", EditorStyles.boldLabel);
+            EditorGUILayout.LabelField(CL4EE.Tr("MergeSkinnedMesh:label:Merge Materials"), EditorStyles.boldLabel);
             if (targets.Length != 1)
                 EditorGUILayout.LabelField("MergeMaterial is not supported with Multi Target Editor");
             else
                 MergeMaterials((MergeSkinnedMesh)target);
         }
 
-        public void ShowRenderers<T>(string property, SerializedProperty array, Action<T> validation)
-            where T : Object
-        {
-            EditorGUILayout.LabelField(property, EditorStyles.boldLabel);
-
-            EditorGUI.indentLevel++;
-            for (var i = 0; i < array.arraySize; i++)
-            {
-                var elementProp = array.GetArrayElementAtIndex(i);
-                EditorGUILayout.PropertyField(elementProp);
-
-                if (elementProp.objectReferenceValue == null)
-                {
-                    array.DeleteArrayElementAtIndex(i);
-                    i--;
-                }
-                else if (elementProp.objectReferenceValue is T renderer)
-                {
-                    validation(renderer);
-                }
-            }
-
-            var toAdd = (T)EditorGUILayout.ObjectField($"Element {array.arraySize}", null, typeof(T), true);
-            if (toAdd != null)
-            {
-                array.arraySize += 1;
-                array.GetArrayElementAtIndex(array.arraySize - 1).objectReferenceValue = toAdd;
-            }
-
-            EditorGUI.indentLevel--;
-        }
-
         public void MergeMaterials(MergeSkinnedMesh merge)
         {
             var materials = new HashSet<Material>();
@@ -123,11 +86,11 @@ public void MergeMaterials(MergeSkinnedMesh merge)
                 EditorGUI.indentLevel++;
                 var element = _doNotMergeMaterials.GetElementOf(group.Key);
                 var fieldPosition = EditorGUILayout.GetControlRect();
-                var label = new GUIContent("Merge");
+                var label = new GUIContent(CL4EE.Tr("MergeSkinnedMesh:label:Merge"));
                 using (new PrefabSafeSet.PropertyScope<Material>(element, fieldPosition, label))
                     element.SetExistence(!EditorGUI.ToggleLeft(fieldPosition, label, !element.Contains));
 
-                EditorGUILayout.LabelField("Renderers:");
+                EditorGUILayout.LabelField(CL4EE.Tr("MergeSkinnedMesh:label:Renderers"));
                 EditorGUI.indentLevel++;
                 EditorGUI.BeginDisabledGroup(true);
                 foreach (var (_, rendererIndex, _) in group)