fix(locale): fallback to device preferences instead of 'en' #864
+33
−36
Conversation
This file contains 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
ShGKme
added
type: bug
Signed-off-by: Grigorii K. Shartsev <[email protected]>
ShGKme
force-pushed
the
fix/fallback-to-navigator-language
branch
from
4fefcdb to
5ccded6
Compare
susnux
reviewed
Feb 18, 2025
| /** | ||
| * Returns the user's locale | ||
| */ | ||
| export function getLocale(): string { | ||
| return document.documentElement.dataset.locale || 'en' | ||
| return document.documentElement.dataset.locale || environmentLocale.replace(/-/g, '_') |
There was a problem hiding this comment.
This only replaces the first instance of - but BCP47 allows also adding the script which might become a thing for us. Because there are some languages using Latin and Cyrillic script. One popular one is Serbian.
So possible variants:
sr-Latn-RSsr-Cyrl-RS
susnux
reviewed
Feb 18, 2025
| @@ -22,7 +24,7 @@ export function getCanonicalLocale(): string { | |||
| * Returns the user's language | |||
| */ | |||
| export function getLanguage(): string { | |||
| return document.documentElement.lang || 'en' | |||
| return document.documentElement.lang || environmentLocale | |||
There was a problem hiding this comment.
Language is not locale, probably better:
Suggested change
| return document.documentElement.lang || environmentLocale | |
| return document.documentElement.lang || navigator.language || navigator.userLanguage |
susnux
reviewed
Feb 18, 2025
| setLanguage('zu') | ||
| expect(getLanguage()).toBe('zu') | ||
| it('returns the environment locale with underscore if no locale is set', () => { | ||
| const environmentLocale = Intl.DateTimeFormat().resolvedOptions().locale |
There was a problem hiding this comment.
IMHO this should be mocked otherwise there is no control what this value will be
susnux
reviewed
Feb 18, 2025
|
|
||
| it('Returns extended locales with hyphens', () => { | ||
| setLocale('az_Cyrl_AZ') |
There was a problem hiding this comment.
You are loosing the test case of having the script information in the locale
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
When language or locale is not available,
@nextcloud/l10nfallbacks to'en'.Instead, fallback to the environment (aka Web-Brrowser/OS) settings.
Alternative: fallback locale to language instead of system locale.