MWPW-185900: refactor locales structure #552

3ch023 · 2026-01-27T19:32:14Z

Resolves MWPW-185900

Locale changes in Studio & /mas/io

In acom and express

add en_GB and pt_PT in top nav
in acom, en_AU and en_IN are variations of en_GB, not en_US
in express only en_IN is a variation of en_GB, en_AU is not supported
user can no longer create en_GB variation of en_US

To retest in Studio:
Top nav, placeholders & creation of regional variations.

C1. Cover code with Unit Tests
C2. Add a Nala test (double check with #fishbags if nala test is needed)
C3. Verify all Checks are green (unit tests, nala tests)
C4. PR description contains working Test Page link where the feature can be tested
C5: you are ready to do a demo from Test Page in PR (bonus: write a working demo script that you'll use on Thursday, you can eventually put in your PR)
C.6 read your Jira one more time to validate that you've addressed all AC's and nothing is missing

Test URLs Studio:

en_GB&acom (sandbox,nala) - becomes 'default lang'

pt_BR&acom - becomes 'default lang'

pt_PT&acom - becomes 'default lang'

pt_PT&ccd - stay 'variation lang' of pt_BR

corner case - variation language fr_LU&acom:

Test URLs /mas/io:

CCD gallery (Nala rules are same as acom)

There is not content in en_GB, so before it was falling back to en_US. Now its a default language so it will 404.

en_IN and en_AU fallback to en_GB, so 404
https://main--mas--adobecom.aem.live/web-components/docs/ccd.html?locale=en_IN&mas-io-url=https://14257-merchatscale-3ch023.adobeioruntime.net/api/v1/web/MerchAtScale
https://main--mas--adobecom.aem.live/web-components/docs/ccd.html?locale=en_AU&mas-io-url=https://14257-merchatscale-3ch023.adobeioruntime.net/api/v1/web/MerchAtScale

en_KW falls back to en_US, so 200
https://main--mas--adobecom.aem.live/web-components/docs/ccd.html?locale=en_KW&mas-io-url=https://14257-merchatscale-3ch023.adobeioruntime.net/api/v1/web/MerchAtScale

corner case - bu_BU unexisting locale - 404

aem-code-sync · 2026-01-27T19:32:18Z

Hello, I'm the AEM Code Sync Bot and I will run some actions to deploy your branch.
In case there are problems, just click the checkbox below to rerun the respective action.

Re-sync branch

Commits

c38ea0e ✅ (latest)
04cbaa6 ✅
70e02e5 ✅
898fe5c ✅
9838e6e ✅
318ba2a ✅
1b6e25a ✅
90c8dfe ✅
d204d38 ✅
ac3e616 ✅
112af53 ✅
bf96229 ✅
98cb588 ✅
14b5d14 ✅
02a4646 ✅
ee59007 ✅
ddb779c ✅
7d79130 ✅
22c7699 ✅
ba7d879 ✅
db2c84c ✅
34ea41f ✅
719c835 ✅
8fb69e3 ✅
1060cbc ✅
1ffbcc8 ✅
f0702c8 ✅
fa2f15e ✅
c5fcf71 ✅
7dfa891 ✅

npeltier

code feedbacks are mostly comments
expected results in tests things i actually request to change

npeltier · 2026-02-03T12:40:41Z

io/www/src/fragment/locales.js

-        regionLocalesCache[cacheKey] = LOCALES.filter((locale) =>
-            isRegionLocale(locale, surface, language, includeDefault),
-        ).sort((a, b) => getCountryName(a.country).localeCompare(getCountryName(b.country)));
+        const [lang, country] = localeCode.split('_');


i know it's a simple operation, but i would still factorize localeCode -> [lang, country] code somewhere in this file (you are using it l423 too)

npeltier · 2026-02-03T12:49:53Z

io/www/src/fragment/transformers/customize.js

+function getCorrespondingLocale(surface, locale) {
+    const defaultLocale = getDefaultLocaleCode(surface, locale);
+    return defaultLocale || locale;
 }


can we remove this, and just use getDefaultLocaleCode? to me that corresponding wording (i created) just introduces confusion

yes, i just need to test it via customized method then
reason why i kept this method was that its easy for unit test

npeltier · 2026-02-03T12:59:17Z

io/www/test/fragment/customize.test.js

+        });
+    });
+
+    it('should return 503 if language is not supported', async function () {


no, it should return 400 or 403 depending how we want to phrase it, but it's not a server error

npeltier · 2026-02-03T13:00:32Z

io/www/test/fragment/customize.test.js

-        const locale = getCorrespondingLocale('zh_TW');
-        expect(locale).to.equal('zh_TW');
+describe('corresponding locale corner case', function () {
+    it('locale with no default should be returned as is', async function () {


assuming we remove getCorrespondingLocale and just keep default one. I think we should in here just return null: there is not default locale for bb_BB

npeltier · 2026-02-03T13:03:29Z

studio/src/reactivity/editor-context-store.js

@@ -19,14 +19,10 @@ export class EditorContextStore extends ReactiveStore {
        if (!fragmentPath) return { isVariation: false, defaultLocale: null };
        const pathMatch = fragmentPath.match(/\/content\/dam\/mas\/[^/]+\/([^/]+)\//);


we could probably extract logic from io/www fetchFragment here too

npeltier · 2026-02-03T13:05:17Z

studio/src/mas-locale-picker.js

+    handleMenuOpen() {
+        this.updateComplete.then(() => {
+            const search = this.shadowRoot.querySelector('sp-search');
+            if (search) {
+                search.focus();
+            }
+        });
+    }
+


not related to that PR but ok

it was hard to test it without this :D

npeltier

Lgtm

Axelcureno · 2026-02-03T17:55:50Z

io/www/src/fragment/transformers/customize.js

        return { status, message };
    }
    const baseFragment = skimFragmentFromReferences(body);
+    //todo check


we should add more details to this todo

3ch023 and others added 11 commits January 26, 2026 11:18

move locales.js to mas/io

7dfa891

fix import

c5fcf71

Merge branch 'main' into MWPW-185900

fa2f15e

fix import

f0702c8

delete locales.js

1ffbcc8

fix import

1060cbc

handle menu open

8fb69e3

remove obsolete import

719c835

reuse locales.js

34ea41f

add new structure

db2c84c

refactor locales structure

ba7d879

3ch023 changed the title ~~MWPW-185900:~~ MWPW-185900: refactor locales structure Jan 27, 2026

Merge remote-tracking branch 'upstream/main' into MWPW-185900

22c7699

aem-code-sync bot temporarily deployed to MWPW-185900 January 27, 2026 19:39 Inactive

discard logic changes

7d79130

aem-code-sync bot temporarily deployed to MWPW-185900 January 28, 2026 15:09 Inactive

3ch023 added 3 commits February 2, 2026 12:12

bring back same fallback

ddb779c

fix unit tests

ee59007

return en_US fro en_ZZ

02a4646

aem-code-sync bot temporarily deployed to MWPW-185900 February 2, 2026 11:45 Inactive

Merge remote-tracking branch 'upstream/main' into MWPW-185900

14b5d14

3ch023 force-pushed the MWPW-185900 branch from 02a4646 to 14b5d14 Compare February 2, 2026 11:46

aem-code-sync bot temporarily deployed to MWPW-185900 February 2, 2026 11:46 Inactive

3ch023 marked this pull request as ready for review February 2, 2026 11:55

fix prettier

98cb588

aem-code-sync bot temporarily deployed to MWPW-185900 February 2, 2026 12:08 Inactive

add corner cases coverage

bf96229

aem-code-sync bot temporarily deployed to MWPW-185900 February 2, 2026 12:26 Inactive

fix unit tests

112af53

aem-code-sync bot temporarily deployed to MWPW-185900 February 2, 2026 15:34 Inactive

fix formatting

ac3e616

aem-code-sync bot temporarily deployed to MWPW-185900 February 2, 2026 15:35 Inactive

Merge remote-tracking branch 'upstream/main' into MWPW-185900

d204d38

aem-code-sync bot temporarily deployed to MWPW-185900 February 3, 2026 10:24 Inactive

3ch023 added 2 commits February 3, 2026 13:03

fix regional locales issue

90c8dfe

fix empty regions

1b6e25a

aem-code-sync bot temporarily deployed to MWPW-185900 February 3, 2026 12:10 Inactive

npeltier requested changes Feb 3, 2026

View reviewed changes

3ch023 added 2 commits February 3, 2026 14:13

remove defaultLocalesCache

318ba2a

review comments

9838e6e

aem-code-sync bot temporarily deployed to MWPW-185900 February 3, 2026 14:29 Inactive

npeltier approved these changes Feb 3, 2026

View reviewed changes

fix formatting

898fe5c

aem-code-sync bot temporarily deployed to MWPW-185900 February 3, 2026 15:05 Inactive

Axelcureno approved these changes Feb 3, 2026

View reviewed changes

3ch023 and others added 2 commits February 4, 2026 10:28

fix tests in studio

70e02e5

Merge branch 'main' into MWPW-185900

04cbaa6

aem-code-sync bot temporarily deployed to MWPW-185900 February 4, 2026 09:28 Inactive

aem-code-sync bot temporarily deployed to MWPW-185900 February 4, 2026 10:00 Inactive

aem-code-sync bot temporarily deployed to MWPW-185900 February 4, 2026 13:02 Inactive

3ch023 force-pushed the MWPW-185900 branch from f372d01 to 04cbaa6 Compare February 4, 2026 13:54

aem-code-sync bot temporarily deployed to MWPW-185900 February 4, 2026 13:54 Inactive

Merge branch 'main' into MWPW-185900

c38ea0e

aem-code-sync bot deployed to MWPW-185900 February 4, 2026 14:21 View deployment

afmicka added the run nala label Feb 4, 2026

		@@ -19,14 +19,10 @@ export class EditorContextStore extends ReactiveStore {
		if (!fragmentPath) return { isVariation: false, defaultLocale: null };
		const pathMatch = fragmentPath.match(/\/content\/dam\/mas\/[^/]+\/([^/]+)\//);

MWPW-185900: refactor locales structure #552

Are you sure you want to change the base?

MWPW-185900: refactor locales structure #552

Uh oh!

Conversation

3ch023 commented Jan 27, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Locale changes in Studio & /mas/io

In acom and express

Test URLs Studio:

en_GB&acom (sandbox,nala) - becomes 'default lang'

pt_BR&acom - becomes 'default lang'

pt_PT&acom - becomes 'default lang'

pt_PT&ccd - stay 'variation lang' of pt_BR

corner case - variation language fr_LU&acom:

Test URLs /mas/io:

CCD gallery (Nala rules are same as acom)

corner case - bu_BU unexisting locale - 404

Uh oh!

aem-code-sync bot commented Jan 27, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

npeltier left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

npeltier left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

3ch023 commented Jan 27, 2026 •

edited

Loading

aem-code-sync bot commented Jan 27, 2026 •

edited

Loading