From 7315cacb5a6057b17e6552f3358713266d6c85aa Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Mon, 20 Jan 2020 22:55:22 +0100 Subject: [PATCH] Text for 403 error is localized I hacked the error.vue to catch the default 404 error message and to display a localized message instead. I found no better way to do it. Any ideas? --- webapp/layouts/error.vue | 5 ++++- webapp/locales/de.json | 4 +++- webapp/locales/en.json | 4 +++- webapp/middleware/isAdmin.js | 2 +- webapp/middleware/isModerator.js | 2 +- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/webapp/layouts/error.vue b/webapp/layouts/error.vue index 0b8c37bec..ab4f5e5bb 100644 --- a/webapp/layouts/error.vue +++ b/webapp/layouts/error.vue @@ -2,7 +2,10 @@

- {{ $t(error.message) }} + + {{ $t('error-pages.default') }} + + {{ $t(error.message) }}
{{ $t('error-pages.back-to-index') }}
diff --git a/webapp/locales/de.json b/webapp/locales/de.json index 1a396fa01..ae4b5bfc1 100644 --- a/webapp/locales/de.json +++ b/webapp/locales/de.json @@ -803,6 +803,8 @@ "profile-not-found": "Dieses Profil konnte nicht gefunden werden", "back-to-index": "Zurück zur Startseite", "post-not-found": "Dieser Beitrag konnte nicht gefunden werden", - "cannot-edit-post": "Dieser Beitrag kann nicht editiert werden" + "cannot-edit-post": "Dieser Beitrag kann nicht editiert werden", + "default": "Diese Seite konnte nicht gefunden werden", + "not-authorized": "Kein Zugang zu dieser Seite" } } diff --git a/webapp/locales/en.json b/webapp/locales/en.json index 3138af41f..cb0d3ca07 100644 --- a/webapp/locales/en.json +++ b/webapp/locales/en.json @@ -803,7 +803,9 @@ "profile-not-found": "This profile could not be found", "back-to-index": "Back to index page", "post-not-found": "This post could not be found", - "cannot-edit-post": "This post cannot be edited" + "cannot-edit-post": "This post cannot be edited", + "default": "This page could not be found", + "not-authorized": "Not authorized to this page" } } diff --git a/webapp/middleware/isAdmin.js b/webapp/middleware/isAdmin.js index 4db10bbb6..12b6c5bac 100644 --- a/webapp/middleware/isAdmin.js +++ b/webapp/middleware/isAdmin.js @@ -1,5 +1,5 @@ export default ({ store, error }) => { if (!store.getters['auth/isAdmin']) { - return error({ statusCode: 403 }) + return error({ statusCode: 403, message: 'error-pages.not-authorized' }) } } diff --git a/webapp/middleware/isModerator.js b/webapp/middleware/isModerator.js index e99793a3e..9b17badea 100644 --- a/webapp/middleware/isModerator.js +++ b/webapp/middleware/isModerator.js @@ -1,5 +1,5 @@ export default ({ store, error }) => { if (!store.getters['auth/isModerator']) { - return error({ statusCode: 403 }) + return error({ statusCode: 403, message: 'error-pages.not-authorized' }) } }