bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-15 07:43:35 +00:00
Code Issues Releases Wiki Activity

pass utilsService to i18n function

Browse Source
This commit is contained in:
Kyle Spearrin
2017-12-06 14:05:49 -05:00
parent 81fcfb4f6f
commit a5add2c6f9
3 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/background.ts
View File

@@ -2,9 +2,10 @@ import MainBackground from './background/main.background';
// tslint:disable-next-line:variable-name // tslint:disable-next-line:variable-name
const bg_isBackground = (window as any).bg_isBackground = true; const bg_isBackground = (window as any).bg_isBackground = true;
// tslint:disable-next-line:variable-name // tslint:disable-next-line:variable-name
const bg_main = (window as any).bg_main = new MainBackground(); const bg_main = (window as any).bg_main = new MainBackground();
// tslint:disable-next-line:no-var-requires // tslint:disable-next-line:no-var-requires
require('./scripts/analytics.js'); require('./scripts/analytics.js');
bg_main.bootstrap(); bg_main.bootstrap();

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

@@ -56,7 +56,7 @@ export default class MainBackground {
constructor() { constructor() {
// Services // Services
this.utilsService = new UtilsService(); this.utilsService = new UtilsService();
this.i18nService = i18nService(); this.i18nService = i18nService(this.utilsService);
this.constantsService = new ConstantsService(i18nService, this.utilsService); this.constantsService = new ConstantsService(i18nService, this.utilsService);
this.cryptoService = new CryptoService(); this.cryptoService = new CryptoService();
this.tokenService = new TokenService(); this.tokenService = new TokenService();

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

@@ -1,18 +1,18 @@
export default function i18nService() { import UtilsService from '../services/utils.service';
export default function i18nService(utilsService: UtilsService) {
const edgeMessages: any = {}; const edgeMessages: any = {};
if (navigator.userAgent.indexOf(' Edge/') !== -1) { if (utilsService.isEdge()) {
fetch('../_locales/en/messages.json') fetch('../_locales/en/messages.json').then((file) => {
.then((file) => { return file.json();
return file.json(); }).then((locales) => {
}) for (const prop in locales) {
.then((locales) => { if (locales.hasOwnProperty(prop)) {
for (const prop in locales) { edgeMessages[prop] = chrome.i18n.getMessage(prop);
if (locales.hasOwnProperty(prop)) {
edgeMessages[prop] = chrome.i18n.getMessage(prop);
}
} }
}); }
});
return edgeMessages; return edgeMessages;
} }
@@ -22,8 +22,6 @@ export default function i18nService() {
return chrome.i18n.getMessage(name); return chrome.i18n.getMessage(name);
}, },
set(target, name, value) { set(target, name, value) {
throw new Error('set not allowed for i18n');
// @ts-ignore: Unreachable code error
return false; return false;
}, },
}); });