@formio/js 5.1.0-dev.5969.9a6e3f5 → 5.1.0-dev.5972.67b2845

package/lib/mjs/translations/en.js

@@ -1,4 +1,6 @@
+import bootstrap from '@formio/bootstrap';
 export default {
+    ...(bootstrap?.translations?.en || {}),
     unsavedRowsError: 'Please save all rows before proceeding.',
     invalidRowsError: 'Please correct invalid rows before proceeding.',
     invalidRowError: 'Invalid row. Please correct it or delete.',
@@ -24,8 +26,8 @@ export default {
     maxWords: '{{field}} must have no more than {{length}} words.',
     min: '{{field}} cannot be less than {{min}}.',
     max: '{{field}} cannot be greater than {{max}}.',
-    maxDate: '{{field}} should not contain date after {{- maxDate}}',
-    minDate: '{{field}} should not contain date before {{- minDate}}',
+    maxDate: '{{field}} should not contain date after {{maxDate}}',
+    minDate: '{{field}} should not contain date before {{minDate}}',
     maxYear: '{{field}} should not contain year greater than {{maxYear}}',
     minYear: '{{field}} should not contain year less than {{minYear}}',
     minSelectedCount: 'You must select at least {{minCount}} items',
@@ -77,5 +79,89 @@ export default {
     requiredDayField: '{{ field }} is required',
     requiredDayEmpty: '{{ field }} is required',
     requiredMonthField: '{{ field }} is required',
-    requiredYearField: '{{ field }} is required'
+    requiredYearField: '{{ field }} is required',
+    formNotReady: 'Form not ready. Use form.ready promise',
+    noFormElement: 'No DOM element for form.',
+    notUniqueKey: 'API Key is not unique',
+    newFormSchema: 'Form schema is for a newer version, please upgrade your renderer. Some functionality may not work.',
+    missingUrl: 'Missing URL argument',
+    urlNotAttachedToBtn: 'You should add a URL to this button.',
+    loadingProjectSettingsError: 'Could not load project settings',
+    sessionStorageSupportError: 'Session storage is not supported in this browser.',
+    builderUniqueError: `You cannot add more than one {{componentKeyOrTitle}} component to one page.`,
+    pageNotFound: 'Page not found',
+    noDragInfoError: 'There is no Drag Info available for either dragged or sibling element',
+    addonSupportTypeError: 'Addon {{label}} does not support component of type {{type}}',
+    setPathError: 'Should not be setting the path of a component.',
+    calculatedPathDeprecation: 'component.calculatedPath was deprecated, use component.path instead.',
+    unknownTemplate: 'Unknown template: {{name}}',
+    unknownComponent: 'Unknown component: {{type}}',
+    renderTemplateFunctionDeprecation: `Form.io 'render' template function is deprecated.
+    If you need to render template (template A) inside of another template (template B),
+    pass pre-compiled template A (use this.renderTemplate('template_A_name') as template context variable for template B`,
+    whenReadyDeprecation: 'The whenReady() method has been deprecated. Please use the dataReady property instead.',
+    loadResourcesError: 'Unable to load resources for {{componentKey}}',
+    noSelectDataConfiguration: 'Select component {{componentKey}} does not have data configuration.',
+    indexedDBSupportError: "Your browser doesn't support current version of indexedDB",
+    caretPositionSavingError: 'An error occurred while trying to save caret position',
+    iteratableRowsError: 'Getter #iteratableRows() is not implemented',
+    checkRowDeprecation: 'Deprecation Warning: checkRow method has been replaced with processRow',
+    noOAuthBtn: 'You must add the OAuth button to a form for it to function properly',
+    noOAuthConfiguration: 'OAuth not configured. You must configure oauth for your project before it will work.',
+    oAuthErrorsTitle: 'The Following Error Has Occured',
+    noOAuthFormUrl: 'You must attach a Form API url to your form in order to use OAuth buttons.',
+    oAuthStateError: 'OAuth state does not match. Please try logging in again.',
+    componentInvalidRowValidation: 'Invalid row validation for {{componentKey}}',
+    videoPlayerNotFound: 'Video player not found in template.',
+    synchronizationFailed: 'Synchronization is failed',
+    fileWithDuplicatedNameInProgress: 'File with the same name is already being uploaded',
+    fileWithDuplicatedNameLoaded: 'File with the same name is already uploaded',
+    nestedForm: 'Nested form',
+    noDataProvided: 'No data provided',
+    subformSubmissionLoadingError: 'Unable to load subform submission {{submissionId}}:',
+    noDelimiterSet: 'In order for thousands separator to work properly, you must set the delimiter to true in the component json',
+    noSiteKey: 'There is no Site Key specified in settings in form JSON',
+    failedToNormalize: 'Failed to normalize value',
+    failedToCompareItems: 'Error while comparing items',
+    editorFocusError: 'An editor did not initialize properly when trying to focus:',
+    quillImageUploadFailed: 'Quill image upload failed',
+    noFilesSelected: 'No files selected',
+    needConfigurationForQuill: 'The WYSIWYG settings are configured for CKEditor. For this renderer, you will need to use configurations for the Quill Editor. See https://quilljs.com/docs/configuration for more information.',
+    waitPdfConverting: 'Converting PDF. Please wait.',
+    uploading: 'Uploading',
+    pasteBelow: 'Paste below',
+    copy: 'Copy',
+    move: 'Move',
+    edit: 'Edit',
+    editJson: 'Edit JSON',
+    remove: 'Remove',
+    clickToSetValue: 'Click to set value',
+    words: 'words',
+    characters: 'characters',
+    addAnother: 'Add Another',
+    yes: 'Yes',
+    no: 'No',
+    wantToClearData: 'Do you want to clear data?',
+    yesDelete: 'Yes, delete it',
+    waitFileProcessing: 'Processing file. Please wait...',
+    wrongFileType: 'File is the wrong type; it must be {{ pattern }}',
+    fileTooSmall: 'File is too small; it must be at least {{ size }}',
+    fileTooBig: 'File is too big; it must be at most {{ size }}',
+    noFileService: 'File Service not provided.',
+    fileProcessingFailed: 'File processing has been failed.',
+    readyForUpload: 'Ready to be uploaded into storage',
+    readyForRemovingFromStorage: 'Ready to be removed from storage',
+    preparingFileToRemove: 'Preparing file to remove',
+    succefullyRemoved: 'Succefully removed',
+    succefullyUploaded: 'Succefully uploaded',
+    maxSelectItems: 'You may only select up to {{maxCount}} items',
+    minSelectItems: 'You must select at least {{minCount}} items',
+    clickToSign: 'Click to Sign',
+    surveyQuestion: 'Question',
+    surveyQuestionValue: 'Value',
+    success: 'Success',
+    noResultsFound: 'No results found',
+    noChoices: 'No choices to choose from',
+    typeToSearch: 'Type to search',
+    loading: 'Loading',
 };

package/lib/mjs/utils/i18n.d.ts

@@ -2,13 +2,16 @@
  * This file is used to mimic the i18n library interface.
  */
 export class I18n {
+    static languages: {};
+    static setDefaultTranslations(languages: any): void;
     static init(languages?: {}): I18n;
     static createInstance(): I18n;
     constructor(languages?: {});
-    languages: {};
+    languages: any;
+    defaultKeys: any;
     language: string;
     currentLanguage: any;
-    setLanguages(languages: any): void;
+    setLanguages(languages: any, noDefaultOverride: any): void;
     dir(lang?: string): "rtl" | "ltr";
     changeLanguage(language: any, ready?: null): void;
     addResourceBundle(language: any, type: any, strings: any): void;

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.67b2845",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {
@@ -41,7 +41,7 @@
     "build": "yarn doc && yarn lib && yarn dist",
     "doc": "typedoc",
     "dist": "gulp clean:dist && webpack --config webpack.config.js && webpack --config webpack.prod.js && gulp build",
-    "lib": "gulp clean:lib && tsc --project tsconfig.cjs.json && tsc --project tsconfig.mjs.json && yarn lib:package",
+    "lib": "gulp clean:lib && tsc --project tsconfig.cjs.json && tsc --project tsconfig.mjs.json && yarn lib:package  && gulp version",
     "lib:package": "node ./libpackage.js",
     "version": "node -e 'console.log(require(`./package.json`).version)'",
     "build-app": "yarn build-app:create-app && yarn build-app:jekyll && yarn build-app:remove-app",
@@ -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",