-
Notifications
You must be signed in to change notification settings - Fork 21
Fixed Default Language in i18n translation #58
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
52 changes: 52 additions & 0 deletions
52
packages/javascript/src/utils/__tests__/normalizeLocaleTag.test.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| // Copyright 2026 The ThunderID Authors | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| import normalizeLocaleTag from '../normalizeLocaleTag'; | ||
|
|
||
| describe('normalizeLocaleTag', () => { | ||
| describe('with Intl.Locale', () => { | ||
| it('normalizes casing', () => { | ||
| expect(normalizeLocaleTag('en-us')).toBe('en-US'); | ||
| }); | ||
|
|
||
| it('leaves an already-canonical tag unchanged', () => { | ||
| expect(normalizeLocaleTag('fr-CA')).toBe('fr-CA'); | ||
| }); | ||
|
|
||
| it('normalizes a bare language subtag', () => { | ||
| expect(normalizeLocaleTag('EN')).toBe('en'); | ||
| }); | ||
| }); | ||
|
|
||
| describe('without Intl.Locale', () => { | ||
| const originalLocale = Intl.Locale; | ||
|
|
||
| beforeEach(() => { | ||
| // @ts-expect-error - simulating an environment without Intl.Locale | ||
| delete Intl.Locale; | ||
| }); | ||
|
|
||
| afterEach(() => { | ||
| Intl.Locale = originalLocale; | ||
| }); | ||
|
|
||
| it('still normalizes casing via the manual fallback', () => { | ||
| expect(normalizeLocaleTag('en-us')).toBe('en-US'); | ||
| }); | ||
|
|
||
| it('matches the Intl.Locale result for the same input', () => { | ||
| expect(normalizeLocaleTag('fr-ca')).toBe(new originalLocale('fr-ca').toString()); | ||
| }); | ||
| }); | ||
|
|
||
| it('produces the same result for equivalent tags with and without Intl.Locale', () => { | ||
| const withIntl: string = normalizeLocaleTag('en-us'); | ||
| const originalLocale = Intl.Locale; | ||
| // @ts-expect-error - simulating an environment without Intl.Locale | ||
| delete Intl.Locale; | ||
| const withoutIntl: string = normalizeLocaleTag('en-us'); | ||
| Intl.Locale = originalLocale; | ||
|
|
||
| expect(withIntl).toBe(withoutIntl); | ||
| }); | ||
| }); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| /** | ||
| * Copyright (c) 2026, WSO2 LLC. (https://www.wso2.com). | ||
| * | ||
| * WSO2 LLC. licenses this file to you under the Apache License, | ||
| * Version 2.0 (the "License"); you may not use this file except | ||
| * in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| /** | ||
| * Resolves a BCP 47 locale tag to its base (primary) language subtag, so that | ||
| * region-qualified tags compare equal to their bare form (e.g. "en-US" and "en" | ||
| * both resolve to "en"). Uses `Intl.Locale` when available, falling back to a | ||
| * simple split on the first "-". | ||
| * | ||
| * @param tag - BCP 47 locale tag to resolve (e.g. "en-US", "hi-IN", "en") | ||
| * @returns The lowercased base language subtag (e.g. "en", "hi") | ||
| * | ||
| * @example | ||
| * ```typescript | ||
| * getBaseLanguage('en-US') // 'en' | ||
| * getBaseLanguage('hi-IN') // 'hi' | ||
| * getBaseLanguage('en') // 'en' | ||
| * ``` | ||
| */ | ||
| export default function getBaseLanguage(tag: string): string { | ||
| try { | ||
| return new Intl.Locale(tag).language.toLowerCase(); | ||
| } catch { | ||
| return tag.split('-')[0].toLowerCase(); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| /** | ||
| * Copyright (c) 2026, WSO2 LLC. (https://www.wso2.com). | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Let's update license header. It should be the following. |
||
| * | ||
| * WSO2 LLC. licenses this file to you under the Apache License, | ||
| * Version 2.0 (the "License"); you may not use this file except | ||
| * in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| /** | ||
| * Lowercases the language subtag and uppercases a 2-letter region subtag (the common | ||
| * `language-REGION` shape), leaving everything else as-is. Not a full BCP 47 canonicalizer, | ||
| * but deterministic and dependency-free, so case-only differences still compare equal without | ||
| * `Intl.Locale`. | ||
| */ | ||
| function canonicalizeTagManually(tag: string): string { | ||
| return tag | ||
| .split('-') | ||
| .map((part: string, index: number): string => { | ||
| if (index === 0) { | ||
| return part.toLowerCase(); | ||
| } | ||
| return part.length === 2 ? part.toUpperCase() : part; | ||
| }) | ||
| .join('-'); | ||
| } | ||
|
|
||
| /** | ||
| * Resolves a BCP 47 locale tag to its canonical form, so tags that differ only in casing or | ||
| * separator style compare equal (e.g. "en-us" and "en-US"). Uses `Intl.Locale` when available; | ||
| * falls back to {@link canonicalizeTagManually} when it isn't (or rejects the input), so exact | ||
| * dialect matching stays consistent either way. | ||
| * | ||
| * Unlike {@link getBaseLanguage}, this preserves the region/dialect — use it to test for an | ||
| * *exact* match (e.g. "en-IN" against "en-IN"), not a same-base-language match. | ||
| * | ||
| * @param tag - BCP 47 locale tag to resolve (e.g. "en-US", "fr-CA") | ||
| * @returns The canonical form of the tag | ||
| * | ||
| * @example | ||
| * ```typescript | ||
| * normalizeLocaleTag('en-us') // 'en-US' | ||
| * normalizeLocaleTag('fr-CA') // 'fr-CA' | ||
| * ``` | ||
| */ | ||
| export default function normalizeLocaleTag(tag: string): string { | ||
| try { | ||
| return new Intl.Locale(tag).toString(); | ||
| } catch { | ||
| return canonicalizeTagManually(tag); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's update license header. It should be the following.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@SajidMannikeri17 Can you fix this in the #73