onix-core - npm Package Compare versions

Comparing version 1.1.21 to 1.1.22

built/Intl.d.ts

@@ -14,2 +14,4 @@ export interface StringsMap {
     static setLocale: (value: string) => "ru-ru";
+    private static safeT;
+    private static safeTS;
     static t: (category: string, key: string) => string;
@@ -16,0 +18,0 @@ static ts: (category: string, key: string) => string[];

built/Intl.js

@@ -16,6 +16,20 @@ "use strict";
     };
+    Intl.safeT = function (category, locale, key) {
+        var result = null;
+        if (Intl.categories[category] && Intl.categories[category][locale]) {
+            result = Intl.categories[category][locale][key];
+        }
+        return result;
+    };
+    Intl.safeTS = function (category, locale, key) {
+        var result = null;
+        if (Intl.categories[category] && Intl.categories[category][locale]) {
+            result = Intl.categories[category][locale][key];
+        }
+        return result;
+    };
     Intl.t = function (category, key) {
-        var result = Intl.categories[category][Intl.currentLocale][key];
+        var result = Intl.safeT(category, Intl.currentLocale, key);
         if (!result) {
-            result = Intl.categories[category][defaultLocale][key];
+            result = Intl.safeT(category, defaultLocale, key);
         }
@@ -25,5 +39,5 @@ return result;
     Intl.ts = function (category, key) {
-        var result = Intl.categories[category][Intl.currentLocale][key];
+        var result = Intl.safeTS(category, Intl.currentLocale, key);
         if (!result) {
-            result = Intl.categories[category][defaultLocale][key];
+            result = Intl.safeTS(category, defaultLocale, key);
         }
@@ -30,0 +44,0 @@ return result;

package.json

 {
   "name": "onix-core",
-  "version": "1.1.21",
+  "version": "1.1.22",
   "description": "Onix library core",
@@ -5,0 +5,0 @@ "main": "built/index.js",

src/Intl.ts

@@ -32,6 +32,24 @@ declare type Locales = 'ru-ru' | 'en-us';
 
+    private static safeT = (category: string, locale: string, key: string) => {
+        let result: string = null;
+        if (Intl.categories[category] && Intl.categories[category][locale]) {
+            result = <string>Intl.categories[category][locale][key];
+        }
+        
+        return result;
+    };
+
+    private static safeTS = (category: string, locale: string, key: string) => {
+        let result: string[] = null;
+        if (Intl.categories[category] && Intl.categories[category][locale]) {
+            result = <string[]>Intl.categories[category][locale][key];
+        }
+        
+        return result;
+    };
+
     public static t = (category: string, key: string) => {
-        let result = <string>Intl.categories[category][Intl.currentLocale][key];
+        let result = Intl.safeT(category, Intl.currentLocale, key);
         if (!result) {
-            result = <string>Intl.categories[category][defaultLocale][key];
+            result = Intl.safeT(category, defaultLocale, key);
         }
@@ -43,5 +61,5 @@
     public static ts = (category: string, key: string) => {
-        let result = <string[]>Intl.categories[category][Intl.currentLocale][key];
+        let result = Intl.safeTS(category, Intl.currentLocale, key);
         if (!result) {
-            result = <string[]>Intl.categories[category][defaultLocale][key];
+            result = Intl.safeTS(category, defaultLocale, key);
         }
@@ -48,0 +66,0 @@

No alert changes

Improved metrics

Total package byte prevSize

1511707

increased by0.15%

Lines of code

21538

increased by0.2%

No dependency changes