Address Ramonas Feedback

ls1intum · Dec 17, 2024 · 4afc64f · 4afc64f
1 parent c249e87
commit 4afc64f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/...main/webapp/app/lecture/close-edit-lecture-dialog/close-edit-lecture-modal.component.html b/...main/webapp/app/lecture/close-edit-lecture-dialog/close-edit-lecture-modal.component.html
@@ -3,10 +3,12 @@ <h4 class="modal-title" jhiTranslate="artemisApp.lecture.dismissChangesModal.tit
 </div>
 <div class="modal-body">
     <span jhiTranslate="artemisApp.lecture.dismissChangesModal.message" class="fw-bold"></span><br />
+    <!--    check if translation should be singular or plural, to be exchanged
+        with computed signals once input signals are supported with ng-bootstrap modals -->
     @if (hasUnsavedChangesInTitleSection && hasUnsavedChangesInPeriodSection) {
-        <span jhiTranslate="artemisApp.lecture.dismissChangesModal.sectionsThatContainUnsavedChanges"></span>
+        <span jhiTranslate="artemisApp.lecture.dismissChangesModal.sectionsThatContainUnsavedChangesPlural"></span>
     } @else {
-        <span jhiTranslate="artemisApp.lecture.dismissChangesModal.sectionThatContainsUnsavedChanges"></span>
+        <span jhiTranslate="artemisApp.lecture.dismissChangesModal.sectionsThatContainUnsavedChangesSingular"></span>
     }
     <ul>
         @if (hasUnsavedChangesInTitleSection) {
@@ -22,11 +24,11 @@ <h4 class="modal-title" jhiTranslate="artemisApp.lecture.dismissChangesModal.tit
     </ul>
 </div>
 <div class="modal-footer">
-    <button type="button" (click)="closeWindow(false)" class="btn btn-default">
-        <fa-icon [icon]="faTimes" />
-        &nbsp;<span jhiTranslate="entity.action.cancel"></span>
-    </button>
-    <button class="btn btn-primary" type="submit" (click)="closeWindow(true)">
+    <button class="btn btn-default" (click)="closeWindow(true)">
         <span jhiTranslate="entity.action.discardChanges"></span>
     </button>
+    <button type="button" (click)="closeWindow(false)" class="btn btn-primary" type="submit">
+        <fa-icon [icon]="faTimes" />
+        <span class="ms-1" jhiTranslate="entity.action.cancel"></span>
+    </button>
 </div>
diff --git a/src/main/webapp/i18n/de/lecture.json b/src/main/webapp/i18n/de/lecture.json
@@ -80,7 +80,7 @@
                     "attachmentsStepTitle": "Anhänge",
                     "attachmentsStepMessage": "Lade Anhänge für die Vorlesung hoch.",
                     "unitsStepTitle": "Vorlesungseinheiten",
-                    "unitsStepMessage": "Füge Inhalte zur Vorlesung hinzu durch Erstellung von Vorlesungseinheiten."
+                    "unitsStepMessage": "Füge Inhalte zur Vorlesung hinzu, indem du Vorlesungseinheiten erstellst."
                 },
                 "newLectureUnit": "Neue Vorlesungseinheit",
                 "editLectureUnit": "Vorlesungseinheit bearbeiten",
@@ -91,10 +91,10 @@
                 "competencyNoConnectedUnits": "Keine verknüpften Einheiten"
             },
             "dismissChangesModal": {
-                "title": "Ungespeicherte Änderungen der Vorlesung verwerfen",
-                "message": "Bist du sicher, dass die ungespeicherten Änderungen verworfen werden sollen?",
-                "sectionsThatContainUnsavedChanges": "Die folgenden Abschnitte enthalten ungespeicherte Änderungen:",
-                "sectionThatContainsUnsavedChanges": "Der folgenden Abschnitt enthält ungespeicherte Änderungen:"
+                "title": "Ungespeicherte Änderungen der Vorlesung verwerfen?",
+                "message": "Bist du sicher, dass du die ungespeicherten Änderungen verwerfen willst?",
+                "sectionsThatContainUnsavedChangesSingular": "Der folgenden Abschnitt enthält ungespeicherte Änderungen:",
+                "sectionsThatContainUnsavedChangesPlural": "Die folgenden Abschnitte enthalten ungespeicherte Änderungen:"
             }
         },
         "attachment": {

diff --git a/src/main/webapp/i18n/en/lecture.json b/src/main/webapp/i18n/en/lecture.json
@@ -93,8 +93,8 @@
             "dismissChangesModal": {
                 "title": "Discard unsaved lecture changes",
                 "message": "Are you sure you want to discard your unsaved changes?",
-                "sectionsThatContainUnsavedChanges": "The following sections contain unsaved changes:",
-                "sectionThatContainsUnsavedChanges": "The following section contains unsaved changes:"
+                "sectionsThatContainUnsavedChangesSingular": "The following section contains unsaved changes:",
+                "sectionsThatContainUnsavedChangesPlural": "The following sections contain unsaved changes:"
             }
         },
         "attachment": {