sanghee/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' into bug/3806/cannot_create_vms_after_password_reset

Browse source
This commit is contained in:
PCoder 2017-09-25 23:55:20 +05:30
commit 78abc0c740
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hosting/views.py
View file

@ -16,7 +16,7 @@ from django.http import Http404, HttpResponseRedirect, HttpResponse
from django.shortcuts import redirect, render from django.shortcuts import redirect, render
from django.utils.http import urlsafe_base64_decode from django.utils.http import urlsafe_base64_decode
from django.utils.safestring import mark_safe from django.utils.safestring import mark_safe
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import get_language, ugettext_lazy as _
from django.utils.translation import ugettext from django.utils.translation import ugettext
from django.views.generic import ( from django.views.generic import (
View, CreateView, FormView, ListView, DetailView, DeleteView, View, CreateView, FormView, ListView, DetailView, DeleteView,

8
utils/locale/de/LC_MESSAGES/django.po
View file

@ -772,13 +772,13 @@ msgid "The link to reset your email has been sent to your email"
msgstr "Der Link zum Zur?cksetzen deines Passwortes wurde an deine E-Mail gesendet" msgstr "Der Link zum Zur?cksetzen deines Passwortes wurde an deine E-Mail gesendet"
msgid "Password Reset" msgid "Password Reset"
msgstr "" msgstr "Passwort zurücksetzen"
msgid "Password has been reset." msgid "Password has been reset."
msgstr "Das Passwort wurde zur?ckgesetzt." msgstr "Das Passwort wurde zurückgesetzt."
msgid "Password reset has not been successful." msgid "Password reset has not been successful."
msgstr "Das Zur?cksetzen war nicht erfolgreich." msgstr "Das Zurücksetzen war nicht erfolgreich."
msgid "The reset password link is no longer valid." msgid "The reset password link is no longer valid."
msgstr "Der Link zum Zur?cksetzen deines Passwortes ist nicht l?nger g?ltig." msgstr "Der Link zum Zurücksetzen Deines Passwortes ist nicht länger gültig."