From bfe2edcdea4d99eca1a2122378955c51c78d62f2 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Tue, 18 Oct 2016 18:56:40 -0400 Subject: [PATCH] moved i18nService out to global services --- src/background.js | 1 + src/manifest.json | 1 + src/popup/app/services/backgroundService.js | 3 +++ src/popup/index.html | 1 - src/{popup/app => }/services/i18nService.js | 7 ++----- 5 files changed, 7 insertions(+), 6 deletions(-) rename src/{popup/app => }/services/i18nService.js (98%) diff --git a/src/background.js b/src/background.js index c4e7965ecf..55578f9e0e 100644 --- a/src/background.js +++ b/src/background.js @@ -1,4 +1,5 @@ var isBackground = true; +var i18nService = new i18nService(); var utilsService = new UtilsService(); var cryptoService = new CryptoService(); var tokenService = new TokenService(); diff --git a/src/manifest.json b/src/manifest.json index 40c02ea9b4..c08b85af73 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -32,6 +32,7 @@ "models/api/responseModels.js", "models/dataModels.js", "models/domainModels.js", + "services/i18nService.js", "services/utilsService.js", "services/cryptoService.js", "services/tokenService.js", diff --git a/src/popup/app/services/backgroundService.js b/src/popup/app/services/backgroundService.js index 872f15bd31..38cde8bb85 100644 --- a/src/popup/app/services/backgroundService.js +++ b/src/popup/app/services/backgroundService.js @@ -36,4 +36,7 @@ }) .factory('appIdService', function () { return chrome.extension.getBackgroundPage().appIdService; + }) + .factory('i18nService', function () { + return chrome.extension.getBackgroundPage().i18nService; }); diff --git a/src/popup/index.html b/src/popup/index.html index 24955d66e6..2f548215ce 100644 --- a/src/popup/index.html +++ b/src/popup/index.html @@ -40,7 +40,6 @@ - diff --git a/src/popup/app/services/i18nService.js b/src/services/i18nService.js similarity index 98% rename from src/popup/app/services/i18nService.js rename to src/services/i18nService.js index bc796f66ba..cb3fccb246 100644 --- a/src/popup/app/services/i18nService.js +++ b/src/services/i18nService.js @@ -1,7 +1,4 @@ -angular -.module('bit.services') - -.factory('i18nService', function () { +function i18nService() { return { loginOrCreateNewAccount: chrome.i18n.getMessage("loginOrCreateNewAccount"), createAccount: chrome.i18n.getMessage("createAccount"), @@ -93,4 +90,4 @@ angular rateExtensionDesc: chrome.i18n.getMessage("rateExtensionDesc"), browserNotSupportClipboard: chrome.i18n.getMessage("browserNotSupportClipboard") }; -}); +};