diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po index 4a837fcc..06e9a0df 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-02 19:31+0000\n" +"POT-Creation-Date: 2017-09-03 14:48+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -258,6 +258,42 @@ msgstr "" "dann ignoriere diese E-Mail.\n" "Dankeschön!\n" +#, python-format +msgid "" +"You're receiving this mail because your virtual machine [%(vm_name)s] has " +"been cancelled.
\n" +"You can see your order status by clicking [my VM page] below.
\n" +"If you want to order a new virtual machine, you can do it by clicking this link.
\n" +msgstr "" +"Du erhälst diese E-Mail, da deine virtuelle Maschine [%(vm_name)s] gekündigt " +"wurde.
\n" +"Um deinen Auftragsstatus zu sehen, klicke auf die [my VM page] unten.
\n" +"Falls du eine neue virtuelle Maschine bestellen möchtest, kannst du dies " +"tun, indem du diesen " +"Link klickst.
\n" + +msgid "My VM page" +msgstr "" + +#, python-format +msgid "" +"You're receiving this mail because your virtual machine [%(vm_name)s] has " +"been cancelled.\n" +"You can see your order status by clicking here\n" +"%(base_url)s%(vm_order_url)s\n" +"If you want to order a new virtual machine, you can do it by clicking this " +"link.\n" +"%(base_url)s%(my_virtual_machines_url)s\n" +msgstr "" +"Du erhälst diese E-Mail, da deine virtuelle Maschine [%(vm_name)s] gekündigt " +"wurde.\n" +"Um deinen Auftragsstatus zu sehen, klicke hier.\n" +"%(base_url)s%(vm_order_url)s\n" +"Falls du eine neue virtuelle Maschine bestellen möchtest, kannst du dies " +"tun, indem du diesen Link klickst.\n" +"%(base_url)s%(my_virtual_machines_url)s" + msgid "Don't have an account yet ? " msgstr "Besitzt du kein Benutzerkonto?" @@ -575,6 +611,9 @@ msgid "" "contact Data Center Light Support." msgstr "Kontaktiere den Data Center Light Support." +msgid "Virtual Machine Cancellation" +msgstr "VM Kündigung" + #~ msgid "Your SSH Keys" #~ msgstr "Deine SSH Keys" diff --git a/hosting/templates/hosting/emails/vm_canceled.html b/hosting/templates/hosting/emails/vm_canceled.html index e0f382cc..68c7b9fd 100644 --- a/hosting/templates/hosting/emails/vm_canceled.html +++ b/hosting/templates/hosting/emails/vm_canceled.html @@ -3,10 +3,13 @@ {% block email_head %}{{page_header}}{% endblock %} {% block email_body %} {% url 'hosting:virtual_machines' as my_virtual_machines_url %} -{% url 'hosting:orders' order.id as vm_order_url %} +{% url 'hosting:orders' as vm_orders_url %} {% blocktrans with vm.name as vm_name %}You're receiving this mail because your virtual machine [{{vm_name}}] has been cancelled.
-You can see your order status by clicking here.
+You can see your order status by clicking [my VM page] below.
If you want to order a new virtual machine, you can do it by clicking this link.
{% endblocktrans %} + {% endblock %} diff --git a/hosting/templates/hosting/emails/vm_canceled.txt b/hosting/templates/hosting/emails/vm_canceled.txt index 81df786f..e20e639c 100644 --- a/hosting/templates/hosting/emails/vm_canceled.txt +++ b/hosting/templates/hosting/emails/vm_canceled.txt @@ -4,8 +4,8 @@ {% block email_body %} {% url 'hosting:virtual_machines' as my_virtual_machines_url %} {% url 'hosting:orders' order.id as vm_order_url %} -{% blocktrans with vm.name as vm_name %}{% blocktrans with vm.name as vm_name %}You're receiving this mail because your virtual machine [{{vm_name}}] has been cancelled. -You can see your order status by clicking +{% blocktrans with vm.name as vm_name %}You're receiving this mail because your virtual machine [{{vm_name}}] has been cancelled. +You can see your order status by clicking here {{base_url}}{{vm_order_url}} If you want to order a new virtual machine, you can do it by clicking this link. {{base_url}}{{my_virtual_machines_url}} diff --git a/hosting/views.py b/hosting/views.py index 4856a0f1..68b21c6d 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -891,10 +891,8 @@ class VirtualMachineView(LoginRequiredMixin, View): 'Error terminating VM %s' % (opennebula_vm_id) ) return HttpResponseRedirect(self.get_success_url()) - order = HostingOrder.objects.filter(vm_id=vm.id).first() context = { 'vm': vm, - 'order': order, 'base_url': "{0}://{1}".format(self.request.scheme, self.request.get_host()), 'page_header': _('Virtual Machine Cancellation')