From e4e074ea8d6bac85cdbc760d61d6422900b2a196 Mon Sep 17 00:00:00 2001 From: PCoder Date: Sun, 15 Sep 2019 09:12:36 +0530 Subject: [PATCH] Add explanatory text indicating puffy username on OpenBSD VMs --- hosting/locale/de/LC_MESSAGES/django.po | 16 +++++++++++----- .../templates/hosting/emails/new_booked_vm.html | 5 +++++ .../templates/hosting/emails/new_booked_vm.txt | 3 +++ 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po index 14d48da9..5c719457 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: 2019-07-09 15:21+0000\n" +"POT-Creation-Date: 2019-09-15 03:39+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -72,10 +72,6 @@ msgstr "Key-Name" msgid "Please input a proper SSH key" msgstr "Bitte verwende einen gültigen SSH-Key" -#, python-format -msgid "This key exists already with the name \"%(name)s\"" -msgstr "Der SSH-Key mit dem Name \"%(name)s\" existiert bereits" - msgid "Comma not accepted in the name of the key" msgstr "" @@ -242,6 +238,9 @@ msgstr "" msgid "You can view your VM detail by clicking the button below." msgstr "Um die Rechnung zu sehen, klicke auf den Button unten." +msgid "You can log in to your VM by the username puffy." +msgstr "Du kannst Dich auf Deiner VM mit dem user puffy einloggen." + msgid "View Detail" msgstr "Details anzeigen" @@ -255,6 +254,9 @@ msgstr "Deine Bestellung von %(vm_name)s wurde entgegengenommen." msgid "You can view your VM detail by following the link below." msgstr "Um die Rechnung zu sehen, klicke auf den Link unten." +msgid "You can log in to your VM by the username puffy." +msgstr "Du kannst Dich auf Deiner VM mit dem user puffy einloggen." + msgid "Password Reset" msgstr "Passwort zurücksetzen" @@ -873,6 +875,10 @@ msgstr "" "Es gab einen Fehler bei der Bearbeitung Deine Anfrage. Bitte versuche es " "noch einmal." +#, python-format +#~ msgid "This key exists already with the name \"%(name)s\"" +#~ msgstr "Der SSH-Key mit dem Name \"%(name)s\" existiert bereits" + #~ msgid "Add your public SSH key" #~ msgstr "Füge deinen öffentlichen SSH-Key hinzu" diff --git a/hosting/templates/hosting/emails/new_booked_vm.html b/hosting/templates/hosting/emails/new_booked_vm.html index 7bc0cf3a..9fad05fd 100644 --- a/hosting/templates/hosting/emails/new_booked_vm.html +++ b/hosting/templates/hosting/emails/new_booked_vm.html @@ -33,6 +33,11 @@

{% blocktrans %}You can view your VM detail by clicking the button below.{% endblocktrans %}

+ {% if 'OpenBSD' in vm_name %} +

+ {% blocktrans %}You can log in to your VM by the username puffy.{% endblocktrans %} +

+ {% endif %} diff --git a/hosting/templates/hosting/emails/new_booked_vm.txt b/hosting/templates/hosting/emails/new_booked_vm.txt index cfd9c63a..42b48e6a 100644 --- a/hosting/templates/hosting/emails/new_booked_vm.txt +++ b/hosting/templates/hosting/emails/new_booked_vm.txt @@ -5,6 +5,9 @@ {% blocktrans %}You have ordered a new virtual machine!{% endblocktrans %} {% blocktrans %}Your order of {{vm_name}} has been charged.{% endblocktrans %} {% blocktrans %}You can view your VM detail by following the link below.{% endblocktrans %} +{% if 'OpenBSD' in vm_name %} + {% blocktrans %}You can log in to your VM by the username puffy.{% endblocktrans %} +{% endif %} {{ base_url }}{{ order_url }}