refactor: refs #6425 translation files in .yml format and minor changes

quasar.config.js

@@ -93,13 +93,11 @@ module.exports = configure(function (/* ctx */) {
                 [
                     VueI18nPlugin({
                         runtimeOnly: false,
+                        include: [
+                            path.resolve(__dirname, './src/i18n/locale/**'),
+                            path.resolve(__dirname, './src/pages/**/locale/**'),
+                        ],
                     }),
-                    {
-                        // if you want to use Vue I18n Legacy API, you need to set `compositionOnly: false`
-                        // compositionOnly: false,
-                        // you need to set i18n resource including paths !
-                        include: path.resolve(__dirname, './src/i18n/**'),
-                    },
                 ],
             ],
         },

src/i18n/index.js

@@ -1,27 +1,21 @@
-const langs = import.meta.glob(`./**/*.js`);
+const files = import.meta.glob(`./locale/*.yml`);
-const files = import.meta.glob(`../pages/**/Translation/en.js`);
+const modules = import.meta.glob(`../pages/**/locale/en.yml`);
-const importLang = {};
+const translations = {};
 
-for (const fileLang in langs) {
+for (const file in files) {
-    const lang = fileLang.split('/').at(1);
+    const lang = file.split('/').at(2).split('.')[0];
-
+    import(file)
-    import(fileLang)
         .then((t) => {
-            importLang[lang] = t.default;
+            translations[lang] = t.default;
         })
         .finally(() => {
-            for (const file in files) {
+            for (const module in modules) {
-                const splittedFile = file.split('/');
+                const splittedFile = module.split('/');
                 splittedFile.pop();
-                const langFiles = splittedFile.join('/') + '/' + lang + '.js';
+                const moduleFiles = splittedFile.join('/') + '/' + lang + '.yml';
-                console.log('myFile: ', langFiles);
+                import(moduleFiles).then((t) => {
-                import(langFiles)
+                    Object.assign(translations[lang], t.default);
-                    .then((t) => {
+                });
-                        Object.assign(importLang[lang], t.default);
-                    })
-                    .catch((err) => {
-                        console.log('no va: ' + err, file, importLang);
-                    });
             }
         });
 }
@@ -29,4 +23,5 @@ for (const fileLang in langs) {
 export const localeEquivalence = {
     en: 'en-GB',
 };
-export default importLang;
+
+export default translations;

src/pages/Customer/CustomerFilter.vue

@@ -174,7 +174,6 @@ en:
     params:
         search: Contains
         fi: FI
-        
         salesPersonFk: Salesperson
         provinceFk: Province
         city: City
@@ -186,8 +185,6 @@ es:
     params:
         search: Contiene
         fi: NIF
-        name: Nombre
-        socialName: Razón Social
         salesPersonFk: Comercial
         provinceFk: Provincia
         city: Ciudad
@@ -196,8 +193,6 @@ es:
         zoneFk: Zona
         postcode: CP
     FI: NIF
-    
-    
     Salesperson: Comercial
     Province: Provincia
     City: Ciudad

src/pages/Customer/Translation/en.js

@@ -1,8 +0,0 @@
-export default {
-    customerFilter: {
-        filter: {
-            name: 'Name',
-            socialName: 'Social name',
-        },
-    },
-};

src/pages/Customer/Translation/es.js

@@ -1,8 +0,0 @@
-export default {
-    customerFilter: {
-        filter: {
-            name: 'Nombre',
-            socialName: 'Razón Social',
-        },
-    },
-};

src/pages/Customer/locale/en.yml

@@ -0,0 +1,4 @@
+customerFilter:
+    filter:
+        name: Name
+        socialName: Social name

src/pages/Customer/locale/es.yml

@@ -0,0 +1,4 @@
+customerFilter:
+    filter:
+        name: Nombre
+        socialName: Razón Social

src/pages/Entry/Translation/en.js

@@ -1,14 +0,0 @@
-export default {
-    entryList: {
-        list: {
-            inventoryEntry: 'Inventory entry',
-            virtualEntry: 'Virtual entry',
-        },
-    },
-    entryFilter: {
-        filter: {
-            search: 'General search',
-            reference: 'Reference',
-        },
-    },
-};

src/pages/Entry/Translation/es.js

@@ -1,14 +0,0 @@
-export default {
-    entryList: {
-        list: {
-            inventoryEntry: 'Es inventario',
-            virtualEntry: 'Es una redada',
-        },
-    },
-    entryFilter: {
-        filter: {
-            search: 'Búsqueda general',
-            reference: 'Referencia',
-        },
-    },
-};

src/pages/Entry/locale/en.yml

@@ -0,0 +1,8 @@
+entryList:
+    list:
+        inventoryEntry: 'Inventory entry'
+        virtualEntry: 'Virtual entry'
+entryFilter:
+    filter:
+        search: 'General search'
+        reference: 'Reference'

src/pages/Entry/locale/es.yml

@@ -0,0 +1,8 @@
+entryList:
+    list:
+        inventoryEntry: 'Es inventario'
+        virtualEntry: 'Es una redada'
+entryFilter:
+    filter:
+        search: 'Búsqueda general'
+        reference: 'Referencia'

src/pages/Travel/Translation/en.js

@@ -1,8 +0,0 @@
-export default {
-    travelFilter: {
-        filter: {
-            warehouseOutFk: 'Warehouse Out',
-            warehouseInFk: 'Warehouse In',
-        },
-    },
-};

src/pages/Travel/Translation/es.js

@@ -1,8 +0,0 @@
-export default {
-    travelFilter: {
-        filter: {
-            warehouseInFk: 'Alm. entrada',
-            warehouseOutFk: 'Alm. salida',
-        },
-    },
-};

src/pages/Travel/locale/en.yml

@@ -0,0 +1,4 @@
+travelFilter:
+    filter:
+        warehouseOutFk: 'Warehouse Out'
+        warehouseInFk: 'Warehouse In'

src/pages/Travel/locale/es.yml

@@ -0,0 +1,4 @@
+travelFilter:
+    filter:
+        warehouseInFk: 'Alm. entrada'
+        warehouseOutFk: 'Alm. salida'

vitest.config.js

@@ -19,7 +19,7 @@ export default defineConfig({
     plugins: [
         vue({
             template: {
-                transformAssetUrls
+                transformAssetUrls,
             },
         }),
         quasar({