🐞 dynamic translation issues (#328)

Parent issue: sequentech/voting-booth#321
sequentech · Jul 18, 2023 · 57a7612 · 57a7612
1 parent 536d441
commit 57a7612
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 31 deletions.
diff --git a/avUi/i18n-override-service.js b/avUi/i18n-override-service.js
@@ -56,36 +56,30 @@ angular
         // load i18n_overrides if any
         if (performOverrides)
         {
-          $window.i18n.preload(
-            _.keys($window.i18nOverride),
-            function ()
+          _.map(
+            $window.i18nOverride,
+            function (i18nOverride, language)
             {
-              _.map(
-                $window.i18nOverride,
-                function (i18nOverride, language)
-                {
-                  $window.i18n.addResources(
-                    /* lng = */ language,
-                    /* ns = */ "translation",
-                    /* resources = */ i18nOverride
-                  );
+              $window.i18n.addResources(
+                /* lng = */ language,
+                /* ns = */ "translation",
+                /* resources = */ i18nOverride
+              );
 
-                  // force-refresh cached translations to override
-                  _.each(
-                    _.keys(i18nOverride),
-                    function (i18nString)
-                    {
-                      $i18next(i18nString, {});
-                    }
-                  );
+              // force-refresh cached translations to override
+              _.each(
+                _.keys(i18nOverride),
+                function (i18nString)
+                {
+                  $i18next(i18nString, {});
                 }
               );
-              $rootScope.$broadcast(
-                'i18nextLanguageChange',
-                $window.i18n.lng()
-              );
             }
           );
+          $rootScope.$broadcast(
+            'i18nextLanguageChange',
+            $window.i18n.lng()
+          );
         }
       };
     }

diff --git a/dist/appCommon-v9.0.0.js b/dist/appCommon-v9.0.0.js
@@ -1094,13 +1094,11 @@ angular.module("avRegistration").config(function() {}), angular.module("avRegist
         force = !!angular.isDefined(force) && force;
         var performOverrides = !1;
         (overrides = null === overrides ? $window.i18nOverride : overrides) && (performOverrides = force || JSON.stringify(overrides) !== JSON.stringify($window.i18nOverride), 
-        $window.i18nOverride = overrides), performOverrides && $window.i18n.preload(_.keys($window.i18nOverride), function() {
-            _.map($window.i18nOverride, function(i18nOverride, language) {
-                $window.i18n.addResources(language, "translation", i18nOverride), _.each(_.keys(i18nOverride), function(i18nString) {
-                    $i18next(i18nString, {});
-                });
-            }), $rootScope.$broadcast("i18nextLanguageChange", $window.i18n.lng());
-        });
+        $window.i18nOverride = overrides), performOverrides && (_.map($window.i18nOverride, function(i18nOverride, language) {
+            $window.i18n.addResources(language, "translation", i18nOverride), _.each(_.keys(i18nOverride), function(i18nString) {
+                $i18next(i18nString, {});
+            });
+        }), $rootScope.$broadcast("i18nextLanguageChange", $window.i18n.lng()));
     };
 } ]), angular.module("avUi").directive("avChangeLang", [ "$i18next", "ipCookie", "angularLoad", "amMoment", "ConfigService", "$window", "I18nOverride", function($i18next, ipCookie, angularLoad, amMoment, ConfigService, $window, I18nOverride) {
     return {