diff --git a/resources/lang/de_DE/default.po b/resources/lang/de_DE/default.po index 76228453..9084f844 100644 --- a/resources/lang/de_DE/default.po +++ b/resources/lang/de_DE/default.po @@ -32,25 +32,25 @@ msgstr "" msgid "password.email.message" msgstr "Bitte besuche %s, um Dein Passwort zurückzusetzen." -msgid "Forbidden" +msgid "page.403.title" msgstr "Nicht erlaubt" -msgid "You are not allowed to access this page" +msgid "page.403.headline" msgstr "Du darfst diese Seite nicht aufrufen" -msgid "Page not found" +msgid "page.404.title" msgstr "Seite nicht gefunden" -msgid "No sleep found" -msgstr "No sleep found" +msgid "page.404.not_found" +msgstr "Schlaf nicht auffindbar" -msgid "405: Method not allowed" -msgstr "405: Method not allowed" +msgid "page.405.title" +msgstr "405: Anfragetyp nicht erlaubt" -msgid "Authentication expired" +msgid "page.419.title" msgstr "Autorisierung ist abgelaufen" -msgid "The provided CSRF token is invalid or has expired" +msgid "page.419.text" msgstr "Das angegebene CSRF Token ist ungültig oder abgelaufen" msgid "general.date" @@ -135,8 +135,7 @@ msgid "login.do" msgstr "Was kann ich machen?" msgid "login.jobs" -msgstr "" -"Bitte informiere Dich über die Tätigkeiten bei denen Du uns helfen kannst." +msgstr "Informiere Dich über die Tätigkeiten bei denen Du uns helfen kannst." msgid "login.cookies" msgstr "Hinweis: Cookies müssen aktiviert sein!" diff --git a/resources/lang/en_US/default.po b/resources/lang/en_US/default.po index 6baa78d7..d9db2105 100644 --- a/resources/lang/en_US/default.po +++ b/resources/lang/en_US/default.po @@ -34,14 +34,35 @@ msgstr "Name" msgid "general.description" msgstr "Description" +msgid "page.403.title" +msgstr "Forbidden" + +msgid "page.403.headline" +msgstr "You are not allowed to access this page" + msgid "page.403.login" msgstr "Please log in." +msgid "page.404.title" +msgstr "Page not found" + +msgid "page.404.not_found" +msgstr "No sleep found" + msgid "page.404.text" msgstr "" "This page could not be found or you don't have permission to view it. " "You probably have to sign in or register in order to gain access!" +msgid "page.405.title" +msgstr "405: Method not allowed" + +msgid "page.419.title" +msgstr "Authentication expired" + +msgid "page.419.text" +msgstr "The provided CSRF token is invalid or has expired" + msgid "credits.credit" msgstr "" "The original engelsystem was written by " @@ -795,8 +816,7 @@ msgid "login.do" msgstr "What can I do?" msgid "login.jobs" -msgstr "" -"Please read about the jobs you can do to help us." +msgstr "Read about the jobs you can do to help us." msgid "login.cookies" msgstr "Please note: You have to activate cookies!" diff --git a/resources/views/admin/user/edit-worklog.twig b/resources/views/admin/user/edit-worklog.twig index 55b3cc27..0e789a15 100644 --- a/resources/views/admin/user/edit-worklog.twig +++ b/resources/views/admin/user/edit-worklog.twig @@ -2,7 +2,7 @@ {% import 'macros/base.twig' as m %} {% import 'macros/form.twig' as f %} -{% block title %}{{ __(is_edit ? 'worklog.edit' : 'worklog.add') }}{% endblock %} +{% block title %}{{ is_edit ? __('worklog.edit') : __('worklog.add') }}{% endblock %} {% block content %}
diff --git a/resources/views/errors/403.twig b/resources/views/errors/403.twig index 4c838fae..f2782b95 100644 --- a/resources/views/errors/403.twig +++ b/resources/views/errors/403.twig @@ -1,9 +1,9 @@ {% extends "errors/default.twig" %} {% import 'macros/base.twig' as m %} -{% block title %}{{ __("Forbidden") }}{% endblock %} +{% block title %}{{ __('page.403.title') }}{% endblock %} -{% block content_headline_text %}{{ __("You are not allowed to access this page") }}{% endblock %} +{% block content_headline_text %}{{ __('page.403.headline') }}{% endblock %} {% block content_text %} {% if is_guest() %} diff --git a/resources/views/errors/404.twig b/resources/views/errors/404.twig index 620aaa2d..2f44226b 100644 --- a/resources/views/errors/404.twig +++ b/resources/views/errors/404.twig @@ -1,13 +1,13 @@ {% extends "errors/default.twig" %} -{% block title %}{{ __("Page not found") }}{% endblock %} +{% block title %}{{ __('page.404.title') }}{% endblock %} {% block content_container %}

4:{{ status|slice(1, 2) }} - {{ __("No sleep found") }} + {{ __('page.404.not_found') }}

{% block content_text %} diff --git a/resources/views/errors/405.twig b/resources/views/errors/405.twig index cbbb94ea..84a12b16 100644 --- a/resources/views/errors/405.twig +++ b/resources/views/errors/405.twig @@ -1,5 +1,5 @@ {% extends "errors/default.twig" %} -{% block title %}{{ __("405: Method not allowed") }}{% endblock %} +{% block title %}{{ __("page.405.title") }}{% endblock %} -{% block content_headline_text %}{{ __("405: Method not allowed") }}{% endblock %} +{% block content_headline_text %}{{ __("page.405.title") }}{% endblock %} diff --git a/resources/views/errors/419.twig b/resources/views/errors/419.twig index a9545af2..47cf12e1 100644 --- a/resources/views/errors/419.twig +++ b/resources/views/errors/419.twig @@ -1,7 +1,7 @@ {% extends "errors/default.twig" %} -{% block title %}{{ __("Authentication expired") }}{% endblock %} +{% block title %}{{ __('page.419.title') }}{% endblock %} {% block content %} - + {% endblock %} diff --git a/resources/views/pages/login.twig b/resources/views/pages/login.twig index 49129f5d..ae2ef2e7 100644 --- a/resources/views/pages/login.twig +++ b/resources/views/pages/login.twig @@ -117,7 +117,7 @@

{{ __('login.do') }}

-

{{ __('Please read about the jobs you can do to help us.') }}

+

{{ __('login.jobs') }}

{{ __('angeltypes.about') }} » diff --git a/src/Middleware/LegacyMiddleware.php b/src/Middleware/LegacyMiddleware.php index 2f837249..c1065228 100644 --- a/src/Middleware/LegacyMiddleware.php +++ b/src/Middleware/LegacyMiddleware.php @@ -60,7 +60,7 @@ class LegacyMiddleware implements MiddlewareInterface $translator = $this->container->get('translator'); $page = 404; - $title = $translator->translate('Page not found'); + $title = $translator->translate('page.404.title'); $content = $translator->translate('page.404.text'); }