diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index 8f586cd01..891ede724 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -100,13 +100,143 @@ globals: modes: Modes zones: Zones zonesList: Zones - deliveryList: Delivery days - upcomingList: Upcoming deliveries + deliveryDays: Delivery days + upcomingDeliveries: Upcoming deliveries role: Role alias: Alias aliasUsers: Users subRoles: Subroles inheritedRoles: Inherited Roles + customers: Customers + list: List + webPayments: Web Payments + extendedList: Extended list + notifications: Notifications + defaulter: Defaulter + customerCreate: New customer + fiscalData: Fiscal data + billingData: Billing data + consignees: Consignees + notes: Notes + credits: Credits + greuges: Greuges + balance: Balance + recoveries: Recoveries + webAccess: Web access + sms: Sms + creditManagement: Credit management + creditContracts: Credit contracts + creditOpinion: Credit opinion + others: Others + samples: Samples + consumption: Consumption + mandates: Mandates + contacts: Contacts + webPayment: Web payment + fileManagement: File management + unpaid: Unpaid + entries: Entries + buys: Buys + dms: File management + entryCreate: New entry + latestBuys: Latest buys + tickets: Tickets + ticketCreate: New Tickets + boxing: Boxing + sale: Sale + claims: Claims + claimCreate: New claim + lines: Lines + photos: Photos + development: Development + action: Action + invoiceOuts: Invoice out + negativeBases: Negative Bases + globalInvoicing: Global invoicing + invoiceOutCreate: Create invoice out + shelving: Shelving + shelvingList: Shelving List + shelvingCreate: New shelving + invoiceIns: Invoices In + invoiceInCreate: Create invoice in + vat: VAT + dueDay: Due day + intrastat: Intrastat + corrective: Corrective + order: Orders + orderList: List + orderCreate: New order + catalog: Catalog + volume: Volume + workers: Workers + workerCreate: New worker + department: Department + pda: PDA + pbx: Private Branch Exchange + calendar: Calendar + timeControl: Time control + locker: Locker + wagons: Wagons + wagonsList: Wagons List + wagonCreate: Create wagon + wagonEdit: Edit wagon + typesList: Types List + typeCreate: Create type + typeEdit: Edit type + wagonCounter: Trolley counter + roadmap: Roadmap + stops: Stops + routes: Routes + cmrsList: CMRs list + RouteList: List + routeCreate: New route + RouteRoadmap: Roadmaps + RouteRoadmapCreate: Create roadmap + autonomous: Autonomous + suppliers: Suppliers + supplier: Supplier + labeler: Labeler + supplierCreate: New supplier + accounts: Accounts + addresses: Addresses + agencyTerm: Agency agreement + travel: Travels + extraCommunity: Extra community + travelCreate: New travel + history: Log + thermographs: Thermograph + items: Items + diary: Diary + tags: Tags + create: Create + buyRequest: Buy requests + fixedPrice: Fixed prices + wasteBreakdown: Waste breakdown + itemCreate: New item + barcode: Barcodes + tax: Tax + botanical: Botanical + itemTypeCreate: New item type + family: Item Type + lastEntries: Last entries + itemType: Item type + monitors: Monitors + dashboard: Dashboard + users: Users + createTicket: Create ticket + ticketAdvance: Advance tickets + futureTickets: Future tickets + purchaseRequest: Purchase request + weeklyTickets: Weekly tickets + formation: Formation + locations: Locations + warehouses: Warehouses + roles: Roles + connections: Connections + acls: ACLs + mailForwarding: Mail forwarding + mailAlias: Mail alias + privileges: Privileges created: Created worker: Worker now: Now @@ -148,40 +278,8 @@ verifyEmail: verifyEmail: Email verification dashboard: pageTitles: - dashboard: Dashboard + customer: - pageTitles: - customers: Customers - list: List - webPayments: Web Payments - extendedList: Extended list - notifications: Notifications - defaulter: Defaulter - customerCreate: New customer - summary: Summary - basicData: Basic data - fiscalData: Fiscal data - billingData: Billing data - consignees: Consignees - notes: Notes - credits: Credits - greuges: Greuges - balance: Balance - recoveries: Recoveries - webAccess: Web access - log: Log - sms: Sms - creditManagement: Credit management - creditContracts: Credit contracts - creditOpinion: Credit opinion - others: Others - samples: Samples - consumption: Consumption - mandates: Mandates - contacts: Contacts - webPayment: Web payment - fileManagement: File management - unpaid: Unpaid list: phone: Phone email: Email @@ -314,7 +412,6 @@ entry: pageTitles: entries: Entries list: List - labeler: Labeler summary: Summary basicData: Basic data buys: Buys @@ -527,18 +624,6 @@ ticket: warehouse: Warehouse agency: Agency claim: - pageTitles: - claims: Claims - list: List - claimCreate: New claim - summary: Summary - basicData: Basic Data - lines: Lines - photos: Photos - development: Development - log: Audit logs - notes: Notes - action: Action list: customer: Customer assignedTo: Assigned @@ -602,14 +687,6 @@ claim: noData: 'There are no images/videos, click here or drag and drop the file' dragDrop: Drag and drop it here invoiceOut: - pageTitles: - invoiceOuts: Invoice out - list: List - negativeBases: Negative Bases - globalInvoicing: Global invoicing - invoiceOutCreate: Create invoice out - summary: Summary - basicData: Basic Data list: ref: Reference issued: Issued @@ -677,13 +754,6 @@ invoiceOut: errors: downloadCsvFailed: CSV download failed shelving: - pageTitles: - shelving: Shelving - shelvingList: Shelving List - shelvingCreate: New shelving - summary: Summary - basicData: Basic Data - log: Logs list: parking: Parking priority: Priority @@ -710,17 +780,6 @@ parking: info: You can search by parking code label: Search parking... invoiceIn: - pageTitles: - invoiceIns: Invoices In - list: List - invoiceInCreate: Create invoice in - summary: Summary - basicData: Basic data - vat: VAT - dueDay: Due day - intrastat: Intrastat - corrective: Corrective - log: Logs list: ref: Reference supplier: Supplier @@ -771,15 +830,6 @@ invoiceIn: stems: Stems country: Country order: - pageTitles: - order: Orders - orderList: List - orderCreate: New order - summary: Summary - basicData: Basic Data - catalog: Catalog - volume: Volume - lines: Lines field: salesPersonFk: Sales Person clientFk: Client @@ -855,7 +905,6 @@ worker: timeControl: Time control locker: Locker balance: Balance - formation: Formation list: name: Name email: Email @@ -944,15 +993,6 @@ worker: credit: Have concept: Concept wagon: - pageTitles: - wagons: Wagons - wagonsList: Wagons List - wagonCreate: Create wagon - wagonEdit: Edit wagon - typesList: Types List - typeCreate: Create type - typeEdit: Edit type - wagonCounter: Trolley counter type: name: Name submit: Submit @@ -981,31 +1021,7 @@ wagon: minHeightBetweenTrays: 'The minimum height between trays is ' maxWagonHeight: 'The maximum height of the wagon is ' uncompleteTrays: There are incomplete trays -route/roadmap: - pageTitles: - roadmap: Roadmap - summary: Summary - basicData: Basic Data - stops: Stops -roadmap: - pageTitles: - roadmap: Roadmap - summary: Summary - basicData: Basic Data - stops: Stops route: - pageTitles: - routes: Routes - cmrsList: CMRs list - RouteList: List - routeCreate: New route - basicData: Basic Data - summary: Summary - RouteRoadmap: Roadmaps - RouteRoadmapCreate: Create roadmap - tickets: Tickets - log: Log - autonomous: Autonomous cmr: list: results: results @@ -1033,22 +1049,6 @@ route: volume: Volume finished: Finished supplier: - pageTitles: - suppliers: Suppliers - supplier: Supplier - list: List - supplierCreate: New supplier - summary: Summary - basicData: Basic data - fiscalData: Fiscal data - billingData: Billing data - log: Log - accounts: Accounts - contacts: Contacts - addresses: Addresses - consumption: Consumption - agencyTerm: Agency agreement - dms: File management list: payMethod: Pay method payDeadline: Pay deadline @@ -1140,15 +1140,6 @@ supplier: date: Date reference: Reference travel: - pageTitles: - travel: Travels - list: List - summary: Summary - extraCommunity: Extra community - travelCreate: New travel - basicData: Basic data - history: Log - thermographs: Thermograph summary: confirmed: Confirmed entryId: Entry Id @@ -1195,24 +1186,6 @@ travel: travelFileDescription: 'Travel id { travelId }' file: File item: - pageTitles: - items: Items - list: List - diary: Diary - tags: Tags - create: Create - buyRequest: Buy requests - fixedPrice: Fixed prices - wasteBreakdown: Waste breakdown - itemCreate: New item - barcode: Barcodes - tax: Tax - log: Log - botanical: Botanical - shelving: Shelving - itemTypeCreate: New item type - family: Item Type - lastEntries: Last entries descriptor: item: Item buyer: Buyer @@ -1298,22 +1271,6 @@ item: minSalesQuantity: 'Cantidad mínima de venta' genus: 'Genus' specie: 'Specie' -item/itemType: - pageTitles: - itemType: Item type - basicData: Basic data - summary: Summary -monitor: - pageTitles: - monitors: Monitors - list: List -zone: - pageTitles: - zones: Zones - zonesList: Zones - deliveryList: Delivery days - upcomingList: Upcoming deliveries - components: topbar: {} itemsFilterPanel: diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index 3a3330d11..8c9b894fc 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -100,14 +100,144 @@ globals: modes: Modos zones: Zonas zonesList: Zonas - deliveryList: Días de entrega - upcomingList: Próximos repartos + deliveryDays: Días de entrega + upcomingDeliveries: Próximos repartos role: Role alias: Alias aliasUsers: Usuarios subRoles: Subroles inheritedRoles: Roles heredados + customers: Clientes + customerCreate: Nuevo cliente + list: Listado + webPayments: Pagos Web + extendedList: Listado extendido + notifications: Notificaciones + defaulter: Morosos + createCustomer: Crear cliente + fiscalData: Datos fiscales + billingData: Forma de pago + consignees: Consignatarios + notes: Notas + credits: Créditos + greuges: Greuges + balance: Balance + recoveries: Recobros + webAccess: Acceso web + sms: Sms + creditManagement: Gestión de crédito + creditContracts: Contratos de crédito + creditOpinion: Opinión de crédito + others: Otros + samples: Plantillas + consumption: Consumo + mandates: Mandatos + contacts: Contactos + webPayment: Pago web + fileManagement: Gestión documental + unpaid: Impago + entries: Entradas + buys: Compras + dms: Gestión documental + entryCreate: Nueva entrad_ö ñ,a + latestBuys: Últimas compras + tickets: Tickets + ticketCreate: Nuevo ticket + boxing: Encajado + sale: Lineas del pedido + claims: Reclamaciones + claimCreate: Crear reclamación + lines: Líneas + development: Trazabilidad + photos: Fotos + action: Acción + invoiceOuts: Fact. emitidas + negativeBases: Bases Negativas + globalInvoicing: Facturación global + invoiceOutCreate: Crear fact. emitida + order: Cesta + orderList: Listado + orderCreate: Nueva orden + catalog: Catálogo + volume: Volumen + shelving: Carros + shelvingList: Listado de carros + shelvingCreate: Nuevo carro + invoiceIns: Fact. recibidas + invoiceInCreate: Crear fact. recibida + vat: IVA + labeler: Etiquetas + dueDay: Vencimiento + intrastat: Intrastat + corrective: Rectificativa workers: Trabajadores + workerCreate: Nuevo trabajador + department: Departamentos + pda: PDA + pbx: Centralita + calendar: Calendario + timeControl: Control de horario + locker: Taquilla + wagons: Vagones + wagonsList: Listado vagones + wagonCreate: Crear tipo + wagonEdit: Editar tipo + typesList: Listado tipos + typeCreate: Crear tipo + typeEdit: Editar tipo + wagonCounter: Contador de carros + roadmap: Troncales + stops: Paradas + routes: Rutas + cmrsList: Listado de CMRs + RouteList: Listado + routeCreate: Nueva ruta + RouteRoadmap: Troncales + RouteRoadmapCreate: Crear troncal + autonomous: Autónomos + suppliers: Proveedores + supplier: Proveedor + supplierCreate: Nuevo proveedor + accounts: Cuentas + addresses: Direcciones + agencyTerm: Acuerdo agencia + travel: Envíos + create: Crear + extraCommunity: Extra comunitarios + travelCreate: Nuevo envío + history: Historial + thermographs: Termógrafos + items: Artículos + diary: Histórico + tags: Etiquetas + fixedPrice: Precios fijados + buyRequest: Peticiones de compra + wasteBreakdown: Deglose de mermas + itemCreate: Nuevo artículo + tax: 'IVA' + botanical: 'Botánico' + barcode: 'Código de barras' + itemTypeCreate: Nueva familia + family: Familia + lastEntries: Últimas entradas + itemType: Familia + monitors: Monitores + dashboard: Tablón + users: Usuarios + createTicket: Crear ticket + ticketAdvance: Adelantar tickets + futureTickets: Tickets a futuro + purchaseRequest: Petición de compra + weeklyTickets: Tickets programados + formation: Formación + locations: Ubicaciones + warehouses: Almacenes + roles: Roles + connections: Conexiones + acls: ACLs + mailForwarding: Reenvío de correo + mailAlias: Alias de correo + privileges: Privilegios created: Fecha creación worker: Trabajador now: Ahora @@ -147,41 +277,8 @@ verifyEmail: verifyEmail: Verificación de correo dashboard: pageTitles: - dashboard: Tablón + customer: - pageTitles: - customers: Clientes - customerCreate: Nuevo cliente - list: Listado - webPayments: Pagos Web - extendedList: Listado extendido - notifications: Notificaciones - defaulter: Morosos - createCustomer: Crear cliente - summary: Resumen - basicData: Datos básicos - fiscalData: Datos fiscales - billingData: Forma de pago - consignees: Consignatarios - notes: Notas - credits: Créditos - greuges: Greuges - balance: Balance - recoveries: Recobros - webAccess: Acceso web - log: Historial - sms: Sms - creditManagement: Gestión de crédito - creditContracts: Contratos de crédito - creditOpinion: Opinión de crédito - others: Otros - samples: Plantillas - consumption: Consumo - mandates: Mandatos - contacts: Contactos - webPayment: Pago web - fileManagement: Gestión documental - unpaid: Impago list: phone: Teléfono email: Email @@ -313,7 +410,6 @@ entry: pageTitles: entries: Entradas list: Listado - labeler: Etiquetar summary: Resumen basicData: Datos básicos buys: Compras @@ -526,18 +622,6 @@ ticket: warehouse: Almacén agency: Agencia claim: - pageTitles: - claims: Reclamaciones - list: Listado - claimCreate: Crear reclamación - summary: Resumen - basicData: Datos básicos - lines: Líneas - development: Trazabilidad - photos: Fotos - log: Historial - notes: Notas - action: Acción list: customer: Cliente assignedTo: Asignada a @@ -601,14 +685,6 @@ claim: noData: No hay imágenes/videos haz click aquí o arrastra y suelta el archivo dragDrop: Arrástralo y sueltalo aquí invoiceOut: - pageTitles: - invoiceOuts: Fact. emitidas - list: Listado - negativeBases: Bases Negativas - globalInvoicing: Facturación global - invoiceOutCreate: Crear fact. emitida - summary: Resumen - basicData: Datos básicos list: ref: Referencia issued: Fecha emisión @@ -676,15 +752,6 @@ invoiceOut: errors: downloadCsvFailed: Error al descargar CSV order: - pageTitles: - order: Cesta - orderList: Listado - orderCreate: Nueva orden - summary: Resumen - basicData: Datos básicos - catalog: Catálogo - volume: Volumen - lines: Líneas field: salesPersonFk: Comercial clientFk: Cliente @@ -726,13 +793,6 @@ order: price: Precio amount: Monto shelving: - pageTitles: - shelving: Carros - shelvingList: Listado de carros - shelvingCreate: Nuevo carro - summary: Resumen - basicData: Datos básicos - log: Historial list: parking: Parking priority: Prioridad @@ -758,17 +818,6 @@ parking: info: Puedes buscar por código de parking label: Buscar parking... invoiceIn: - pageTitles: - invoiceIns: Fact. recibidas - list: Listado - invoiceInCreate: Crear fact. recibida - summary: Resumen - basicData: Datos básicos - vat: IVA - dueDay: Vencimiento - intrastat: Intrastat - corrective: Rectificativa - log: Historial list: ref: Referencia supplier: Proveedor @@ -851,7 +900,6 @@ worker: timeControl: Control de horario locker: Taquilla balance: Balance - formation: Formación list: name: Nombre email: Email @@ -931,15 +979,6 @@ worker: credit: Haber concept: Concepto wagon: - pageTitles: - wagons: Vagones - wagonsList: Listado vagones - wagonCreate: Crear tipo - wagonEdit: Editar tipo - typesList: Listado tipos - typeCreate: Crear tipo - typeEdit: Editar tipo - wagonCounter: Contador de carros type: name: Nombre submit: Guardar @@ -968,31 +1007,7 @@ wagon: minHeightBetweenTrays: 'La distancia mínima entre bandejas es ' maxWagonHeight: 'La altura máxima del vagón es ' uncompleteTrays: Hay bandejas sin completar -route/roadmap: - pageTitles: - roadmap: Troncales - summary: Resumen - basicData: Datos básicos - stops: Paradas -roadmap: - pageTitles: - roadmap: Troncales - summary: Resumen - basicData: Datos básicos - stops: Paradas route: - pageTitles: - routes: Rutas - cmrsList: Listado de CMRs - RouteList: Listado - routeCreate: Nueva ruta - basicData: Datos básicos - summary: Resumen - RouteRoadmap: Troncales - RouteRoadmapCreate: Crear troncal - tickets: Tickets - log: Historial - autonomous: Autónomos cmr: list: results: resultados @@ -1020,22 +1035,6 @@ route: volume: Volumen finished: Finalizada supplier: - pageTitles: - suppliers: Proveedores - supplier: Proveedor - list: Listado - supplierCreate: Nuevo proveedor - summary: Resumen - basicData: Datos básicos - fiscalData: Datos fiscales - billingData: Forma de pago - log: Historial - accounts: Cuentas - contacts: Contactos - addresses: Direcciones - consumption: Consumo - agencyTerm: Acuerdo agencia - dms: Gestión documental list: payMethod: Método de pago payDeadline: Plazo de pago @@ -1127,16 +1126,6 @@ supplier: date: Fecha reference: Referencia travel: - pageTitles: - travel: Envíos - list: Listado - create: Crear - summary: Resumen - extraCommunity: Extra comunitarios - travelCreate: Nuevo envío - basicData: Datos básicos - history: Historial - thermographs: Termógrafos summary: confirmed: Confirmado entryId: Id entrada @@ -1183,24 +1172,6 @@ travel: travelFileDescription: 'Id envío { travelId }' file: Fichero item: - pageTitles: - items: Artículos - list: Listado - diary: Histórico - tags: Etiquetas - fixedPrice: Precios fijados - buyRequest: Peticiones de compra - wasteBreakdown: Deglose de mermas - itemCreate: Nuevo artículo - basicData: 'Datos básicos' - tax: 'IVA' - botanical: 'Botánico' - barcode: 'Código de barras' - log: Historial - shelving: Carros - itemTypeCreate: Nueva familia - family: Familia - lastEntries: Últimas entradas descriptor: item: Artículo buyer: Comprador @@ -1286,27 +1257,6 @@ item: achieved: 'Conseguido' concept: 'Concepto' state: 'Estado' -item/itemType: - pageTitles: - itemType: Familia - basicData: Datos básicos - summary: Resumen -zone: - pageTitles: - zones: Zonas - list: Zonas - deliveryList: Días de entrega - upcomingList: Próximos repartos -role: - pageTitles: - zones: Zonas - list: Zonas - deliveryList: Días de entrega - upcomingList: Próximos repartos -monitor: - pageTitles: - monitors: Monitores - list: Listado components: topbar: {} itemsFilterPanel: diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue index 1a2d3c251..55d59822d 100644 --- a/src/pages/Claim/Card/ClaimSummary.vue +++ b/src/pages/Claim/Card/ClaimSummary.vue @@ -224,7 +224,7 @@ async function changeState(value) { [ > - - + + + + diff --git a/src/pages/Entry/locale/en.yml b/src/pages/Entry/locale/en.yml index 164b501af..677c3c055 100644 --- a/src/pages/Entry/locale/en.yml +++ b/src/pages/Entry/locale/en.yml @@ -1,5 +1,4 @@ entryList: - labeler: Labeler list: inventoryEntry: Inventory entry virtualEntry: Virtual entry diff --git a/src/pages/Entry/locale/es.yml b/src/pages/Entry/locale/es.yml index 9522c113c..10b77c2ee 100644 --- a/src/pages/Entry/locale/es.yml +++ b/src/pages/Entry/locale/es.yml @@ -2,7 +2,6 @@ Search entries: Buscar entradas You can search by entry reference: Puedes buscar por referencia de la entrada entryList: - labeler: Etiquetas list: inventoryEntry: Es inventario virtualEntry: Es una redada diff --git a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue index 428e7a7a1..cdf012b2a 100644 --- a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue +++ b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue @@ -209,7 +209,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`; `#/invoice-in/${entityId.value}/${param}`; `#/invoice-in/${entityId.value}/${param}`; `#/invoice-in/${entityId.value}/${param}`; diff --git a/src/pages/Shelving/Card/ShelvingSummary.vue b/src/pages/Shelving/Card/ShelvingSummary.vue index 08d05626e..94175b0c1 100644 --- a/src/pages/Shelving/Card/ShelvingSummary.vue +++ b/src/pages/Shelving/Card/ShelvingSummary.vue @@ -51,7 +51,7 @@ const filter = { class="header header-link" :to="{ name: 'ShelvingBasicData', params: { id: entityId } }" > - {{ t('shelving.pageTitles.basicData') }} + {{ t('globals.pageTitles.basicData') }} diff --git a/src/pages/Travel/Card/TravelSummary.vue b/src/pages/Travel/Card/TravelSummary.vue index 88ddee9a2..de539e949 100644 --- a/src/pages/Travel/Card/TravelSummary.vue +++ b/src/pages/Travel/Card/TravelSummary.vue @@ -49,7 +49,7 @@ const entriesTableColumns = computed(() => { showValue: false, }, { - label: t('supplier.pageTitles.supplier'), + label: t('globals.pageTitles.supplier'), field: 'supplierName', name: 'supplierName', align: 'left', @@ -248,7 +248,7 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`; @@ -266,7 +266,7 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`; @@ -284,7 +284,7 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`; diff --git a/src/pages/Travel/ExtraCommunity.vue b/src/pages/Travel/ExtraCommunity.vue index 98648512f..4dc7eb052 100644 --- a/src/pages/Travel/ExtraCommunity.vue +++ b/src/pages/Travel/ExtraCommunity.vue @@ -140,7 +140,7 @@ const columns = computed(() => [ sortable: true, }, { - label: t('supplier.pageTitles.supplier'), + label: t('globals.pageTitles.supplier'), field: 'cargoSupplierNickname', name: 'cargoSupplierNickname', align: 'left', diff --git a/src/pages/Travel/ExtraCommunityFilter.vue b/src/pages/Travel/ExtraCommunityFilter.vue index 78905ee5f..c51151451 100644 --- a/src/pages/Travel/ExtraCommunityFilter.vue +++ b/src/pages/Travel/ExtraCommunityFilter.vue @@ -218,7 +218,7 @@ warehouses(); 1) { const module = matches[1]; const moduleTitle = module.meta && module.meta.title; - moduleName = toLowerCamel(module.name); if (moduleTitle) { - title = t(`${moduleName}.pageTitles.${moduleTitle}`); + title = t(`globals.pageTitles.${moduleTitle}`); } } @@ -94,7 +91,7 @@ export default route(function (/* { store, ssrContext } */) { if (childPageTitle && matches.length > 2) { if (title != '') title += ': '; - const moduleLocale = `${moduleName}.pageTitles.${childPageTitle}`; + const moduleLocale = `globals.pageTitles.${childPageTitle}`; const pageTitle = te(moduleLocale) ? t(moduleLocale) : t(`globals.pageTitles.${childPageTitle}`); diff --git a/src/router/modules/item.js b/src/router/modules/item.js index 6e8659747..06fe680eb 100644 --- a/src/router/modules/item.js +++ b/src/router/modules/item.js @@ -201,15 +201,6 @@ export default { }, component: () => import('src/pages/Item/Card/ItemLog.vue'), }, - { - path: 'botanical', - name: 'ItemBotanical', - meta: { - title: 'botanical', - icon: 'vn:botanical', - }, - component: () => import('src/pages/Item/Card/ItemBotanical.vue'), - }, ], }, ], diff --git a/src/stores/useNavigationStore.js b/src/stores/useNavigationStore.js index 4dd5ed2ae..51f266800 100644 --- a/src/stores/useNavigationStore.js +++ b/src/stores/useNavigationStore.js @@ -60,7 +60,7 @@ export const useNavigationStore = defineStore('navigationStore', () => { menuChildren = menuChildren.map(({ name, title, icon }) => ({ name, icon, - title: `${module}.pageTitles.${title}`, + title: `globals.pageTitles.${title}`, })); if (meta && meta.roles && role.hasAny(meta.roles) === false) return; @@ -70,7 +70,7 @@ export const useNavigationStore = defineStore('navigationStore', () => { children: menuChildren, }; if (meta) { - item.title = `${module}.pageTitles.${meta.title}`; + item.title = `globals.pageTitles.${meta.title}`; item.icon = meta.icon; } diff --git a/test/vitest/__tests__/components/Leftmenu.spec.js b/test/vitest/__tests__/components/Leftmenu.spec.js index ea1c51f8d..10d9d66fb 100644 --- a/test/vitest/__tests__/components/Leftmenu.spec.js +++ b/test/vitest/__tests__/components/Leftmenu.spec.js @@ -78,13 +78,13 @@ describe('Leftmenu', () => { { children: null, name: 'CustomerList', - title: 'customer.pageTitles.list', + title: 'globals.pageTitles.list', icon: 'view_list', }, { children: null, name: 'CustomerCreate', - title: 'customer.pageTitles.createCustomer', + title: 'globals.pageTitles.createCustomer', icon: 'vn:addperson', }, ];