arno/trezor-wallet
1
0
Fork 0
mirror of https://github.com/trezor/trezor-wallet synced 2025-02-13 16:42:01 +00:00
Code Issues Releases Wiki Activity

getInitialLocale now accepts navigatorLanguage as param

Browse Source
This commit is contained in:
slowbackspace 2019-04-12 17:24:11 +02:00
parent 241e59dc98
commit 71fb19861d
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/actions/LocalStorageActions.js
View File

@ -277,7 +277,7 @@ const loadStorageData = (): ThunkAction => (dispatch: Dispatch): void => {
if (language) { if (language) {
dispatch(WalletActions.fetchLocale(JSON.parse(language))); dispatch(WalletActions.fetchLocale(JSON.parse(language)));
} else { } else {
dispatch(WalletActions.fetchLocale(l10nUtils.getInitialLocale())); dispatch(WalletActions.fetchLocale(l10nUtils.getInitialLocale(navigator.language)));
} }
const localCurrency: ?string = storageUtils.get(TYPE, KEY_LOCAL_CURRENCY); const localCurrency: ?string = storageUtils.get(TYPE, KEY_LOCAL_CURRENCY);

6
src/utils/l10n.js
View File

@ -1,7 +1,9 @@
import { LANGUAGE } from 'config/app'; import { LANGUAGE } from 'config/app';
export const getInitialLocale = (defaultLocale = 'en') => { export const getInitialLocale = (navigatorLanguage, defaultLocale = 'en') => {
const browserLocale = navigator.language.split('-')[0]; if (!navigatorLanguage) return defaultLocale;
const browserLocale = navigatorLanguage.split('-')[0];
if (LANGUAGE.some(e => e.code === browserLocale)) { if (LANGUAGE.some(e => e.code === browserLocale)) {
// Array of supported languages contains the locale we're looking for // Array of supported languages contains the locale we're looking for
return browserLocale; return browserLocale;