From 68cbfdd393beccc0c54e5861ab3ff58cdb191fd7 Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Sun, 1 Oct 2017 23:06:51 +0200 Subject: [PATCH] Update translation and fix loginmixin required for dashboard view --- hosting/locale/de/LC_MESSAGES/django.po | 19 +++++++++++++++++-- hosting/views.py | 10 +++++----- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po index f51e23f8..984bafde 100644 --- a/hosting/locale/de/LC_MESSAGES/django.po +++ b/hosting/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-29 20:14+0000\n" +"POT-Creation-Date: 2017-10-01 20:57+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -629,7 +629,8 @@ msgstr "Um eine neue VM zu erzeugen, klicke \"Neue VM erzeugen\"" msgid "" "To access your VM, add your SSH key here" msgstr "" -"Um auf Deine VM zuzugreifen, füge Deinen SSH-Key hinzu" +"Um auf Deine VM zuzugreifen, füge Deinen SSH-" +"Key hinzu" msgid "CREATE VM" msgstr "NEUE VM" @@ -688,6 +689,16 @@ msgid "In order to create a VM, you need to create/upload your SSH KEY first." msgstr "" "Um eine VM zu erstellen musst du zuerst einen SSH-Key erstellen / hochladen." +msgid "Error." +msgstr "Fehler" + +msgid "" +"There was a payment related error. On close of this popup, you will be " +"redirected back to the payment page." +msgstr "" +"Es ist ein Fehler bei der Zahlung betreten. Du wirst nach dem " +"Schliessen vom Popup zur Bezahlseite weitergeleitet" + msgid "Thank you for the order." msgstr "Danke für Deine Bestellung." @@ -724,6 +735,10 @@ msgstr "Fehler beenden VM" msgid "Virtual Machine Cancellation" msgstr "VM Kündigung" +msgid "There was an error processing your request. Please try again." +msgstr "Es gab einen Fehler bei der Bearbeitung Deine Anfrage. Bitte" +" versuche es noch einmal." + #~ msgid "VM %(VM_ID)s terminated successfully" #~ msgstr "VM %(VM_ID)s erfolgreich beendet" diff --git a/hosting/views.py b/hosting/views.py index 77c7a108..46a0775f 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -60,8 +60,9 @@ CONNECTION_ERROR = "Your VMs cannot be displayed at the moment due to a \ minutes." -class DashboardView(View): +class DashboardView(LoginRequiredMixin, View): template_name = "hosting/dashboard.html" + login_url = reverse_lazy('hosting:login') def get_context_data(self, **kwargs): context = {} @@ -1143,9 +1144,8 @@ def forbidden_view(request, exception=None, reason=''): Handle 403 error """ logger.error(str(exception) if exception else None) + logger.error('Reason = {reason}'.format(reason=reason)) err_msg = _('There was an error processing your request. Please try ' - 'again. Details: {reason}'.format(reason=reason)) + 'again.') messages.add_message(request, messages.ERROR, err_msg) - return HttpResponseRedirect( - request.get_full_path() - ) + return HttpResponseRedirect(request.get_full_path())