Theaninova/openstapps
1
0
Fork 0
mirror of https://gitlab.com/openstapps/openstapps.git synced 2026-01-22 01:22:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: fix issues found by ng build for production

Browse Source 
Closes #48
This commit is contained in:
Jovan Krunić
2019-04-11 11:11:22 +02:00
parent 161da630ea
commit a503811c1c
6 changed files with 12 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/app/modules/settings/item/settings-item.component.ts
View File

@@ -17,9 +17,9 @@ import {Geolocation} from '@ionic-native/geolocation/ngx';
import {AlertController} from '@ionic/angular';
import {LangChangeEvent, TranslateService} from '@ngx-translate/core';
import {
SCLanguageName,
SCSetting,
SCSettingMeta,
SCTranslations,
} from '@openstapps/core';
import {SettingsProvider} from '../settings.provider';
@@ -29,7 +29,8 @@ import {SettingsProvider} from '../settings.provider';
})
export class SettingsItemComponent {
isVisible = true;
language: SCLanguageName;
// limit to languages that are available in StApps Core
language: keyof SCTranslations<any>;
meta = SCSettingMeta;
@Input() setting: SCSetting;
@@ -40,11 +41,11 @@ export class SettingsItemComponent {
private geoLocation: Geolocation) {
this.meta = SCSettingMeta;
this.language = translateService.currentLang as SCLanguageName;
this.language = translateService.currentLang as keyof SCTranslations<any>;
translateService.onLangChange.subscribe((event: LangChangeEvent) => {
this.isVisible = false;
this.language = event.lang as SCLanguageName;
this.language = event.lang as keyof SCTranslations<any>;
// workaround for selected 'select option' not updating translation
setTimeout(() => this.isVisible = true);
});

9
src/app/modules/settings/page/settings-page.component.ts
View File

@@ -14,7 +14,7 @@
*/
import {Component, OnInit} from '@angular/core';
import {LangChangeEvent, TranslateService} from '@ngx-translate/core';
import {SCLanguageName, SCSettingMeta} from '@openstapps/core';
import {SCSettingMeta, SCTranslations} from '@openstapps/core';
import {SettingsCache, SettingsProvider} from '../settings.provider';
@Component({
@@ -23,16 +23,17 @@ import {SettingsCache, SettingsProvider} from '../settings.provider';
})
export class SettingsPageComponent implements OnInit {
categoriesOrder: string[];
language: SCLanguageName;
// limit to languages that are available in StApps Core
language: keyof SCTranslations<any>;
meta = SCSettingMeta;
objectKeys = Object.keys;
settingsCache: SettingsCache;
constructor(public settingsProvider: SettingsProvider,
translateService: TranslateService) {
this.language = translateService.currentLang as SCLanguageName;
this.language = translateService.currentLang as keyof SCTranslations<any>;
translateService.onLangChange.subscribe((event: LangChangeEvent) => {
this.language = event.lang as SCLanguageName;
this.language = event.lang as keyof SCTranslations<any>;
});
this.settingsCache = {};
this.categoriesOrder = settingsProvider.getCategoriesOrder();