javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-14 18:12:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(Device): don't cache device language & region (#9394)

Browse Source 
closes #6082
This commit is contained in:
Osei Fortune
2021-05-12 15:51:35 -04:00
committed by GitHub
parent 7e878f83a3
commit 95596e8230
2 changed files with 4 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/core/platform/index.android.ts
View File

@ -67,8 +67,6 @@ class DeviceRef {
private _sdkVersion: string; private _sdkVersion: string;
private _deviceType: 'Phone' | 'Tablet'; private _deviceType: 'Phone' | 'Tablet';
private _uuid: string; private _uuid: string;
private _language: string;
private _region: string;
get manufacturer(): string { get manufacturer(): string {
if (!this._manufacturer) { if (!this._manufacturer) {
@ -130,19 +128,11 @@ class DeviceRef {
} }
get language(): string { get language(): string {
if (!this._language) { return java.util.Locale.getDefault().getLanguage().replace('_', '-');
this._language = java.util.Locale.getDefault().getLanguage().replace('_', '-');
}
return this._language;
} }
get region(): string { get region(): string {
if (!this._region) { return java.util.Locale.getDefault().getCountry();
this._region = java.util.Locale.getDefault().getCountry();
}
return this._region;
} }
} }

15
packages/core/platform/index.ios.ts
View File

@ -10,8 +10,6 @@ class DeviceRef {
private _osVersion: string; private _osVersion: string;
private _sdkVersion: string; private _sdkVersion: string;
private _deviceType: 'Phone' | 'Tablet'; private _deviceType: 'Phone' | 'Tablet';
private _language: string;
private _region: string;
get manufacturer(): string { get manufacturer(): string {
return 'Apple'; return 'Apple';
@ -72,20 +70,11 @@ class DeviceRef {
} }
get language(): string { get language(): string {
if (!this._language) { return NSLocale.preferredLanguages[0];
const languages = NSLocale.preferredLanguages;
this._language = languages[0];
}
return this._language;
} }
get region(): string { get region(): string {
if (!this._region) { return NSLocale.currentLocale.objectForKey(NSLocaleCountryCode);
this._region = NSLocale.currentLocale.objectForKey(NSLocaleCountryCode);
}
return this._region;
} }
} }