Merge branch 'master' of https://github.com/haxeui/haxeui-core

haxeui · Aug 26, 2024 · ac541d2 · ac541d2
2 parents 651fa6b + aea9139
commit ac541d2
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 2 deletions.
diff --git a/haxe/ui/_module/locale/fr/form-strings.properties b/haxe/ui/_module/locale/fr/form-strings.properties
@@ -0,0 +1 @@
+form.field.required=Le champs est requis
diff --git a/haxe/ui/_module/locale/fr/messagebox-strings.properties b/haxe/ui/_module/locale/fr/messagebox-strings.properties
@@ -0,0 +1,4 @@
+messagebox.title.info=Info
+messagebox.title.question=Question
+messagebox.title.warning=Avertissement
+messagebox.title.error=Erreur
diff --git a/haxe/ui/components/NumberStepper.hx b/haxe/ui/components/NumberStepper.hx
@@ -256,7 +256,7 @@ private class Events extends haxe.ui.events.Events {
         _stepper.unregisterEvent(FocusEvent.FOCUS_IN, onFocusIn);
         _stepper.unregisterEvent(FocusEvent.FOCUS_OUT, onFocusOut);
         _stepper.unregisterEvent(MouseEvent.MOUSE_WHEEL, onMouseWheel);
-        LocaleManager.instance.unregisterEvent(LocaleEvent.LOCALE_CHANGED, onLocaleChanged);
+        removeLocaleChanged();
 
         var value:TextField = _stepper.findComponent("value", TextField);
         value.unregisterEvent(UIEvent.CHANGE, onValueFieldChange);
@@ -268,7 +268,17 @@ private class Events extends haxe.ui.events.Events {
         inc.unregisterEvent(MouseEvent.CLICK, onInc);
         unregisterEvent(ActionEvent.ACTION_START, onActionStart);
     }
-
+
+    public override function onDispose() {
+        // `unregister()` isn't called when the component is disposed,
+        // so this listener would be left lingering
+        removeLocaleChanged();
+    }
+
+    private function removeLocaleChanged() {
+        LocaleManager.instance.unregisterEvent(LocaleEvent.LOCALE_CHANGED, onLocaleChanged);
+    }
+
     private var _autoCorrectTimer:Timer = null;
     private function onValueFieldChange(event:UIEvent) {
         if (_stepper.autoCorrect == true) {

diff --git a/haxe/ui/module.xml b/haxe/ui/module.xml
@@ -19,6 +19,8 @@
             <resource path="haxeui-core/locale/en/expression-replacements.properties" />
             <resource path="haxeui-core/locale/en/std-strings.properties" />
             <resource path="haxeui-core/locale/en/formats.properties" />
+            <resource path="haxeui-core/locale/en/form-strings.properties" />
+            <resource path="haxeui-core/locale/en/messagebox-strings.properties" />
         </locale>
         <locale id="en_US">
             <resource path="haxeui-core/locale/en_US/formats.properties" />
@@ -37,12 +39,21 @@
             <resource path="haxeui-core/locale/fr/expression-replacements.properties" />
             <resource path="haxeui-core/locale/fr/std-strings.properties" />
             <resource path="haxeui-core/locale/fr/formats.properties" />
+            <resource path="haxeui-core/locale/fr/form-strings.properties" />
+            <resource path="haxeui-core/locale/fr/messagebox-strings.properties" />
         </locale>
         <locale id="it">
             <resource path="haxeui-core/locale/it/expression-replacements.properties" />
             <resource path="haxeui-core/locale/it/std-strings.properties" />
             <resource path="haxeui-core/locale/it/formats.properties" />
         </locale>
+        <locale id="pt">
+            <resource path="haxeui-core/locale/pt/expression-replacements.properties" />
+            <resource path="haxeui-core/locale/pt/std-strings.properties" />
+            <resource path="haxeui-core/locale/pt/formats.properties" />
+            <resource path="haxeui-core/locale/pt/form-strings.properties" />
+            <resource path="haxeui-core/locale/pt/messagebox-strings.properties" />
+        </locale>
         <locale id="ru">
             <resource path="haxeui-core/locale/ru/expression-replacements.properties" />
             <resource path="haxeui-core/locale/ru/std-strings.properties" />

diff --git a/haxe/ui/util/RTTI.hx b/haxe/ui/util/RTTI.hx
@@ -137,6 +137,10 @@ class RTTI {
             return _allPropertiesCache.get(cacheKey);
         }
 
+        if (classInfo == null) {
+            return null;
+        }
+
         var entry = classInfo.get(className);
         var properties = null;
         if (entry != null) {