Refactoring

VirtoCommerce · Nov 15, 2023 · 5669204 · 5669204
1 parent 54b76b0
commit 5669204
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/...irtoCommerce.Platform.Web/wwwroot/js/app/settings/services/localizable-setting-service.js b/...irtoCommerce.Platform.Web/wwwroot/js/app/settings/services/localizable-setting-service.js
@@ -14,6 +14,7 @@ angular.module("platformWebApp")
 
             return {
                 isLocalizable: isLocalizable,
+                translate: translate,
                 getValues: getValues,
                 getItemsAndLanguagesAsync: getItemsAndLanguagesAsync,
                 saveItemsAsync: saveItemsAsync,
@@ -37,6 +38,18 @@ angular.module("platformWebApp")
                 return names.includes(settingName);
             }
 
+            function translate(key, settingName, language) {
+                const values = getValues(settingName, language);
+
+                if (!values) {
+                    return key
+                }
+
+                const item = values.find(x => x.key === key);
+
+                return item ? item.value : key;
+            }
+
             function getValues(settingName, language) {
                 const items = settings[settingName];
 

diff --git a/src/VirtoCommerce.Platform.Web/wwwroot/js/app/settings/services/setting-translate-filter.js b/src/VirtoCommerce.Platform.Web/wwwroot/js/app/settings/services/setting-translate-filter.js
@@ -1,14 +1,4 @@
 angular.module("platformWebApp")
     .filter('settingTranslate', ['platformWebApp.localizableSettingService', function (localizableSettingService) {
-        return function (input, settingName) {
-            const values = localizableSettingService.getValues(settingName);
-
-            if (!values) {
-                return input
-            }
-
-            const item = values.find(x => x.key === input);
-
-            return item ? item.value : input;
-        };
+        return localizableSettingService.translate;
     }]);