diff --git a/src/app/components/creator/room-creator-page/room-creator-page.component.ts b/src/app/components/creator/room-creator-page/room-creator-page.component.ts index d45f7a3983866fe94e5cf84d204d1487ae529e64..08a525ef23b35fdcacb7da01ce048e81c65f8d5c 100644 --- a/src/app/components/creator/room-creator-page/room-creator-page.component.ts +++ b/src/app/components/creator/room-creator-page/room-creator-page.component.ts @@ -38,6 +38,8 @@ export class RoomCreatorPageComponent extends RoomPageComponent implements OnIni }); } + /* TODO: i18n */ + updateRoom(): void { if ((this.updRoom.name === this.room.name) && (this.updRoom.description === this.room.description) diff --git a/src/app/components/shared/content-groups/content-groups.component.html b/src/app/components/shared/content-groups/content-groups.component.html index e3b214e60197a1eccbfa22ff1c42d4a960465219..678068b53cd376b56a1e3484a6112646bd5ea69b 100644 --- a/src/app/components/shared/content-groups/content-groups.component.html +++ b/src/app/components/shared/content-groups/content-groups.component.html @@ -3,7 +3,10 @@ <mat-divider></mat-divider> <mat-card-header> <mat-card-title> - <h4>{{contentGroup.name}}<mat-icon color="accent" matBadge="{{contentGroup.contentIds.length}}" matBadgePosition="after" matBadgeColor="accent"></mat-icon></h4> + <h4 *ngIf="!(contentGroup.name == 'Default')">{{contentGroup.name}}<mat-icon color="accent" + matBadge="{{contentGroup.contentIds.length}}" matBadgePosition="after" matBadgeColor="accent"></mat-icon></h4> + <h4 *ngIf="contentGroup.name == 'Default'">{{'room-page.default-content-group' | translate}}<mat-icon color="accent" + matBadge="{{contentGroup.contentIds.length}}" matBadgePosition="after" matBadgeColor="accent"></mat-icon></h4> </mat-card-title> </mat-card-header> </mat-card> diff --git a/src/app/services/http/room.service.ts b/src/app/services/http/room.service.ts index bb01e5f9d22260061c0cf176dfccbe2e462029ce..86cf0aebf609ac8f81c8a282f7c1e27d2198ad39 100644 --- a/src/app/services/http/room.service.ts +++ b/src/app/services/http/room.service.ts @@ -95,7 +95,6 @@ export class RoomService extends BaseHttpService { } parseDefaultContentGroup(room: Room): Room { - // ToDo: i18n if (room.contentGroups) { for (let cg of room.contentGroups) { if (!cg.name || cg.name === '') { diff --git a/src/assets/i18n/creator/de.json b/src/assets/i18n/creator/de.json index 12b66546f7bd047161ea0918d65606e8ad03e659..da3a5f3f2d16f156db798b4c16eab9d11ec81d29 100644 --- a/src/assets/i18n/creator/de.json +++ b/src/assets/i18n/creator/de.json @@ -15,7 +15,8 @@ "really": "Wollen Sie die Session ", "really2": " wirklich löschen? Diese Aktion kann nicht rückgängig gemacht werden.", "abort": "Abbrechen", - "update": "Update" + "update": "Update", + "default-content-group": "Standard" }, "content": { "create": "Erstellen", diff --git a/src/assets/i18n/creator/en.json b/src/assets/i18n/creator/en.json index 30e1f22156dadb6c1fecc693c66445e4d0679bb0..70a899f5931c20e60ae79974bc5788ae2f6458e2 100644 --- a/src/assets/i18n/creator/en.json +++ b/src/assets/i18n/creator/en.json @@ -14,7 +14,8 @@ "really": "Do you really want to delete session ", "really2": "? This action can not be undone.", "abort": "Abort", - "update": "Update" + "update": "Update", + "default-content-group": "Default" }, "content": { "create": "Create", diff --git a/src/assets/i18n/participant/de.json b/src/assets/i18n/participant/de.json index 02137056e444f64b377cc3ab10d3a30d6835b3c6..2d4131fd14390116ff155b794f40d5e5f50a5d8d 100644 --- a/src/assets/i18n/participant/de.json +++ b/src/assets/i18n/participant/de.json @@ -12,7 +12,8 @@ "create-comment": "Kommentar abgeben", "give-feedback": "Feedback geben", "live-feedback": "Live Feedback", - "answer-statistics": "Statistiken" + "answer-statistics": "Statistiken", + "default-content-group": "Standard" }, "comment-page": { "enter-title": "Geben Sie einen Titel ein", diff --git a/src/assets/i18n/participant/en.json b/src/assets/i18n/participant/en.json index 92af57133e399e6343a75edefacccb9882740e63..039bc8b02db68ec1dc98797c6bfb77eeb19cee21 100644 --- a/src/assets/i18n/participant/en.json +++ b/src/assets/i18n/participant/en.json @@ -12,7 +12,8 @@ "create-comment": "Create comment", "give-feedback": "Give feedback", "live-feedback": "Live feedback", - "answer-statistics": "Statistics" + "answer-statistics": "Statistics", + "default-content-group": "Default" }, "comment-page": { "enter-title": "Enter a title",