diff --git a/src/main/webapp/app/course/competencies/generate-competencies/course-description-form.component.html b/src/main/webapp/app/course/competencies/generate-competencies/course-description-form.component.html
index f0297c939a1c..3b0151de263d 100644
--- a/src/main/webapp/app/course/competencies/generate-competencies/course-description-form.component.html
+++ b/src/main/webapp/app/course/competencies/generate-competencies/course-description-form.component.html
@@ -14,19 +14,13 @@
@if (courseDescriptionControl.invalid && (courseDescriptionControl.dirty || courseDescriptionControl.touched)) {
@if (courseDescriptionControl.errors?.required) {
-
- {{ 'artemisApp.competency.generate.courseDescription.requiredValidationError' | artemisTranslate }}
-
+
}
@if (courseDescriptionControl.errors?.minlength) {
-
- {{ 'artemisApp.competency.generate.courseDescription.minlengthValidationError' | artemisTranslate: { min: DESCRIPTION_MIN } }}
-
+
}
@if (courseDescriptionControl.errors?.maxlength) {
-
- {{ 'artemisApp.competency.generate.courseDescription.maxlengthValidationError' | artemisTranslate: { max: DESCRIPTION_MAX } }}
-
+
}
}
diff --git a/src/main/webapp/app/course/competencies/import/competency-search.component.html b/src/main/webapp/app/course/competencies/import/competency-search.component.html
index 345bc3c02558..2a58720983cf 100644
--- a/src/main/webapp/app/course/competencies/import/competency-search.component.html
+++ b/src/main/webapp/app/course/competencies/import/competency-search.component.html
@@ -1,32 +1,24 @@
-
+
-
+
-
+
diff --git a/src/main/webapp/app/course/course-scores/course-scores.component.html b/src/main/webapp/app/course/course-scores/course-scores.component.html
index 67f3e94610e7..21e3186ea908 100644
--- a/src/main/webapp/app/course/course-scores/course-scores.component.html
+++ b/src/main/webapp/app/course/course-scores/course-scores.component.html
@@ -149,13 +149,11 @@
@if (gradingScaleExists) {
-
- {{
- isBonus
- ? ('artemisApp.courseScoreCalculation.gradingSystemBonus' | artemisTranslate)
- : ('artemisApp.courseScoreCalculation.gradingSystemGrade' | artemisTranslate)
- }}
-
+
|
}
diff --git a/src/main/webapp/app/course/dashboards/assessment-dashboard/assessment-dashboard-information.component.html b/src/main/webapp/app/course/dashboards/assessment-dashboard/assessment-dashboard-information.component.html
index aa56233500bd..a91807bd95a9 100644
--- a/src/main/webapp/app/course/dashboards/assessment-dashboard/assessment-dashboard-information.component.html
+++ b/src/main/webapp/app/course/dashboards/assessment-dashboard/assessment-dashboard-information.component.html
@@ -32,16 +32,14 @@
@if (!isExamMode) {
-
- {{ 'artemisApp.assessmentDashboard.assessments' | artemisTranslate }}
-
+
{{ totalNumberOfAssessments.total }} / {{ numberOfSubmissions.total }} ({{ totalAssessmentPercentage }}%) | {{ numberOfTutorAssessments }}
@if (complaintsEnabled) {
-
{{ 'artemisApp.assessmentDashboard.complaints' | artemisTranslate }}
+
@if (course?.isAtLeastInstructor) {
@@ -67,9 +65,7 @@
}
@if (feedbackRequestEnabled) {
-
- {{ 'artemisApp.assessmentDashboard.moreFeedbackRequests' | artemisTranslate }}
-
+
@if (course?.isAtLeastInstructor) {
@@ -96,9 +92,7 @@
}
-
- {{ 'artemisApp.assessmentDashboard.assessmentLocks' | artemisTranslate }}
-
+
-
{{ 'artemisApp.exerciseAssessmentDashboard.ratings' | artemisTranslate }}
+
@if (course?.isAtLeastInstructor) {
{{ ratings.total }}
@@ -124,18 +118,14 @@
@if (isExamMode) {
-
- {{ 'artemisApp.assessmentDashboard.assessments' | artemisTranslate }}
-
+
({{ totalNumberOfAssessments.total }} / {{ numberOfSubmissions.total * numberOfCorrectionRounds }}) ({{ totalAssessmentPercentage }}%) |
{{ numberOfTutorAssessments }}
-
- {{ 'artemisApp.assessmentDashboard.complaints' | artemisTranslate }}
-
+
@if (course?.isAtLeastInstructor) {
@@ -153,9 +143,7 @@
-
- {{ 'artemisApp.assessmentDashboard.assessmentLocks' | artemisTranslate }}
-
+
{{ assessmentLocks.total }}
|
@@ -165,9 +153,7 @@
-
- {{ 'artemisApp.assessmentDashboard.totalAssessmentsForCorrectionrounds' | artemisTranslate }}
-
+
{{ numberOfAssessmentsOfCorrectionRounds[0].inTime }}
@if (numberOfAssessmentsOfCorrectionRounds[1]) {
diff --git a/src/main/webapp/app/course/dashboards/assessment-dashboard/assessment-dashboard.component.html b/src/main/webapp/app/course/dashboards/assessment-dashboard/assessment-dashboard.component.html
index 6319c7dda35a..6d95da823bb4 100644
--- a/src/main/webapp/app/course/dashboards/assessment-dashboard/assessment-dashboard.component.html
+++ b/src/main/webapp/app/course/dashboards/assessment-dashboard/assessment-dashboard.component.html
@@ -96,9 +96,7 @@
[ngModel]="hideFinishedExercises"
(ngModelChange)="triggerFinishedExercises()"
/>
-
+
[ngModel]="hideOptional"
(ngModelChange)="triggerOptionalExercises()"
/>
-
+
}
@@ -120,33 +116,33 @@
- {{ 'artemisApp.assessmentDashboard.exerciseType' | artemisTranslate }}
+
|
- {{ 'artemisApp.assessmentDashboard.exercise' | artemisTranslate }}
+
|
@if (!isTestRun) {
- {{ 'artemisApp.assessmentDashboard.yourStatus' | artemisTranslate }} |
+ |
}
- {{ 'artemisApp.assessmentDashboard.exerciseAverageRating' | artemisTranslate }}
+
|
@if (!isExamMode) {
- {{ 'artemisApp.assessmentDashboard.exerciseDueDate' | artemisTranslate }}
+
|
}
@if (!isExamMode) {
- {{ 'artemisApp.assessmentDashboard.assessmentsDueDate' | artemisTranslate }}
+
|
}
- {{ 'artemisApp.assessmentDashboard.actions' | artemisTranslate }} |
+ |
@@ -241,7 +237,7 @@
@if (course && course.isAtLeastInstructor && tutorIssues.length > 0) {
-
{{ 'artemisApp.assessmentDashboard.tutorPerformanceIssues.title' | artemisTranslate }}
+
@for (issue of tutorIssues; track issue) {
}
@@ -13,9 +11,7 @@
-
- {{ 'artemisApp.learningPath.graph.legend.matchStart.title' | artemisTranslate }}
-
+
}
@@ -23,9 +19,7 @@
-
- {{ 'artemisApp.learningPath.graph.legend.matchEnd.title' | artemisTranslate }}
-
+
}
@@ -33,9 +27,7 @@
-
- {{ 'artemisApp.learningPath.graph.legend.learningObject.title' | artemisTranslate }}
-
+
}
@@ -43,9 +35,7 @@
-
- {{ 'artemisApp.learningPath.graph.legend.completedLearningObject.title' | artemisTranslate }}
-
+
}
diff --git a/src/main/webapp/app/course/learning-paths/learning-path-graph/learning-path.component.html b/src/main/webapp/app/course/learning-paths/learning-path-graph/learning-path.component.html
index 396b2735560b..864bcc2920b0 100644
--- a/src/main/webapp/app/course/learning-paths/learning-path-graph/learning-path.component.html
+++ b/src/main/webapp/app/course/learning-paths/learning-path-graph/learning-path.component.html
@@ -1,7 +1,7 @@
@if (isLoading) {
- {{ 'loading' | artemisTranslate }}
+
} @else {
diff --git a/src/main/webapp/app/course/learning-paths/learning-path-management/learning-path-management.component.html b/src/main/webapp/app/course/learning-paths/learning-path-management/learning-path-management.component.html
index 061c611f6b93..c8a10304da15 100644
--- a/src/main/webapp/app/course/learning-paths/learning-path-management/learning-path-management.component.html
+++ b/src/main/webapp/app/course/learning-paths/learning-path-management/learning-path-management.component.html
@@ -1,7 +1,7 @@
@if (isLoading) {
- {{ 'loading' | artemisTranslate }}
+
}
diff --git a/src/main/webapp/app/course/manage/course-lti-configuration/course-lti-configuration.component.html b/src/main/webapp/app/course/manage/course-lti-configuration/course-lti-configuration.component.html
index 8c267652beff..b7252be6dc5d 100644
--- a/src/main/webapp/app/course/manage/course-lti-configuration/course-lti-configuration.component.html
+++ b/src/main/webapp/app/course/manage/course-lti-configuration/course-lti-configuration.component.html
@@ -16,28 +16,28 @@
- {{ 'artemisApp.lti.userPrefix' | artemisTranslate }}
+
{{ onlineCourseConfiguration?.userPrefix }}
- {{ 'artemisApp.lti.requireExistingUser' | artemisTranslate }}
+
- {{ (onlineCourseConfiguration?.requireExistingUser ? 'global.generic.yes' : 'global.generic.no') | artemisTranslate }}
+
{{ 'LTI Version' }}
- {{ 'artemisApp.lti.version13' | artemisTranslate }}
+
- {{ 'artemisApp.lti13.externalToolSettings' | artemisTranslate }}
+
@if (missingLti13ConfigurationField()) {
}
@@ -45,42 +45,42 @@
{{ onlineCourseConfiguration?.ltiPlatformConfiguration?.customName }}
- {{ 'artemisApp.lti.registrationId' | artemisTranslate }}
+
{{ onlineCourseConfiguration?.ltiPlatformConfiguration?.registrationId }}
- {{ 'artemisApp.lti.clientId' | artemisTranslate }}
+
{{ onlineCourseConfiguration?.ltiPlatformConfiguration?.clientId }}
- {{ 'artemisApp.lti.authorizationUri' | artemisTranslate }}
+
{{ onlineCourseConfiguration?.ltiPlatformConfiguration?.authorizationUri }}
- {{ 'artemisApp.lti.tokenUri' | artemisTranslate }}
+
{{ onlineCourseConfiguration?.ltiPlatformConfiguration?.tokenUri }}
- {{ 'artemisApp.lti.jwkSetUri' | artemisTranslate }}
+
{{ onlineCourseConfiguration?.ltiPlatformConfiguration?.jwkSetUri }}
@@ -91,10 +91,10 @@
@if (!showAdvancedSettings) {
- {{ 'artemisApp.lti.viewAdvancedSettings' | artemisTranslate }}
+
}
@if (showAdvancedSettings) {
- {{ 'artemisApp.lti.closeAdvancedSettings' | artemisTranslate }}
+
}
@@ -102,26 +102,26 @@
New Window
- {{ 'artemisApp.lti.scored' | artemisTranslate }}
+
True
- {{ 'artemisApp.lti.requestUsername' | artemisTranslate }}
+
True
- {{ 'artemisApp.lti.requestEmail' | artemisTranslate }}
+
diff --git a/src/main/webapp/app/course/manage/course-lti-configuration/edit-course-lti-configuration.component.html b/src/main/webapp/app/course/manage/course-lti-configuration/edit-course-lti-configuration.component.html
index 85a65e3bf46f..4b6e4c70cea3 100644
--- a/src/main/webapp/app/course/manage/course-lti-configuration/edit-course-lti-configuration.component.html
+++ b/src/main/webapp/app/course/manage/course-lti-configuration/edit-course-lti-configuration.component.html
@@ -36,7 +36,7 @@
@@ -319,9 +319,11 @@
[ngModelOptions]="{ standalone: true }"
(change)="disableMessaging()"
/>
-
+
[ngModelOptions]="{ standalone: true }"
[disabled]="!communicationEnabled"
/>
-
+
[error]="!isValidEnrollmentPeriod"
/>
@if (!isValidEnrollmentPeriod) {
- {{ 'artemisApp.course.form.enrollmentStartDate.invalid' | artemisTranslate }}
+
}
@@ -458,7 +458,7 @@
[error]="!isValidEnrollmentPeriod"
/>
@if (!isValidEnrollmentPeriod) {
- {{ 'artemisApp.course.form.enrollmentEndDate.invalid' | artemisTranslate }}
+
}
@@ -500,7 +500,7 @@
[error]="!isValidUnenrollmentEndDate"
/>
@if (!isValidUnenrollmentEndDate) {
- {{ 'artemisApp.course.form.unenrollmentEndDate.invalid' | artemisTranslate }}
+
}
}
@@ -509,13 +509,11 @@
@if (tutorialGroupsFeatureActivated) {
BETA
-
+
@if (timeZoneChanged) {
-
- {{ 'artemisApp.forms.configurationForm.timeZoneInput.changeWarning' | artemisTranslate }}
-
+
}
-
{{ 'artemisApp.forms.configurationForm.timeZoneInput.beta' | artemisTranslate }}
+
(focus)="tzFocus$.next($any($event).target.value)"
(click)="tzClick$.next($any($event).target.value)"
/>
-
- {{ 'artemisApp.forms.configurationForm.timeZoneInput.explanation' | artemisTranslate }}
-
+
}
diff --git a/src/main/webapp/app/course/manage/detail/course-detail-line-chart.component.html b/src/main/webapp/app/course/manage/detail/course-detail-line-chart.component.html
index b499fda9b56b..9d379b38622e 100644
--- a/src/main/webapp/app/course/manage/detail/course-detail-line-chart.component.html
+++ b/src/main/webapp/app/course/manage/detail/course-detail-line-chart.component.html
@@ -1,7 +1,7 @@
@@ -16,25 +16,24 @@
{{ 'artemisApp.courseStatistics.activeStudents' | artemisTranslate }}
[disabled]="!showLifetimeOverview && displayedNumberOfWeeks === 4"
(click)="displayPeriodOverview(4)"
ngbTooltip="{{ 'artemisApp.courseStatistics.scopeButton.periodTooltip' | artemisTranslate: { amount: 4 } }}"
- >
- {{ 'artemisApp.courseStatistics.scopeButton.period' | artemisTranslate: { amount: 4 } }}
-
+ jhiTranslate="artemisApp.courseStatistics.scopeButton.period"
+ [translateValues]="{ amount: 4 }"
+ >
+ jhiTranslate="artemisApp.courseStatistics.scopeButton.period"
+ [translateValues]="{ amount: 8 }"
+ >
+ jhiTranslate="artemisApp.courseStatistics.scopeButton.overview"
+ >
|
}
@@ -85,7 +84,7 @@
} @else {
- {{ 'artemisApp.course.notStartedYet' | artemisTranslate }}
+
{{ course.startDate | artemisDate }}
}
diff --git a/src/main/webapp/app/course/manage/overview/course-management-card.component.html b/src/main/webapp/app/course/manage/overview/course-management-card.component.html
index 3619d90a93d8..adf01ba9af77 100644
--- a/src/main/webapp/app/course/manage/overview/course-management-card.component.html
+++ b/src/main/webapp/app/course/manage/overview/course-management-card.component.html
@@ -40,9 +40,7 @@
@@ -76,9 +72,7 @@ {{ course.title }} ({{
}
@if (courseWithUsers.numberOfEditors === undefined) {
-
- {{ 'artemisApp.course.editors' | artemisTranslate }}
-
+
}
@@ -116,7 +108,7 @@ {{ course.title }} ({{
- {{ 'artemisApp.course.releasedSoon' | artemisTranslate }}
+
@if (showFutureExercises) {
@@ -139,7 +131,7 @@
{{ course.title }} ({{
- {{ 'artemisApp.course.currentWorking' | artemisTranslate }}
+
@if (showCurrentExercises) {
@@ -162,7 +154,7 @@
{{ course.title }} ({{
- {{ 'artemisApp.course.inAssessment' | artemisTranslate }}
+
@if (showExercisesInAssessment) {
@@ -185,7 +177,7 @@
{{ course.title }} ({{
- {{ 'artemisApp.course.pastExercises' | artemisTranslate: { amount: pastExercises.length, total: pastExerciseCount } }}
+
@if (showPastExercises) {
@@ -206,7 +198,7 @@
{{ course.title }} ({{
}
@if ((futureExercises?.length || 0) + (currentExercises?.length || 0) + (exercisesInAssessment?.length || 0) + (pastExercises?.length || 0) === 0) {
-
{{ 'artemisApp.course.noExercises' | artemisTranslate }}
+
}
@@ -240,7 +232,7 @@
{{ 'artemisApp.course.noExer
id="course-card-open-exams"
>
- {{ 'entity.action.exams' | artemisTranslate }}
+
}
@if (course.isAtLeastTutor) {
@@ -252,7 +244,7 @@ {{ 'artemisApp.course.noExer
id="course-card-open-exercises"
>
- {{ 'entity.action.exercise' | artemisTranslate }}
+
}
@if (course.isAtLeastEditor) {
@@ -263,7 +255,7 @@ {{ 'artemisApp.course.noExer
id="course-card-open-lectures"
>
- {{ 'entity.action.lecture' | artemisTranslate }}
+
}
@if (course.isAtLeastTutor) {
@@ -274,7 +266,7 @@ {{ 'artemisApp.course.noExer
id="course-card-open-open-statistics"
>
- {{ 'artemisApp.courseStatistics.statistics' | artemisTranslate }}
+
}
@if (isCommunicationEnabled(course) && course.isAtLeastTutor) {
@@ -284,7 +276,7 @@ {{ 'artemisApp.course.noExer
[ngbTooltip]="'artemisApp.courseOverview.menu.communication' | artemisTranslate"
>
- {{ 'artemisApp.metis.communication.label' | artemisTranslate }}
+
}
@if (course.timeZone || course.isAtLeastInstructor) {
@@ -332,7 +324,7 @@ {{ 'artemisApp.course.noExer
id="course-card-open-assessment-dashboard"
>
- {{ 'entity.action.assessmentDashboard' | artemisTranslate }}
+
}
@if (course.isAtLeastInstructor) {
@@ -343,7 +335,7 @@ {{ 'artemisApp.course.noExer
id="course-card-open-scores"
>
- {{ 'entity.action.scores' | artemisTranslate }}
+
}
diff --git a/src/main/webapp/app/course/manage/overview/course-management-exercise-row.component.html b/src/main/webapp/app/course/manage/overview/course-management-exercise-row.component.html
index f4940c20c0c4..e5f8cdd9dee2 100644
--- a/src/main/webapp/app/course/manage/overview/course-management-exercise-row.component.html
+++ b/src/main/webapp/app/course/manage/overview/course-management-exercise-row.component.html
@@ -25,7 +25,7 @@
-
{{ 'artemisApp.course.releaseDate' | artemisTranslate }}
+
@if (!details.releaseDate) {
@@ -51,7 +51,7 @@
-
{{ 'artemisApp.course.dueDate' | artemisTranslate }}
+
@if (!details.dueDate) {
@@ -77,7 +77,7 @@
-
{{ 'artemisApp.course.assessmentDueDate' | artemisTranslate }}
+
@if (!details.assessmentDueDate) {
@@ -105,7 +105,7 @@
@if (statistic && rowType === exerciseRowType.CURRENT) {
-
{{ 'artemisApp.course.participations' | artemisTranslate }}
+
- {{ 'artemisApp.course.assessmentProgress' | artemisTranslate }}
+
- {{ 'artemisApp.course.averageScore' | artemisTranslate }}
+
diff --git a/src/main/webapp/app/course/plagiarism-cases/instructor-view/detail-view/plagiarism-case-instructor-detail-view.component.html b/src/main/webapp/app/course/plagiarism-cases/instructor-view/detail-view/plagiarism-case-instructor-detail-view.component.html
index d6a8cb3f33ac..a66f7b342595 100644
--- a/src/main/webapp/app/course/plagiarism-cases/instructor-view/detail-view/plagiarism-case-instructor-detail-view.component.html
+++ b/src/main/webapp/app/course/plagiarism-cases/instructor-view/detail-view/plagiarism-case-instructor-detail-view.component.html
@@ -3,7 +3,7 @@