@tolgee/core 4.9.0-rc.b7a4088.0 → 4.9.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tolgee/core",
-  "version": "4.9.0-rc.b7a4088.0",
+  "version": "4.9.2",
   "description": "Library providing ability to translate messages directly in context of developed application.",
   "main": "index.js",
   "module": "./dist/tolgee.esm.mjs",
@@ -67,7 +67,7 @@
     "require": "./dist/tolgee.cjs.js",
     "import": "./dist/tolgee.esm.mjs"
   },
-  "gitHead": "eb9351083de345c08157103aa758a8c6ef370d73",
+  "gitHead": "dcbded7f7d158facb5eac126baf2ec1e1dc5699e",
   "publishConfig": {
     "access": "public"
   }

package/src/modules/IcuFormatter.test.ts

@@ -0,0 +1,21 @@
+jest.autoMockOff();
+import { IcuFormatter } from './IcuFormatter';
+
+describe('icu formatter', () => {
+  it('formats simple string', () => {
+    const formatter = new IcuFormatter();
+    const result = formatter.format({
+      translation: 'result is {number, number}',
+      params: { number: 42000 },
+      language: 'en',
+    });
+    expect(result).toEqual('result is 42,000');
+  });
+
+  it('fixes invalid locale', () => {
+    const formatter = new IcuFormatter() as any;
+    expect(formatter.getLocale('en_GB')).toEqual('en-GB');
+    expect(formatter.getLocale('en_GB-nonsenceeeee')).toEqual('en-GB');
+    expect(formatter.getLocale('cs CZ')).toEqual('cs-CZ');
+  });
+});

package/src/modules/IcuFormatter.ts

@@ -3,14 +3,36 @@ import { TolgeeModule } from '../types';
 export const IcuFormatter: TolgeeModule = class {
   static type = 'formatter' as const;
 
-  cache = new Map<string, IntlMessageFormat>();
+  private locales = new Map() as Map<string, string>;
+
+  isLocaleValid(locale: string) {
+    try {
+      return Boolean(Intl.NumberFormat.supportedLocalesOf(locale).length);
+    } catch {
+      return false;
+    }
+  }
+
+  getLocale(language: string) {
+    if (!this.locales.get(language)) {
+      let localeCandidate: string = String(language).replace(/[^a-zA-Z]/g, '-');
+      while (!this.isLocaleValid(localeCandidate)) {
+        localeCandidate =
+          localeCandidate.split('-').slice(0, -1).join('-') || 'en';
+      }
+      this.locales.set(language, localeCandidate);
+    }
+    return this.locales.get(language);
+  }
 
   format({ translation, language, params }) {
     const ignoreTag = !Object.values(params).find(
       (p) => typeof p === 'function'
     );
 
-    return new IntlMessageFormat(translation, language, undefined, {
+    const locale = this.getLocale(language);
+
+    return new IntlMessageFormat(translation, locale, undefined, {
       ignoreTag,
     }).format(params) as string;
   }