From c3a75d3a754e91e88b597cb2ad3a88247fd87265 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Wed, 9 Jun 2021 13:02:42 +0200 Subject: [PATCH] refactor(messages): move to categories --- .../authorship_statement/de-de-formal.msg | 25 ------------------- .../categories/authorship_statement/en-eu.msg | 25 ------------------- .../courses/exam/exam/de-de-formal.msg | 8 +++++- .../categories/courses/exam/exam/en-eu.msg | 8 +++++- .../categories/courses/sheet/de-de-formal.msg | 12 +++++++++ .../categories/courses/sheet/en-eu.msg | 12 +++++++++ .../categories/school/de-de-formal.msg | 15 ++++++++++- messages/uniworx/categories/school/en-eu.msg | 15 ++++++++++- src/Foundation/I18n.hs | 7 +++--- 9 files changed, 69 insertions(+), 58 deletions(-) delete mode 100644 messages/uniworx/categories/authorship_statement/de-de-formal.msg delete mode 100644 messages/uniworx/categories/authorship_statement/en-eu.msg diff --git a/messages/uniworx/categories/authorship_statement/de-de-formal.msg b/messages/uniworx/categories/authorship_statement/de-de-formal.msg deleted file mode 100644 index cf57b5fe1..000000000 --- a/messages/uniworx/categories/authorship_statement/de-de-formal.msg +++ /dev/null @@ -1,25 +0,0 @@ -Statement: Eigenständigkeitserklärung -Section: Eigenständigkeitserklärungen - -SchoolModeNone: Keine Eigenständigkeitserklärung erlauben -SchoolModeOptional: Eigenständigkeitserklärung optional einforderbar -SchoolModeRequired: Eigenständigkeitserklärung immer erforderlich -SchoolSheetMode: Modus für nicht-prüfungsrelevante Übungsblattabgaben -SchoolSheetDefinition: Eigenständigkeitserklärung für nicht-prüfungsrelevante Übungsblattabgaben -SchoolSheetDefinitionTip: Deutsch und Englisch -SchoolSheetAllowOther: Abweichende Erklärungen für nicht-prüfungsrelevante Übungsblätter erlauben? -SchoolSheetExamMode: Modus für prüfungsrelevante Übungsblattabgaben -SchoolSheetExamDefinition: Eigenständigkeitserklärung für prüfungsrelevante Übungsblattabgaben -SchoolSheetExamDefinitionTip: Deutsch und Englisch -SchoolSheetExamAllowOther: Abweichende Erklärungen für prüfungsrelevante Übungsblätter erlauben? - -SheetRequired: Falls nicht-prüfungsrelevant: Eigenständigkeitserklärung einfordern? -SheetRequiredTip: Soll jeder Abgebende (bei Abgabegruppen jedes Gruppenmitglied) aufgefordert werden, eine Eigenständigkeitserklärung zu akzeptieren? -SheetRequiredDisabled: Eigenständigkeitserklärungen für nicht-prüfungsrelevante Übungsblattabgaben sind institutsweit deaktiviert. -SheetRequiredForced: Es ist institutsweit vorgeschrieben, dass bei Übungsblattabgaben jeder Abgebende (bei Abgabegruppen jedes Gruppenmitglied) aufgefordert werden muss, eine Eigenständigkeitserklärung zu akzeptieren. -SheetIsRequiredTrue: Erforderlich -SheetIsRequiredFalse: Keine -SheetUseSchoolDefault: Vorgabe des Instituts verwenden? -SheetUseSchoolDefaultTip: Soll die aktuelle Vorgabe des Instituts (siehe unten) verwendet werden? (Hinweis: Um über alle Abgaben eines Blattes hinweg konsistente Eigenständigkeitserklärungen zu gewährleisten, werden Änderungen an der Vorgabe des Instituts nur für neue Blätter angewandt.) -SheetCustom: Benutzerdefinierte Erklärung -SheetSchoolDefault: Vorgabe des Instituts diff --git a/messages/uniworx/categories/authorship_statement/en-eu.msg b/messages/uniworx/categories/authorship_statement/en-eu.msg deleted file mode 100644 index f2e624a0d..000000000 --- a/messages/uniworx/categories/authorship_statement/en-eu.msg +++ /dev/null @@ -1,25 +0,0 @@ -Statement: Statement of Authorship -Section: Statements of Authorship - -SchoolModeNone: No Statement of Authorship allowed -SchoolModeOptional: Statement of Authorship optionally activatable -SchoolModeRequired: Statement of Authorship always required -SchoolSheetMode: Mode for exam-unrelated exercise sheets -SchoolSheetDefinition: Statement of Authorship for exam-unrelated exercise sheets -SchoolSheetDefinitionTip: German and English -SchoolSheetAllowOther: Allow adaptations for exam-unrelated exercise sheets? -SchoolSheetExamMode: Mode for exam-related exercise sheets -SchoolSheetExamDefinition: Statement of Authorship for exam-related exercise sheets -SchoolSheetExamDefinitionTip: German and English -SchoolSheetExamAllowOther: Allow adaptations for exam-related exercise sheets? - -SheetRequired: For exam-unrelated sheets: Require Statement of Authorship for submissions? -SheetRequiredTip: Should each submittor (in case of submission groups each group member) be required to accept a Statement of Authorship? -SheetRequiredDisabled: The school settings prohibit Statements of Authorship for exam-unrelated exercise sheet submissions. -SheetRequiredForced: The school settings enforce that each submittor (in case of submission groups each group member) is required to accept a Statement of Authorship. -SheetIsRequiredTrue: Required -SheetIsRequiredFalse: None -SheetUseSchoolDefault: Use school preset? -SheetUseSchoolDefaultTip: Should the school-wide preset be used? (Hint: To ensure consistent statements across all submissions for a sheet, changes of the school-wide preset will only apply to new exercise sheets.) -SheetCustom: Custom statement -SheetSchoolDefault: School preset diff --git a/messages/uniworx/categories/courses/exam/exam/de-de-formal.msg b/messages/uniworx/categories/courses/exam/exam/de-de-formal.msg index 32713c799..9e8168802 100644 --- a/messages/uniworx/categories/courses/exam/exam/de-de-formal.msg +++ b/messages/uniworx/categories/courses/exam/exam/de-de-formal.msg @@ -311,4 +311,10 @@ TitleExamAutoOccurrence tid@TermId ssh@SchoolId csh@CourseShorthand examn@ExamNa ExamGradingPass: Bestanden/Nicht Bestanden ExamGradingGrades: Numerische Noten ExamGradingMixed: Gemischt -ExamFinished: Ergebnisse sichtbar ab \ No newline at end of file +ExamFinished: Ergebnisse sichtbar ab + +ExamAuthorshipStatementSection: Eigenständigkeitserklärung +ExamAuthorshipStatementRequired: Eigenständigkeitserklärung für zugehörige Übungsblattabgaben einfordern? +ExamAuthorshipStatementRequiredTip: Sollen für alle zu dieser Prüfung zugehörige Übungsblätter die Abgebenden (bei Abgabegruppen jedes Gruppenmitglied) aufgefordert werden, eine Eigenständigkeitserklärung zu akzeptieren? +ExamAuthorshipStatementUseSchoolDefinition: Eigenständigkeitserklärung des Instituts verwenden +ExamAuthorshipStatementCustom: Benutzerdefinierte Eigenständigkeitserklärung \ No newline at end of file diff --git a/messages/uniworx/categories/courses/exam/exam/en-eu.msg b/messages/uniworx/categories/courses/exam/exam/en-eu.msg index 20325610a..4a33f8383 100644 --- a/messages/uniworx/categories/courses/exam/exam/en-eu.msg +++ b/messages/uniworx/categories/courses/exam/exam/en-eu.msg @@ -309,4 +309,10 @@ TitleExamAutoOccurrence tid ssh csh examn: #{tid} - #{ssh} - #{csh} #{examn}: Au ExamGradingPass: Passed/Failed ExamGradingGrades: Numeric grades ExamGradingMixed: Mixed -ExamFinished: Results visible from \ No newline at end of file +ExamFinished: Results visible from + +ExamAuthorshipStatementSection: Statement of Authorship +ExamAuthorshipStatementRequired: Require Statement of Authorship for exam-related exercise sheet submissions? +ExamAuthorshipStatementRequiredTip: Should submittors (in case of submission groups each group member) be required to accept a Statement of Authorship for all exercise sheets related to this exam? +ExamAuthorshipStatementUseSchoolDefinition: Use school-wide Statement of Authorship +ExamAuthorshipStatementCustom: Custom Statement of Authorship \ No newline at end of file diff --git a/messages/uniworx/categories/courses/sheet/de-de-formal.msg b/messages/uniworx/categories/courses/sheet/de-de-formal.msg index e35dbc9e9..f830472ee 100644 --- a/messages/uniworx/categories/courses/sheet/de-de-formal.msg +++ b/messages/uniworx/categories/courses/sheet/de-de-formal.msg @@ -151,3 +151,15 @@ SheetGradingPoints maxPoints@Points: #{maxPoints} #{pluralDE maxPoints "Punkt" " SheetGradingPassPoints maxPoints@Points passingPoints@Points: Bestanden ab #{passingPoints} von #{maxPoints} #{pluralDE maxPoints "Punkt" "Punkten"} SheetGradingPassBinary: Bestanden/Nicht Bestanden SheetGradingPassAlways: Automatisch bestanden, sobald korrigiert + +SheetAuthorshipStatementSection: Eigenständigkeitserklärung +SheetAuthorshipStatementRequired: Falls nicht-prüfungsrelevant: Eigenständigkeitserklärung einfordern? +SheetAuthorshipStatementRequiredTip: Soll jeder Abgebende (bei Abgabegruppen jedes Gruppenmitglied) aufgefordert werden, eine Eigenständigkeitserklärung zu akzeptieren? +SheetAuthorshipStatementRequiredDisabled: Eigenständigkeitserklärungen für nicht-prüfungsrelevante Übungsblattabgaben sind institutsweit deaktiviert. +SheetAuthorshipStatementRequiredForced: Es ist institutsweit vorgeschrieben, dass bei Übungsblattabgaben jeder Abgebende (bei Abgabegruppen jedes Gruppenmitglied) aufgefordert werden muss, eine Eigenständigkeitserklärung zu akzeptieren. +SheetAuthorshipStatementIsRequiredTrue: Erforderlich +SheetAuthorshipStatementIsRequiredFalse: Keine +SheetAuthorshipStatementUseSchoolDefault: Vorgabe des Instituts verwenden? +SheetAuthorshipStatementUseSchoolDefaultTip: Soll die aktuelle Vorgabe des Instituts (siehe unten) verwendet werden? (Hinweis: Um über alle Abgaben eines Blattes hinweg konsistente Eigenständigkeitserklärungen zu gewährleisten, werden Änderungen an der Vorgabe des Instituts nur für neue Blätter angewandt.) +SheetAuthorshipStatementCustom: Benutzerdefinierte Erklärung +SheetAuthorshipStatementSchoolDefault: Vorgabe des Instituts diff --git a/messages/uniworx/categories/courses/sheet/en-eu.msg b/messages/uniworx/categories/courses/sheet/en-eu.msg index 793b9c397..0ce9116f1 100644 --- a/messages/uniworx/categories/courses/sheet/en-eu.msg +++ b/messages/uniworx/categories/courses/sheet/en-eu.msg @@ -150,3 +150,15 @@ SheetGradingPoints maxPoints: #{maxPoints} #{pluralEN maxPoints "point" "points" SheetGradingPassPoints maxPoints passingPoints: Pass with #{passingPoints} of #{maxPoints} #{pluralEN maxPoints "point" "points"} SheetGradingPassBinary: Pass/Fail SheetGradingPassAlways: Automatically passed when corrected + +SheetAuthorshipStatementSection: Statement of Authorship +SheetAuthorshipStatementRequired: For exam-unrelated sheets: Require Statement of Authorship for submissions? +SheetAuthorshipStatementRequiredTip: Should each submittor (in case of submission groups each group member) be required to accept a Statement of Authorship? +SheetAuthorshipStatementRequiredDisabled: The school settings prohibit Statements of Authorship for exam-unrelated exercise sheet submissions. +SheetAuthorshipStatementRequiredForced: The school settings enforce that each submittor (in case of submission groups each group member) is required to accept a Statement of Authorship. +SheetAuthorshipStatementIsRequiredTrue: Required +SheetAuthorshipStatementIsRequiredFalse: None +SheetAuthorshipStatementUseSchoolDefault: Use school preset? +SheetAuthorshipStatementUseSchoolDefaultTip: Should the school-wide preset be used? (Hint: To ensure consistent statements across all submissions for a sheet, changes of the school-wide preset will only apply to new exercise sheets.) +SheetAuthorshipStatementCustom: Custom statement +SheetAuthorshipStatementSchoolDefault: School preset diff --git a/messages/uniworx/categories/school/de-de-formal.msg b/messages/uniworx/categories/school/de-de-formal.msg index b2afee856..8a0c21c8e 100644 --- a/messages/uniworx/categories/school/de-de-formal.msg +++ b/messages/uniworx/categories/school/de-de-formal.msg @@ -24,4 +24,17 @@ SchoolLecturer: Dozent:in SchoolEvaluation: Kursumfragenverwaltung SchoolExamOffice: Prüfungsverwaltung SchoolAllocation: Zentralanmeldungs-Administration -SchoolAdmin !ident-ok: Admin \ No newline at end of file +SchoolAdmin !ident-ok: Admin + +SchoolAuthorshipStatementSection: Eigenständigkeitserklärung +SchoolAuthorshipStatementModeNone: Keine Eigenständigkeitserklärung erlauben +SchoolAuthorshipStatementModeOptional: Eigenständigkeitserklärung optional einforderbar +SchoolAuthorshipStatementModeRequired: Eigenständigkeitserklärung immer erforderlich +SchoolAuthorshipStatementSheetMode: Modus für nicht-prüfungsrelevante Übungsblattabgaben +SchoolAuthorshipStatementSheetDefinition: Eigenständigkeitserklärung für nicht-prüfungsrelevante Übungsblattabgaben +SchoolAuthorshipStatementSheetDefinitionTip: Deutsch und Englisch +SchoolAuthorshipStatementSheetAllowOther: Abweichende Erklärungen für nicht-prüfungsrelevante Übungsblätter erlauben? +SchoolAuthorshipStatementSheetExamMode: Modus für prüfungsrelevante Übungsblattabgaben +SchoolAuthorshipStatementSheetExamDefinition: Eigenständigkeitserklärung für prüfungsrelevante Übungsblattabgaben +SchoolAuthorshipStatementSheetExamDefinitionTip: Deutsch und Englisch +SchoolAuthorshipStatementSheetExamAllowOther: Abweichende Erklärungen für prüfungsrelevante Übungsblätter erlauben? \ No newline at end of file diff --git a/messages/uniworx/categories/school/en-eu.msg b/messages/uniworx/categories/school/en-eu.msg index 4bb741369..008b44ed2 100644 --- a/messages/uniworx/categories/school/en-eu.msg +++ b/messages/uniworx/categories/school/en-eu.msg @@ -24,4 +24,17 @@ SchoolAdmin: Admin SchoolLecturer: Lecturer SchoolEvaluation: Course evaluation SchoolExamOffice: Exam office -SchoolAllocation: Administration of central allocations \ No newline at end of file +SchoolAllocation: Administration of central allocations + +SchoolAuthorshipStatementSection: Statement of Authorship +SchoolAuthorshipStatementModeNone: No Statement of Authorship allowed +SchoolAuthorshipStatementModeOptional: Statement of Authorship optionally activatable +SchoolAuthorshipStatementModeRequired: Statement of Authorship always required +SchoolAuthorshipStatementSheetMode: Mode for exam-unrelated exercise sheets +SchoolAuthorshipStatementSheetDefinition: Statement of Authorship for exam-unrelated exercise sheets +SchoolAuthorshipStatementSheetDefinitionTip: German and English +SchoolAuthorshipStatementSheetAllowOther: Allow adaptations for exam-unrelated exercise sheets? +SchoolAuthorshipStatementSheetExamMode: Mode for exam-related exercise sheets +SchoolAuthorshipStatementSheetExamDefinition: Statement of Authorship for exam-related exercise sheets +SchoolAuthorshipStatementSheetExamDefinitionTip: German and English +SchoolAuthorshipStatementSheetExamAllowOther: Allow adaptations for exam-related exercise sheets? \ No newline at end of file diff --git a/src/Foundation/I18n.hs b/src/Foundation/I18n.hs index c8e8a2900..17f4d418b 100644 --- a/src/Foundation/I18n.hs +++ b/src/Foundation/I18n.hs @@ -183,7 +183,6 @@ mkMessageAddition ''UniWorX "ModelTypes" "messages/uniworx/categories/model_type mkMessageAddition ''UniWorX "Send" "messages/uniworx/categories/send" "de-de-formal" mkMessageAddition ''UniWorX "YesodMiddleware" "messages/uniworx/categories/yesod_middleware" "de-de-formal" mkMessageAddition ''UniWorX "User" "messages/uniworx/categories/user" "de-de-formal" -mkMessageAddition ''UniWorX "AuthorshipStatement" "messages/uniworx/categories/authorship_statement" "de-de-formal" mkMessageAddition ''UniWorX "Button" "messages/uniworx/utils/buttons" "de-de-formal" mkMessageAddition ''UniWorX "Form" "messages/uniworx/utils/handler_form" "de-de-formal" mkMessageAddition ''UniWorX "TableColumn" "messages/uniworx/utils/table_column" "de-de-formal" @@ -407,9 +406,9 @@ instance RenderMessage UniWorX ExamCloseMode where instance RenderMessage UniWorX SchoolAuthorshipStatementMode where renderMessage foundation ls = \case - SchoolAuthorshipStatementModeNone -> mr MsgSchoolModeNone - SchoolAuthorshipStatementModeOptional -> mr MsgSchoolModeOptional - SchoolAuthorshipStatementModeRequired -> mr MsgSchoolModeRequired + SchoolAuthorshipStatementModeNone -> mr MsgSchoolAuthorshipStatementModeNone + SchoolAuthorshipStatementModeOptional -> mr MsgSchoolAuthorshipStatementModeOptional + SchoolAuthorshipStatementModeRequired -> mr MsgSchoolAuthorshipStatementModeRequired where mr :: RenderMessage UniWorX msg => msg -> Text mr = renderMessage foundation ls