Refactor arialabel parsing

CSCfi · Sep 17, 2024 · 02c4fe4 · 02c4fe4
1 parent 7c8a970
commit 02c4fe4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/ui/src/app/examination/question/examination-question.component.html b/ui/src/app/examination/question/examination-question.component.html
@@ -19,13 +19,7 @@
                     <button
                         tabindex="0"
                         class="pointer section-box-title arrow border-none background-none"
-                        [attr.aria-label]="
-                            (expanded ? ('i18n_collapse' | translate) : ('i18n_expand' | translate)) +
-                            ' ' +
-                            ('i18n_question' | translate) +
-                            ' ' +
-                            questionTitle
-                        "
+                        [attr.aria-label]="parseAriaLabel(expanded ? 'i18n_collapse' : 'i18n_expand')"
                         [attr.aria-expanded]="expanded"
                         (click)="expanded = !expanded"
                         (keydown.enter)="expanded = !expanded"

diff --git a/ui/src/app/examination/question/examination-question.component.ts b/ui/src/app/examination/question/examination-question.component.ts
@@ -15,7 +15,7 @@
 import { NgClass, SlicePipe, UpperCasePipe } from '@angular/common';
 import type { AfterViewInit } from '@angular/core';
 import { ChangeDetectorRef, Component, Input, OnInit } from '@angular/core';
-import { TranslateModule } from '@ngx-translate/core';
+import { TranslateModule, TranslateService } from '@ngx-translate/core';
 import type { EssayAnswer } from 'src/app/exam/exam.model';
 import type { Examination, ExaminationQuestion } from 'src/app/examination/examination.model';
 import { ExaminationService } from 'src/app/examination/examination.service';
@@ -62,6 +62,7 @@ export class ExaminationQuestionComponent implements OnInit, AfterViewInit {
         private cdr: ChangeDetectorRef,
         private Examination: ExaminationService,
         private Attachment: AttachmentService,
+        private translate: TranslateService,
     ) {}
 
     ngOnInit() {
@@ -90,6 +91,16 @@ export class ExaminationQuestionComponent implements OnInit, AfterViewInit {
         return result;
     }
 
+    parseAriaLabel(expanded: string): string {
+        return (
+            this.translate?.instant(expanded) +
+            ' ' +
+            this.translate?.instant('i18n_question') +
+            ' ' +
+            this.questionTitle
+        );
+    }
+
     ngAfterViewInit() {
         this.cdr.detectChanges();
     }