merge translation to slider toggle

package.json

@@ -41,7 +41,7 @@
     "zone.js": "~0.10.3"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^0.1102.10",
+    "@angular-devkit/build-angular": "^0.1102.11",
     "@angular/cli": "11.2.10",
     "@angular/compiler-cli": "^11.2.11",
     "@angular/language-service": "11.2.11",

src/app/components/shared/_dialogs/topic-cloud-confirm-dialog/topic-cloud-confirm-dialog.component.html

-<h1 mat-dialog-title>Do you really want to delete the topic "{{data.topic}}"?</h1>
+<h1 mat-dialog-title>{{'topic-cloud-confirm-dialog.confirm' | translate}}  "{{data.topic}}"?</h1>
 
 <div mat-dialog-actions>
-  <button class="primary" mat-stroked-button [mat-dialog-close]="false">Cancel</button>
-  <button class="warn" mat-stroked-button [mat-dialog-close]="true">Delete</button>
+  <button class="primary" mat-stroked-button [mat-dialog-close]="false">
+    {{'topic-cloud-confirm-dialog.cancel' | translate}}</button>
+  <button class="warn" mat-stroked-button [mat-dialog-close]="true">
+    {{'topic-cloud-confirm-dialog.delete' | translate}}
+  </button>
 </div>

src/app/components/shared/_dialogs/topic-cloud-dialog/topic-cloud-dialog.component.html

@@ -11,7 +11,8 @@
           {{keyword.keyword}}
         </mat-panel-title>
         <mat-panel-description>
-          {{keyword.questions.length}} Questions
+          {{keyword.questions.length}}
+          {{'topic-cloud-dialog.question-count-'+(keyword.questions.length > 1 ? 'plural' : 'singular') | translate}}
         </mat-panel-description>
       </mat-expansion-panel-header>
       <p *ngFor="let question of keyword.questions">{{question}}</p>
@@ -33,21 +34,20 @@
       </div>
 
       <!-- Only visible when editing -->
-      <div *ngIf="edit">
-        <mat-divider></mat-divider>
-
-        <mat-form-field>
-          <mat-label>Enter new Keyword</mat-label>
-          <input matInput [(ngModel)]="newKeyword">
-        </mat-form-field>
-        <div>
-        <button mat-icon-button (click)="confirmEdit(keyword.keywordID)">
-          <mat-icon class="primary">check</mat-icon>
-        </button>
-        <button mat-icon-button (click)="cancelEdit()">
-          <mat-icon class="warn">cancel</mat-icon>
-        </button>
-      </div>
+        <div *ngIf="edit">
+          <mat-divider></mat-divider>
+          <mat-form-field>
+            <mat-label>{{'topic-cloud-dialog.editkeyword-tipp' | translate}}</mat-label>
+            <input matInput [(ngModel)]="newKeyword">
+          </mat-form-field>
+          <div>
+          <button mat-icon-button (click)="confirmEdit(keyword.keywordID)">
+            <mat-icon class="primary">check</mat-icon>
+          </button>
+          <button mat-icon-button (click)="cancelEdit()">
+            <mat-icon class="warn">cancel</mat-icon>
+          </button>
+        </div>
       </div>
 
     </mat-expansion-panel>

src/app/components/shared/_dialogs/topic-cloud-dialog/topic-cloud-dialog.component.ts

@@ -5,7 +5,8 @@ import { NotificationService } from '../../../../services/util/notification.serv
 import { TopicCloudConfirmDialogComponent } from '../topic-cloud-confirm-dialog/topic-cloud-confirm-dialog.component';
 import { AuthenticationService } from '../../../../services/http/authentication.service';
 import { UserRole } from '../../../../models/user-roles.enum';
