diff --git a/src/components/VnTable/VnTableFilter.vue b/src/components/VnTable/VnTableFilter.vue index f23c657cf12..f792909a67b 100644 --- a/src/components/VnTable/VnTableFilter.vue +++ b/src/components/VnTable/VnTableFilter.vue @@ -62,9 +62,9 @@ function columnName(col) { :columns="columns" /> </template> - <template #tags="{ tag, formatFn }" v-if="chipLocale"> + <template #tags="{ tag, formatFn, getLocale }"> <div class="q-gutter-x-xs"> - <strong>{{ t(`${chipLocale}.${tag.label}`) }}: </strong> + <strong>{{ getLocale(`${tag.label}`) }}: </strong> <span>{{ formatFn(tag.value) }}</span> </div> </template> diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue index 46c43356fc2..aba797678ca 100644 --- a/src/components/ui/VnFilterPanel.vue +++ b/src/components/ui/VnFilterPanel.vue @@ -190,7 +190,7 @@ const getLocale = (label) => { const globalLocale = `globals.params.${param}`; if (te(globalLocale)) return t(globalLocale); else if (te(t(`params.${param}`))); - else return t(`${route.meta.moduleName}.params.${param}`); + else return t(`${route.meta.moduleName.toLowerCase()}.params.${param}`); }; </script> diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index 33829d98d08..023f8da4b54 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -456,6 +456,11 @@ entry: landing: Landing isExcludedFromAvailable: Es inventory ticket: + params: + ticketFk: Ticket ID + weekDay: Weekday + agencyModeFk: Agency + id: Worker card: customerId: Customer ID customerCard: Customer card @@ -697,6 +702,11 @@ wagon: minHeightBetweenTrays: 'The minimum height between trays is ' maxWagonHeight: 'The maximum height of the wagon is ' uncompleteTrays: There are incomplete trays + params: + label: Label + plate: Plate + volume: Volume + name: Name supplier: list: diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index f0cbe35434f..139486e0379 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -457,6 +457,11 @@ entry: landing: Llegada isExcludedFromAvailable: Es inventario ticket: + params: + ticketFk: ID de ticket + weekDay: Salida + agencyModeFk: Agencia + id: Comercial card: customerId: ID cliente customerCard: Ficha del cliente @@ -700,6 +705,11 @@ wagon: minHeightBetweenTrays: 'La distancia mínima entre bandejas es ' maxWagonHeight: 'La altura máxima del vagón es ' uncompleteTrays: Hay bandejas sin completar + params: + label: Etiqueta + plate: Matrícula + volume: Volumen + name: Nombre supplier: list: payMethod: Método de pago diff --git a/src/pages/Account/locale/en.yml b/src/pages/Account/locale/en.yml index 88a6b11e990..1826250fd26 100644 --- a/src/pages/Account/locale/en.yml +++ b/src/pages/Account/locale/en.yml @@ -1,4 +1,18 @@ account: + params: + id: Id + name: Name + roleFk: Role + nickname: Nickname + password: Password + active: Active + search: Id + description: Description + alias: Alias + model: Model + principalId: Role + property: Property + accessType: Access card: nickname: User role: Role diff --git a/src/pages/Account/locale/es.yml b/src/pages/Account/locale/es.yml index ba559f2c393..941a9948f12 100644 --- a/src/pages/Account/locale/es.yml +++ b/src/pages/Account/locale/es.yml @@ -1,4 +1,20 @@ +accessType: Acceso +property: Propiedad account: + params: + id: Id + name: Nombre + roleFk: Rol + nickname: Nickname + password: Contraseña + active: Activo + search: Id + description: Descripción + alias: Alias + model: Modelo + principalId: Rol + property: Propiedad + accessType: Acceso card: nickname: Usuario role: Rol diff --git a/src/pages/Entry/locale/en.yml b/src/pages/Entry/locale/en.yml index cd5113d8467..68cc9caa790 100644 --- a/src/pages/Entry/locale/en.yml +++ b/src/pages/Entry/locale/en.yml @@ -19,3 +19,11 @@ myEntries: daysAgo: Days ago wasteRecalc: recalcOk: The wastes were successfully recalculated +entry: + params: + toShipped: To + fromShipped: From + warehouseiNFk: Warehouse + daysOnward: Days onward + daysAgo: Days ago + \ No newline at end of file diff --git a/src/pages/Entry/locale/es.yml b/src/pages/Entry/locale/es.yml index 3007c5d4415..cc9a4ff7b34 100644 --- a/src/pages/Entry/locale/es.yml +++ b/src/pages/Entry/locale/es.yml @@ -22,3 +22,11 @@ myEntries: daysAgo: Días atras wasteRecalc: recalcOk: Se han recalculado las mermas correctamente +entry: + params: + toShipped: Hasta + fromShipped: Desde + warehouseInFk: Alm. entrada + daysOnward: Días adelante + daysAgo: Días atras + \ No newline at end of file diff --git a/src/pages/InvoiceOut/locale/en.yml b/src/pages/InvoiceOut/locale/en.yml index 8cefe8bdca8..51502f00d5e 100644 --- a/src/pages/InvoiceOut/locale/en.yml +++ b/src/pages/InvoiceOut/locale/en.yml @@ -24,3 +24,15 @@ negativeBases: hasToInvoice: Has to invoice verifiedData: Verified data commercial: Commercial +invoiceout: + params: + company: Company + country: Country + clientId: Client ID + clientSocialName: Client + taxableBase: Base + ticketFk: Ticket + isActive: Active + hasToInvoice: Has to invoice + hasVerifiedData: Verified data + workerName: Worker \ No newline at end of file diff --git a/src/pages/InvoiceOut/locale/es.yml b/src/pages/InvoiceOut/locale/es.yml index 106168a5d70..c448f606816 100644 --- a/src/pages/InvoiceOut/locale/es.yml +++ b/src/pages/InvoiceOut/locale/es.yml @@ -27,3 +27,15 @@ negativeBases: hasToInvoice: Debe facturar verifiedData: Datos verificados commercial: Comercial +invoiceout: + params: + company: Empresa + country: País + clientId: ID del cliente + clientSocialName: Cliente + taxableBase: Base + ticketFk: Ticket + isActive: Activo + hasToInvoice: Debe facturar + hasVerifiedData: Datos verificados + workerName: Comercial \ No newline at end of file