Merge pull request #61 from Shallowmallow/FixLocale2

Fix locale2
haxeui · Oct 3, 2024 · b716a18 · b716a18
2 parents 404d954 + de3133d
commit b716a18
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 2 deletions.
diff --git a/haxe/ui/backend/MessageBoxBase.hx b/haxe/ui/backend/MessageBoxBase.hx
@@ -1,5 +1,7 @@
 package haxe.ui.backend;
 
+import haxe.ui.util.ExpressionUtil;
+import haxe.ui.locale.LocaleManager;
 import haxe.ui.containers.dialogs.Dialog;
 import haxe.ui.containers.dialogs.MessageBox.MessageBoxType;
 import haxe.ui.core.Screen;
@@ -23,7 +25,10 @@ class MessageBoxBase extends Dialog {
             case MessageBoxType.TYPE_ERROR:
                 style = MessageDialogStyle.ICON_ERROR;
         }
-        var dialog:MessageDialog = new MessageDialog(Screen.instance.frame, _message, title, style);
+        var translatedMessage =LocaleManager.instance.stringToTranslation(_message);
+        var translatedTitle =LocaleManager.instance.stringToTranslation(_message);
+
+        var dialog:MessageDialog = new MessageDialog(Screen.instance.frame, translatedMessage, translatedTitle, style);
         var retVal = dialog.showModal();
         var event = new DialogEvent(DialogEvent.DIALOG_CLOSED);
         event.button = DialogBase.standardIdToButton(retVal);

diff --git a/haxe/ui/backend/hxwidgets/behaviours/ChoiceDataSource.hx b/haxe/ui/backend/hxwidgets/behaviours/ChoiceDataSource.hx
@@ -1,5 +1,7 @@
 package haxe.ui.backend.hxwidgets.behaviours;
 
+import haxe.ui.locale.LocaleEvent;
+import haxe.ui.locale.LocaleManager;
 import haxe.ui.events.UIEvent;
 import haxe.ui.behaviours.DataBehaviour;
 import haxe.ui.components.DropDown;
@@ -10,6 +12,13 @@ import hx.widgets.Choice;
 
 @:access(haxe.ui.core.Component)
 class ChoiceDataSource extends DataBehaviour {
+
+    public function new(component:haxe.ui.core.Component) {
+        super(component);
+        LocaleManager.instance.registerEvent(LocaleEvent.LOCALE_CHANGED, function (e) {
+            changeLang();
+        });
+    }
     public override function get():Variant {
         if (_value == null || _value.isNull) {
             _value = new ArrayDataSource<Dynamic>();
@@ -28,6 +37,36 @@ class ChoiceDataSource extends DataBehaviour {
         }
     }
 
+    public function changeLang() {
+        if (_component.window == null) {
+            return;
+        }
+
+        var choice:Choice = cast(_component.window, Choice);
+        var oldSelection = choice.selection;
+        choice.clear();
+
+        if (_value.isNull) {
+            return;
+        }
+
+        var ds:DataSource<Dynamic> = _value;
+        for (n in 0...ds.size) {
+            var item = ds.get(n);
+            if (item.text != null) {
+                choice.append(LocaleManager.instance.stringToTranslation(item.text));
+            } else {
+                choice.append(Std.string(item));
+            }
+        }
+
+        var dropDown:DropDown = cast(_component, DropDown);
+        choice.selection = oldSelection;
+        if (dropDown.text != null) {
+            choice.selectedString = dropDown.text;
+        }
+    }
+
     public override function validateData() {
         if (_component.window == null) {
             return;
@@ -44,7 +83,7 @@ class ChoiceDataSource extends DataBehaviour {
         for (n in 0...ds.size) {
             var item = ds.get(n);
             if (item.text != null) {
-                choice.append(item.text);
+                choice.append(LocaleManager.instance.stringToTranslation(item.text));
             } else {
                 choice.append(Std.string(item));
             }