Merge branch 'master' into task/3747/multiple_cards_support

datacenterlight/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-10-10 21:35+0530\n"
+"POT-Creation-Date: 2017-10-16 00:57+0530\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -144,6 +144,21 @@ msgid ""
 "browser to activate your Data Center Light account."
 msgstr "Kopiere den folgenden Link in die Adressleiste deines Browsers."
 
+msgid "Your account details are as follows"
+msgstr "Deine Account Details sind unten aufgelistet"
+
+msgid "Username"
+msgstr "Username"
+
+msgid "Your email address"
+msgstr "Deine E-Mail-Adresse"
+
+msgid "Password"
+msgstr "Passwort"
+
+msgid "You can reset your password here"
+msgstr "Du kannst dein Passwort hier zurück setzen"
+
 msgid ""
 "You can copy and paste the following link into the address bar of your "
 "browser to activate your Data Center Light account."
@@ -546,9 +561,6 @@ msgstr ""
 #~ "kontaktiere uns unter support@datacenterlight.ch. Unser Team wird sich "
 #~ "umgehend um dein Anliegen kümmern!"
 
-#~ msgid "Email Address"
-#~ msgstr "E-Mail-Adresse"
-
 #~ msgid "is not a proper name"
 #~ msgstr "ist kein gültiger Name"
 

datacenterlight/templates/datacenterlight/emails/user_activation.html

@@ -33,6 +33,18 @@
                 <p style="color: #4382c8; line-height: 1.4; font-family: Lato, Arial, sans-serif; font-weight: 300; margin: 0;">
                     {{base_url}}{{activation_link}}
                 </p>
+                <p>
+                    {% if account_details %}
+                        {% url 'hosting:reset_password' as reset_password_url %}
+                        {% trans "Your account details are as follows" %}:
+
+                        {% trans "Username" %} : {% trans "Your email address" %}
+                        {% trans "Password" %} : {{account_details}}
+
+                        {% trans "You can reset your password here" %}:
+                        {{base_url}}{{reset_password_url}}
+                    {% endif %}
+                </p>
             </td>
         </tr>
         <tr>

datacenterlight/templates/datacenterlight/emails/user_activation.txt

@@ -6,4 +6,15 @@
 
 {{base_url}}{{activation_link}}
 
+{% if account_details %}
+    {% url 'hosting:reset_password' as reset_password_url %}
+    {% trans "Your account details are as follows" %}:
+
+    {% trans "Username" %} : {% trans "Your email address" %}
+    {% trans "Password" %} : {{account_details}}
+
+    {% trans "You can reset your password here" %}:
+    {{base_url}}{{reset_password_url}}
+{% endif %}
+
 {% trans "Your Data Center Light Team" %}