From aec4b21757c4d38622db30d96faa95b4fcaa72c3 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Tue, 29 Oct 2019 15:56:38 +0100 Subject: [PATCH] feat(i18n): missing message translations; small fixes --- messages/button/en.msg | 3 +++ messages/campus/en.msg | 6 ++++++ messages/dummy/en.msg | 3 +++ messages/frontend/en.msg | 4 ++++ messages/pw-hash/en.msg | 4 ++++ messages/uniworx/de-de-formal.msg | 4 ++++ messages/uniworx/en-eu.msg | 10 +++++++--- src/Handler/Profile.hs | 6 +++--- templates/i18n/html-input/en-eu.hamlet | 2 +- 9 files changed, 35 insertions(+), 7 deletions(-) create mode 100644 messages/button/en.msg create mode 100644 messages/campus/en.msg create mode 100644 messages/dummy/en.msg create mode 100644 messages/frontend/en.msg create mode 100644 messages/pw-hash/en.msg diff --git a/messages/button/en.msg b/messages/button/en.msg new file mode 100644 index 000000000..b468d80ff --- /dev/null +++ b/messages/button/en.msg @@ -0,0 +1,3 @@ +AmbiguousButtons: Multiple active submit buttons +WrongButtonValue: Submit button has wrong value +MultipleButtonValues: Submit button has multiple values diff --git a/messages/campus/en.msg b/messages/campus/en.msg new file mode 100644 index 000000000..6264db29e --- /dev/null +++ b/messages/campus/en.msg @@ -0,0 +1,6 @@ +CampusIdentPlaceholder: First.Last@campus.lmu.de +CampusIdent: Campus account +CampusPassword: Password +CampusPasswordPlaceholder: Password +CampusSubmit: Send +CampusInvalidCredentials: Invalid login diff --git a/messages/dummy/en.msg b/messages/dummy/en.msg new file mode 100644 index 000000000..da7b50f0f --- /dev/null +++ b/messages/dummy/en.msg @@ -0,0 +1,3 @@ +DummyIdent: Identification +DummyIdentPlaceholder: Identification +DummyNoFormData: No form data received diff --git a/messages/frontend/en.msg b/messages/frontend/en.msg new file mode 100644 index 000000000..743eb91be --- /dev/null +++ b/messages/frontend/en.msg @@ -0,0 +1,4 @@ +FilesSelected: Files selected +SelectFile: Select file +SelectFiles: Select file(s) +AsyncFormFailure: Something went wrong, we are sorry. If this error occurs again, please let us know by clicking the Support button in the upper right corner. Thank you very much! diff --git a/messages/pw-hash/en.msg b/messages/pw-hash/en.msg new file mode 100644 index 000000000..52fb04bdf --- /dev/null +++ b/messages/pw-hash/en.msg @@ -0,0 +1,4 @@ +PWHashIdent: Identification +PWHashIdentPlaceholder: Identification +PWHashPassword: Password +PWHashPasswordPlaceholder: Password diff --git a/messages/uniworx/de-de-formal.msg b/messages/uniworx/de-de-formal.msg index e665c10f7..bf651eca0 100644 --- a/messages/uniworx/de-de-formal.msg +++ b/messages/uniworx/de-de-formal.msg @@ -664,6 +664,10 @@ FormCosmetics: Oberfläche FormPersonalAppearance: Öffentliche Daten FormFieldRequiredTip: Gekennzeichnete Pflichtfelder sind immer auszufüllen +PersonalInfoExamAchievementsWip: Die Anzeige von Prüfungsergebnissen wird momentan an dieser Stelle leider noch nicht unterstützt. +PersonalInfoOwnTutorialsWip: Die Anzeige von Tutorien, zu denen Sie als Tutor eingetragen sind wird momentan an dieser Stelle leider noch nicht unterstützt. +PersonalInfoTutorialsWip: Die Anzeige von Tutorien, zu denen Sie angemeldet sind wird momentan an dieser Stelle leider noch nicht unterstützt. + ActiveAuthTags: Aktivierte Authorisierungsprädikate InvalidDateTimeFormat: Ungültiges Datums- und Zeitformat, JJJJ-MM-TTTHH:MM[:SS] Format erwartet diff --git a/messages/uniworx/en-eu.msg b/messages/uniworx/en-eu.msg index bfa5628c2..f3a46e755 100644 --- a/messages/uniworx/en-eu.msg +++ b/messages/uniworx/en-eu.msg @@ -175,7 +175,7 @@ CourseApplicationTemplateTip: Students can download this template if they decide CourseApplicationsText: Text application CourseApplicationsTextTip: Should students submit a plaintext application (in addition to submitted files if applicable)? CourseApplicationRatingsVisible: Feedback to applications -CourseApplicationRatingsVisibleTip: Should students be allowed to view rating and commentaries on their application after the rating period? +CourseApplicationRatingsVisibleTip: Should students be allowed to view rating and comments on their application after the rating period? CourseApplicationRequired: Applications required CourseApplicationRequiredTip: Should registrations for this course be provisional at first (without capacity constraint), until they are approved by a course administrator? CourseApplicationInstructionsApplication: Instructions for application @@ -661,6 +661,10 @@ FormCosmetics: Interface FormPersonalAppearance: Public data FormFieldRequiredTip: Marked fields need to be filled +PersonalInfoExamAchievementsWip: The feature to display your exam achievements has not yet been implemented. +PersonalInfoOwnTutorialsWip: The feature to display tutorials you have been assigned to as tutor has not yet been implemented. +PersonalInfoTutorialsWip: The feature to display tutorials you have registered for has not yet been implemented. + ActiveAuthTags: Active authorisation predicates InvalidDateTimeFormat: Invalid date and time format. YYYY-MM-DDTHH:MM[:SS] expected @@ -1753,7 +1757,7 @@ AllocationStaffRegisterFrom: Registration of courses starts AllocationStaffRegister: Registration of courses AllocationRegisterFrom: Application period start AllocationRegister: Application period -AllocationRegisterClosed: This central allocation is currntely closed. +AllocationRegisterClosed: This central allocation is currently closed. AllocationRegisterOpensIn difftime: This central allocation is expected to open in #{difftime} AllocationStaffAllocationFrom: Grading of applications starts AllocationStaffAllocation: Grading of applications @@ -1767,7 +1771,7 @@ AllocationOverrideDeregister: Leaving courses only until AllocationProcess: Allocation process AllocationNoApplication: No application AllocationPriority: Priority -AllocationPriorityTip: Courses which you assign a higher priority are preferred during the allocation process. +AllocationPriorityTip: Courses to which you assign a higher priority are preferred during the allocation process. AllocationPriorityRelative: The absolute priority values are meaningless. The only consideration is whether one course has a higher priority than another. AllocationTotalCoursesNegative: Requested number of placements must be greater than zero AllocationTotalCourses: Requested number of placements diff --git a/src/Handler/Profile.hs b/src/Handler/Profile.hs index 19c59a07c..d6de8d24e 100644 --- a/src/Handler/Profile.hs +++ b/src/Handler/Profile.hs @@ -370,9 +370,9 @@ makeProfileData (Entity uid User{..}) = do submissionTable <- mkSubmissionTable uid -- Tabelle mit allen Abgaben und Abgabe-Gruppen submissionGroupTable <- mkSubmissionGroupTable uid -- Tabelle mit allen Abgabegruppen correctionsTable <- mkCorrectionsTable uid -- Tabelle mit allen Korrektor-Aufgaben - let examTable = [whamlet|Prüfungen werden hier momentan leider noch nicht unterstützt.|] - let ownTutorialTable = [whamlet|Übungsgruppen werden momentan leider noch nicht unterstützt.|] - let tutorialTable = [whamlet|Übungsgruppen werden momentan leider noch nicht unterstützt.|] + let examTable = [whamlet|_{MsgPersonalInfoExamAchievementsWip}|] + let ownTutorialTable = [whamlet|_{MsgPersonalInfoOwnTutorialsWip}|] + let tutorialTable = [whamlet|_{MsgPersonalInfoTutorialsWip}|] lastLogin <- traverse (formatTime SelFormatDateTime) userLastAuthentication let profileRemarks = $(i18nWidgetFile "profile-remarks") return $(widgetFile "profileData") diff --git a/templates/i18n/html-input/en-eu.hamlet b/templates/i18n/html-input/en-eu.hamlet index d7630147a..6c45f2c59 100644 --- a/templates/i18n/html-input/en-eu.hamlet +++ b/templates/i18n/html-input/en-eu.hamlet @@ -1,7 +1,7 @@ $newline never

Attention: line breaks will be removed!

- The textarea currently accepts only Htmlp.
+ The text area currently accepts only Html.
Thus any linebreaks will be ignored but can be added using # <br>