From bad8999aa4eec5f92192e845194ae49f3d11df9a Mon Sep 17 00:00:00 2001 From: KrzysztofPajak Date: Sat, 12 Sep 2026 13:42:49 +0200 Subject: [PATCH 1/2] Backfill 2.4 localization resources into the upgrade migration Resources added during 2.4 development landed only in DefaultLanguage.xml, which is imported on a fresh install. Existing installations upgraded by MigrationUpdateResourceString read Upgrade/en_240.xml, which never received them, so every new Store panel screen rendered raw resource keys instead of labels. Admin.GiftVouchers.Permissions had the mirror-image problem: present only in en_240.xml, so fresh installs were the ones missing it. Also moves the 2.4 entries in the admin.common, admin.configuration.currencies and admin.configuration.languages families into their alphabetical position and fixes four entries indented without a leading tab; they had been appended at the end of their section. Co-Authored-By: Claude Opus 5 Claude-Session: https://claude.ai/code/session_01GrGY1NnCzdkn7wUxbyHzsX --- .../App_Data/Resources/DefaultLanguage.xml | Bin 1543368 -> 1543710 bytes .../App_Data/Resources/Upgrade/en_240.xml | 198 ++++++++++++++++++ 2 files changed, 198 insertions(+) diff --git a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml index 3fc6e2659486b0287c61bf3be2628884e481e8a0..09de03d11a7f4f0e600c8da30ba5a3a32ed83502 100644 GIT binary patch delta 413 zcmYk$&nx6{9LMoK-0*MH*U?WaYlC)V3*Vk~SxKw>daG>is^wo~PeZ%lTAp+Z4_j{$)O~xM5m& zIb?P?@Yl5df4%61QI_&a^upge&b~biaCa1sT>fo^WTF#OmK46C$4IFQlg(V*x05V2 zl?T}|jz;FE?RvVySe2^``i|bo--DohMc&>=J9N^@xIRChXjJM zvk%vZOWe3`0@n^-10{8UkY7sQk*|=EBfR%9`vcW7yM=2XSAHVtEgVA@j_q_a!@BJy zZf#Yj97)^;(os5BR+fc7fqEXr%hp*e1sc3f1XZ~TsS4$)N)=XBs#?{kT2-eavWa&Q F?*(Uwp=JO8 delta 401 zcmW;GPbh{_VnFNo3~qL;#BQDQ0PlVDSNCMDLLalC;M83 zY2wp3Ap22uQ)1Tr^PgD}TM377a>UjGlT^D3FW+=x!NE%*%r{VG92zwb=x(|g!z-Un zKvOJXK%K=ARD3asTE)Q;3@Un>!Y$=vFgeyCH;22Vu@Q&PnNfTzO3a~(%!tuSzIMa2 zK2|nFb?s>S%d7c)8t*mx_bZV1DTG~XFN+#i?ZEbO@)+qNHm{I(QYeQWN~YkWcpLJR zU51}4SFz;a`y_f5Ww+rayAP$*5{1E9TJ}=nNH%;NBBOEhCF-5zyMtkE=D?ddeYk;6 y`t@##J?kDT`lbt)aC7vnV7S^cT!ttV9#JH`qFDGui6|9i!Y|52fDKoL-}(hHN{;RT diff --git a/src/Web/Grand.Web/App_Data/Resources/Upgrade/en_240.xml b/src/Web/Grand.Web/App_Data/Resources/Upgrade/en_240.xml index 719c4b60a..9f51c3550 100644 --- a/src/Web/Grand.Web/App_Data/Resources/Upgrade/en_240.xml +++ b/src/Web/Grand.Web/App_Data/Resources/Upgrade/en_240.xml @@ -51,4 +51,202 @@ Wrong format of the URL - provide the full address including the scheme (e.g. https://yourstore.com/) + + Limited to stores + + + Global attribute - read only + + + You can't edit this checkout attribute. + + + Global attribute - read only + + + You can't edit this product attribute. + + + You can't edit this specification attribute. + + + Actions + + + Copy + + + Assign to store + + + Global currencies cannot be modified by store owners. + + + The default store currency can't be unassigned. + + + This currency is not assigned to your store. + + + This currency is not the default currency for your store. + + + Currency not found. + + + This currency is not published. + + + Set as default currency + + + Unassign from store + + + Unset as default currency + + + Enter a test email address + + + Store + + + Assign to store + + + Global languages cannot be modified by store owners. + + + The primary store language can't be unassigned. + + + The default store language can't be unassigned. + + + Is primary store language + + + This language is not assigned to your store. + + + This language is not the default language for your store. + + + Language not found. + + + This language is not published. + + + Set as default language + + + Unassign from store + + + Unset as default language + + + Delivery date is already assigned to another store. + + + Store + + + Delivery date is not assigned to this store. + + + Delivery date not found. + + + Select store + + + Store + + + Select store + + + Pickup point is already assigned to another store. + + + Pickup point is not assigned to this store. + + + Pickup point not found. + + + Warehouse is already assigned to another store. + + + Store + + + Warehouse is not assigned to this store. + + + Warehouse not found. + + + Select store + + + Store not found. + + + The message template has been copied. + + + A message template with the same name already exists for this store. + + + Global + + + Store + + + You can't edit this news, because it can be used in many stores. + + + A page with the same system name already exists for this store. + + + Global Pages + + + Store Pages + + + Warning: This page is shared across multiple stores. Changes may affect other stores. + + + Limited to stores + + + Global attribute - read only + + + Store + + + As a store manager you can only assign the customer to your own store + + + Store is required + + + Default page size + + + Default page size options (3,6,9) comma separated + + + Access Store Manager Panel + + + Store portal + From d3a04b400b9f745638497cf8bd3d10eddb218360 Mon Sep 17 00:00:00 2001 From: KrzysztofPajak Date: Sat, 12 Sep 2026 13:42:50 +0200 Subject: [PATCH 2/2] Bump nanoid to 3.3.19 to clear GHSA-2v37-7h3g-55p8 Transitive dependency of the Vite build chain. npm audit reported one high severity advisory; the bump clears it with no change to the produced bundles - app.runtime.bundle.js, libs.css, style.min.css and style.rtl.min.css are byte-identical before and after. Co-Authored-By: Claude Opus 5 Claude-Session: https://claude.ai/code/session_01GrGY1NnCzdkn7wUxbyHzsX --- src/Web/Grand.Web/vueapp/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Web/Grand.Web/vueapp/package-lock.json b/src/Web/Grand.Web/vueapp/package-lock.json index 8bd403f14..e2d48a546 100644 --- a/src/Web/Grand.Web/vueapp/package-lock.json +++ b/src/Web/Grand.Web/vueapp/package-lock.json @@ -2355,9 +2355,9 @@ "license": "MIT" }, "node_modules/nanoid": { - "version": "3.3.16", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.16.tgz", - "integrity": "sha512-bzlKTyNJ7+LdGIIwy8ijFpIqEQIvafahV7eYykJ8Cvh42EdJeODoJ6gUJXpQJvej1BddH8OqTXZNE/KfbWAu8Q==", + "version": "3.3.19", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.19.tgz", + "integrity": "sha512-Y2tUNy4ouw6tq5oDSKeQYGOyhkUBhNOcGV/02KC+6kd9eDGqdZd++mjMiIDilrBYvjEnCYvVtsuHCuP+okSfug==", "funding": [ { "type": "github",