Development: Fix an issue with updated translations

ls1intum · Nov 16, 2024 · 32f6b56 · 32f6b56
1 parent afe5f7f
commit 32f6b56
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 20 deletions.
diff --git a/...pp/app/exercises/programming/assess/code-editor-tutor-assessment-container.component.html b/...pp/app/exercises/programming/assess/code-editor-tutor-assessment-container.component.html
@@ -85,15 +85,15 @@
         <ng-template #editorTitle>
             <span>
                 <span>{{ exercise?.title }}</span>
-                <span>&nbsp;[</span>
-                <span>{{ exercise?.maxPoints }} {{ 'artemisApp.examParticipation.points' | artemisTranslate }}</span>
-                @if (exercise.bonusPoints) {
-                    <span>, {{ exercise.bonusPoints }} {{ 'artemisApp.examParticipation.bonus' | artemisTranslate }}</span>
-                }
-                @if (exercise.includedInOverallScore !== IncludedInOverallScore.INCLUDED_COMPLETELY) {
-                    <jhi-included-in-score-badge [includedInOverallScore]="exercise.includedInOverallScore" />
-                }
-                <span>]</span>
+                <span
+                    [jhiTranslate]="exercise.bonusPoints ? 'artemisApp.examParticipation.bonus' : 'artemisApp.examParticipation.points'"
+                    [translateValues]="{ points: exercise.maxPoints, bonusPoints: exercise.bonusPoints }"
+                ></span>
+                <span>
+                    @if (exercise.includedInOverallScore !== IncludedInOverallScore.INCLUDED_COMPLETELY) {
+                        <jhi-included-in-score-badge [includedInOverallScore]="exercise.includedInOverallScore" />
+                    }
+                </span>
             </span>
         </ng-template>
         <ng-template #editorToolbar>

diff --git a/...programming/manage/code-editor/code-editor-instructor-and-editor-container.component.html b/...programming/manage/code-editor/code-editor-instructor-and-editor-container.component.html
@@ -20,13 +20,15 @@
     <jhi-code-editor-container [participation]="selectedParticipation!" [buildable]="selectedRepository !== REPOSITORY.TEST" [course]="course" [allowHiddenFiles]="true">
         <div editorTitle>
             <span>{{ exercise?.title }}</span>
-            <!-- prettier-ignore -->
-            <span>&nbsp;[{{ exercise?.maxPoints }} {{ 'artemisApp.examParticipation.points' | artemisTranslate }}@if (exercise.bonusPoints) {
-                <span>, {{ exercise.bonusPoints }} {{ 'artemisApp.examParticipation.bonus' | artemisTranslate }}</span>
-            }]
-            @if (exercise.includedInOverallScore !== IncludedInOverallScore.INCLUDED_COMPLETELY) {
-                <jhi-included-in-score-badge [includedInOverallScore]="exercise.includedInOverallScore"/>
-            }</span>
+            <span
+                [jhiTranslate]="exercise.bonusPoints ? 'artemisApp.examParticipation.bonus' : 'artemisApp.examParticipation.points'"
+                [translateValues]="{ points: exercise.maxPoints, bonusPoints: exercise.bonusPoints }"
+            ></span>
+            <span>
+                @if (exercise.includedInOverallScore !== IncludedInOverallScore.INCLUDED_COMPLETELY) {
+                    <jhi-included-in-score-badge [includedInOverallScore]="exercise.includedInOverallScore" />
+                }
+            </span>
         </div>
         <div editorTitleActions class="d-flex align-items-center ms-2">
             <jhi-programming-exercise-instructor-exercise-status

diff --git a/...webapp/app/exercises/programming/participate/code-editor-student-container.component.html b/...webapp/app/exercises/programming/participate/code-editor-student-container.component.html
@@ -33,10 +33,11 @@
         >
             <div editorTitle>
                 <span>{{ exercise?.title }}</span>
-                <!-- prettier-ignore -->
-                <span>&nbsp;[{{ exercise?.maxPoints }} {{ 'artemisApp.examParticipation.points' | artemisTranslate }}@if (exercise.bonusPoints) {
-                        <span>, {{ exercise.bonusPoints }} {{ 'artemisApp.examParticipation.bonus' | artemisTranslate }}</span>
-                    }]
+                <span
+                    [jhiTranslate]="exercise?.bonusPoints ? 'artemisApp.examParticipation.bonus' : 'artemisApp.examParticipation.points'"
+                    [translateValues]="{ points: exercise?.maxPoints, bonusPoints: exercise?.bonusPoints }"
+                ></span>
+                <span>
                     @if (exercise.includedInOverallScore !== IncludedInOverallScore.INCLUDED_COMPLETELY) {
                         <jhi-included-in-score-badge [includedInOverallScore]="exercise.includedInOverallScore" />
                     }