From 63eb0959a7a2adfaf267b18a01f8d9c9ae504cd9 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Wed, 18 Nov 2020 16:54:29 -0500 Subject: [PATCH] support for sr lang. resolve sendService deps (#1466) --- jslib | 2 +- src/background/main.background.ts | 7 ++++++- src/popup/app.module.ts | 2 ++ src/popup/services/services.module.ts | 2 ++ src/services/i18n.service.ts | 4 ++-- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/jslib b/jslib index 5e50aa1a19..f44e99d74d 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit 5e50aa1a195bde11fdc14e9bdf71542766fdbb8d +Subproject commit f44e99d74dc011c026525d171f7d2940b60b6587 diff --git a/src/background/main.background.ts b/src/background/main.background.ts index fa30ca2481..f5c7d7ee6c 100644 --- a/src/background/main.background.ts +++ b/src/background/main.background.ts @@ -26,6 +26,7 @@ import { ExportService } from 'jslib/services/export.service'; import { NotificationsService } from 'jslib/services/notifications.service'; import { PolicyService } from 'jslib/services/policy.service'; import { SearchService } from 'jslib/services/search.service'; +import { SendService } from 'jslib/services/send.service'; import { SystemService } from 'jslib/services/system.service'; import { WebCryptoFunctionService } from 'jslib/services/webCryptoFunction.service'; @@ -58,6 +59,7 @@ import { ExportService as ExportServiceAbstraction } from 'jslib/abstractions/ex import { NotificationsService as NotificationsServiceAbstraction } from 'jslib/abstractions/notifications.service'; import { PolicyService as PolicyServiceAbstraction } from 'jslib/abstractions/policy.service'; import { SearchService as SearchServiceAbstraction } from 'jslib/abstractions/search.service'; +import { SendService as SendServiceAbstraction } from 'jslib/abstractions/send.service'; import { SystemService as SystemServiceAbstraction } from 'jslib/abstractions/system.service'; import { Analytics } from 'jslib/misc'; @@ -118,6 +120,7 @@ export default class MainBackground { policyService: PolicyServiceAbstraction; analytics: Analytics; popupUtilsService: PopupUtilsService; + sendService: SendServiceAbstraction; onUpdatedRan: boolean; onReplacedRan: boolean; @@ -169,6 +172,8 @@ export default class MainBackground { this.collectionService = new CollectionService(this.cryptoService, this.userService, this.storageService, this.i18nService); this.searchService = new SearchService(this.cipherService); + this.sendService = new SendService(this.cryptoService, this.userService, this.apiService, this.storageService, + this.i18nService, this.cryptoFunctionService); this.stateService = new StateService(); this.policyService = new PolicyService(this.userService, this.storageService); this.vaultTimeoutService = new VaultTimeoutService(this.cipherService, this.folderService, @@ -187,7 +192,7 @@ export default class MainBackground { }, async () => await this.logout(false)); this.syncService = new SyncService(this.userService, this.apiService, this.settingsService, this.folderService, this.cipherService, this.cryptoService, this.collectionService, - this.storageService, this.messagingService, this.policyService, + this.storageService, this.messagingService, this.policyService, this.sendService, async (expired: boolean) => await this.logout(expired)); this.eventService = new EventService(this.storageService, this.apiService, this.userService, this.cipherService); diff --git a/src/popup/app.module.ts b/src/popup/app.module.ts index a4167cbe15..125f7a713e 100644 --- a/src/popup/app.module.ts +++ b/src/popup/app.module.ts @@ -102,6 +102,7 @@ import localePtPt from '@angular/common/locales/pt-PT'; import localeRo from '@angular/common/locales/ro'; import localeRu from '@angular/common/locales/ru'; import localeSk from '@angular/common/locales/sk'; +import localeSr from '@angular/common/locales/sr'; import localeSv from '@angular/common/locales/sv'; import localeTh from '@angular/common/locales/th'; import localeTr from '@angular/common/locales/tr'; @@ -138,6 +139,7 @@ registerLocaleData(localePtPt, 'pt-PT'); registerLocaleData(localeRo, 'ro'); registerLocaleData(localeRu, 'ru'); registerLocaleData(localeSk, 'sk'); +registerLocaleData(localeSr, 'sr'); registerLocaleData(localeSv, 'sv'); registerLocaleData(localeTh, 'th'); registerLocaleData(localeTr, 'tr'); diff --git a/src/popup/services/services.module.ts b/src/popup/services/services.module.ts index ab52d38c27..6791075017 100644 --- a/src/popup/services/services.module.ts +++ b/src/popup/services/services.module.ts @@ -33,6 +33,7 @@ import { PasswordGenerationService } from 'jslib/abstractions/passwordGeneration import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PolicyService } from 'jslib/abstractions/policy.service'; import { SearchService as SearchServiceAbstraction } from 'jslib/abstractions/search.service'; +import { SendService } from 'jslib/abstractions/send.service'; import { SettingsService } from 'jslib/abstractions/settings.service'; import { StateService as StateServiceAbstraction } from 'jslib/abstractions/state.service'; import { StorageService } from 'jslib/abstractions/storage.service'; @@ -156,6 +157,7 @@ export function initFactory(i18nService: I18nService, storageService: StorageSer { provide: AppIdService, useFactory: getBgService('appIdService'), deps: [] }, { provide: AutofillService, useFactory: getBgService('autofillService'), deps: [] }, { provide: ExportService, useFactory: getBgService('exportService'), deps: [] }, + { provide: SendService, useFactory: getBgService('sendService'), deps: [] }, { provide: VaultTimeoutService, useFactory: getBgService('vaultTimeoutService'), diff --git a/src/services/i18n.service.ts b/src/services/i18n.service.ts index 0725509e87..4eb880424d 100644 --- a/src/services/i18n.service.ts +++ b/src/services/i18n.service.ts @@ -18,8 +18,8 @@ export default class I18nService extends BaseI18nService { this.supportedTranslationLocales = [ 'en', 'be', 'bg', 'ca', 'cs', 'da', 'de', 'el', 'en-GB', 'es', 'et', 'fa', 'fi', 'fr', 'he', 'hr', 'hu', - 'id', 'it', 'ja', 'ko', 'nb', 'nl', 'pl', 'pt-BR', 'pt-PT', 'ro', 'ru', 'sk', 'sv', 'th', 'tr', 'uk', 'vi', - 'zh-CN', 'zh-TW', + 'id', 'it', 'ja', 'ko', 'nb', 'nl', 'pl', 'pt-BR', 'pt-PT', 'ro', 'ru', 'sk', 'sr', 'sv', 'th', 'tr', 'uk', + 'vi', 'zh-CN', 'zh-TW', ]; }