From 715ca52ce76f8f218ac5fbcf3c403e52d49067d0 Mon Sep 17 00:00:00 2001 From: Pedro Amorim Date: Wed, 22 Oct 2025 09:36:31 +0000 Subject: [PATCH] Bug 39320: (QA follow-up): Fix ERMCounts translatability MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Tomás Cohen Arazi --- .../ModuleDashboard/Widgets/ERMCounts.vue | 57 ++++++++----------- .../integration/ERM/ModuleDashboard_spec.ts | 9 ++- 2 files changed, 31 insertions(+), 35 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ModuleDashboard/Widgets/ERMCounts.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ModuleDashboard/Widgets/ERMCounts.vue index 9f6350a18b3..cbbe94e4b57 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ModuleDashboard/Widgets/ERMCounts.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ModuleDashboard/Widgets/ERMCounts.vue @@ -1,29 +1,18 @@ @@ -61,51 +50,51 @@ export default { { page: "AgreementsList", name: "agreements_count", - labelSingular: __("agreement"), - labelPlural: __("agreements"), + labelSingular: __("1 agreement"), + labelPlural: __("%s agreements"), count: 0, }, { page: "LicensesList", name: "licenses_count", - labelSingular: __("license"), - labelPlural: __("licenses"), + labelSingular: __("1 license"), + labelPlural: __("%s licenses"), count: 0, }, { name: "documents_count", - labelSingular: __("document"), - labelPlural: __("documents"), + labelSingular: __("1 document"), + labelPlural: __("%s documents"), count: 0, }, { page: "EHoldingsLocalPackagesList", name: "eholdings_packages_count", - labelSingular: __("local package"), - labelPlural: __("local packages"), + labelSingular: __("1 local package"), + labelPlural: __("%s local packages"), count: 0, }, { page: "EHoldingsLocalTitlesList", name: "eholdings_titles_count", - labelSingular: __("local title"), - labelPlural: __("local titles"), + labelSingular: __("1 local title"), + labelPlural: __("%s local titles"), count: 0, }, { page: "UsageStatisticsDataProvidersList", name: "usage_data_providers_count", - labelSingular: __("usage data provider"), - labelPlural: __("usage data providers"), + labelSingular: __("1 usage data provider"), + labelPlural: __("%s usage data providers"), count: 0, }, ]); const createCountText = definition => { if (definition.count === 1) { - return `${definition.count} ${definition.labelSingular}`; + return definition.labelSingular; } else { - return `${definition.count} ${definition.labelPlural}`; + return definition.labelPlural.format(definition.count); } }; diff --git a/t/cypress/integration/ERM/ModuleDashboard_spec.ts b/t/cypress/integration/ERM/ModuleDashboard_spec.ts index 4a9f4d5de6e..50aeb90adaf 100644 --- a/t/cypress/integration/ERM/ModuleDashboard_spec.ts +++ b/t/cypress/integration/ERM/ModuleDashboard_spec.ts @@ -103,8 +103,15 @@ describe("ERM Module Dashboard", () => { "Loading..." ); cy.wait("@getCounts"); + cy.get(".widget#ERMCounts .widget-content").contains("1 agreement"); + cy.get(".widget#ERMCounts .widget-content").contains("5 licenses"); + cy.get(".widget#ERMCounts .widget-content").contains("0 documents"); cy.get(".widget#ERMCounts .widget-content").contains( - "There are 1 agreement, 5 licenses, 0 documents, 0 local packages, 0 local titles, 1 usage data provider." + "0 local packages" + ); + cy.get(".widget#ERMCounts .widget-content").contains("0 local titles"); + cy.get(".widget#ERMCounts .widget-content").contains( + "1 usage data provider" ); //Move to the right -- 2.51.2