diff --git a/.vscode/settings.json b/.vscode/settings.json index ca621d30..813fcdd1 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -5,5 +5,6 @@ "editor.defaultFormatter": "esbenp.prettier-vscode", "[typescript]": { "editor.defaultFormatter": "esbenp.prettier-vscode" - } + }, + "typescript.tsdk": "node_modules/typescript/lib" } diff --git a/src/app/pages/tasks/task-playables/task-display/task-display.component.html b/src/app/pages/tasks/task-playables/task-display/task-display.component.html index d34ec607..2c9245b2 100644 --- a/src/app/pages/tasks/task-playables/task-display/task-display.component.html +++ b/src/app/pages/tasks/task-playables/task-display/task-display.component.html @@ -43,5 +43,7 @@

[isStart]="buttonConfig.isStart" [previousDisabled]="buttonConfig.previousDisabled" [nextDisabled]="buttonConfig.nextDisabled" + [forwardButtonText]="nextButtonText" + [backButtonText]="previousButtonText" > diff --git a/src/app/pages/tasks/task-playables/task-display/task-display.component.ts b/src/app/pages/tasks/task-playables/task-display/task-display.component.ts index ada0a69e..687de204 100644 --- a/src/app/pages/tasks/task-playables/task-display/task-display.component.ts +++ b/src/app/pages/tasks/task-playables/task-display/task-display.component.ts @@ -1,4 +1,4 @@ -import { Component, OnDestroy } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { Subject } from 'rxjs'; import { getTextForLang, thisOrDefault } from 'src/app/common/commonMethods'; import { ComponentName } from 'src/app/services/component-factory.service'; @@ -52,7 +52,7 @@ export interface TaskDisplayComponentMetadata { templateUrl: './task-display.component.html', styleUrls: ['./task-display.component.scss'], }) -export class TaskDisplayComponent implements OnDestroy, Playable { +export class TaskDisplayComponent implements OnInit, OnDestroy, Playable { // metadata variables title: string = ''; subtitle: string = ''; @@ -75,6 +75,9 @@ export class TaskDisplayComponent implements OnDestroy, Playable { timerCountDown: boolean = false; showNavigationButtons: boolean = true; + nextButtonText: string = ''; + previousButtonText: string = ''; + // intervals/timers interval: number; @@ -163,6 +166,13 @@ export class TaskDisplayComponent implements OnDestroy, Playable { } } + ngOnInit(): void { + this.previousButtonText = + this.translateService.translations[this.translateService.currentLang]?.buttons?.previous ?? 'previous'; + this.nextButtonText = + this.translateService.translations[this.translateService.currentLang]?.buttons?.next ?? 'next'; + } + afterInit() { if (this.skippable && this.cacheKey) { const shouldSkip = this.config.getCacheValue(this.cacheKey); diff --git a/src/assets/images/instructions/informationsearch/en/1.jpeg b/src/assets/images/instructions/informationsearch/en/1.jpeg index 02f07aea..4788a92c 100644 Binary files a/src/assets/images/instructions/informationsearch/en/1.jpeg and b/src/assets/images/instructions/informationsearch/en/1.jpeg differ diff --git a/src/assets/images/instructions/informationsearch/en/2.jpeg b/src/assets/images/instructions/informationsearch/en/2.jpeg index 3cc50366..511b344e 100644 Binary files a/src/assets/images/instructions/informationsearch/en/2.jpeg and b/src/assets/images/instructions/informationsearch/en/2.jpeg differ diff --git a/src/assets/images/instructions/informationsearch/en/3.jpeg b/src/assets/images/instructions/informationsearch/en/3.jpeg index cff0f66d..93afe73c 100644 Binary files a/src/assets/images/instructions/informationsearch/en/3.jpeg and b/src/assets/images/instructions/informationsearch/en/3.jpeg differ diff --git a/src/assets/images/instructions/informationsearch/en/4.jpeg b/src/assets/images/instructions/informationsearch/en/4.jpeg index f3df9b52..68823940 100644 Binary files a/src/assets/images/instructions/informationsearch/en/4.jpeg and b/src/assets/images/instructions/informationsearch/en/4.jpeg differ diff --git a/src/assets/images/instructions/informationsearch/en/5.jpeg b/src/assets/images/instructions/informationsearch/en/5.jpeg index e460ccd0..be5b6e1d 100644 Binary files a/src/assets/images/instructions/informationsearch/en/5.jpeg and b/src/assets/images/instructions/informationsearch/en/5.jpeg differ diff --git a/src/assets/images/instructions/informationsearch/en/6.jpeg b/src/assets/images/instructions/informationsearch/en/6.jpeg deleted file mode 100644 index 139e654f..00000000 Binary files a/src/assets/images/instructions/informationsearch/en/6.jpeg and /dev/null differ diff --git a/src/assets/images/instructions/informationsearch/fr/1.jpeg b/src/assets/images/instructions/informationsearch/fr/1.jpeg index 2dc529f1..512c42d4 100644 Binary files a/src/assets/images/instructions/informationsearch/fr/1.jpeg and b/src/assets/images/instructions/informationsearch/fr/1.jpeg differ diff --git a/src/assets/images/instructions/informationsearch/fr/2.jpeg b/src/assets/images/instructions/informationsearch/fr/2.jpeg index 8b2a215b..957551d3 100644 Binary files a/src/assets/images/instructions/informationsearch/fr/2.jpeg and b/src/assets/images/instructions/informationsearch/fr/2.jpeg differ diff --git a/src/assets/images/instructions/informationsearch/fr/3.jpeg b/src/assets/images/instructions/informationsearch/fr/3.jpeg index 75d30d12..64c2fa3c 100644 Binary files a/src/assets/images/instructions/informationsearch/fr/3.jpeg and b/src/assets/images/instructions/informationsearch/fr/3.jpeg differ diff --git a/src/assets/images/instructions/informationsearch/fr/4.jpeg b/src/assets/images/instructions/informationsearch/fr/4.jpeg index 71d3751d..88b3689b 100644 Binary files a/src/assets/images/instructions/informationsearch/fr/4.jpeg and b/src/assets/images/instructions/informationsearch/fr/4.jpeg differ diff --git a/src/assets/images/instructions/informationsearch/fr/5.jpeg b/src/assets/images/instructions/informationsearch/fr/5.jpeg index a2949ac5..82f68157 100644 Binary files a/src/assets/images/instructions/informationsearch/fr/5.jpeg and b/src/assets/images/instructions/informationsearch/fr/5.jpeg differ diff --git a/src/assets/images/instructions/informationsearch/fr/6.jpeg b/src/assets/images/instructions/informationsearch/fr/6.jpeg deleted file mode 100644 index a9176105..00000000 Binary files a/src/assets/images/instructions/informationsearch/fr/6.jpeg and /dev/null differ diff --git a/src/assets/translate/en.json b/src/assets/translate/en.json index 541593ec..4e172126 100644 --- a/src/assets/translate/en.json +++ b/src/assets/translate/en.json @@ -58,6 +58,8 @@ "maxValidation": "Must be below" }, "buttons": { - "submit": "submit" + "submit": "submit", + "next": "Next", + "previous": "Previous" } } diff --git a/src/assets/translate/fr.json b/src/assets/translate/fr.json index 05f84451..2197e7c4 100644 --- a/src/assets/translate/fr.json +++ b/src/assets/translate/fr.json @@ -58,6 +58,8 @@ "maxValidation": "Doit être inférieur à" }, "buttons": { - "submit": "soumettre" + "submit": "soumettre", + "next": "Suivant", + "previous": "Précedent" } }