Skip to content

Support for language codes with 3 characters #520

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.

Sign up for GitHub

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
NathanWalker merged 2 commits into from
Jul 12, 2023
Merged

Support for language codes with 3 characters #520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce087f3
add support for language code of 3 characters
kmahelona Jul 9, 2023
df0b95c
chore: format
NathanWalker Jul 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion packages/localize/index.android.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@ export function androidLaunchEventLocalizationHandler() {
}

export function overrideLocale(locale: string): boolean {
ApplicationSettings.setString('__app__language__', locale.substring(0, 2));
let language_code = locale.substring(0, 2);
if (locale.indexOf('-') < 0 && locale.length == 3) {
language_code = locale;
}
ApplicationSettings.setString('__app__language__', language_code);
return true;
}
9 changes: 7 additions & 2 deletions packages/localize/index.ios.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,12 @@ export function androidLaunchEventLocalizationHandler() {
}

export function overrideLocale(locale: string): boolean {
const path = NSBundle.mainBundle.pathForResourceOfType(locale.substring(0, 2), 'lproj');
let language_code = locale.substring(0, 2);
if (locale.indexOf('-') < 0 && locale.length == 3) {
language_code = locale;
}

const path = NSBundle.mainBundle.pathForResourceOfType(language_code, 'lproj');

if (!path) {
return false;
Expand All @@ -39,7 +44,7 @@ export function overrideLocale(locale: string): boolean {
bundle = NSBundle.bundleWithPath(path);
NSUserDefaults.standardUserDefaults.setObjectForKey([locale], 'AppleLanguages');
NSUserDefaults.standardUserDefaults.synchronize();
ApplicationSettings.setString('__app__language__', locale.substring(0, 2));
ApplicationSettings.setString('__app__language__', language_code);

return true;
}