From a73bcaef05053ee585fe5d08e03716ab964bc0f2 Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Mon, 25 Sep 2017 09:35:18 +0200 Subject: [PATCH 1/4] Store hash --- hosting/views.py | 2 +- opennebula_api/models.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hosting/views.py b/hosting/views.py index d7c4c168..887a4bb6 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -319,7 +319,7 @@ class PasswordResetConfirmView(PasswordResetConfirmViewMixin): messages.success(request, _('Password has been reset.')) # Change opennebula password - opennebula_client.change_user_password(new_password) + opennebula_client.change_user_password(user.password) return self.form_valid(form) else: diff --git a/opennebula_api/models.py b/opennebula_api/models.py index d584bf26..057139c0 100644 --- a/opennebula_api/models.py +++ b/opennebula_api/models.py @@ -438,11 +438,11 @@ class OpenNebulaManager(): self.oneadmin_client.call(oca.VmTemplate.METHODS[ 'delete'], template_id, False) - def change_user_password(self, new_password): + def change_user_password(self, passwd_hash): self.oneadmin_client.call( oca.User.METHODS['passwd'], self.opennebula_user.id, - new_password + passwd_hash ) def add_public_key(self, user, public_key='', merge=False): From c2844d25ed53ee5b1834b2bc47176698cc05c9b4 Mon Sep 17 00:00:00 2001 From: PCoder Date: Tue, 26 Sep 2017 00:06:17 +0530 Subject: [PATCH 2/4] Corrected a de spelling --- utils/locale/de/LC_MESSAGES/django.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/locale/de/LC_MESSAGES/django.po b/utils/locale/de/LC_MESSAGES/django.po index 92593c40..794b5fd9 100644 --- a/utils/locale/de/LC_MESSAGES/django.po +++ b/utils/locale/de/LC_MESSAGES/django.po @@ -769,7 +769,7 @@ msgid "Message" msgstr "Nachricht" 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" msgstr "Passwort zurücksetzen" From e2779314b053c142764839c2f545ddc1b2474ac5 Mon Sep 17 00:00:00 2001 From: PCoder Date: Tue, 26 Sep 2017 00:25:54 +0530 Subject: [PATCH 3/4] Fix cancel vm modal text translation --- hosting/locale/de/LC_MESSAGES/django.po | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po index b273dbcf..f28fe9db 100644 --- a/hosting/locale/de/LC_MESSAGES/django.po +++ b/hosting/locale/de/LC_MESSAGES/django.po @@ -602,7 +602,8 @@ msgstr "" #, python-format msgid "" "Your Virtual Machine %(virtual_machine.name)s is successfully terminated!" -msgstr "Deine Virtuelle Machine (VM) %(virtual_machine.name)s wurde erfolgreich beendet!" +msgstr "" +"Deine Virtuelle Machine (VM) %(virtual_machine.name)s wurde erfolgreich beendet!" msgid "Virtual Machines" msgstr "Virtuelle Maschinen" From a9755ccbff787df6f85d471f01ea7570f7c89125 Mon Sep 17 00:00:00 2001 From: PCoder Date: Tue, 26 Sep 2017 00:34:33 +0530 Subject: [PATCH 4/4] Updated hosting django.po --- hosting/locale/de/LC_MESSAGES/django.po | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po index 8d4db60e..d6b01d6e 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-23 19:00+0530\n" +"POT-Creation-Date: 2017-09-25 19:00+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -601,8 +601,11 @@ msgstr "" #, python-format msgid "" -"Your Virtual Machine %(virtual_machine.name)s is successfully terminated!" -msgstr "Deine Virtuelle Machine (VM) %(virtual_machine.name)s wurde erfolgreich beendet!" +"Your Virtual Machine %(machine_name)s is successfully " +"terminated!" +msgstr "" +"Deine Virtuelle Machine (VM) %(machine_name)s wurde erfolgreich " +"beendet!" msgid "Virtual Machines" msgstr "Virtuelle Maschinen"