diff --git a/src/app/app.component.ts b/src/app/app.component.ts index a1e6621c..b9bc27af 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -17,8 +17,6 @@ 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 {Logger} from '@openstapps/logger'; import {ConfigProvider} from './modules/config/config.provider'; import {SettingsProvider} from './modules/settings/settings.provider'; @@ -74,7 +72,7 @@ export class AppComponent { try { // set language from settings - const languageCode: SCLanguageCode = await this.settingsProvider.getSettingValue('profile', 'language'); + const languageCode = await this.settingsProvider.getSettingValue('profile', 'language'); this.translateService.use(languageCode); } catch (error) { this.logger.warn(error); diff --git a/src/app/modules/data/types/dish/dish-detail-content.html b/src/app/modules/data/types/dish/dish-detail-content.html index 785a02fa..c37de191 100644 --- a/src/app/modules/data/types/dish/dish-detail-content.html +++ b/src/app/modules/data/types/dish/dish-detail-content.html @@ -7,41 +7,3 @@ {{meta.getFieldTranslation(language, 'categories')}} {{item.categories.join(', ')}} - - - {{meta.getFieldTranslation(language, 'characteristics')}} - {{item.characteristics.join(', ')}} - - - - {{meta.getFieldTranslation(language, 'additives')}} - {{item.additives.join(', ')}} - - - - {{meta.getFieldTranslation(language, 'place')}} - {{item.place.name}} - - - - {{meta.getFieldTranslation(language, 'price')}} - - - - - {{offer.universityRole.name}} - - {{offer.price}} - - - Standard / Gäste - {{item.price}} - - - - - - - Verfügbarkeit - {{item.availabilityStarts | date}} - diff --git a/src/app/modules/data/types/dish/dish-list-item.html b/src/app/modules/data/types/dish/dish-list-item.html index b77b8304..204590ae 100644 --- a/src/app/modules/data/types/dish/dish-list-item.html +++ b/src/app/modules/data/types/dish/dish-list-item.html @@ -1,6 +1,4 @@ {{item.name}}
- {{item.price}} {{item.categories.join(',')}} - {{item.place.name}} diff --git a/src/app/modules/data/types/event/event-list-item.html b/src/app/modules/data/types/event/event-list-item.html index 2e9ac7cc..048d920f 100644 --- a/src/app/modules/data/types/event/event-list-item.html +++ b/src/app/modules/data/types/event/event-list-item.html @@ -1,7 +1,5 @@ {{item.name}}
- {{item.subProperties.semester}} - {{item.categories.join(', ')}} - {{item.startDate}} - {{item.endDate}} + {{item.type}} diff --git a/src/app/modules/settings/item/settings-item.component.ts b/src/app/modules/settings/item/settings-item.component.ts index 8fc30a80..0fa89dbe 100644 --- a/src/app/modules/settings/item/settings-item.component.ts +++ b/src/app/modules/settings/item/settings-item.component.ts @@ -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; 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; translateService.onLangChange.subscribe((event: LangChangeEvent) => { this.isVisible = false; - this.language = event.lang as SCLanguageName; + this.language = event.lang as keyof SCTranslations; // workaround for selected 'select option' not updating translation setTimeout(() => this.isVisible = true); }); diff --git a/src/app/modules/settings/page/settings-page.component.ts b/src/app/modules/settings/page/settings-page.component.ts index 43cca939..c5932d78 100644 --- a/src/app/modules/settings/page/settings-page.component.ts +++ b/src/app/modules/settings/page/settings-page.component.ts @@ -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; 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; translateService.onLangChange.subscribe((event: LangChangeEvent) => { - this.language = event.lang as SCLanguageName; + this.language = event.lang as keyof SCTranslations; }); this.settingsCache = {}; this.categoriesOrder = settingsProvider.getCategoriesOrder();