From 9316f06c683734b415099a7acf95b7f2a2a701a6 Mon Sep 17 00:00:00 2001 From: Jan-Hendrik Willms Date: Thu, 26 Jun 2025 21:18:12 +0200 Subject: unify text strings that are very very similar, fixes #5669 Closes #5669 Merge request studip/studip!4294 --- app/controllers/admin/configuration.php | 2 +- app/controllers/admin/courseplanning.php | 2 +- app/controllers/admin/courses.php | 2 +- app/controllers/admin/datafields.php | 2 +- app/controllers/admin/extern.php | 2 +- app/controllers/admin/ilias_interface.php | 2 +- app/controllers/admin/user.php | 8 +++---- app/controllers/admission/courseset.php | 2 +- app/controllers/blubber.php | 2 +- app/controllers/calendar/date.php | 10 ++++---- app/controllers/calendar/schedule.php | 2 +- app/controllers/course/admission.php | 6 ++--- app/controllers/course/archive.php | 2 +- app/controllers/course/basicdata.php | 4 ++-- app/controllers/course/dates.php | 2 +- app/controllers/course/room_requests.php | 2 +- app/controllers/course/studygroup.php | 4 ++-- app/controllers/course/timesrooms.php | 2 +- app/controllers/course/wiki.php | 6 ++--- app/controllers/institute/basicdata.php | 2 +- app/controllers/lvgruppen/lvgruppen.php | 2 +- app/controllers/module/module.php | 2 +- app/controllers/online.php | 2 +- app/controllers/privacy.php | 2 +- app/controllers/registration.php | 4 ++-- app/controllers/resources/admin.php | 2 +- app/controllers/resources/export.php | 4 ++-- app/controllers/resources/print.php | 2 +- app/controllers/resources/property.php | 4 ++-- app/controllers/resources/resource.php | 6 ++--- app/controllers/search/globalsearch.php | 2 +- app/controllers/settings/accessibility.php | 2 +- app/controllers/settings/calendar.php | 2 +- app/controllers/settings/studies.php | 4 ++-- app/controllers/settings/userdomains.php | 2 +- app/controllers/vips/solutions.php | 2 +- app/views/admin/banner/edit.php | 16 ++++++------- app/views/admin/banner/info.php | 18 +++++++------- app/views/admin/configuration/configuration.php | 2 +- .../admin/configuration/edit_range_config.php | 2 +- app/views/admin/courseplanning/weekday.php | 2 +- .../admin/ilias_interface/edit_permissions.php | 4 ++-- app/views/admin/plugin/manifest.php | 2 +- app/views/admin/sem_classes/details.php | 4 ++-- app/views/admin/user/_delete.php | 2 +- app/views/admin/user/edit.php | 2 +- app/views/admin/user/edit_institute.php | 4 ++-- app/views/admission/courseset/instcourses.php | 2 +- app/views/api/oauth2/applications/index.php | 2 +- app/views/consultation/admin/note.php | 2 +- app/views/course/admission/index.php | 4 ++-- app/views/course/block_appointments/index.php | 2 +- app/views/course/dates/singledate.php | 2 +- app/views/course/details/index.php | 10 ++++---- app/views/course/enrolment/apply.php | 2 +- app/views/course/feedback/_entry.php | 2 +- app/views/course/members/accepted_list.php | 2 +- app/views/course/members/autor_list.php | 2 +- app/views/course/members/csv_manual_assignment.php | 2 +- app/views/course/members/index.php | 2 +- app/views/course/room_requests/new_request.php | 2 +- .../request_find_available_properties.php | 2 +- .../room_requests/request_find_matching_rooms.php | 2 +- app/views/course/statusgroups/_member.php | 2 +- app/views/course/studygroup/globalmodules.php | 2 +- app/views/course/timesrooms/_irregularEvents.php | 2 +- app/views/course/topics/index.php | 4 ++-- .../wizard/steps/basicdata/index_studygroup.php | 6 ++--- .../course/wizard/steps/studygroups/index.php | 6 ++--- app/views/event_log/show.php | 2 +- app/views/fachabschluss/abschluesse/abschluss.php | 2 +- app/views/fachabschluss/faecher/fach.php | 2 +- app/views/fachabschluss/kategorien/kategorie.php | 2 +- app/views/file/file_details.php | 4 ++-- app/views/files_dashboard/_search_tr.php | 8 +++---- app/views/help_content/delete.php | 2 +- .../extern/extern_config/persondetails.php | 6 ++--- app/views/lvgruppen/lvgruppen/details.php | 4 ++-- app/views/lvgruppen/lvgruppen/lvgruppe.php | 2 +- app/views/materialien/files/details.php | 4 ++-- app/views/materialien/files/index.php | 2 +- app/views/materialien/files/range.php | 2 +- app/views/module/module/lvgruppe.php | 2 +- app/views/module/module/modul.php | 28 +++++++++++----------- app/views/module/module/modulteil.php | 12 +++++----- app/views/my_ilias_accounts/_ilias_module.php | 4 ++-- app/views/profile_modules/index.php | 2 +- .../question_types/automated_data/answer.php | 8 +++---- app/views/registration/save.php | 2 +- app/views/resources/room_request/overview.php | 2 +- app/views/room_management/overview/index.php | 2 +- app/views/seminar/details/show_module_pathes.php | 2 +- app/views/shared/contacts/contact_range_fields.php | 4 ++-- app/views/shared/modul/_modullvs.php | 10 ++++---- app/views/shared/version/_versionmodule.php | 4 ++-- app/views/siteinfo/markup/userinfo.php | 2 +- app/views/siteinfo/markup/userlink.php | 2 +- .../studiengaenge/stgteilbezeichnungen/details.php | 4 ++-- .../stgteilbezeichnungen/stgteilbezeichnung.php | 2 +- .../studiengaenge/studiengaenge/studiengang.php | 18 +++++++------- .../studiengaenge/studiengangteile/stgteil.php | 4 ++-- app/views/studiengaenge/versionen/abschnitt.php | 2 +- .../studiengaenge/versionen/modul_zuordnung.php | 2 +- .../studiengaenge/versionen/modulteil_semester.php | 4 ++-- app/views/studiengaenge/versionen/version.php | 4 ++-- app/views/tour/admin_details.php | 2 +- app/views/tour/import.php | 2 +- app/views/userfilter/field/configure.php | 2 +- app/views/vips/exercises/TextLineTask/correct.php | 4 ++-- app/views/vips/exercises/TextLineTask/print.php | 2 +- app/views/vips/exercises/TextTask/print.php | 6 ++--- app/views/vips/exercises/print_exercise.php | 4 ++-- app/views/vips/sheets/print_assignments.php | 2 +- app/views/vips/sheets/show_assignment.php | 4 ++-- app/views/vips/sheets/show_exercise.php | 2 +- app/views/vips/solutions/assignment_solutions.php | 2 +- app/views/vips/solutions/feedback_files.php | 2 +- app/views/vips/solutions/participants_overview.php | 2 +- app/views/web_migrate/index.php | 2 +- db/migrations/6.0.25_step_4253.php | 2 +- .../ParticipantRestrictedAdmission.php | 4 ++-- lib/classes/DataFieldEntry.php | 2 +- lib/classes/ForumLike.php | 2 +- lib/classes/LockRules.php | 2 +- lib/classes/StudygroupModel.php | 2 +- lib/classes/auth_plugins/StudipAuthAbstract.php | 2 +- .../AdvancedBasicDataWizardStep.php | 2 +- lib/classes/forms/Form.php | 2 +- .../visibility/visibilitySettings/Extern.php | 2 +- lib/models/Abschluss.php | 6 ++--- lib/models/Courseware/BlockTypes/BeforeAfter.php | 2 +- .../Courseware/BlockTypes/BiographyGoals.php | 2 +- lib/models/Courseware/BlockTypes/Document.php | 4 ++-- lib/models/Courseware/BlockTypes/Download.php | 4 ++-- lib/models/Courseware/BlockTypes/Link.php | 2 +- .../Courseware/ContainerTypes/ContainerType.php | 6 ++--- lib/models/Courseware/StructuralElement.php | 4 ++-- lib/models/SeminarCycleDate.php | 2 +- lib/models/resources/ResourceBooking.php | 4 ++-- lib/modules/CoreStudygroupAdmin.php | 2 +- lib/modules/CoursewareModule.php | 16 +++++++------ lib/modules/NewsWidget.php | 2 +- lib/showNews.inc.php | 2 +- resources/assets/javascripts/bootstrap/forms.js | 4 ++-- resources/assets/javascripts/lib/dialog.js | 2 +- .../assets/javascripts/lib/multi_person_search.js | 8 +++++-- resources/vue/apps/AdminCourses.vue | 4 ++-- resources/vue/apps/ConsultationCreator.vue | 10 ++++---- .../vue/apps/admission/ConfigureCourseSet.vue | 2 +- .../vue/apps/massmail/MassMailMessagesList.vue | 2 +- .../vue/components/admission/PasswordAdmission.vue | 2 +- resources/vue/components/avatar/AvatarApp.vue | 2 +- ...CoursewareBiographyPersonalInformationBlock.vue | 18 +++++++------- .../courseware/blocks/CoursewareBlubberComment.vue | 4 ++-- .../courseware/blocks/CoursewareDocumentBlock.vue | 2 +- .../courseware/blocks/CoursewareEmbedBlock.vue | 2 +- .../courseware/blocks/CoursewareTestBlock.vue | 2 +- .../structural-element/CoursewareRibbonToolbar.vue | 2 +- .../CoursewareStructuralElement.vue | 6 ++--- ...rsewareStructuralElementDialogExportChooser.vue | 2 +- .../CoursewareStructuralElementDialogSettings.vue | 2 +- .../PublicCoursewareStructuralElement.vue | 4 ++-- .../tasks/CoursewareTasksDialogDistribute.vue | 4 ++-- .../courseware/tasks/peer-review/ProcessDetail.vue | 2 +- .../tasks/peer-review/ProcessDurationDialog.vue | 5 ++-- .../courseware/unit/CoursewareUnitItem.vue | 2 +- .../unit/CoursewareUnitItemDialogLayout.vue | 2 +- .../unit/CoursewareUnitItemDialogPermissions.vue | 2 +- .../unit/CoursewareUnitItemDialogSettings.vue | 10 ++++---- .../vue/components/file-chooser/FileChooserBox.vue | 2 +- .../vue/components/form_inputs/RepetitionInput.vue | 2 +- .../vue/components/form_inputs/UserFilterInput.vue | 2 +- resources/vue/components/tree/StudipTreeList.vue | 2 +- resources/vue/components/tree/StudipTreeNode.vue | 2 +- resources/vue/components/tree/StudipTreeTable.vue | 5 ++-- resources/vue/mixins/courseware/import.js | 2 +- templates/admission/rules/info.php | 4 ++-- templates/courseware/block_types/download.php | 4 ++-- templates/dates/seminar_xml.php | 6 ++--- templates/globalsearch/_hints.php | 2 +- templates/globalsearch/searchbar.php | 2 +- templates/sidebar/clipboard-area.php | 2 +- tests/jsonapi/StructuralElementsShowTest.php | 2 +- 183 files changed, 334 insertions(+), 330 deletions(-) diff --git a/app/controllers/admin/configuration.php b/app/controllers/admin/configuration.php index 9cc2e26..1538334 100644 --- a/app/controllers/admin/configuration.php +++ b/app/controllers/admin/configuration.php @@ -427,7 +427,7 @@ class Admin_ConfigurationController extends AuthenticatedController 'section', 'get' ); - $widget->addElement(new SelectElement(-1, _('alle anzeigen'))); + $widget->addElement(new SelectElement(-1, _('Alle anzeigen'))); $widget->setOptions($options); $sidebar->addWidget($widget); } diff --git a/app/controllers/admin/courseplanning.php b/app/controllers/admin/courseplanning.php index 100088e..132b35a 100644 --- a/app/controllers/admin/courseplanning.php +++ b/app/controllers/admin/courseplanning.php @@ -943,6 +943,6 @@ class Admin_CourseplanningController extends AuthenticatedController $this->redirect('admin/courseplanning/weekday/' . $weekday); } - PageLayout::postSuccess(_('Ihre Einstellungen wurden gespeichert.')); + PageLayout::postSuccess(_('Die Einstellungen wurden gespeichert.')); } } diff --git a/app/controllers/admin/courses.php b/app/controllers/admin/courses.php index 6c0b16b..e963342 100644 --- a/app/controllers/admin/courses.php +++ b/app/controllers/admin/courses.php @@ -77,7 +77,7 @@ class Admin_CoursesController extends AuthenticatedController $selectWidget->addElement( new SelectElement( '', - '(' . _('keine Auswahl') . ')' + '(' . _('Keine Auswahl') . ')' ) ); foreach ($options as $option) { diff --git a/app/controllers/admin/datafields.php b/app/controllers/admin/datafields.php index 2ec8762..ef0f708 100644 --- a/app/controllers/admin/datafields.php +++ b/app/controllers/admin/datafields.php @@ -288,7 +288,7 @@ class Admin_DatafieldsController extends AuthenticatedController $sidebar->addWidget($actions); $filter = new SelectWidget(_('Filter'), $this->url_for('admin/datafields'), 'class_filter'); - $filter->addElement(new SelectElement('', _('alle anzeigen'))); + $filter->addElement(new SelectElement('', _('Alle anzeigen'))); $filter->setOptions($this->allclasses, $this->class_filter); $sidebar->addWidget($filter); } diff --git a/app/controllers/admin/extern.php b/app/controllers/admin/extern.php index 732b586..59df0ab 100644 --- a/app/controllers/admin/extern.php +++ b/app/controllers/admin/extern.php @@ -175,7 +175,7 @@ class Admin_ExternController extends AuthenticatedController )); } } else { - PageLayout::postInfo(_('Es wurden keine Änderungen vorgenommen')); + PageLayout::postInfo(_('Es wurden keine Änderungen vorgenommen.')); } if (Request::submitted('store_cancel')) { $this->redirect($this->indexURL(['open_type' => $type_id])); diff --git a/app/controllers/admin/ilias_interface.php b/app/controllers/admin/ilias_interface.php index ee069c4..9022505 100644 --- a/app/controllers/admin/ilias_interface.php +++ b/app/controllers/admin/ilias_interface.php @@ -110,7 +110,7 @@ class Admin_IliasInterfaceController extends AuthenticatedController //store config entry Config::get()->store('ILIAS_INTERFACE_BASIC_SETTINGS', $this->ilias_interface_config); Config::get()->store('ILIAS_INTERFACE_MODULETITLE', Request::get('ilias_interface_moduletitle')); - PageLayout::postSuccess(_('Einstellungen wurden gespeichert.')); + PageLayout::postSuccess(_('Die Einstellungen wurden gespeichert.')); } $this->redirect($this->url_for('admin/ilias_interface')); } diff --git a/app/controllers/admin/user.php b/app/controllers/admin/user.php index b8a67dd..88b5272 100644 --- a/app/controllers/admin/user.php +++ b/app/controllers/admin/user.php @@ -318,10 +318,10 @@ class Admin_UserController extends AuthenticatedController ) ) { $details = explode('§', str_replace(['msg§', 'info§', 'error§'], '', mb_substr($umanager->msg, 0, -1))); - PageLayout::postSuccess(htmlReady(sprintf(_('"%s (%s)" wurde erfolgreich gelöscht.'), $user->getFullName(), $user->username)), $details); + PageLayout::postSuccess(htmlReady(sprintf(_('"%s (%s)" wurde erfolgreich gelöscht'), $user->getFullName(), $user->username)), $details); } else { $details = explode('§', str_replace(['msg§', 'info§', 'error§'], '', mb_substr($umanager->msg, 0, -1))); - PageLayout::postError(htmlReady(sprintf(_('Fehler! "%s (%s)" konnte nicht gelöscht werden.'), $user->getFullName(), $user->username)), $details); + PageLayout::postError(htmlReady(sprintf(_('Fehler! "%s (%s)" konnte nicht gelöscht werden'), $user->getFullName(), $user->username)), $details); } //sicherheitsabfrage @@ -411,7 +411,7 @@ class Admin_UserController extends AuthenticatedController $this->user_roles = $this->user->getRoles(); - // get ilias account data + // get ilias account data if ($GLOBALS['perm']->have_perm('root') && Config::get()->ILIAS_INTERFACE_ENABLE) { $this->ilias_list = []; foreach (Config::get()->ILIAS_INTERFACE_SETTINGS as $ilias_index => $ilias_config) { @@ -650,7 +650,7 @@ class Admin_UserController extends AuthenticatedController $umdetails = explode('§', str_replace(['msg§', 'info§', 'error§'], '', mb_substr($um->msg, 0, -1))); if (!empty($details)) { $details = array_reverse(array_merge((array)$details, (array)$umdetails)); - PageLayout::postInfo(_('Hinweise:'), $details); + PageLayout::postInfo(_('Hinweise'), $details); } $this->redirect('admin/user/edit/' . $user_id); diff --git a/app/controllers/admission/courseset.php b/app/controllers/admission/courseset.php index e1e059b..a6c6eed 100644 --- a/app/controllers/admission/courseset.php +++ b/app/controllers/admission/courseset.php @@ -128,7 +128,7 @@ class Admission_CoursesetController extends AuthenticatedController }, $this->coursesets)); if (count($not_distributed_coursesets)) { PageLayout::postInfo( - _('"Es existieren Anmeldesets, die zum Zeitpunkt der Platzverteilung nicht gelost wurden. Stellen Sie sicher, dass der Cronjob "Losverfahren überprüfen" ausgeführt wird."'), + _('Es existieren Anmeldesets, die zum Zeitpunkt der Platzverteilung nicht gelost wurden. Stellen Sie sicher, dass der Cronjob "Losverfahren überprüfen" ausgeführt wird.'), array_unique($not_distributed_coursesets)); } } diff --git a/app/controllers/blubber.php b/app/controllers/blubber.php index 550770b..c072a46 100644 --- a/app/controllers/blubber.php +++ b/app/controllers/blubber.php @@ -463,7 +463,7 @@ class BlubberController extends AuthenticatedController $this->thread->delete(); PageLayout::postSuccess(_('Private Konversation gelöscht.')); } else { - PageLayout::postSuccess(_('Private Konversation verlassen.')); + PageLayout::postSuccess(_('Private Konversation verlassen')); } $this->redirect('blubber/index'); } diff --git a/app/controllers/calendar/date.php b/app/controllers/calendar/date.php index 39284d9..07a77b9 100644 --- a/app/controllers/calendar/date.php +++ b/app/controllers/calendar/date.php @@ -265,7 +265,7 @@ class Calendar_DateController extends AuthenticatedController $this->date = CalendarDate::find($date_id); if (!$this->date) { - throw new Exception(_('Der Termin wurde nicht gefunden!')); + throw new Exception(_('Der Termin wurde nicht gefunden.')); } //Set the repetition end date to the end of the date in case it isn't set: if (!$this->date->repetition_end) { @@ -785,7 +785,7 @@ class Calendar_DateController extends AuthenticatedController $this->date = CalendarDate::find($date_id); if (!$this->date) { PageLayout::postError( - _('Der Termin wurde nicht gefunden!') + _('Der Termin wurde nicht gefunden.') ); $this->render_nothing(); } @@ -844,15 +844,15 @@ class Calendar_DateController extends AuthenticatedController if ($this->date_has_repetitions) { PageLayout::postSuccess(_('Die Terminserie wurde gelöscht!')); } else { - PageLayout::postSuccess(_('Der Termin wurde gelöscht!')); + PageLayout::postSuccess(_('Der Termin wurde gelöscht')); } $this->response->add_header('X-Dialog-Close', '1'); $this->render_nothing(); } else { if ($this->date_has_repetitions) { - PageLayout::postError(_('Die Terminserie konnte nicht gelöscht werden!')); + PageLayout::postError(_('Die Terminserie konnte nicht gelöscht werden.')); } else { - PageLayout::postError(_('Der Termin konnte nicht gelöscht werden!')); + PageLayout::postError(_('Der Termin konnte nicht gelöscht werden.')); } } } elseif ($this->multiple_calendar_handling === 'delete_from_mine') { diff --git a/app/controllers/calendar/schedule.php b/app/controllers/calendar/schedule.php index 1e77158..fa097fd 100644 --- a/app/controllers/calendar/schedule.php +++ b/app/controllers/calendar/schedule.php @@ -451,7 +451,7 @@ class Calendar_ScheduleController extends AuthenticatedController throw new AccessDeniedException(_('Sie dürfen diesen Termin nicht bearbeiten!')); } if ($this->entry->delete()) { - PageLayout::postSuccess(_('Der Termin wurde gelöscht.')); + PageLayout::postSuccess(_('Der Termin wurde gelöscht')); } else { PageLayout::postError(_('Der Termin konnte nicht gelöscht werden.')); } diff --git a/app/controllers/course/admission.php b/app/controllers/course/admission.php index 5b22c82..44de70c 100644 --- a/app/controllers/course/admission.php +++ b/app/controllers/course/admission.php @@ -102,7 +102,7 @@ class Course_AdmissionController extends AuthenticatedController } else { if ($this->current_courseset->isSeatDistributionEnabled() && !$this->course->admission_turnout) { PageLayout::postInfo( - _('Diese Veranstaltung ist teilnahmebeschränkt, aber die maximale Teilnehmendenanzahl ist nicht gesetzt.') + _('Diese Veranstaltung ist teilnahmebeschränkt, aber die maximale Teilnehmendenzahl ist nicht gesetzt.') ); } } @@ -254,7 +254,7 @@ class Course_AdmissionController extends AuthenticatedController function change_admission_turnout_action() { CSRFProtection::verifyUnsafeRequest(); - PageLayout::setTitle(_('Teilnehmendenanzahl ändern')); + PageLayout::setTitle(_('Teilnehmendenzahl ändern')); $request = null; if (Request::submitted('change_admission_turnout')) { $request = Request::extract('admission_turnout int, admission_disable_waitlist submitted, admission_disable_waitlist_move submitted, admission_waitlist_max int'); @@ -306,7 +306,7 @@ class Course_AdmissionController extends AuthenticatedController } if ($this->course->store()) { - PageLayout::postSuccess(_('Die Teilnehmendenanzahl wurde geändert.')); + PageLayout::postSuccess(_('Die Teilnehmendenzahl wurde geändert.')); } unset($question); } diff --git a/app/controllers/course/archive.php b/app/controllers/course/archive.php index 1c6fc25..02cf835 100644 --- a/app/controllers/course/archive.php +++ b/app/controllers/course/archive.php @@ -67,7 +67,7 @@ class Course_ArchiveController extends AuthenticatedController . '' . _('Untertitel') . ':' . $course->untertitel . '' //. '' . _("Zeit") . ':' . INSERT_ZEIT_HERE . '' . '' . _('Semester') . ':' . $course->start_semester . '' //TODO: check if start_semester is right - . '' . _('Erster Temin') . ':' . $course->untertitel . '' + . '' . _('Erster Termin') . ':' . $course->untertitel . '' //. '' . _("Vorbesprechung") . ':' . INSERT_VORBESPRECHUNG_HERE . '' . '' . _('Ort') . ':' . $course->ort . '' . '' . _('Typ der Veranstaltung') . ':' diff --git a/app/controllers/course/basicdata.php b/app/controllers/course/basicdata.php index 4524153..f1610d6 100644 --- a/app/controllers/course/basicdata.php +++ b/app/controllers/course/basicdata.php @@ -121,7 +121,7 @@ class Course_BasicdataController extends AuthenticatedController } } $this->institutional[] = [ - 'title' => _('Heimat-Einrichtung'), + 'title' => _('Heimateinrichtung'), 'name' => 'course_institut_id', 'must' => true, 'type' => 'nested-select', @@ -131,7 +131,7 @@ class Course_BasicdataController extends AuthenticatedController ]; $this->institutional[] = [ - 'title' => _('beteiligte Einrichtungen'), + 'title' => _('Beteiligte Einrichtungen'), 'name' => 'related_institutes[]', 'type' => 'nested-select', 'value' => array_diff($course->institutes->pluck('id'), [$course->institut_id]), diff --git a/app/controllers/course/dates.php b/app/controllers/course/dates.php index a0ca605..1a766a9 100644 --- a/app/controllers/course/dates.php +++ b/app/controllers/course/dates.php @@ -448,7 +448,7 @@ class Course_DatesController extends AuthenticatedController } elseif ($singledate instanceof CourseExDate && $singledate->content) { $dates[] = [ 'date' => (string) $singledate, - 'title' => _('fällt aus') . ' (' . _('Kommentar:') . ' ' . $singledate->content . ')', + 'title' => _('fällt aus') . ' (' . _('Kommentar') . ': ' . $singledate->content . ')', 'description' => '', 'start' => $singledate->date, 'related_persons' => [], diff --git a/app/controllers/course/room_requests.php b/app/controllers/course/room_requests.php index 1fa0282..cfe1f31 100644 --- a/app/controllers/course/room_requests.php +++ b/app/controllers/course/room_requests.php @@ -591,7 +591,7 @@ class Course_RoomRequestsController extends AuthenticatedController // once stored, we can delete the session data for this request $this->clearSession(); - PageLayout::postSuccess(_('Die Anfrage wurde gespeichert!')); + PageLayout::postSuccess(_('Die Anfrage wurde gespeichert.')); $this->relocate('course/timesrooms/'); } } diff --git a/app/controllers/course/studygroup.php b/app/controllers/course/studygroup.php index 617e394..99aad77 100644 --- a/app/controllers/course/studygroup.php +++ b/app/controllers/course/studygroup.php @@ -141,7 +141,7 @@ class Course_StudygroupController extends AuthenticatedController $awidget->addLink($infotext, $infolink ?? '#', $icon, $infolink_options ?? []); if ($send_from_search_page) { $awidget->addLink( - _('zurück zur Suche'), + _('Zurück zur Suche'), URLHelper::getURL($send_from_search_page), Icon::create('link-intern') ); @@ -842,7 +842,7 @@ class Course_StudygroupController extends AuthenticatedController if (Request::get('institute')) { $cfg->store('STUDYGROUP_DEFAULT_INST', Request::get('institute')); $cfg->store('STUDYGROUP_TERMS', Request::i18n('terms')); - PageLayout::postSuccess(_('Die Einstellungen wurden gespeichert!')); + PageLayout::postSuccess(_('Die Einstellungen wurden gespeichert.')); } else { PageLayout::postError(_('Fehler beim Speichern der Einstellung!')); } diff --git a/app/controllers/course/timesrooms.php b/app/controllers/course/timesrooms.php index 209ba9f..e33907f 100644 --- a/app/controllers/course/timesrooms.php +++ b/app/controllers/course/timesrooms.php @@ -1541,7 +1541,7 @@ class Course_TimesroomsController extends AuthenticatedController PageLayout::postSuccess(_('Änderungen gespeichert!')); } } else { - PageLayout::postInfo(_('Es wurden keine Änderungen vorgenommen')); + PageLayout::postInfo(_('Es wurden keine Änderungen vorgenommen.')); } $this->relocate('course/timesrooms/index'); diff --git a/app/controllers/course/wiki.php b/app/controllers/course/wiki.php index 16b57f6..54a6ef1 100644 --- a/app/controllers/course/wiki.php +++ b/app/controllers/course/wiki.php @@ -351,7 +351,7 @@ class Course_WikiController extends AuthenticatedController $this->render_form($setting_form); } elseif (Request::isPost()) { CSRFProtection::verifyUnsafeRequest(); - + $read_permission = Request::get('read_permission'); $write_permission = Request::get('write_permission'); @@ -1152,7 +1152,7 @@ class Course_WikiController extends AuthenticatedController $document = new ExportPDF(); $document->SetTitle(_('Wiki: ') . $page->name); $document->setHeaderTitle(sprintf(_('Wiki von "%s"'), $this->range->name)); - $document->setHeaderSubtitle(sprintf(_('Seite: %s'), $page->name)); + $document->setHeaderSubtitle(sprintf(_('Seite %s'), $page->name)); $document->addPage(); $content = $page->content; //remove wiki-links: @@ -1182,7 +1182,7 @@ class Course_WikiController extends AuthenticatedController continue; } - $document->setHeaderSubtitle(sprintf(_('Seite: %s'), $page->name)); + $document->setHeaderSubtitle(sprintf(_('Seite %s'), $page->name)); $document->addPage(); // We need the @ in front since TCPDF might throw warning that can lead diff --git a/app/controllers/institute/basicdata.php b/app/controllers/institute/basicdata.php index 2f211c2..3a5a751 100644 --- a/app/controllers/institute/basicdata.php +++ b/app/controllers/institute/basicdata.php @@ -133,7 +133,7 @@ class Institute_BasicdataController extends AuthenticatedController || ($GLOBALS['perm']->is_fak_admin() && Config::get()->INST_FAK_ADMIN_PERMS == 'all')); if (!$this->may_delete) { //Set infotext for disabled delete-button - $reason_txt = _('Löschen nicht möglich.'); + $reason_txt = _('Löschen nicht möglich'); if (count($institute->home_courses) > 0) { $reason_txt .= ' '; $reason_txt .= sprintf(ngettext('Es ist eine Veranstaltung zugeordnet.', diff --git a/app/controllers/lvgruppen/lvgruppen.php b/app/controllers/lvgruppen/lvgruppen.php index 8562836..ae12161 100644 --- a/app/controllers/lvgruppen/lvgruppen.php +++ b/app/controllers/lvgruppen/lvgruppen.php @@ -199,7 +199,7 @@ class Lvgruppen_LvgruppenController extends MVVController $this->lvgruppe = new Lvgruppe(); PageLayout::setTitle(_('Neue Lehrveranstaltungsgruppe anlegen')); $success_message = _('Die Lehrveranstaltungsgruppe "%s" wurde angelegt.'); - $this->headline = _('Neue Lehrveranstaltungsgruppe anlegen.'); + $this->headline = _('Neue Lehrveranstaltungsgruppe anlegen'); } else { PageLayout::setTitle(_('Lehrveranstaltungsgruppe bearbeiten')); $success_message = _('Die Lehrveranstaltungsgruppe "%s" wurde gespeichert.'); diff --git a/app/controllers/module/module.php b/app/controllers/module/module.php index cbcba00..6da241b 100644 --- a/app/controllers/module/module.php +++ b/app/controllers/module/module.php @@ -1005,7 +1005,7 @@ class Module_ModuleController extends MVVController $this->lvgruppe = new Lvgruppe(); PageLayout::setTitle(_('Neue Lehrveranstaltungsgruppe anlegen')); $success_message = _('Die Lehrveranstaltungsgruppe "%s" wurde angelegt.'); - $this->headline = _('Neue Lehrveranstaltungsgruppe anlegen.'); + $this->headline = _('Neue Lehrveranstaltungsgruppe anlegen'); } else { PageLayout::setTitle(_('Lehrveranstaltungsgruppe bearbeiten')); $success_message = _('Die Lehrveranstaltungsgruppe "%s" wurde geändert.'); diff --git a/app/controllers/online.php b/app/controllers/online.php index 0407cb7..9413352 100644 --- a/app/controllers/online.php +++ b/app/controllers/online.php @@ -130,7 +130,7 @@ class OnlineController extends AuthenticatedController } $GLOBALS['user']->cfg->store('MESSAGING_SETTINGS', $this->settings); - $message = MessageBox::success(_('Ihre Einstellungen wurden gespeichert.')); + $message = MessageBox::success(_('Die Einstellungen wurden gespeichert.')); } PageLayout::postMessage($message); diff --git a/app/controllers/privacy.php b/app/controllers/privacy.php index 049aea6..5598f65 100644 --- a/app/controllers/privacy.php +++ b/app/controllers/privacy.php @@ -365,7 +365,7 @@ class PrivacyController extends AuthenticatedController $zip->close(); if (!file_exists($zipname)) { - PageLayout::postError(_('Keine Dateien vorhanden.')); + PageLayout::postError(_('Keine Dateien vorhanden')); $this->redirect("privacy/index/" . $user_id); return; } diff --git a/app/controllers/registration.php b/app/controllers/registration.php index 5ca4cfd..712289a 100644 --- a/app/controllers/registration.php +++ b/app/controllers/registration.php @@ -63,7 +63,7 @@ class RegistrationController extends AuthenticatedController 'minlength' => '8', 'attributes' => ['autocomplete' => 'new-password'], ':pattern' => "password.replace(/[.*+?^\${}()|[\\]\\\\]/g, '\\\\$&')", //mask special chars - 'data-validation_requirement' => _('Passwörter stimmen nicht überein.'), + 'data-validation_requirement' => _('Die Passwörter stimmen nicht überein.'), 'store' => function() {} ], 'title_front' => [ @@ -95,7 +95,7 @@ class RegistrationController extends AuthenticatedController 'type' => 'radio', 'orientation' => 'horizontal', 'options' => [ - '0' => _('keine Angabe'), + '0' => _('Keine Angabe'), '1' => _('männlich'), '2' => _('weiblich'), '3' => _('divers'), diff --git a/app/controllers/resources/admin.php b/app/controllers/resources/admin.php index 3dade9d..bea43ed 100644 --- a/app/controllers/resources/admin.php +++ b/app/controllers/resources/admin.php @@ -1055,7 +1055,7 @@ class Resources_AdminController extends AuthenticatedController 0 => _('Buchung'), 1 => _('Reservierung'), 2 => _('Sperrbuchung'), - 3 => _('geplante Buchung') + 3 => _('Geplante Buchung') ]; if (Request::submitted('save')) { diff --git a/app/controllers/resources/export.php b/app/controllers/resources/export.php index 585c5db..c9ccdf9 100644 --- a/app/controllers/resources/export.php +++ b/app/controllers/resources/export.php @@ -131,7 +131,7 @@ class Resources_ExportController extends AuthenticatedController ResourceBooking::TYPE_NORMAL => _('Buchung'), ResourceBooking::TYPE_RESERVATION => _('Reservierung'), ResourceBooking::TYPE_LOCK => _('Sperrbuchung'), - ResourceBooking::TYPE_PLANNED => _('geplante Buchung') + ResourceBooking::TYPE_PLANNED => _('Geplante Buchung') ]; $this->selected_booking_types = Request::intArray('bookingtypes') ?: Config::get()->RESOURCES_EXPORT_BOOKINGTYPES_DEFAULT; @@ -239,7 +239,7 @@ class Resources_ExportController extends AuthenticatedController ResourceBooking::TYPE_NORMAL => _('Buchung'), ResourceBooking::TYPE_RESERVATION => _('Reservierung'), ResourceBooking::TYPE_LOCK => _('Sperrbuchung'), - ResourceBooking::TYPE_PLANNED => _('geplante Buchung') + ResourceBooking::TYPE_PLANNED => _('Geplante Buchung') ]; $this->selected_booking_types = Config::get()->RESOURCES_EXPORT_BOOKINGTYPES_DEFAULT; } diff --git a/app/controllers/resources/print.php b/app/controllers/resources/print.php index 8118935..ea7da07 100644 --- a/app/controllers/resources/print.php +++ b/app/controllers/resources/print.php @@ -143,7 +143,7 @@ class Resources_PrintController extends AuthenticatedController ResourceBooking::TYPE_NORMAL => _('Buchung'), ResourceBooking::TYPE_RESERVATION => _('Reservierung'), ResourceBooking::TYPE_LOCK => _('Sperrbuchung'), - ResourceBooking::TYPE_PLANNED => _('geplante Buchung'), + ResourceBooking::TYPE_PLANNED => _('Geplante Buchung'), ]; // Get additional text to print diff --git a/app/controllers/resources/property.php b/app/controllers/resources/property.php index e7e56cf..bcaf7bc 100644 --- a/app/controllers/resources/property.php +++ b/app/controllers/resources/property.php @@ -67,7 +67,7 @@ class Resources_PropertyController extends AuthenticatedController if (!$this->name) { PageLayout::postError( - _('Es wurde kein Name angegeben!') + _('Es wurde kein Name angegeben.') ); return; } @@ -147,7 +147,7 @@ class Resources_PropertyController extends AuthenticatedController //since they are editable for non-system properties. if (!$this->name) { PageLayout::postError( - _('Es wurde kein Name angegeben!') + _('Es wurde kein Name angegeben.') ); return; } diff --git a/app/controllers/resources/resource.php b/app/controllers/resources/resource.php index 02ecacd..2e6e481 100644 --- a/app/controllers/resources/resource.php +++ b/app/controllers/resources/resource.php @@ -423,7 +423,7 @@ class Resources_ResourceController extends AuthenticatedController PageLayout::setTitle( sprintf( - _('%s: bearbeiten'), + _('%s: Bearbeiten'), $this->resource->getFullName() ) ); @@ -436,7 +436,7 @@ class Resources_ResourceController extends AuthenticatedController PageLayout::setTitle( sprintf( - _('%s: löschen'), + _('%s: Löschen'), $this->resource->getFullName() ) ); @@ -1438,7 +1438,7 @@ class Resources_ResourceController extends AuthenticatedController if (!$this->folder->isReadable($this->current_user->id)) { throw new AccessDeniedException( - _('Sie sind nicht berechtigt, den Inhalt dieses Ordners zu sehen!') + _('Sie sind nicht berechtigt, den Inhalt dieses Ordners zu sehen.') ); } diff --git a/app/controllers/search/globalsearch.php b/app/controllers/search/globalsearch.php index fd82103..284401f 100644 --- a/app/controllers/search/globalsearch.php +++ b/app/controllers/search/globalsearch.php @@ -205,6 +205,6 @@ class Search_GlobalsearchController extends AuthenticatedController { Helpbar::get()->addPlainText(_('Platzhalter'), _('_ ist Platzhalter für ein beliebiges Zeichen. % ist Platzhalter für beliebig viele Zeichen. Me_er findet Treffer für Meyer und Meier. M__er findet zusätzlich auch Mayer und Maier. M%er findet alle vorherigen Treffer aber auch Münchner.')); Helpbar::get()->addPlainText(_('Klick auf Überschrift'), _('Erweitert die ausgewählte Suchkategorie, um mehr Suchergebnisse aus dieser Kategorie anzuzeigen. Ein weiterer Klick zeigt wieder Ergebnisse aus allen Kategorien an.')); - Helpbar::get()->addPlainText(_('Dateisuche'), _('Die Dateisuche kann über einen Schrägstrich (/) verfeinert werden. Beispiel: "Meine Veranstaltung/Datei" zeigt alle Dateien, die das Wort "Datei" enthalten und in "Meine Veranstaltung" sind, an. Die Veranstaltung kann auch auf einen Teil (z.B. Veran/Datei) oder auf die Großbuchstaben bzw. auch deren Abkürzung (z.B. MV/Datei oder V/Datei) beschränkt werden.')); + Helpbar::get()->addPlainText(_('Dateisuche'), _('Die Dateisuche kann über einen Schrägstrich (/) verfeinert werden. Beispiel: "Meine Veranstaltung/Datei" zeigt alle Dateien, die das Wort "Datei" enthalten und in "Meine Veranstaltung" sind, an. Die Veranstaltung kann auch auf einen Teil (z.B. "Veran/Datei") oder auf die Großbuchstaben bzw. auch deren Abkürzung (z.B. "MV/Datei" oder "V/Datei") beschränkt werden.')); } } diff --git a/app/controllers/settings/accessibility.php b/app/controllers/settings/accessibility.php index 5ca4e8d..5ca2ddd 100644 --- a/app/controllers/settings/accessibility.php +++ b/app/controllers/settings/accessibility.php @@ -37,7 +37,7 @@ class Settings_AccessibilityController extends Settings_SettingsController $this->config->store('USER_HIGH_CONTRAST', Request::bool('enable_high_contrast')); - PageLayout::postSuccess(_('Ihre Einstellungen wurden gespeichert.')); + PageLayout::postSuccess(_('Die Einstellungen wurden gespeichert.')); $this->redirect('settings/accessibility'); } diff --git a/app/controllers/settings/calendar.php b/app/controllers/settings/calendar.php index 50c556b..e2775d0 100644 --- a/app/controllers/settings/calendar.php +++ b/app/controllers/settings/calendar.php @@ -83,7 +83,7 @@ class Settings_CalendarController extends Settings_SettingsController 'step_day_group' => Request::option('cal_step_day_group') ]); - PageLayout::postSuccess(_('Ihre Einstellungen wurden gespeichert')); + PageLayout::postSuccess(_('Die Einstellungen wurden gespeichert')); if (Request::isDialog()) { $this->response->add_header('X-Dialog-Close', '1'); $this->render_nothing(); diff --git a/app/controllers/settings/studies.php b/app/controllers/settings/studies.php index 7763aa6..c34a1f6 100644 --- a/app/controllers/settings/studies.php +++ b/app/controllers/settings/studies.php @@ -148,7 +148,7 @@ class Settings_StudiesController extends Settings_SettingsController PageLayout::postSuccess(_('Die Zuordnung zu Studiengängen wurde geändert.')); setTempLanguage($this->user->user_id); - $this->postPrivateMessage(_("Die Zuordnung zu Studiengängen wurde geändert!\n")); + $this->postPrivateMessage(_('Die Zuordnung zu Studiengängen wurde geändert!') . "\n"); restoreLanguage(); } @@ -204,7 +204,7 @@ class Settings_StudiesController extends Settings_SettingsController PageLayout::postSuccess(_('Die Zuordnung zu Einrichtungen wurde geändert.')); setTempLanguage($this->user->user_id); - $this->postPrivateMessage(_("Die Zuordnung zu Einrichtungen wurde geändert!\n")); + $this->postPrivateMessage(_('Die Zuordnung zu Einrichtungen wurde geändert.') . "\n"); restoreLanguage(); } diff --git a/app/controllers/settings/userdomains.php b/app/controllers/settings/userdomains.php index eda8bcc..750d33e 100644 --- a/app/controllers/settings/userdomains.php +++ b/app/controllers/settings/userdomains.php @@ -76,7 +76,7 @@ class Settings_UserdomainsController extends Settings_SettingsController PageLayout::postSuccess(_('Die Zuordnung zu Nutzerdomänen wurde geändert.')); setTempLanguage($this->user->user_id); - $this->postPrivateMessage(_("Die Zuordnung zu Nutzerdomänen wurde geändert!\n")); + $this->postPrivateMessage(_('Die Zuordnung zu Nutzerdomänen wurde geändert.') . "\n"); restoreLanguage(); } diff --git a/app/controllers/vips/solutions.php b/app/controllers/vips/solutions.php index 2ced036..c436f49 100644 --- a/app/controllers/vips/solutions.php +++ b/app/controllers/vips/solutions.php @@ -338,7 +338,7 @@ class Vips_SolutionsController extends AuthenticatedController $data = [$columns]; - $row = [_('Maximalpunktzahl:')]; + $row = [_('Maximalpunktzahl')]; foreach ($exercises as $exercise) { $row[] = sprintf('%g', $exercise['points']); diff --git a/app/views/admin/banner/edit.php b/app/views/admin/banner/edit.php index 9bf48f5..3268698 100644 --- a/app/views/admin/banner/edit.php +++ b/app/views/admin/banner/edit.php @@ -32,18 +32,18 @@