support for sr lang. resolve sendService deps (#1466)

This commit is contained in:
Kyle Spearrin 2020-11-18 16:54:29 -05:00 committed by GitHub
parent 3155029c32
commit 63eb0959a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 4 deletions

2
jslib

@ -1 +1 @@
Subproject commit 5e50aa1a195bde11fdc14e9bdf71542766fdbb8d Subproject commit f44e99d74dc011c026525d171f7d2940b60b6587

View File

@ -26,6 +26,7 @@ import { ExportService } from 'jslib/services/export.service';
import { NotificationsService } from 'jslib/services/notifications.service'; import { NotificationsService } from 'jslib/services/notifications.service';
import { PolicyService } from 'jslib/services/policy.service'; import { PolicyService } from 'jslib/services/policy.service';
import { SearchService } from 'jslib/services/search.service'; import { SearchService } from 'jslib/services/search.service';
import { SendService } from 'jslib/services/send.service';
import { SystemService } from 'jslib/services/system.service'; import { SystemService } from 'jslib/services/system.service';
import { WebCryptoFunctionService } from 'jslib/services/webCryptoFunction.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 { NotificationsService as NotificationsServiceAbstraction } from 'jslib/abstractions/notifications.service';
import { PolicyService as PolicyServiceAbstraction } from 'jslib/abstractions/policy.service'; import { PolicyService as PolicyServiceAbstraction } from 'jslib/abstractions/policy.service';
import { SearchService as SearchServiceAbstraction } from 'jslib/abstractions/search.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 { SystemService as SystemServiceAbstraction } from 'jslib/abstractions/system.service';
import { Analytics } from 'jslib/misc'; import { Analytics } from 'jslib/misc';
@ -118,6 +120,7 @@ export default class MainBackground {
policyService: PolicyServiceAbstraction; policyService: PolicyServiceAbstraction;
analytics: Analytics; analytics: Analytics;
popupUtilsService: PopupUtilsService; popupUtilsService: PopupUtilsService;
sendService: SendServiceAbstraction;
onUpdatedRan: boolean; onUpdatedRan: boolean;
onReplacedRan: boolean; onReplacedRan: boolean;
@ -169,6 +172,8 @@ export default class MainBackground {
this.collectionService = new CollectionService(this.cryptoService, this.userService, this.storageService, this.collectionService = new CollectionService(this.cryptoService, this.userService, this.storageService,
this.i18nService); this.i18nService);
this.searchService = new SearchService(this.cipherService); 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.stateService = new StateService();
this.policyService = new PolicyService(this.userService, this.storageService); this.policyService = new PolicyService(this.userService, this.storageService);
this.vaultTimeoutService = new VaultTimeoutService(this.cipherService, this.folderService, this.vaultTimeoutService = new VaultTimeoutService(this.cipherService, this.folderService,
@ -187,7 +192,7 @@ export default class MainBackground {
}, async () => await this.logout(false)); }, async () => await this.logout(false));
this.syncService = new SyncService(this.userService, this.apiService, this.settingsService, this.syncService = new SyncService(this.userService, this.apiService, this.settingsService,
this.folderService, this.cipherService, this.cryptoService, this.collectionService, 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)); async (expired: boolean) => await this.logout(expired));
this.eventService = new EventService(this.storageService, this.apiService, this.userService, this.eventService = new EventService(this.storageService, this.apiService, this.userService,
this.cipherService); this.cipherService);

View File

@ -102,6 +102,7 @@ import localePtPt from '@angular/common/locales/pt-PT';
import localeRo from '@angular/common/locales/ro'; import localeRo from '@angular/common/locales/ro';
import localeRu from '@angular/common/locales/ru'; import localeRu from '@angular/common/locales/ru';
import localeSk from '@angular/common/locales/sk'; import localeSk from '@angular/common/locales/sk';
import localeSr from '@angular/common/locales/sr';
import localeSv from '@angular/common/locales/sv'; import localeSv from '@angular/common/locales/sv';
import localeTh from '@angular/common/locales/th'; import localeTh from '@angular/common/locales/th';
import localeTr from '@angular/common/locales/tr'; import localeTr from '@angular/common/locales/tr';
@ -138,6 +139,7 @@ registerLocaleData(localePtPt, 'pt-PT');
registerLocaleData(localeRo, 'ro'); registerLocaleData(localeRo, 'ro');
registerLocaleData(localeRu, 'ru'); registerLocaleData(localeRu, 'ru');
registerLocaleData(localeSk, 'sk'); registerLocaleData(localeSk, 'sk');
registerLocaleData(localeSr, 'sr');
registerLocaleData(localeSv, 'sv'); registerLocaleData(localeSv, 'sv');
registerLocaleData(localeTh, 'th'); registerLocaleData(localeTh, 'th');
registerLocaleData(localeTr, 'tr'); registerLocaleData(localeTr, 'tr');

View File

@ -33,6 +33,7 @@ import { PasswordGenerationService } from 'jslib/abstractions/passwordGeneration
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
import { PolicyService } from 'jslib/abstractions/policy.service'; import { PolicyService } from 'jslib/abstractions/policy.service';
import { SearchService as SearchServiceAbstraction } from 'jslib/abstractions/search.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 { SettingsService } from 'jslib/abstractions/settings.service';
import { StateService as StateServiceAbstraction } from 'jslib/abstractions/state.service'; import { StateService as StateServiceAbstraction } from 'jslib/abstractions/state.service';
import { StorageService } from 'jslib/abstractions/storage.service'; import { StorageService } from 'jslib/abstractions/storage.service';
@ -156,6 +157,7 @@ export function initFactory(i18nService: I18nService, storageService: StorageSer
{ provide: AppIdService, useFactory: getBgService<AppIdService>('appIdService'), deps: [] }, { provide: AppIdService, useFactory: getBgService<AppIdService>('appIdService'), deps: [] },
{ provide: AutofillService, useFactory: getBgService<AutofillService>('autofillService'), deps: [] }, { provide: AutofillService, useFactory: getBgService<AutofillService>('autofillService'), deps: [] },
{ provide: ExportService, useFactory: getBgService<ExportService>('exportService'), deps: [] }, { provide: ExportService, useFactory: getBgService<ExportService>('exportService'), deps: [] },
{ provide: SendService, useFactory: getBgService<SendService>('sendService'), deps: [] },
{ {
provide: VaultTimeoutService, provide: VaultTimeoutService,
useFactory: getBgService<VaultTimeoutService>('vaultTimeoutService'), useFactory: getBgService<VaultTimeoutService>('vaultTimeoutService'),

View File

@ -18,8 +18,8 @@ export default class I18nService extends BaseI18nService {
this.supportedTranslationLocales = [ this.supportedTranslationLocales = [
'en', 'be', 'bg', 'ca', 'cs', 'da', 'de', 'el', 'en-GB', 'es', 'et', 'fa', 'fi', 'fr', 'he', 'hr', 'hu', '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', 'id', 'it', 'ja', 'ko', 'nb', 'nl', 'pl', 'pt-BR', 'pt-PT', 'ro', 'ru', 'sk', 'sr', 'sv', 'th', 'tr', 'uk',
'zh-CN', 'zh-TW', 'vi', 'zh-CN', 'zh-TW',
]; ];
} }