Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-23 11:56:00 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:bitwarden/browser

Browse Source
This commit is contained in:
Kyle Spearrin 2019-08-14 16:55:21 -04:00
commit 9ee25156bd
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/background/main.background.ts
View File

@ -136,8 +136,7 @@ export default class MainBackground {
}); });
this.storageService = new BrowserStorageService(this.platformUtilsService); this.storageService = new BrowserStorageService(this.platformUtilsService);
this.secureStorageService = new BrowserStorageService(this.platformUtilsService); this.secureStorageService = new BrowserStorageService(this.platformUtilsService);
this.i18nService = new I18nService(BrowserApi.getUILanguage(window), this.i18nService = new I18nService(BrowserApi.getUILanguage(window));
BrowserApi.isSafariApi ? './_locales/' : null);
const cryptoFunctionService = new WebCryptoFunctionService(window, this.platformUtilsService); const cryptoFunctionService = new WebCryptoFunctionService(window, this.platformUtilsService);
this.cryptoService = new CryptoService(this.storageService, this.secureStorageService, cryptoFunctionService); this.cryptoService = new CryptoService(this.storageService, this.secureStorageService, cryptoFunctionService);
this.tokenService = new TokenService(this.storageService); this.tokenService = new TokenService(this.storageService);

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

@ -1,10 +1,19 @@
import { I18nService as BaseI18nService } from 'jslib/services/i18n.service'; import { I18nService as BaseI18nService } from 'jslib/services/i18n.service';
import { BrowserApi } from '../browser/browserApi';
import { SafariApp } from '../browser/safariApp';
export default class I18nService extends BaseI18nService { export default class I18nService extends BaseI18nService {
constructor(systemLanguage: string, localesDirectory: string) { constructor(systemLanguage: string) {
super(systemLanguage, localesDirectory, async (formattedLocale: string) => { super(systemLanguage, BrowserApi.isSafariApi ? 'safari' : null, async (formattedLocale: string) => {
const file = await fetch(localesDirectory + formattedLocale + '/messages.json'); if (BrowserApi.isSafariApi) {
const localeJson = await SafariApp.sendMessageToApp('getLocaleStrings', formattedLocale);
return JSON.parse(localeJson);
} else {
// Deprecated
const file = await fetch(this.localesDirectory + formattedLocale + '/messages.json');
return await file.json(); return await file.json();
}
}); });
this.supportedTranslationLocales = [ this.supportedTranslationLocales = [