@formio/js 5.1.0-dev.5969.9a6e3f5 → 5.1.0-dev.5972.f3a71a8

package/lib/cjs/utils/i18n.js

@@ -6,6 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.I18n = void 0;
 const utils_1 = require("@formio/core/utils");
 const i18n_1 = __importDefault(require("../i18n"));
+const lodash_1 = require("lodash");
+const core_1 = require("@formio/core");
 const i18Defaults = {};
 for (const lang in i18n_1.default.resources) {
     if (i18n_1.default.resources.hasOwnProperty(lang)) {
@@ -17,13 +19,28 @@ for (const lang in i18n_1.default.resources) {
  */
 class I18n {
     constructor(languages = {}) {
-        this.languages = i18Defaults;
+        var _a;
+        this.languages = (0, core_1.fastCloneDeep)(I18n.languages || {});
+        this.defaultKeys = ((_a = I18n.languages) === null || _a === void 0 ? void 0 : _a.en) || {};
         this.language = 'en';
         this.currentLanguage = i18Defaults.en;
         this.setLanguages(languages);
         this.changeLanguage(this.language);
     }
-    setLanguages(languages) {
+    static setDefaultTranslations(languages) {
+        if ((0, lodash_1.isEmpty)(languages)) {
+            return;
+        }
+        for (const lang in languages) {
+            if (lang !== 'language' && languages.hasOwnProperty(lang)) {
+                if (!this.languages[lang]) {
+                    this.languages[lang] = {};
+                }
+                this.languages[lang] = Object.assign(Object.assign({}, languages[lang]), this.languages[lang]);
+            }
+        }
+    }
+    setLanguages(languages, noDefaultOverride) {
         if (languages.resources) {
             for (const lang in languages.resources) {
                 if (languages.resources.hasOwnProperty(lang)) {
@@ -50,7 +67,8 @@ class I18n {
                 if (!this.languages[lang]) {
                     this.languages[lang] = {};
                 }
-                this.languages[lang] = Object.assign(Object.assign({}, this.languages[lang]), languages[lang]);
+                this.languages[lang] = noDefaultOverride
+                    ? Object.assign(Object.assign({}, languages[lang]), this.languages[lang]) : Object.assign(Object.assign({}, this.languages[lang]), languages[lang]);
             }
         }
     }
@@ -80,14 +98,23 @@ class I18n {
     }
     t(text, ...args) {
         var _a;
-        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 = (_a = args[0]) === null || _a === void 0 ? void 0 : _a.field;
             if (customTranslationFieldName && this.currentLanguage[customTranslationFieldName]) {
                 args[0].field = this.currentLanguage[customTranslationFieldName];
             }
-            return utils_1.Evaluator.interpolateString(this.currentLanguage[text], ...args);
+            return utils_1.Evaluator.interpolateString(currentTranslation, ...args);
         }
         return utils_1.Evaluator.interpolateString(text, ...args);
     }
 }
 exports.I18n = I18n;
+I18n.languages = i18Defaults;

package/lib/mjs/Form.js

@@ -406,10 +406,10 @@ export default class Form extends Element {
      */
     build() {
         if (!this.instance) {
-            return Promise.reject('Form not ready. Use form.ready promise');
+            return Promise.reject(this.t('formNotReady'));
         }
         if (!this.element) {
-            return Promise.reject('No DOM element for form.');
+            return Promise.reject(this.t('noFormElement'));
         }
         // Add temporary loader.
         const template = (this.options && this.options.template) ? this.options.template : 'bootstrap';
@@ -426,7 +426,7 @@ export default class Form extends Element {
     }
     render() {
         if (!this.instance) {
-            return Promise.reject('Form not ready. Use form.ready promise');
+            return Promise.reject(this.t('formNotReady'));
         }
         return Promise.resolve(this.instance.render())
             .then((param) => {
@@ -436,7 +436,7 @@ export default class Form extends Element {
     }
     attach(element) {
         if (!this.instance) {
-            return Promise.reject('Form not ready. Use form.ready promise');
+            return Promise.reject(this.t('formNotReady'));
         }
         if (this.element) {
             delete this.element.component;

package/lib/mjs/PDFBuilder.js

@@ -196,10 +196,10 @@ export default class PDFBuilder extends WebformBuilder {
                 const progress = Math.floor((event.loaded / event.total) * 100);
                 this.refs.uploadProgress.style.width = `${progress}%`;
                 if (progress > 98) {
-                    this.refs.uploadProgress.innerHTML = this.t('Converting PDF. Please wait.');
+                    this.refs.uploadProgress.innerHTML = this.t('waitPdfConverting');
                 }
                 else {
-                    this.refs.uploadProgress.innerHTML = `${this.t('Uploading')} ${progress}%`;
+                    this.refs.uploadProgress.innerHTML = `${this.t('uploading')} ${progress}%`;
                 }
             }
         }, `${this.projectUrl}/upload`, {}, 'file')
@@ -236,7 +236,7 @@ export default class PDFBuilder extends WebformBuilder {
             return;
         }
         this.refs.uploadError.style.display = message ? '' : 'none';
-        this.refs.uploadError.innerHTML = message;
+        this.refs.uploadError.innerHTML = this.t(`${message}`);
     }
     createForm(options) {
         // Instantiate the webform from the PDF class instead of Webform
@@ -464,7 +464,7 @@ export default class PDFBuilder extends WebformBuilder {
                     name: 'showBuilderErrors',
                     data: {
                         compId: comp.component.id,
-                        errorMessage: `API Key is not unique: ${comp.key}`,
+                        errorMessage: `${this.t('notUniqueKey')}: ${comp.key}`,
                     }
                 });
             }

package/lib/mjs/Webform.d.ts

@@ -34,10 +34,10 @@
  */
 /**
  * @typedef {object} ButtonSettings
- * @property {boolean} [showPrevious] - Show the "Previous" button.
- * @property {boolean} [showNext] - Show the "Next" button.
- * @property {boolean} [showCancel] - Show the "Cancel" button.
- * @property {boolean} [showSubmit] - Show the "Submit" button.
+ * @property {boolean} [showPrevious] - Show the 'Previous' button.
+ * @property {boolean} [showNext] - Show the 'Next' button.
+ * @property {boolean} [showCancel] - Show the 'Cancel' button.
+ * @property {boolean} [showSubmit] - Show the 'Submit' button.
  */
 /**
  * @typedef {object} FormOptions
@@ -257,7 +257,7 @@ declare class Webform extends NestedDataComponent {
     get ready(): Promise<any>;
     /**
      * Set the loading state for this form, and also show the loader spinner.
-     * @param {boolean} loading - If this form should be "loading" or not.
+     * @param {boolean} loading - If this form should be 'loading' or not.
      */
     set loading(loading: boolean);
     /**
@@ -369,7 +369,7 @@ declare class Webform extends NestedDataComponent {
     hasRequiredFields(): boolean;
     /**
      * Sets a new alert to display in the error dialog of the form.
-     * @param {string} type - The type of alert to display. "danger", "success", "warning", etc.
+     * @param {string} type - The type of alert to display. 'danger', 'success', 'warning', etc.
      * @param {string} message - The message to show in the alert.
      * @param {object} options - The options for the alert.
      */
@@ -547,19 +547,19 @@ export type SanitizeConfig = {
 };
 export type ButtonSettings = {
     /**
-     * - Show the "Previous" button.
+     * - Show the 'Previous' button.
      */
     showPrevious?: boolean | undefined;
     /**
-     * - Show the "Next" button.
+     * - Show the 'Next' button.
      */
     showNext?: boolean | undefined;
     /**
-     * - Show the "Cancel" button.
+     * - Show the 'Cancel' button.
      */
     showCancel?: boolean | undefined;
     /**
-     * - Show the "Submit" button.
+     * - Show the 'Submit' button.
      */
     showSubmit?: boolean | undefined;
 };
@@ -739,5 +739,5 @@ export type FormOptions = {
      */
     zoom?: number | undefined;
 };
-import NestedDataComponent from "./components/_classes/nesteddata/NestedDataComponent";
-import EventEmitter from "./EventEmitter";
+import NestedDataComponent from './components/_classes/nesteddata/NestedDataComponent';
+import EventEmitter from './EventEmitter';