@formio/js 5.1.0-dev.5969.9a6e3f5 → 5.1.0-dev.5972.317ce89

package/lib/mjs/utils/i18n.js

@@ -1,5 +1,7 @@
 import { Evaluator } from '@formio/core/utils';
 import i18n from '../i18n';
+import { isEmpty } from 'lodash';
+import { fastCloneDeep } from '@formio/core';
 const i18Defaults = {};
 for (const lang in i18n.resources) {
     if (i18n.resources.hasOwnProperty(lang)) {
@@ -10,14 +12,29 @@ for (const lang in i18n.resources) {
  * This file is used to mimic the i18n library interface.
  */
 export class I18n {
-    languages = i18Defaults;
+    static languages = i18Defaults;
+    languages = fastCloneDeep(I18n.languages || {});
+    defaultKeys = I18n.languages?.en || {};
     language = 'en';
     currentLanguage = i18Defaults.en;
     constructor(languages = {}) {
         this.setLanguages(languages);
         this.changeLanguage(this.language);
     }
-    setLanguages(languages) {
+    static setDefaultTranslations(languages) {
+        if (isEmpty(languages)) {
+            return;
+        }
+        for (const lang in languages) {
+            if (lang !== 'language' && languages.hasOwnProperty(lang)) {
+                if (!this.languages[lang]) {
+                    this.languages[lang] = {};
+                }
+                this.languages[lang] = { ...languages[lang], ...this.languages[lang], };
+            }
+        }
+    }
+    setLanguages(languages, noDefaultOverride) {
         if (languages.resources) {
             for (const lang in languages.resources) {
                 if (languages.resources.hasOwnProperty(lang)) {
@@ -44,7 +61,9 @@ export class I18n {
                 if (!this.languages[lang]) {
                     this.languages[lang] = {};
                 }
-                this.languages[lang] = { ...this.languages[lang], ...languages[lang] };
+                this.languages[lang] = noDefaultOverride
+                    ? { ...languages[lang], ...this.languages[lang] }
+                    : { ...this.languages[lang], ...languages[lang] };
             }
         }
     }
@@ -73,12 +92,20 @@ export class I18n {
         this.languages[language] = strings;
     }
     t(text, ...args) {
-        if (this.currentLanguage[text]) {
+        let currentTranslation = this.currentLanguage[text];
+        // provide compatibility with cases where the entire phrase is used as a key
+        // get the phrase that is possibly being used as a key
+        const defaultKey = this.defaultKeys[text];
+        if (defaultKey && this.currentLanguage[defaultKey]) {
+            // get translation using the phrase as a key
+            currentTranslation = this.currentLanguage[defaultKey];
+        }
+        if (currentTranslation) {
             const customTranslationFieldName = args[0]?.field;
             if (customTranslationFieldName && this.currentLanguage[customTranslationFieldName]) {
                 args[0].field = this.currentLanguage[customTranslationFieldName];
             }
-            return Evaluator.interpolateString(this.currentLanguage[text], ...args);
+            return Evaluator.interpolateString(currentTranslation, ...args);
         }
         return Evaluator.interpolateString(text, ...args);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.1.0-dev.5969.9a6e3f5",
+  "version": "5.1.0-dev.5972.317ce89",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {
@@ -80,9 +80,9 @@
   },
   "homepage": "https://github.com/formio/formio.js#readme",
   "dependencies": {
-    "@formio/bootstrap": "3.1.0-dev.1-dev.120.01bbe80",
+    "@formio/bootstrap": "v3.0.0-dev.121.085d187",
     "@formio/choices.js": "^10.2.1",
-    "@formio/core": "2.4.0-dev.205.f4cc49f",
+    "@formio/core": "v2.4.0-dev.210.e634ab4",
     "@formio/text-mask-addons": "3.8.0-formio.4",
     "@formio/vanilla-text-mask": "^5.1.1-formio.1",
     "abortcontroller-polyfill": "^1.7.5",