diff --git a/jslib b/jslib index 31bd1f94..05e6d2c0 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit 31bd1f9423f71ed749d27f9500eb88d272f112d1 +Subproject commit 05e6d2c0f0aa6cae6a5e53fac6dccf2a1d75a555 diff --git a/src/app/accounts/login.component.ts b/src/app/accounts/login.component.ts index 506c41fc..2e239f92 100644 --- a/src/app/accounts/login.component.ts +++ b/src/app/accounts/login.component.ts @@ -27,9 +27,8 @@ export class LoginComponent extends BaseLoginComponent { constructor(authService: AuthService, router: Router, analytics: Angulartics2, toasterService: ToasterService, - i18nService: I18nService, syncService: SyncService, - private componentFactoryResolver: ComponentFactoryResolver) { - super(authService, router, analytics, toasterService, i18nService, syncService); + i18nService: I18nService, private componentFactoryResolver: ComponentFactoryResolver) { + super(authService, router, analytics, toasterService, i18nService); } settings() { diff --git a/src/app/accounts/two-factor.component.ts b/src/app/accounts/two-factor.component.ts index 7a035b27..ba00aa90 100644 --- a/src/app/accounts/two-factor.component.ts +++ b/src/app/accounts/two-factor.component.ts @@ -34,10 +34,10 @@ export class TwoFactorComponent extends BaseTwoFactorComponent { constructor(authService: AuthService, router: Router, analytics: Angulartics2, toasterService: ToasterService, i18nService: I18nService, apiService: ApiService, - platformUtilsService: PlatformUtilsService, syncService: SyncService, - environmentService: EnvironmentService, private componentFactoryResolver: ComponentFactoryResolver) { + platformUtilsService: PlatformUtilsService, environmentService: EnvironmentService, + private componentFactoryResolver: ComponentFactoryResolver) { super(authService, router, analytics, toasterService, i18nService, apiService, - platformUtilsService, syncService, window, environmentService); + platformUtilsService, window, environmentService); } anotherMethod() { diff --git a/src/main.ts b/src/main.ts index 995cdc54..cc3fafa8 100644 --- a/src/main.ts +++ b/src/main.ts @@ -2,9 +2,9 @@ import { app, BrowserWindow } from 'electron'; import * as path from 'path'; // import { ElectronMainMessagingService } from 'jslib/electron/services/desktopMainMessaging.service'; -import { I18nService } from 'jslib/services/i18n.service'; import { MessagingMain } from './main/messaging.main'; +import { I18nService } from './services/i18n.service'; import { ElectronLogService } from 'jslib/electron/services/electronLog.service'; import { ElectronStorageService } from 'jslib/electron/services/electronStorage.service'; @@ -43,7 +43,7 @@ export class Main { } this.logService = new ElectronLogService(null, app.getPath('userData')); - // this.i18nService = new I18nService('en', './locales/'); + this.i18nService = new I18nService('en', './locales/'); this.storageService = new ElectronStorageService(); // this.messagingService = new DesktopMainMessagingService(this);