npm - not-locale - Versions diffs - 0.0.28 → 0.0.29 - Mend

not-locale 0.0.28 → 0.0.29

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/package.json +1 -1
package/src/controllers/common/index.js +31 -31
package/src/controllers/common/nsLocale.js +16 -11

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
 	"name": "not-locale",
-	"version": "0.0.28",
+	"version": "0.0.29",
 	"description": "not-* family module for localization in not- environment",
 	"main": "index.js",
 	"scripts": {

package/src/controllers/common/index.js CHANGED Viewed

@@ -1,36 +1,36 @@
-import nsLocale from './nsLocale';
+import nsLocale from "./nsLocale";
 const services = { nsLocale };
 const manifest = {
-  modules:{
-    locale:{
-      default: 'ru'
-    }
-  },
-  menu:{
-    top:{
-      sections:[
-				{
-					id: 'locale',
-          			title: '',
-					icon: {
-						font: 'language',
-						size: 'medium',
-						svg: '',
-						src: '',
-					},
-					tag: {
-						padding: 	'small',
-						bold: 		true,
-						color: 		'success',
-						title: 		''
-					},
-					showOnTouch: true,
-					place: 'end'
-				}
-			]
-    }
-  }
+    modules: {
+        locale: {
+            default: "ru",
+        },
+    },
+    menu: {
+        top: {
+            sections: [
+                {
+                    id: "locale",
+                    title: "",
+                    icon: {
+                        font: "language",
+                        size: "medium",
+                        svg: "",
+                        src: "",
+                    },
+                    tag: {
+                        padding: "small",
+                        bold: true,
+                        color: "success",
+                        title: "",
+                    },
+                    showOnTouch: true,
+                    place: "end",
+                },
+            ],
+        },
+    },
 };
-export { services, manifest};
+export { services, manifest };

package/src/controllers/common/nsLocale.js CHANGED Viewed

@@ -151,19 +151,24 @@ class nsLocale {
     }
     selectBest() {
-        let defaultLocale = "ru";
-        if (navigator.languages) {
-            const navigatorLocale = navigator.languages.find((itm) => {
-                return this.locales.includes(itm);
-            });
-            if (navigatorLocale) {
-                defaultLocale = navigatorLocale;
+        const onlyOneEnabled = this.app.getOptions("modules.locale.only");
+        if (onlyOneEnabled) {
+            return this.app.getWorking("locale", onlyOneEnabled);
+        } else {
+            let defaultLocale = "ru";
+            if (navigator.languages) {
+                const navigatorLocale = navigator.languages.find((itm) => {
+                    return this.locales.includes(itm);
+                });
+                if (navigatorLocale) {
+                    defaultLocale = navigatorLocale;
+                }
             }
+            return this.app.getWorking(
+                "locale",
+                this.app.getOptions("modules.locale.default", defaultLocale)
+            );
         }
-        return this.app.getWorking(
-            "locale",
-            this.app.getOptions("modules.locale.default", defaultLocale)
-        );
     }
 }