-
+import { TranslateService } from '@ngx-translate/core';
+import { LanguageService } from '../../../../services/util/language.service';
 
 @Component({
   selector: 'app-topic-cloud-dialog',
@@ -23,10 +24,18 @@ export class TopicCloudDialogComponent implements OnInit {
   constructor(public cloudDialogRef: MatDialogRef<HeaderComponent>,
               public confirmDialog: MatDialog,
               private notificationService: NotificationService,
-              private authenticationService: AuthenticationService) { }
+              private authenticationService: AuthenticationService,
+              private translateService: TranslateService,
+              private langService: LanguageService) {
+
+                this.langService.langEmitter.subscribe(lang => {
+                  this.translateService.use(lang);
+                });
+              }
 
   ngOnInit(): void {
 
+    this.translateService.use(localStorage.getItem('currentLang'));
     if (this.authenticationService.getRole() === UserRole.CREATOR ||
         this.authenticationService.getRole() === UserRole.EDITING_MODERATOR ||
         this.authenticationService.getRole() === UserRole.EDITING_MODERATOR){
@@ -35,10 +44,6 @@ export class TopicCloudDialogComponent implements OnInit {
         this.hasAccess = false;
     }
 
-    if (this.keywords.length > 0){
-        this.notificationService.show("there are no keywords");
-        this.cloudDialogRef.close();
-    }
     let questions = ["Wie genau ist die Cloud aufgebaut?",
     "Wieviel speicherplatz steht mir in der Cloud zur verfuegung?",
     "Sollen wir die Tag Cloud implementieren?"];
@@ -52,12 +57,19 @@ export class TopicCloudDialogComponent implements OnInit {
     "Ich wollte Fragen ob sie gerne Sachen gefragt werden",
     "Langsam geht mir die Fragerei mit den ganzen Fragen auf den Geist"];
     this.pushToArray(3, "Frage", questions);
+    
+    if (this.keywords.length == 0){
+        this.translateService.get('topic-cloud-dialog.nokeyword-note').subscribe(msg => {
+          this.notificationService.show(msg);
+        });
+        this.cloudDialogRef.close();
+    }
   }
 
   pushToArray(id: number, key: string, questions: string[]){
-      let _keyword = {
-          keywordID: id,
-          keyword: key,
+    let _keyword = {
+      keywordID: id,
+      keyword: key,
           questions: questions
       }
       this.keywords.push(_keyword);

src/app/components/shared/questionwall/question-wall/question-wall.component.ts

@@ -16,7 +16,7 @@ import { CorrectWrong } from '../../../../models/correct-wrong.enum';
 import { MatSliderChange } from '@angular/material/slider';
 import { Period } from '../../comment-list/comment-list.component';
 
-@Component({
+@Component({ 
   selector: 'app-question-wall',
   templateUrl: './question-wall.component.html',
   styleUrls: ['./question-wall.component.scss']

src/assets/i18n/home/de.json

@@ -292,5 +292,18 @@
   },
   "qr-dialog": {
     "session": "Raum"
+  },
+  "topic-cloud-dialog":{
+    "edit": "bearbeiten",
+    "delete": "löschen",
+    "question-count-singular": "Frage",
+    "question-count-plural": "Fragen",
+    "editkeyword-tipp": "geben Sie ein neues Keyword ein",
+    "nokeyword-note": "Es gibt keine Themen"
+  },
+  "topic-cloud-confirm-dialog":{
+    "cancel": "abbrechen",
+    "delete": "löschen",
+    "confirm": "Möchten Sie wirklich das Thema löschen"
   }
 }

src/assets/i18n/home/en.json

@@ -294,5 +294,18 @@
   },
   "qr-dialog": {
     "session": "Key code"
+  },
+  "topic-cloud-dialog":{
+    "edit": "edit",
+    "delete": "delete",
+    "question-count-singular": "question",
+    "question-count-plural": "questions",
+    "editkeyword-tipp": "enter new keyword",
+    "nokeyword-note": "there are no topics!"
+  },
+  "topic-cloud-confirm-dialog":{
+    "cancel": "cancel",
+    "delete": "delete",
+    "confirm": "Do you really want to delete the topic"
   }
 }