diff --git a/src/app/modules/data/types/dish/dish-detail-content.component.ts b/src/app/modules/data/types/dish/dish-detail-content.component.ts index ea34ef2f..1a8e41d4 100644 --- a/src/app/modules/data/types/dish/dish-detail-content.component.ts +++ b/src/app/modules/data/types/dish/dish-detail-content.component.ts @@ -13,8 +13,7 @@ * this program. If not, see . */ import {Component, Input} from '@angular/core'; -import {SCDish, SCThing, SCTranslations} from '@openstapps/core'; -import {SCThingTranslator} from '@openstapps/core'; +import {SCDish} from '@openstapps/core'; /** * TODO @@ -28,22 +27,14 @@ export class DishDetailContentComponent { * TODO */ @Input() item: SCDish; - /** - * TODO - */ - @Input() language: keyof SCTranslations; /** * TODO */ objectKeys = Object.keys; - /** - * TODO - */ - translator: SCThingTranslator; /** * TODO */ constructor() { - this.translator = new SCThingTranslator(this.language); + // nothing yet } } 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 fa7f2be5..b8659636 100644 --- a/src/app/modules/data/types/dish/dish-detail-content.html +++ b/src/app/modules/data/types/dish/dish-detail-content.html @@ -1,8 +1,8 @@ - + - Characteristics - + {{ 'characteristics' | propertyNameTranslate: item | titlecase }} + {{characteristic.name}} @@ -10,47 +10,42 @@ - + - Average Nutrition Information + {{'data.types.dish.detail.AVG_NUTRITION_INFO' | translate }} - Calories: + {{'data.types.dish.detail.CALORIES' | translate }}: - {{item.nutrition.calories}} kcal + {{item.nutrition.calories | numberLocalized}} kcal - Fat content: + {{'data.types.dish.detail.FAT_TOTAL' | translate }}: - {{item.nutrition.fatContent}} g (saturated: - {{item.nutrition.saturatedFatContent}} g) + {{item.nutrition.fatContent | numberLocalized}} g ({{'data.types.dish.detail.FAT_SATURATED' | translate }}: + {{item.nutrition.saturatedFatContent | numberLocalized}} g) - Carbohydrate content: + {{'data.types.dish.detail.CARBOHYDRATE' | translate }}: - {{item.nutrition.carbohydrateContent}} g + {{item.nutrition.carbohydrateContent | numberLocalized}} g ({{'data.types.dish.detail.SUGAR' | translate }}: + {{item.nutrition.sugarContent | numberLocalized}} g) - Salt content: + {{'data.types.dish.detail.SALT' | translate }}: - {{item.nutrition.saltContent}} g - - - - Sugar content: - - {{item.nutrition.sugarContent}} g + {{item.nutrition.saltContent | numberLocalized}} g - Protein content: + {{'data.types.dish.detail.PROTEIN' | translate }}: - {{item.nutrition.proteinContent}} g + {{item.nutrition.proteinContent | numberLocalized}} g diff --git a/src/app/modules/data/types/dish/dish-list-item.component.ts b/src/app/modules/data/types/dish/dish-list-item.component.ts index 7622ec6b..01933847 100644 --- a/src/app/modules/data/types/dish/dish-list-item.component.ts +++ b/src/app/modules/data/types/dish/dish-list-item.component.ts @@ -30,18 +30,9 @@ export class DishListItem extends DataListItem { * TODO */ @Input() item: SCDish; - // settingsProvider: SettingsProvider; - // constructor(settingsProvider: SettingsProvider) { - // super(); - // this.settingsProvider = settingsProvider; - // } - - /** - * TODO - */ - // tslint:disable-next-line:prefer-function-over-method + // tslint:disable-next-line: completed-docs prefer-function-over-method ngOnInit() { - // TODO: translation... + // custom init } } 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 8df88344..cf888069 100644 --- a/src/app/modules/data/types/dish/dish-list-item.html +++ b/src/app/modules/data/types/dish/dish-list-item.html @@ -1,9 +1,9 @@ - {{item.name}} - {{item.description}} - {{item.categories.join(',')}} + {{'name' | thingTranslate: item}} + {{'description' | thingTranslate: item}} + {{'categories' | thingTranslate: item | join: ', '}} diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json index 32f8556e..08a02d00 100644 --- a/src/assets/i18n/de.json +++ b/src/assets/i18n/de.json @@ -9,10 +9,15 @@ }, "types": { "dish": { - "detailPage": { - "DESCRIPTION_TITLE": "Description", - "CATEGORY_TITLE": "Category", - "CHARACTERISTICS_TITLE": "Characteristics" + "detail": { + "AVG_NUTRITION_INFO": "Durchschnittliche Nährwertangaben", + "CALORIES": "Brennwert", + "FAT_TOTAL": "Fett", + "FAT_SATURATED": "davon gesättinge Fettsäuren", + "CARBOHYDRATE" : "Kohlenhydrate", + "SALT": "Salz", + "SUGAR": "davon Zucker", + "PROTEIN": "Protein" } } } diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 22a4dab0..2e852052 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -9,10 +9,15 @@ }, "types": { "dish": { - "detailPage": { - "DESCRIPTION_TITLE": "Description", - "CATEGORY_TITLE": "Category", - "CHARACTERISTICS_TITLE": "Characteristics" + "detail": { + "AVG_NUTRITION_INFO": "Average Nutrition Facts", + "CALORIES": "Calories", + "FAT_TOTAL": "Fat", + "FAT_SATURATED": "Saturated Fat", + "CARBOHYDRATE" : "Carbohydrate", + "SALT": "Salt", + "SUGAR": "Sugars", + "PROTEIN": "Protein" } } }
{{characteristic.name}} @@ -10,47 +10,42 @@
{{item.description}}
{{item.categories.join(',')}}
{{'description' | thingTranslate: item}}
{{'categories' | thingTranslate: item | join: ', '}}