From 3f34396f116f235465388d8dbfbebdb73b4de430 Mon Sep 17 00:00:00 2001 From: iyannsch Date: Sun, 13 Oct 2024 15:28:51 +0200 Subject: [PATCH 1/6] Add tooltips and i18n --- .../programming-exercise-difficulty.component.html | 6 ++++++ src/main/webapp/i18n/de/programmingExercise.json | 3 +++ src/main/webapp/i18n/en/programmingExercise.json | 3 +++ 3 files changed, 12 insertions(+) diff --git a/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-difficulty.component.html b/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-difficulty.component.html index 8f66c32f99dd..59cc94f7c1ba 100644 --- a/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-difficulty.component.html +++ b/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-difficulty.component.html @@ -42,6 +42,8 @@ ngbTooltip="{{ 'artemisApp.programmingExercise.allowOfflineIde.alertNoTheia' | artemisTranslate }}" /> } + } @else { + } @@ -74,6 +76,8 @@ ngbTooltip="{{ 'artemisApp.programmingExercise.allowOnlineEditor.alertNoTheia' | artemisTranslate }}" /> } + } @else { + } @@ -99,6 +103,8 @@ [placement]="'top'" ngbTooltip="{{ 'artemisApp.programmingExercise.allowOnlineIde.alert' | artemisTranslate }}" /> + } @else { + } diff --git a/src/main/webapp/i18n/de/programmingExercise.json b/src/main/webapp/i18n/de/programmingExercise.json index b06ff3845c39..25aa33c3c767 100644 --- a/src/main/webapp/i18n/de/programmingExercise.json +++ b/src/main/webapp/i18n/de/programmingExercise.json @@ -118,18 +118,21 @@ "workdir": "Verzeichnis", "allowOnlineEditor": { "title": "Online-Editor erlauben", + "description": "Ein Online-Texteditor mit Datei-Explorer und Code-Hervorhebungsfunktionen, jedoch ohne die Möglichkeit, Code zu kompilieren oder auszuführen.", "alert": "Es muss mindestens eine Option (Offline-IDE, Online-Editor oder Online-IDE) ausgewählt sein", "alertNoTheia": "Es muss mindestens eine Option (Offline-IDE oder Online-Editor) ausgewählt sein" }, "onlineEditor": "Online", "allowOfflineIde": { "title": "Offline-IDE erlauben", + "description": "Aktivieren Sie diese Option, um es zu erlauben, die Übung herunterzuladen und lokal mit der bevorzugten IDE daran zu arbeiten.", "alert": "Es muss mindestens eine Option (Offline-IDE, Online-Editor oder Online-IDE) ausgewählt sein", "alertNoTheia": "Es muss mindestens eine Option (Offline-IDE oder Online-Editor) ausgewählt sein" }, "offlineIde": "IDE", "allowOnlineIde": { "title": "Online-IDE erlauben", + "description": "Eine auf VisualStudioCode basierende Online-Entwicklungsumgebung mit Code-Hervorhebungs- und Formatierungsfunktionen. Vorkonfiguriert für die Sprache der Übung und mit der Möglichkeit, Code online zu kompilieren oder auszuführen.", "alert": "Es muss mindestens eine Option (Offline-IDE, Online-Editor oder Online-IDE) ausgewählt sein.", "alertNoTheia": "Es muss mindestens eine Option (Offline-IDE oder Online-Editor) ausgewählt sein" }, diff --git a/src/main/webapp/i18n/en/programmingExercise.json b/src/main/webapp/i18n/en/programmingExercise.json index 0362e88038db..1077367a1bf5 100644 --- a/src/main/webapp/i18n/en/programmingExercise.json +++ b/src/main/webapp/i18n/en/programmingExercise.json @@ -130,18 +130,21 @@ "customizeDockerImage": "You can customize the Docker image. Make sure to provide it in amd64 and arm64 and include all build dependencies to guarantee a short build duration.", "allowOnlineEditor": { "title": "Allow Online Editor", + "description": "An online text editor featuring a file explorer, coding window, and code highlighting features but without the ability to compile or run code.", "alert": "At least one option (Offline IDE, Online Editor, or Online IDE) must be selected", "alertNoTheia": "At least one option (Offline IDE or Online Editor) must be selected" }, "onlineEditor": "Online", "allowOfflineIde": { "title": "Allow Offline IDE", + "description": "Check this option to allow students to download the exercise and work on it locally using their preferred IDE.", "alert": "At least one option (Offline IDE, Online Editor, or Online IDE) must be selected", "alertNoTheia": "At least one option (Offline IDE or Online Editor) must be selected" }, "offlineIde": "IDE", "allowOnlineIde": { "title": "Allow Online IDE", + "description": "An online coding environment based on VisualStudioCode featuring code highlighting and formatting features. Pre-configured to your exercise's language and with the ability to compile or run code online.", "alert": "At least one option (Offline IDE, Online Editor, or Online IDE) must be selected.", "alertNoTheia": "At least one option (Offline IDE or Online Editor) must be selected" }, From 1bda254553c5812893c8b7b40a05de673aa0da1a Mon Sep 17 00:00:00 2001 From: iyannsch Date: Sun, 13 Oct 2024 18:24:35 +0200 Subject: [PATCH 2/6] Fix texts and testing component --- src/main/webapp/i18n/de/programmingExercise.json | 4 ++-- src/main/webapp/i18n/en/programmingExercise.json | 2 +- .../programming-exercise-difficulty.component.spec.ts | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/webapp/i18n/de/programmingExercise.json b/src/main/webapp/i18n/de/programmingExercise.json index 25aa33c3c767..04701fc1eb0e 100644 --- a/src/main/webapp/i18n/de/programmingExercise.json +++ b/src/main/webapp/i18n/de/programmingExercise.json @@ -125,14 +125,14 @@ "onlineEditor": "Online", "allowOfflineIde": { "title": "Offline-IDE erlauben", - "description": "Aktivieren Sie diese Option, um es zu erlauben, die Übung herunterzuladen und lokal mit der bevorzugten IDE daran zu arbeiten.", + "description": "Aktiviere diese Option, um es zu erlauben, die Übung herunterzuladen und lokal mit der bevorzugten IDE daran zu arbeiten.", "alert": "Es muss mindestens eine Option (Offline-IDE, Online-Editor oder Online-IDE) ausgewählt sein", "alertNoTheia": "Es muss mindestens eine Option (Offline-IDE oder Online-Editor) ausgewählt sein" }, "offlineIde": "IDE", "allowOnlineIde": { "title": "Online-IDE erlauben", - "description": "Eine auf VisualStudioCode basierende Online-Entwicklungsumgebung mit Code-Hervorhebungs- und Formatierungsfunktionen. Vorkonfiguriert für die Sprache der Übung und mit der Möglichkeit, Code online zu kompilieren oder auszuführen.", + "description": "Eine auf Visual Studio Code basierende Online-Entwicklungsumgebung mit Code-Hervorhebungs- und Formatierungsfunktionen. Vorkonfiguriert für die Sprache der Übung und mit der Möglichkeit, Code online zu kompilieren oder auszuführen.", "alert": "Es muss mindestens eine Option (Offline-IDE, Online-Editor oder Online-IDE) ausgewählt sein.", "alertNoTheia": "Es muss mindestens eine Option (Offline-IDE oder Online-Editor) ausgewählt sein" }, diff --git a/src/main/webapp/i18n/en/programmingExercise.json b/src/main/webapp/i18n/en/programmingExercise.json index 1077367a1bf5..0db17a7ac7de 100644 --- a/src/main/webapp/i18n/en/programmingExercise.json +++ b/src/main/webapp/i18n/en/programmingExercise.json @@ -144,7 +144,7 @@ "offlineIde": "IDE", "allowOnlineIde": { "title": "Allow Online IDE", - "description": "An online coding environment based on VisualStudioCode featuring code highlighting and formatting features. Pre-configured to your exercise's language and with the ability to compile or run code online.", + "description": "An online coding environment based on Visual Studio Code featuring code highlighting and formatting features. Pre-configured to your exercise's language and with the ability to compile or run code online.", "alert": "At least one option (Offline IDE, Online Editor, or Online IDE) must be selected.", "alertNoTheia": "At least one option (Offline IDE or Online Editor) must be selected" }, diff --git a/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-difficulty.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-difficulty.component.spec.ts index 70c70a17dd5b..0750ffcdca6a 100644 --- a/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-difficulty.component.spec.ts +++ b/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-difficulty.component.spec.ts @@ -14,6 +14,7 @@ import { ProfileInfo } from 'app/shared/layouts/profiles/profile-info.model'; import { ProfileService } from 'app/shared/layouts/profiles/profile.service'; import { PROFILE_THEIA } from 'app/app.constants'; import { ArtemisTestModule } from '../../../test.module'; +import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module'; describe('ProgrammingExerciseDifficultyComponent', () => { let fixture: ComponentFixture; @@ -24,7 +25,7 @@ describe('ProgrammingExerciseDifficultyComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ArtemisTestModule], + imports: [ArtemisTestModule, ArtemisSharedComponentModule], declarations: [ CheckboxControlValueAccessor, DefaultValueAccessor, From 2ff20da6cb3ad0f272cf471791033f520bc8588b Mon Sep 17 00:00:00 2001 From: iyannsch Date: Sun, 13 Oct 2024 19:16:47 +0200 Subject: [PATCH 3/6] Fix english files --- src/main/webapp/i18n/de/competency.json | 1 + src/main/webapp/i18n/de/dragAndDropSubmittedAnswer.json | 3 ++- src/main/webapp/i18n/de/exam.json | 1 + src/main/webapp/i18n/de/exerciseAssessmentDashboard.json | 1 + src/main/webapp/i18n/de/lectureUnit.json | 2 +- src/main/webapp/i18n/de/notification.json | 1 + src/main/webapp/i18n/de/organizationManagement.json | 2 +- src/main/webapp/i18n/de/quizExercise.json | 6 ------ src/main/webapp/i18n/de/student-dashboard.json | 1 + src/main/webapp/i18n/de/userSettings.json | 2 +- src/main/webapp/i18n/en/competency.json | 1 + src/main/webapp/i18n/en/complaint.json | 1 + src/main/webapp/i18n/en/conversation.json | 1 + src/main/webapp/i18n/en/dragAndDropSubmittedAnswer.json | 1 + src/main/webapp/i18n/en/editor.json | 1 + src/main/webapp/i18n/en/exam.json | 2 ++ src/main/webapp/i18n/en/exampleSubmission.json | 1 + src/main/webapp/i18n/en/exerciseAssessmentDashboard.json | 1 + src/main/webapp/i18n/en/lectureUnit.json | 1 + src/main/webapp/i18n/en/modelingAssessment.json | 1 + src/main/webapp/i18n/en/multipleChoiceQuestion.json | 1 + src/main/webapp/i18n/en/notification.json | 2 ++ src/main/webapp/i18n/en/programmingExercise.json | 2 ++ src/main/webapp/i18n/en/quizExercise.json | 6 ------ src/main/webapp/i18n/en/student-dashboard.json | 1 + 25 files changed, 27 insertions(+), 16 deletions(-) diff --git a/src/main/webapp/i18n/de/competency.json b/src/main/webapp/i18n/de/competency.json index 40c540dad5cb..aa1ff45fdf4a 100644 --- a/src/main/webapp/i18n/de/competency.json +++ b/src/main/webapp/i18n/de/competency.json @@ -225,6 +225,7 @@ "titleUniqueValidationError": "Es gibt bereits eine Kompetenz/Voraussetzung mit diesem Titel in dem Kurs", "suggestedTaxonomy": "Vorschlag", "averageMastery": "Durchschnittliche Kompetenzbeherrschung der Studierenden", + "averageStudentScore": "Durchschnittliche Bewertung der Studierenden", "selectLecture": "Wähle eine Vorlesung aus", "noLectures": "Dieser Kurs hat keine Vorlesungen", "dropdown": "{{lectureTitle}} ({{ noOfConnectedUnits }} Vorlesungseinheiten verbunden)", diff --git a/src/main/webapp/i18n/de/dragAndDropSubmittedAnswer.json b/src/main/webapp/i18n/de/dragAndDropSubmittedAnswer.json index 21bb95afa9a7..d7165bae8e1c 100644 --- a/src/main/webapp/i18n/de/dragAndDropSubmittedAnswer.json +++ b/src/main/webapp/i18n/de/dragAndDropSubmittedAnswer.json @@ -14,7 +14,8 @@ "detail": { "title": "Drag-and-Drop eingereichte Antwort" }, - "mappings": "Zuordnungen" + "mappings": "Zuordnungen", + "assignments": "Anweisungen" } } } diff --git a/src/main/webapp/i18n/de/exam.json b/src/main/webapp/i18n/de/exam.json index a528405b3451..cc610659d87a 100644 --- a/src/main/webapp/i18n/de/exam.json +++ b/src/main/webapp/i18n/de/exam.json @@ -212,6 +212,7 @@ "examScores": { "xAxes": "Ergebnis in %", "xAxesSuffix": " + {Notenname}", + "xAxesSuffixNoBonus": " + {Notenname}", "xAxesSuffixBonus": " + {Bonuspunkte}", "yAxes": "Anzahl Teilnehmende", "highlightPassedMedian": "Hebe Median aller bestandenen Klausuren im Diagramm hervor: {{ median }}%", diff --git a/src/main/webapp/i18n/de/exerciseAssessmentDashboard.json b/src/main/webapp/i18n/de/exerciseAssessmentDashboard.json index 532f09c8c8d2..768f8a2d863f 100644 --- a/src/main/webapp/i18n/de/exerciseAssessmentDashboard.json +++ b/src/main/webapp/i18n/de/exerciseAssessmentDashboard.json @@ -40,6 +40,7 @@ "toRead": "zum Lesen", "toReview": "zur Überprüfung", "totalExamples": "Es gibt {{total}} Beispielabgaben: {{toRead}} zum Lesen und {{toAssess}} zur Bewertung.", + "totalExampleSubmissions": "Es gibt {{total}} Beispielabgaben: {{toRead}} zum Lesen and {{toAssess}} zur Bewertung.", "readSubmissions": "Überprüfung von Beispielabgaben", "start": "", "continue": "", diff --git a/src/main/webapp/i18n/de/lectureUnit.json b/src/main/webapp/i18n/de/lectureUnit.json index 41fe6c3255fd..3b906677c798 100644 --- a/src/main/webapp/i18n/de/lectureUnit.json +++ b/src/main/webapp/i18n/de/lectureUnit.json @@ -86,7 +86,7 @@ "description": "Beschreibung", "notReleasedTooltip": "Onlineeinheit nur sichtbar für Tutor:innen und Lehrende. Veröffentlichungsdatum:", "doOpen": "Link öffnen", - "createVideoUnit": { + "createOnlineUnit": { "title": "Erstelle Onlineeinheit", "name": "Name", "namePlaceHolder": "Gib der Onlineeinheit einen Namen", diff --git a/src/main/webapp/i18n/de/notification.json b/src/main/webapp/i18n/de/notification.json index bc479b170f0b..911d57b4a79a 100644 --- a/src/main/webapp/i18n/de/notification.json +++ b/src/main/webapp/i18n/de/notification.json @@ -16,6 +16,7 @@ "target": { "newAnswerPost": "Antwort ansehen", "newPost": "Beitrag ansehen", + "newQuestion": "Frage ansehen", "exerciseCreated": "Übung ansehen", "exerciseUpdated": "Übung ansehen", "attachmentUpdated": "Vorlesung ansehen" diff --git a/src/main/webapp/i18n/de/organizationManagement.json b/src/main/webapp/i18n/de/organizationManagement.json index a838d55db96d..c6b917d4d238 100644 --- a/src/main/webapp/i18n/de/organizationManagement.json +++ b/src/main/webapp/i18n/de/organizationManagement.json @@ -7,7 +7,7 @@ "url": "URL", "description": "Beschreibung", "logoUrl": "Logo URL", - "Nutzer:innens": "Nutzer:innen", + "users": "Nutzer:innen", "courses": "Kurse", "emailPattern": "E-Mail-Muster", "delete": { diff --git a/src/main/webapp/i18n/de/quizExercise.json b/src/main/webapp/i18n/de/quizExercise.json index aa444778ac1c..d04f13e11078 100644 --- a/src/main/webapp/i18n/de/quizExercise.json +++ b/src/main/webapp/i18n/de/quizExercise.json @@ -308,12 +308,6 @@ "join": "Bearbeiten", "joinFailed": "Dem Quiz konnte nicht beigetreten werden.", "submitSuccess": "Deine Antworten wurden erfolgreich abgegeben.

Die Ergebnisse sind verfügbar, nachdem das Quiz beendet ist." - }, - "quizLiveModal": { - "title": "Go-Live einer neuen Quiz-Übung", - "body": "Das Quiz {{quizName}} für den Kurs {{courseName}} ist nun aktiv! Klick auf den 'Weiter zum Quiz' Button, um zum Quiz zu gelangen.", - "cancelButton": "Abbrechen", - "goToButton": "Weiter zum Quiz" } } } diff --git a/src/main/webapp/i18n/de/student-dashboard.json b/src/main/webapp/i18n/de/student-dashboard.json index cb10f2199d96..c464ddf4b98d 100644 --- a/src/main/webapp/i18n/de/student-dashboard.json +++ b/src/main/webapp/i18n/de/student-dashboard.json @@ -102,6 +102,7 @@ "achievablePoints": "Erreichbare Punktzahl", "applyFilter": "Filter anwenden", "resetFilter": "Filter zurücksetzen", + "clearFilter": "Filter leeren", "noFilterAvailable": "Für die bisherigen Aufgaben gibt es keine unterscheidenden Filteroptionen", "noMoreOptions": "Keine weiteren Auswahlmöglichkeiten" }, diff --git a/src/main/webapp/i18n/de/userSettings.json b/src/main/webapp/i18n/de/userSettings.json index 1d5cbdacc854..afd95a5f215b 100644 --- a/src/main/webapp/i18n/de/userSettings.json +++ b/src/main/webapp/i18n/de/userSettings.json @@ -107,7 +107,7 @@ }, "settingDescriptions": { "basicWeeklySummaryDescription": "Erhalte jeden Freitag um 17:00 Uhr eine einfache wöchentliche Zusammenfassung (bsp. welche neuen Aufgaben diese Woche veröffentlicht wurden und noch bearbeitbar sind)", - "exerciseCreatedOrStartedDescription": "Erhalte eine Mitteilung, wenn eine neue Aufgabe veröffentlicht wurde", + "exerciseReleasedDescription": "Erhalte eine Mitteilung, wenn eine Aufgabe veröffentlicht wurde", "exerciseOpenForPracticeDescription": "Erhalte eine Mitteilung, wenn eine Aufgabe zum Üben freigeschaltet wurde (z.B. ein Quiz)", "exerciseSubmissionAssessedDescription": "Erhalte eine Mitteilung, wenn deine eingereichten Aufgaben bewertet wurden", "newExercisePostDescription": "Erhalte eine Mitteilung, wenn eine neue Nachricht zu einer Aufgabe erstellt wurde", diff --git a/src/main/webapp/i18n/en/competency.json b/src/main/webapp/i18n/en/competency.json index 9baf2d9d4975..2455994daccf 100644 --- a/src/main/webapp/i18n/en/competency.json +++ b/src/main/webapp/i18n/en/competency.json @@ -207,6 +207,7 @@ "create": { "titleUniqueValidationError": "There already exists a competency/prerequisite with this title in the course", "suggestedTaxonomy": "Suggested", + "averageMastery": "Average competency mastery of students", "averageStudentScore": "Average student mastery", "selectLecture": "Select a Lecture", "noLectures": "This course has no lectures", diff --git a/src/main/webapp/i18n/en/complaint.json b/src/main/webapp/i18n/en/complaint.json index 2d879e4213de..7aa18f6040f1 100644 --- a/src/main/webapp/i18n/en/complaint.json +++ b/src/main/webapp/i18n/en/complaint.json @@ -69,6 +69,7 @@ "info": "Submitting a feedback request does not affect your number of allowed complaints, but your score will remain unchanged.", "review": "Review More Feedback Request", "alreadyHandled": "The request has been resolved", + "alreadySubmitted": "You have already requested more feedback", "alreadySubmittedSubmissionAuthor": "You have already requested more feedback", "alreadySubmittedNotSubmissionAuthor": "The student has already requested more feedback", "acceptedLong": "Request was answered", diff --git a/src/main/webapp/i18n/en/conversation.json b/src/main/webapp/i18n/en/conversation.json index 40cb47bb8f98..8ed306cca8f4 100644 --- a/src/main/webapp/i18n/en/conversation.json +++ b/src/main/webapp/i18n/en/conversation.json @@ -164,6 +164,7 @@ "maxError": "You can only add {{ max }} users", "addUserLabel": "Search for users in the course", "maxUsersNote": "Note: You can add {{ max }} users to this conversation", + "maxU": "Note: You can only add {{ max }} users to this conversation", "addIndividualUsers": "Add individual users", "addWholeGroups": "Add whole groups", "addAllStudents": "Add all students", diff --git a/src/main/webapp/i18n/en/dragAndDropSubmittedAnswer.json b/src/main/webapp/i18n/en/dragAndDropSubmittedAnswer.json index 497a35543bba..25dc947b1a90 100644 --- a/src/main/webapp/i18n/en/dragAndDropSubmittedAnswer.json +++ b/src/main/webapp/i18n/en/dragAndDropSubmittedAnswer.json @@ -14,6 +14,7 @@ "detail": { "title": "Drag And Drop Submitted Answer" }, + "mappings": "Mappings", "assignments": "Assignments" } } diff --git a/src/main/webapp/i18n/en/editor.json b/src/main/webapp/i18n/en/editor.json index 266ce0333d74..18442db3ca14 100644 --- a/src/main/webapp/i18n/en/editor.json +++ b/src/main/webapp/i18n/en/editor.json @@ -33,6 +33,7 @@ "building": "Building and testing...", "buildFailed": "Build failed", "noBuildOutput": "No build results available", + "generatingFeedback": "Generating feedback...", "selectFile": "Select a file to get started!", "binaryFileSelected": "This is a binary file that cannot be displayed.", "downloadBuildResult": "Download Build Result", diff --git a/src/main/webapp/i18n/en/exam.json b/src/main/webapp/i18n/en/exam.json index 4ed4737897a0..cc0ed76e3dc8 100644 --- a/src/main/webapp/i18n/en/exam.json +++ b/src/main/webapp/i18n/en/exam.json @@ -211,6 +211,7 @@ }, "examScores": { "xAxes": "Score in %", + "xAxesSuffix": " + {Grade Name}", "xAxesSuffixNoBonus": " + {Grade Name}", "xAxesSuffixBonus": " + {Bonus Points}", "yAxes": "Number of Participants", @@ -470,6 +471,7 @@ "examStudentReviewStart": "Begin of Student Review", "examStudentReviewEnd": "End of Student Review", "exampleSolutionPublicationDateTooltip": "Students can see the example solutions for all exercises in the exam from this time onwards if they participated in the exam. Leave blank to disable.", + "studentReviewEnabled": "Student review enabled", "maxPoints": { "title": "Maximum number of points for exam", "warning": "Updating this field will update the grading scale for the exam if such exists, such that the points values for the grade steps still match the percentages, adjusted for the new maximum points value. This also affects all students' grades in the exam!" diff --git a/src/main/webapp/i18n/en/exampleSubmission.json b/src/main/webapp/i18n/en/exampleSubmission.json index d63e75979fd0..63cf358ffd47 100644 --- a/src/main/webapp/i18n/en/exampleSubmission.json +++ b/src/main/webapp/i18n/en/exampleSubmission.json @@ -31,6 +31,7 @@ "readSuccessfully": "You have successfully read and understood this example submission", "createNew": "Create new", "pageHeader": "Example Text Submission for Exercise", + "usedForTutorial": "Use in Tutorial", "assessmentTraining": "Assessment Training", "selectModel": "Select Assessment Training Mode:", "selectModelExplanation": "You can select the assessment training mode here. The assessment training mode defines how the tutor has to confirm that the example was understood.", diff --git a/src/main/webapp/i18n/en/exerciseAssessmentDashboard.json b/src/main/webapp/i18n/en/exerciseAssessmentDashboard.json index cf2d3b1c574e..84d5206f2ae9 100644 --- a/src/main/webapp/i18n/en/exerciseAssessmentDashboard.json +++ b/src/main/webapp/i18n/en/exerciseAssessmentDashboard.json @@ -39,6 +39,7 @@ "readAndUnderstood": "I have read and understood the instructions", "toRead": "to read", "toReview": "to review", + "totalExamples": "There are {{total}} example submissions: {{toRead}} to read and {{toAssess}} to assess.", "totalExampleSubmissions": "There are {{total}} example submissions: {{toRead}} to read and {{toAssess}} to assess.", "readSubmissions": "Read submissions", "start": "Start", diff --git a/src/main/webapp/i18n/en/lectureUnit.json b/src/main/webapp/i18n/en/lectureUnit.json index d83040554b23..d54a06f188b1 100644 --- a/src/main/webapp/i18n/en/lectureUnit.json +++ b/src/main/webapp/i18n/en/lectureUnit.json @@ -149,6 +149,7 @@ "endPage": "End page must be less or equal to {{ max }}." }, "split": { + "empty": "", "unit": "Lecture Units", "unitName": "Unit Name", "releaseDate": "Release Date", diff --git a/src/main/webapp/i18n/en/modelingAssessment.json b/src/main/webapp/i18n/en/modelingAssessment.json index 1fe1b53bee3f..1040ce467a3a 100644 --- a/src/main/webapp/i18n/en/modelingAssessment.json +++ b/src/main/webapp/i18n/en/modelingAssessment.json @@ -2,6 +2,7 @@ "artemisApp": { "modelingAssessment": { "points": "Points", + "conflicts": "Conflicts", "assessor": "Assessor: {{firstName}} {{lastName}}", "noModel": "No model found to display", "invalidAssessments": "Your assessments are not valid!", diff --git a/src/main/webapp/i18n/en/multipleChoiceQuestion.json b/src/main/webapp/i18n/en/multipleChoiceQuestion.json index 2426e8563c8e..f342c31a56bc 100644 --- a/src/main/webapp/i18n/en/multipleChoiceQuestion.json +++ b/src/main/webapp/i18n/en/multipleChoiceQuestion.json @@ -37,6 +37,7 @@ "headingOne": "Heading One", "headingTwo": "Heading Two", "headingThree": "Heading Three", + "heading": "Heading", "quote": "Quote", "link": "Link", "orderedList": "Ordered List", diff --git a/src/main/webapp/i18n/en/notification.json b/src/main/webapp/i18n/en/notification.json index a027df9ace12..6c1e49a8bad0 100644 --- a/src/main/webapp/i18n/en/notification.json +++ b/src/main/webapp/i18n/en/notification.json @@ -15,6 +15,8 @@ "hideAllCurrentlyDisplayedNotifications": "Hide all currently displayed notifications", "target": { "newAnswer": "View reply", + "newAnswerPost": "View reply", + "newPost": "View post", "newQuestion": "View post", "exerciseCreated": "View exercise", "exerciseUpdated": "View exercise", diff --git a/src/main/webapp/i18n/en/programmingExercise.json b/src/main/webapp/i18n/en/programmingExercise.json index 0db17a7ac7de..98ed34d9108a 100644 --- a/src/main/webapp/i18n/en/programmingExercise.json +++ b/src/main/webapp/i18n/en/programmingExercise.json @@ -451,6 +451,8 @@ "allowFeedbackRequestsTooltip": "Students can request feedback before the due date. The requests will be processed by Athena, or, if Athena cannot be reached, students can send manual feedback requests.", "manualFeedbackRequests": "Manual feedback requests", "manualFeedbackRequestsTooltip": "Students can request manual feedback before the due date to receive feedback.", + "feedbackRequestsEnabled": "Feedback requests are enabled", + "feedbackRequestsDisabled": "Feedback requests are disabled", "complaintOnAutomaticAssessment": "Complaint on Automatic Assessment", "complaintOnAutomaticAssessmentTooltip": "Students can complain after receiving an automatic assessment. Which will be evaluated by a tutor afterwards.", "exampleSolutionPublicationDateTooltip": "The date when the Solution Repository becomes available to download for students. Leave blank to disable.", diff --git a/src/main/webapp/i18n/en/quizExercise.json b/src/main/webapp/i18n/en/quizExercise.json index 6b9d14db482f..649092bb9f56 100644 --- a/src/main/webapp/i18n/en/quizExercise.json +++ b/src/main/webapp/i18n/en/quizExercise.json @@ -273,12 +273,6 @@ "explanationAnswered": "You have answered this question", "explanationNotAnswered": "You have not answered this question", "submissionWarning": "Are you sure you want to submit? You have not answered all questions and you still have some time left!", - "quizLiveModal": { - "title": "Go-Live of a new Quiz Exercise", - "body": "The Quiz {{quizName}} for Course {{courseName}} is now live! Click on the 'Go to Quiz' button in order to access the quiz.", - "cancelButton": "Cancel", - "goToButton": "Go to quiz" - }, "placeholder": { "title": "Short Quiz Title", "questionTitle": "Question Title", diff --git a/src/main/webapp/i18n/en/student-dashboard.json b/src/main/webapp/i18n/en/student-dashboard.json index 8660888fb761..9fdc73a49bd4 100644 --- a/src/main/webapp/i18n/en/student-dashboard.json +++ b/src/main/webapp/i18n/en/student-dashboard.json @@ -101,6 +101,7 @@ "achievedScore": "Achieved Score", "achievablePoints": "Achievable Points", "applyFilter": "Apply filter", + "resetFilter": "Reset filter", "clearFilter": "Clear filter", "noFilterAvailable": "There are no distinguishing filter options for the existing exercises", "noMoreOptions": "No more options" From 03f5edf650c4502545815caa963c46a242dacba4 Mon Sep 17 00:00:00 2001 From: iyannsch Date: Sun, 13 Oct 2024 19:43:30 +0200 Subject: [PATCH 4/6] Fix german files --- src/main/webapp/i18n/de/competency.json | 5 +++++ src/main/webapp/i18n/de/editor.json | 1 + src/main/webapp/i18n/de/exam.json | 1 + src/main/webapp/i18n/de/exercise-actions.json | 1 + src/main/webapp/i18n/de/global.json | 2 ++ src/main/webapp/i18n/de/lectureUnit.json | 1 + src/main/webapp/i18n/de/metrics.json | 10 +++++++++- src/main/webapp/i18n/de/notification.json | 1 + src/main/webapp/i18n/de/programmingExercise.json | 4 ++++ src/main/webapp/i18n/de/student-dashboard.json | 2 ++ 10 files changed, 27 insertions(+), 1 deletion(-) diff --git a/src/main/webapp/i18n/de/competency.json b/src/main/webapp/i18n/de/competency.json index aa1ff45fdf4a..6315ba4df79e 100644 --- a/src/main/webapp/i18n/de/competency.json +++ b/src/main/webapp/i18n/de/competency.json @@ -282,6 +282,11 @@ "edit": { "title": "Bearbeite eine Voraussetzung" }, + "importAll": { + "title": "Alle Kompetenzen eines Kurses importieren", + "success": "{{ noOfCompetencies }} Kompetenzen aus dem Kurs \"{{ courseTitle }}\" importiert.", + "warning": "Es wurden keine Kompetenzen für den Kurs \"{{ courseTitle }}\" gefunden." + }, "competencyCard": { "delete": { "question": "Willst du wirklich die Voraussetzung {{ title }} löschen? Du kannst diese Aktion nicht rückgängig machen!", diff --git a/src/main/webapp/i18n/de/editor.json b/src/main/webapp/i18n/de/editor.json index 1c1db6d76147..abd74a5c2b5f 100644 --- a/src/main/webapp/i18n/de/editor.json +++ b/src/main/webapp/i18n/de/editor.json @@ -64,6 +64,7 @@ "deleteFolderTitle": "Verzeichnis löschen", "deleteFileConfirm": "Bist Du sicher, dass Du die Datei {{filename}} löschen willst?", "deleteFolderConfirm": "Bist Du sicher, dass Du das Verzeichnis {{filename}} und alle enthaltenen Dateien löschen willst?", + "delete": "Löschen bestätigen", "unsavedChanges": "Datei enthält ungespeicherte Änderungen", "createFolderRoot": "Verzeichnis auf Root Level erstellen", "createFileRoot": "Datei auf Root Level erstellen", diff --git a/src/main/webapp/i18n/de/exam.json b/src/main/webapp/i18n/de/exam.json index cc610659d87a..16edfe2a7308 100644 --- a/src/main/webapp/i18n/de/exam.json +++ b/src/main/webapp/i18n/de/exam.json @@ -319,6 +319,7 @@ "notSynced": "Aufgabe nicht gespeichert", "notStarted": "Aufgabe nicht gestartet", "submitted": "Du hast eine Lösung für die Aufgabe eingereicht. Du kannst die Aufgabe weiter bearbeiten und erneut abgeben.", + "submittedSubmissionLimitReached": "Du hast eine Lösung für die Aufgabe eingereicht. Du kannst keine Lösungen mehr einreichen, weil du das Limit erreicht hast.", "notSubmitted": "Aufgabe nicht eingereicht", "notSavedOrSubmitted": "Du hast Änderungen, die nicht abgesendet sind.", "saveSubmissionError": "Die Änderungen konnten nicht gespeichert werden! Bitte stelle sicher, dass du online bist und speichere nochmal.", diff --git a/src/main/webapp/i18n/de/exercise-actions.json b/src/main/webapp/i18n/de/exercise-actions.json index b4f2ce5c25d4..f2050c3aef59 100644 --- a/src/main/webapp/i18n/de/exercise-actions.json +++ b/src/main/webapp/i18n/de/exercise-actions.json @@ -19,6 +19,7 @@ "openCodeEditor": "Programmiereditor öffnen", "openPracticeCodeEditor": "Programmiereditor zum Üben öffnen", "openGradedCodeEditor": "Programmiereditor öffnen", + "choseGradedMode": "Bewertete Teilnahme gewählt", "openModelingEditor": "Modellierungseditor öffnen", "importIntoIDE": "In deiner IDE öffnen", "openOnlineIDE": "Online IDE öffnen", diff --git a/src/main/webapp/i18n/de/global.json b/src/main/webapp/i18n/de/global.json index b809dec61943..46665c90d975 100644 --- a/src/main/webapp/i18n/de/global.json +++ b/src/main/webapp/i18n/de/global.json @@ -35,6 +35,7 @@ "quizExercise": "Quiz Aufgabe", "lecture": "Vorlesung", "competency": "Kompetenz", + "ltiOutcomeUrl": "Lti Outcome Url", "submittedAnswer": "Eingereichte Antwort", "quizQuestion": "Frage", "multipleChoiceQuestion": "Multiple-Choice Frage", @@ -207,6 +208,7 @@ "confirm": "Bestätigen", "download": "Herunterladen", "dashboard": "Dashboard", + "exportRepos": "Repositories herunterladen", "units": "Einheiten", "edit": "Bearbeiten", "connect": "Verknüpfen", diff --git a/src/main/webapp/i18n/de/lectureUnit.json b/src/main/webapp/i18n/de/lectureUnit.json index 3b906677c798..2ed9397e04ff 100644 --- a/src/main/webapp/i18n/de/lectureUnit.json +++ b/src/main/webapp/i18n/de/lectureUnit.json @@ -15,6 +15,7 @@ }, "releaseDate": "Veröffentlichungsdatum", "details": { + "title": "Eigenschaften", "releaseDateNotSet": "Kein Veröffentlichungsdatum gesetzt!", "releaseDateSet": "Veröffentlichungsdatum: ", "attachmentVersion": "Dateiversion: " diff --git a/src/main/webapp/i18n/de/metrics.json b/src/main/webapp/i18n/de/metrics.json index 4c6034248943..c564bdb825aa 100644 --- a/src/main/webapp/i18n/de/metrics.json +++ b/src/main/webapp/i18n/de/metrics.json @@ -80,7 +80,15 @@ "cachename": "Cache Name", "hits": "Treffer", "misses": "Keine Treffer", - "evictions": "Anzahl entfernter Objekte" + "gets": "Cache Gets", + "puts": "Cache Hinzufügungen", + "removals": "Cache Entfernungen", + "evictions": "Anzahl entfernter Objekte", + "hitPercent": "Cache Hit %", + "missPercent": "Cache Miss %", + "averageGetTime": "Durchschnitt get Zeit (µs)", + "averagePutTime": "Durchschnitt put Zeit (µs)", + "averageRemoveTime": "Durchschnitt remove Zeit (µs)" }, "datasource": { "usage": "Usage", diff --git a/src/main/webapp/i18n/de/notification.json b/src/main/webapp/i18n/de/notification.json index 911d57b4a79a..5c8f606c432c 100644 --- a/src/main/webapp/i18n/de/notification.json +++ b/src/main/webapp/i18n/de/notification.json @@ -14,6 +14,7 @@ "showAllSavedNotifications": "Zeige alle gespeicherten Benachrichtigungen", "hideAllCurrentlyDisplayedNotifications": "Verstecke alle aktuell dargestellten Benachrichtigungen", "target": { + "newAnswer": "Antwort ansehen", "newAnswerPost": "Antwort ansehen", "newPost": "Beitrag ansehen", "newQuestion": "Frage ansehen", diff --git a/src/main/webapp/i18n/de/programmingExercise.json b/src/main/webapp/i18n/de/programmingExercise.json index 04701fc1eb0e..52ee51d9f2bf 100644 --- a/src/main/webapp/i18n/de/programmingExercise.json +++ b/src/main/webapp/i18n/de/programmingExercise.json @@ -56,6 +56,7 @@ "steps": { "generalInfoStepTitle": "Informationen", "difficultyStepTitle": "Modus", + "buildPlansTitle": "Build Pläne", "languageStepTitle": "Sprache", "gradingStepTitle": "Benotung", "problemStepTitle": "Problem", @@ -65,6 +66,7 @@ "generalInfoStepTitle": "Allgemein", "generalInfoStepMessage": "Eingabe von Informationen, die die Grundlage für die Programmieraufgabe bilden", "difficultyStepTitle": "Modus", + "buildPlansTitle": "Build Pläne", "difficultyStepMessage": "Konfiguration der Einstellungen bezüglich der Bearbeitung und Kollaboration der Aufgabe", "languageStepTitle": "Sprache", "languageStepMessage": "Wähle die gewünschte Programmiersprache aus und konfiguriere zusätzliche Funktionen bezüglich der Build Umgebung", @@ -504,10 +506,12 @@ "repositoryName": "Name des Repositorys", "checkoutDirectory": "Checkout-Verzeichnis", "description": "Beschreibung", + "invalidRepositoryName": "Es existiert bereits ein Repository mit diesem Namen in der Aufgabe.", "duplicateRepositoryNames": "Verschiedene Hilfs-Repositories dürfen nicht den gleichen Namen haben.", "duplicateDirectoryNames": "Verschiedene Hilfs-Repositories dürfen nicht das gleiche Checkout-Verzeichnis haben.", "warning": "Hilfs-Repositories können hinzugefügt, editiert und gelöscht werden. Editierungen wirken sich allerdings nicht auf das VCS und CIS aus und müssen dort manuell durchgeführt werden.", "editedWarning": "Du hast die Hilfs-Repositories verändert. Diese Änderungen wirken sich allerdings nicht auf das VCS und CIS aus und müssen dort manuell durchgeführt werden.", + "editedWarningLocalCI": "Du hast die Hilfs-Repositories verändert. Diese Änderungen wirken sich allerdings nicht auf das VCS und CIS aus und müssen dort manuell durchgeführt werden.", "repositoryNameRequired": { "pattern": "Der Name eines Hilfs-Repositories darf nicht 'exercise', 'solution', 'tests', oder 'auxiliary' sein. Außerdem darf der Name nur Wörter und die Sonderzeichen '-' und '_' enthalten." }, diff --git a/src/main/webapp/i18n/de/student-dashboard.json b/src/main/webapp/i18n/de/student-dashboard.json index c464ddf4b98d..6a2383efc2a2 100644 --- a/src/main/webapp/i18n/de/student-dashboard.json +++ b/src/main/webapp/i18n/de/student-dashboard.json @@ -135,6 +135,7 @@ "notReleased": "Nicht freigegeben", "live": "Live", "shortDueDate": "Bis", + "userNotAssignedToTeam": "Du wurdest noch keinem Team zugeteilt.", "userNotStartedExercise": "Du hast mit der Aufgabe noch nicht angefangen.", "exerciseSubmitted": "Bereits abgegeben, Änderungen sind noch möglich.", "exerciseSubmittedWaitingForGrading": "Bereits abgegeben, noch keine Bewertung.", @@ -147,6 +148,7 @@ "userParticipating": "Du nimmst gerade an diesem Quiz teil.", "userSubmitted": "Du hast bereits abgegeben.", "userNotStartedExerciseShort": "Nicht angefangen", + "userNotAssignedToTeamShort": "Noch kein Team", "exerciseNotSubmittedShort": "Nicht abgegeben", "exerciseMissedDueDateShort": "Frist abgelaufen", "quizNotStartedShort": "Nicht begonnen", From 7c4450ca1297de5c073d6927bd8e57c5f7c21b54 Mon Sep 17 00:00:00 2001 From: Yannik Schmidt Date: Mon, 14 Oct 2024 12:17:11 +0200 Subject: [PATCH 5/6] Apply suggestions from code review Co-authored-by: Benedikt Fein Co-authored-by: Tim Cremer <65229601+cremertim@users.noreply.github.com> --- src/main/webapp/i18n/de/global.json | 2 +- src/main/webapp/i18n/de/programmingExercise.json | 6 +++--- src/main/webapp/i18n/de/student-dashboard.json | 2 +- src/main/webapp/i18n/en/complaint.json | 2 +- src/main/webapp/i18n/en/programmingExercise.json | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/webapp/i18n/de/global.json b/src/main/webapp/i18n/de/global.json index 46665c90d975..3b8195fea41d 100644 --- a/src/main/webapp/i18n/de/global.json +++ b/src/main/webapp/i18n/de/global.json @@ -35,7 +35,7 @@ "quizExercise": "Quiz Aufgabe", "lecture": "Vorlesung", "competency": "Kompetenz", - "ltiOutcomeUrl": "Lti Outcome Url", + "ltiOutcomeUrl": "LTI-Outcome-URL", "submittedAnswer": "Eingereichte Antwort", "quizQuestion": "Frage", "multipleChoiceQuestion": "Multiple-Choice Frage", diff --git a/src/main/webapp/i18n/de/programmingExercise.json b/src/main/webapp/i18n/de/programmingExercise.json index 52ee51d9f2bf..dd4e9b51bc77 100644 --- a/src/main/webapp/i18n/de/programmingExercise.json +++ b/src/main/webapp/i18n/de/programmingExercise.json @@ -56,7 +56,7 @@ "steps": { "generalInfoStepTitle": "Informationen", "difficultyStepTitle": "Modus", - "buildPlansTitle": "Build Pläne", + "buildPlansTitle": "Build-Pläne", "languageStepTitle": "Sprache", "gradingStepTitle": "Benotung", "problemStepTitle": "Problem", @@ -66,7 +66,7 @@ "generalInfoStepTitle": "Allgemein", "generalInfoStepMessage": "Eingabe von Informationen, die die Grundlage für die Programmieraufgabe bilden", "difficultyStepTitle": "Modus", - "buildPlansTitle": "Build Pläne", + "buildPlansTitle": "Build-Pläne", "difficultyStepMessage": "Konfiguration der Einstellungen bezüglich der Bearbeitung und Kollaboration der Aufgabe", "languageStepTitle": "Sprache", "languageStepMessage": "Wähle die gewünschte Programmiersprache aus und konfiguriere zusätzliche Funktionen bezüglich der Build Umgebung", @@ -127,7 +127,7 @@ "onlineEditor": "Online", "allowOfflineIde": { "title": "Offline-IDE erlauben", - "description": "Aktiviere diese Option, um es zu erlauben, die Übung herunterzuladen und lokal mit der bevorzugten IDE daran zu arbeiten.", + "description": "Aktiviere diese Option, um den Studierenden zu erlauben, die Übung herunterzuladen und lokal mit der bevorzugten IDE daran zu arbeiten.", "alert": "Es muss mindestens eine Option (Offline-IDE, Online-Editor oder Online-IDE) ausgewählt sein", "alertNoTheia": "Es muss mindestens eine Option (Offline-IDE oder Online-Editor) ausgewählt sein" }, diff --git a/src/main/webapp/i18n/de/student-dashboard.json b/src/main/webapp/i18n/de/student-dashboard.json index 6a2383efc2a2..d6d1e5f59700 100644 --- a/src/main/webapp/i18n/de/student-dashboard.json +++ b/src/main/webapp/i18n/de/student-dashboard.json @@ -102,7 +102,7 @@ "achievablePoints": "Erreichbare Punktzahl", "applyFilter": "Filter anwenden", "resetFilter": "Filter zurücksetzen", - "clearFilter": "Filter leeren", + "clearFilter": "Filter entfernen", "noFilterAvailable": "Für die bisherigen Aufgaben gibt es keine unterscheidenden Filteroptionen", "noMoreOptions": "Keine weiteren Auswahlmöglichkeiten" }, diff --git a/src/main/webapp/i18n/en/complaint.json b/src/main/webapp/i18n/en/complaint.json index 7aa18f6040f1..83d4d2cb4324 100644 --- a/src/main/webapp/i18n/en/complaint.json +++ b/src/main/webapp/i18n/en/complaint.json @@ -69,7 +69,7 @@ "info": "Submitting a feedback request does not affect your number of allowed complaints, but your score will remain unchanged.", "review": "Review More Feedback Request", "alreadyHandled": "The request has been resolved", - "alreadySubmitted": "You have already requested more feedback", + "alreadySubmitted": "You already requested more feedback", "alreadySubmittedSubmissionAuthor": "You have already requested more feedback", "alreadySubmittedNotSubmissionAuthor": "The student has already requested more feedback", "acceptedLong": "Request was answered", diff --git a/src/main/webapp/i18n/en/programmingExercise.json b/src/main/webapp/i18n/en/programmingExercise.json index 98ed34d9108a..cbda0b3cf7fd 100644 --- a/src/main/webapp/i18n/en/programmingExercise.json +++ b/src/main/webapp/i18n/en/programmingExercise.json @@ -451,8 +451,8 @@ "allowFeedbackRequestsTooltip": "Students can request feedback before the due date. The requests will be processed by Athena, or, if Athena cannot be reached, students can send manual feedback requests.", "manualFeedbackRequests": "Manual feedback requests", "manualFeedbackRequestsTooltip": "Students can request manual feedback before the due date to receive feedback.", - "feedbackRequestsEnabled": "Feedback requests are enabled", - "feedbackRequestsDisabled": "Feedback requests are disabled", + "feedbackRequestsEnabled": "Feedback requests are enabled.", + "feedbackRequestsDisabled": "Feedback requests are disabled.", "complaintOnAutomaticAssessment": "Complaint on Automatic Assessment", "complaintOnAutomaticAssessmentTooltip": "Students can complain after receiving an automatic assessment. Which will be evaluated by a tutor afterwards.", "exampleSolutionPublicationDateTooltip": "The date when the Solution Repository becomes available to download for students. Leave blank to disable.", From fce38c1990db5e83ccd286225a7da4c76283a01e Mon Sep 17 00:00:00 2001 From: iyannsch Date: Mon, 14 Oct 2024 12:21:54 +0200 Subject: [PATCH 6/6] Fix faulty iris exercise key --- src/main/webapp/i18n/de/iris.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/i18n/de/iris.json b/src/main/webapp/i18n/de/iris.json index 34572e7581bd..84ceb84b3f9f 100644 --- a/src/main/webapp/i18n/de/iris.json +++ b/src/main/webapp/i18n/de/iris.json @@ -62,7 +62,7 @@ "breadcrumb": "Iris Einstellungen", "global": "Globale Iris Einstellungen", "course": "Kurs Iris Einstellungen", - "programmingExercise": "Programmieraufgabe Iris Einstellungen" + "exercise": "Programmieraufgabe Iris Einstellungen" }, "autoUpdate": { "title": "Auto Update Einstellungen",