bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-21 18:53:29 +00:00
Code Issues Releases Wiki Activity

safari fixes

Browse Source
This commit is contained in:
Kyle Spearrin
2018-01-11 23:39:16 -05:00
parent 2b6c2bd4e2
commit 61dc7454d3
3 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/services/i18n.service.ts
View File

@@ -11,10 +11,10 @@ export default function i18nService(platformUtilsService: PlatformUtilsService)
'zh-CN', 'zh-TW',
];
async function loadMessages(locale: string, messagesObj: any,
async function loadMessages(localesDir: string, locale: string, messagesObj: any,
messageCallback: (prop: string, message: string) => string): Promise<any> {
const formattedLocale = locale.replace('-', '_');
const file = await fetch('../_locales/' + formattedLocale + '/messages.json');
const file = await fetch(localesDir + formattedLocale + '/messages.json');
const locales = await file.json();
for (const prop in locales) {
if (locales.hasOwnProperty(prop)) {
@@ -24,7 +24,7 @@ export default function i18nService(platformUtilsService: PlatformUtilsService)
}
if (platformUtilsService.isEdge()) {
loadMessages('en', localeMessages, (prop: string, message: string) => chrome.i18n.getMessage(prop));
loadMessages('../_locales/', 'en', localeMessages, (prop: string, message: string) => chrome.i18n.getMessage(prop));
return localeMessages;
}
@@ -38,9 +38,10 @@ export default function i18nService(platformUtilsService: PlatformUtilsService)
}
}
loadMessages(lang, localeMessages, (prop: string, message: string) => message);
const dir = './_locales/';
loadMessages(dir, lang, localeMessages, (prop: string, message: string) => message);
if (lang !== supportedLocales[0]) {
loadMessages(supportedLocales[0], defaultMessages, (prop: string, message: string) => message);
loadMessages(dir, supportedLocales[0], defaultMessages, (prop: string, message: string) => message);
}
}