refactor: update to recent changes in translator

This commit is contained in:
Rainer Killinger
2021-01-13 16:47:22 +01:00
parent 456560026c
commit 3d4c476549
20 changed files with 706 additions and 330 deletions

View File

@@ -17,9 +17,11 @@ import {SplashScreen} from '@ionic-native/splash-screen/ngx';
import {StatusBar} from '@ionic-native/status-bar/ngx';
import {Platform} from '@ionic/angular';
import {TranslateService} from '@ngx-translate/core';
import {SCLanguageCode} from '@openstapps/core';
import {NGXLogger} from 'ngx-logger';
import {ConfigProvider} from './modules/config/config.provider';
import {SettingsProvider} from './modules/settings/settings.provider';
import {ThingTranslateService} from './translation/thing-translate.service';
import {initLogger} from './_helpers/ts-logger';
/**
@@ -50,6 +52,7 @@ export class AppComponent {
* @param statusBar TODO
* @param splashScreen TODO
* @param translateService TODO
* @param thingTranslateService TODO
* @param settingsProvider TODO
* @param configProvider TODO
* @param logger An angular logger
@@ -58,6 +61,7 @@ export class AppComponent {
private readonly statusBar: StatusBar,
private readonly splashScreen: SplashScreen,
private readonly translateService: TranslateService,
private readonly thingTranslateService: ThingTranslateService,
private readonly settingsProvider: SettingsProvider,
private readonly configProvider: ConfigProvider,
private readonly logger: NGXLogger) {
@@ -71,7 +75,8 @@ export class AppComponent {
/**
* TODO
*/
initializeApp() {
async initializeApp() {
// tslint:disable-next-line: no-floating-promises
this.platform.ready()
.then(async () => {
// Okay, so the platform is ready and our plugins are available.
@@ -102,6 +107,7 @@ export class AppComponent {
try {
// set language from settings
const languageCode = (await this.settingsProvider.getValue('profile', 'language')) as string;
this.thingTranslateService.translator.language = languageCode as SCLanguageCode;
this.translateService.use(languageCode);
} catch (error) {
this.logger.warn(error);