From 2c463791a8c0dbb47ab11b89fdcb32da83f14943 Mon Sep 17 00:00:00 2001
From: Hiroki Terashima <honchikun@gmail.com>
Date: Wed, 24 Jan 2024 16:20:28 -0800
Subject: [PATCH 1/2] Show current language in TranslatableInput's label

---
 .../translatable-input.component.html                  |  6 +++++-
 .../translatable-input/translatable-input.component.ts |  3 +++
 src/messages.xlf                                       | 10 ++++++----
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/assets/wise5/authoringTool/components/translatable-input/translatable-input.component.html b/src/assets/wise5/authoringTool/components/translatable-input/translatable-input.component.html
index 846bfa879ed..21f9003a562 100644
--- a/src/assets/wise5/authoringTool/components/translatable-input/translatable-input.component.html
+++ b/src/assets/wise5/authoringTool/components/translatable-input/translatable-input.component.html
@@ -1,6 +1,10 @@
 <ng-content *ngIf="!showTranslationInput()"></ng-content>
 <mat-form-field *ngIf="showTranslationInput()">
-  <mat-label i18n>{{ defaultLanguageLabelRef.nativeElement.innerHTML }}</mat-label>
+  <mat-label i18n
+    >{{ defaultLanguageLabelRef.nativeElement.innerHTML }} ({{
+      currentLanguage().language
+    }})</mat-label
+  >
   <input
     matInput
     [ngModel]="translatedText()"
diff --git a/src/assets/wise5/authoringTool/components/translatable-input/translatable-input.component.ts b/src/assets/wise5/authoringTool/components/translatable-input/translatable-input.component.ts
index 0b06ce1121f..a7293bf2ff9 100644
--- a/src/assets/wise5/authoringTool/components/translatable-input/translatable-input.component.ts
+++ b/src/assets/wise5/authoringTool/components/translatable-input/translatable-input.component.ts
@@ -5,6 +5,7 @@ import { MatInput, MatInputModule } from '@angular/material/input';
 import { FormsModule } from '@angular/forms';
 import { TranslateProjectService } from '../../../services/translateProjectService';
 import { MatLabel } from '@angular/material/form-field';
+import { Language } from '../../../../../app/domain/language';
 
 @Component({
   standalone: true,
@@ -15,6 +16,7 @@ import { MatLabel } from '@angular/material/form-field';
 })
 export class TranslatableInputComponent {
   @Input() content: object;
+  protected currentLanguage: Signal<Language>;
   @ContentChild(MatInput) defaultLanguageInput: MatInput;
   @ContentChild(MatLabel, { read: ElementRef }) defaultLanguageLabelRef: ElementRef;
   protected defaultLanguageText: Signal<string>;
@@ -26,6 +28,7 @@ export class TranslatableInputComponent {
     private projectService: TeacherProjectService,
     private translateProjectService: TranslateProjectService
   ) {
+    this.currentLanguage = projectService.currentLanguage;
     this.showTranslationInput = computed(() => !this.projectService.isDefaultLocale());
   }
 
diff --git a/src/messages.xlf b/src/messages.xlf
index 71f12b3b7bc..584637744eb 100644
--- a/src/messages.xlf
+++ b/src/messages.xlf
@@ -10116,18 +10116,20 @@ Click &quot;Cancel&quot; to keep the invalid JSON open so you can fix it.</sourc
           <context context-type="linenumber">75</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="7bd83cfa9e268b699d003e1b37b428995d29fc27" datatype="html">
-        <source><x id="INTERPOLATION" equiv-text="{{ defaultLanguageLabelRef.nativeElement.innerHTML }}"/></source>
+      <trans-unit id="735cfe8637753e64e9adb0e901dcd4b24a3c8aea" datatype="html">
+        <source><x id="INTERPOLATION" equiv-text="{{ defaultLanguageLabelRef.nativeElement.innerHTML }}"/> (<x id="INTERPOLATION_1" equiv-text="{{
+      currentLanguage().language
+    }}"/>)</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/authoringTool/components/translatable-input/translatable-input.component.html</context>
-          <context context-type="linenumber">3</context>
+          <context context-type="linenumber">4,6</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4565494938772544139" datatype="html">
         <source>(<x id="PH" equiv-text="this.projectService.getLocale().getDefaultLanguage().language"/>: <x id="PH_1" equiv-text="this.content[this.key]"/>)</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/authoringTool/components/translatable-input/translatable-input.component.ts</context>
-          <context context-type="linenumber">41,43</context>
+          <context context-type="linenumber">44,46</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1318680729593701201" datatype="html">

From 5e7f24a05c5e3fbb061757904690f08457b2d73d Mon Sep 17 00:00:00 2001
From: Hiroki Terashima <honchikun@gmail.com>
Date: Thu, 25 Jan 2024 15:01:25 -0800
Subject: [PATCH 2/2] Remove i18n tag from label

---
 .../translatable-input/translatable-input.component.html | 2 +-
 src/messages.xlf                                         | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/assets/wise5/authoringTool/components/translatable-input/translatable-input.component.html b/src/assets/wise5/authoringTool/components/translatable-input/translatable-input.component.html
index 21f9003a562..3d2904450b6 100644
--- a/src/assets/wise5/authoringTool/components/translatable-input/translatable-input.component.html
+++ b/src/assets/wise5/authoringTool/components/translatable-input/translatable-input.component.html
@@ -1,6 +1,6 @@
 <ng-content *ngIf="!showTranslationInput()"></ng-content>
 <mat-form-field *ngIf="showTranslationInput()">
-  <mat-label i18n
+  <mat-label
     >{{ defaultLanguageLabelRef.nativeElement.innerHTML }} ({{
       currentLanguage().language
     }})</mat-label
diff --git a/src/messages.xlf b/src/messages.xlf
index 584637744eb..9131a419f4a 100644
--- a/src/messages.xlf
+++ b/src/messages.xlf
@@ -10116,15 +10116,6 @@ Click &quot;Cancel&quot; to keep the invalid JSON open so you can fix it.</sourc
           <context context-type="linenumber">75</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="735cfe8637753e64e9adb0e901dcd4b24a3c8aea" datatype="html">
-        <source><x id="INTERPOLATION" equiv-text="{{ defaultLanguageLabelRef.nativeElement.innerHTML }}"/> (<x id="INTERPOLATION_1" equiv-text="{{
-      currentLanguage().language
-    }}"/>)</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/assets/wise5/authoringTool/components/translatable-input/translatable-input.component.html</context>
-          <context context-type="linenumber">4,6</context>
-        </context-group>
-      </trans-unit>
       <trans-unit id="4565494938772544139" datatype="html">
         <source>(<x id="PH" equiv-text="this.projectService.getLocale().getDefaultLanguage().language"/>: <x id="PH_1" equiv-text="this.content[this.key]"/>)</source>
         <context-group purpose="location">