From 1e0ea1f2c2d93ff7ed4ecaaa7c59d800a04742c0 Mon Sep 17 00:00:00 2001 From: Jonas Mohr <jonas.mohr-2@mni.thm.de> Date: Sun, 27 Jun 2021 19:08:35 +0200 Subject: [PATCH] changed wording of topic cloud filter changed pre selected radio button --- .../topic-cloud-filter/topic-cloud-filter.component.html | 4 ++-- .../topic-cloud-filter/topic-cloud-filter.component.ts | 2 +- src/assets/i18n/home/de.json | 6 +++--- src/assets/i18n/home/en.json | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/app/components/shared/_dialogs/topic-cloud-filter/topic-cloud-filter.component.html b/src/app/components/shared/_dialogs/topic-cloud-filter/topic-cloud-filter.component.html index 206e39353..3b1911cb5 100644 --- a/src/app/components/shared/_dialogs/topic-cloud-filter/topic-cloud-filter.component.html +++ b/src/app/components/shared/_dialogs/topic-cloud-filter/topic-cloud-filter.component.html @@ -1,6 +1,6 @@ <mat-divider></mat-divider> <mat-radio-group [(ngModel)]="continueFilter" aria-label="Select an option"> - <mat-radio-button value="continueWithAll"> + <mat-radio-button checked="true" value="continueWithAll"> <div class="elementRow"> <div class="elementText"> {{'content.continue-with-all-questions' | translate}} @@ -15,7 +15,7 @@ </div> </div> </mat-radio-button> - <mat-radio-button checked="true" value="continueWithCurr" *ngIf="!disableCurrentFiltersOptions"> + <mat-radio-button value="continueWithCurr" *ngIf="!disableCurrentFiltersOptions"> <div class="elementRow"> <div class="elementText"> {{'content.continue-with-current-questions' | translate}} diff --git a/src/app/components/shared/_dialogs/topic-cloud-filter/topic-cloud-filter.component.ts b/src/app/components/shared/_dialogs/topic-cloud-filter/topic-cloud-filter.component.ts index ccb98129f..2cce403e9 100644 --- a/src/app/components/shared/_dialogs/topic-cloud-filter/topic-cloud-filter.component.ts +++ b/src/app/components/shared/_dialogs/topic-cloud-filter/topic-cloud-filter.component.ts @@ -27,7 +27,7 @@ class CommentsCount { export class TopicCloudFilterComponent implements OnInit { @Input() target: string; - continueFilter = 'continueWithCurr'; + continueFilter = 'continueWithAll'; comments: Comment[]; tmpFilter: CommentFilter; allComments: CommentsCount; diff --git a/src/assets/i18n/home/de.json b/src/assets/i18n/home/de.json index e2dda02a3..2d60f5976 100644 --- a/src/assets/i18n/home/de.json +++ b/src/assets/i18n/home/de.json @@ -50,9 +50,9 @@ "cancel": "Abbrechen", "continue": "Weiter", "reset": "Zurücksetzen", - "continue-with-all-questions" : "Weiter mit kompletter Fragenliste", - "continue-with-current-questions": "Weiter mit aktuellen Filtern", - "continue-with-all-questions-from-now": "Weiter mit allen Fragen ab jetzt" + "continue-with-all-questions" : "Weiter mit allen Fragen der Sitzung", + "continue-with-current-questions": "Weiter mit aktueller Fragenliste", + "continue-with-all-questions-from-now": "Weiter mit Fragen, die ab jetzt gestellt werden" }, "header": { "abort": "Abbrechen", diff --git a/src/assets/i18n/home/en.json b/src/assets/i18n/home/en.json index b54f63bb3..c55219181 100644 --- a/src/assets/i18n/home/en.json +++ b/src/assets/i18n/home/en.json @@ -131,9 +131,9 @@ "cancel": "Cancel", "continue": "Continue", "reset": "Reset", - "continue-with-all-questions" : "Continue with complete list of questions", - "continue-with-current-questions": "Continue with current filters", - "continue-with-all-questions-from-now": "Continue with all questions from now" + "continue-with-all-questions" : "Continue with all questions of the session", + "continue-with-current-questions": "Continue with current question list", + "continue-with-all-questions-from-now": "Continue with questions that will be asked form now on" }, "imprint": { -- GitLab