diff --git a/includes/view/AngelTypes_view.php b/includes/view/AngelTypes_view.php index 17d14a87..f44bebce 100644 --- a/includes/view/AngelTypes_view.php +++ b/includes/view/AngelTypes_view.php @@ -578,7 +578,7 @@ function AngelTypes_about_view($angeltypes, $user_logged_in) $buttons[] = button(page_link_to('register'), register_title()); } - $buttons[] = button(page_link_to('login'), __('Login')); + $buttons[] = button(page_link_to('login'), __('login.login')); } $footerConfig = config('footer_items'); diff --git a/resources/lang/de_DE/default.po b/resources/lang/de_DE/default.po index a673df5e..eb2574c3 100644 --- a/resources/lang/de_DE/default.po +++ b/resources/lang/de_DE/default.po @@ -125,9 +125,12 @@ msgstr "Registrieren" #: resources/views/layouts/parts/navbar.twig:43 #: resources/views/pages/login.twig:4 resources/views/pages/login.twig:66 #: includes/view/AngelTypes_view.php:581 -msgid "Login" +msgid "login.login" msgstr "Login" +msgid "page.403.login" +msgstr "Bitte melde dich an." + #: resources/views/macros/form.twig:17 msgid "form.submit" msgstr "Absenden" diff --git a/resources/lang/en_US/default.po b/resources/lang/en_US/default.po index cde9addf..5f33f7c5 100644 --- a/resources/lang/en_US/default.po +++ b/resources/lang/en_US/default.po @@ -27,6 +27,12 @@ msgstr "Your password is incorrect. Please try it again." msgid "form.submit" msgstr "Submit" +msgid "login.login" +msgstr "Login" + +msgid "page.403.login" +msgstr "Please log in." + msgid "page.404.text" msgstr "" "This page could not be found or you don't have permission to view it. " diff --git a/resources/views/errors/403.twig b/resources/views/errors/403.twig index 73bf0274..03a96ed7 100644 --- a/resources/views/errors/403.twig +++ b/resources/views/errors/403.twig @@ -1,5 +1,15 @@ {% extends "errors/default.twig" %} +{% import 'macros/base.twig' as m %} {% block title %}{{ __("Forbidden") }}{% endblock %} {% block content_headline_text %}{{ __("You are not allowed to access this page") }}{% endblock %} + +{% block content_text %} + {% if is_guest() %} + {% do session_set('previous_page', request.url) %} + +
{{ __('page.403.login') }}
+{{ m.button(__('login.login'), url('login')) }}
+ {% endif %} +{% endblock %} diff --git a/resources/views/layouts/parts/navbar.twig b/resources/views/layouts/parts/navbar.twig index 3024bf82..564e76ed 100644 --- a/resources/views/layouts/parts/navbar.twig +++ b/resources/views/layouts/parts/navbar.twig @@ -40,7 +40,7 @@ {% endif %} {% if has_permission_to('login') %} - {{ _self.toolbar_item(__('Login'), url('login'), 'login', 'box-arrow-in-right') }} + {{ _self.toolbar_item(__('login.login'), url('login'), 'login', 'box-arrow-in-right') }} {% endif %} {% if is_user() and has_permission_to('user_messages') %} diff --git a/resources/views/pages/login.twig b/resources/views/pages/login.twig index 90160faf..95220b1d 100644 --- a/resources/views/pages/login.twig +++ b/resources/views/pages/login.twig @@ -1,7 +1,7 @@ {% extends "layouts/app.twig" %} {% import 'macros/base.twig' as m %} -{% block title %}{{ __('Login') }}{% endblock %} +{% block title %}{{ __('login.login') }}{% endblock %} {% block content %}