password reset email, user activation email redesigned

This commit is contained in:
Arvind Tiwari 2017-09-23 01:57:40 +05:30
commit 057a2c77a6
14 changed files with 279 additions and 1460 deletions

View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-09-20 20:23+0000\n"
"POT-Creation-Date: 2017-09-23 01:50+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"
@ -215,39 +215,20 @@ msgstr ""
msgid "Password Reset"
msgstr "Passwort zurücksetzen"
#, python-format
msgid ""
"\n"
"You're receiving this email because you requested a password reset for your "
"user account at %(site_name)s.<br/>\n"
"Please go to the following page and choose a new password: %(base_url)s"
"%(password_reset_url)s<br/>\n"
"If you didn't request a new password, ignore this e-mail.<br/>\n"
"Thank you!\n"
msgid "We received a request to reset your password."
msgstr ""
"\n"
"Du erhälst diese E-Mail da du dein Passwort für deinen Account bei "
"%(site_name)s zurücksetzen möchtest.<br/>\n"
"Bitte folge diesem Link und wähle ein neues Passwort: %(base_url)s"
"%(password_reset_url)s Solltest du kein neues Passwort angefordert haben, "
"dann ignoriere diese E-Mail.<br/>\n"
"Dankeschön!\n"
#, python-format
msgid ""
"You're receiving this email because you requested a password reset for your "
"user account at %(site_name)s.\n"
"Please go to the following page and choose a new password: %(base_url)s"
"%(password_reset_url)s\n"
"If you didn't request a new password, ignore this e-mail.\n"
"Thank you!\n"
msgid "If you didn't make this request you can safely ignore this email."
msgstr ""
"Du erhälst diese E-Mail da du dein Passwort für deinen Account bei "
"%(site_name)s zurücksetzen möchtest.\n"
"Bitte folge diesem Link und wähle ein neues Passwort: %(base_url)s"
"%(password_reset_url)s Solltest du kein neues Passwort angefordert haben, "
"dann ignoriere diese E-Mail.\n"
"Dankeschön!\n"
msgid "Otherwise, click here to reset your password."
msgstr ""
msgid "Thank you!"
msgstr ""
msgid "Your Data Center Light Team"
msgstr "Dein Data Center Light Team"
#, python-format
msgid ""
@ -374,7 +355,6 @@ msgstr ""
msgid "Place order"
msgstr "Bestelle"
msgid "Processing..."
msgstr "Abarbeitung..."
@ -646,8 +626,8 @@ msgid ""
"Your VM will be up and running in a few moments. We will send you a "
"confirmation email as soon as it is ready."
msgstr ""
"Deine VM ist gleich bereit. Wir senden Dir eine Bestätigungsemail, "
"sobald Du auf sie zugreifen kannst."
"Deine VM ist gleich bereit. Wir senden Dir eine Bestätigungsemail, sobald Du "
"auf sie zugreifen kannst."
msgid "In order to create a VM, you need to create/upload your SSH KEY first."
msgstr ""
@ -665,12 +645,41 @@ msgstr "VM Kündigung"
msgid "VM %(VM_ID)s terminated successfully"
msgstr "VM %(VM_ID)s erfolgreich beendet"
#~ msgid ""
#~ "\n"
#~ "You're receiving this email because you requested a password reset for "
#~ "your user account at %(site_name)s.<br/>\n"
#~ "Please go to the following page and choose a new password: %(base_url)s"
#~ "%(password_reset_url)s<br/>\n"
#~ "If you didn't request a new password, ignore this e-mail.<br/>\n"
#~ "Thank you!\n"
#~ msgstr ""
#~ "\n"
#~ "Du erhälst diese E-Mail da du dein Passwort für deinen Account bei "
#~ "%(site_name)s zurücksetzen möchtest.<br/>\n"
#~ "Bitte folge diesem Link und wähle ein neues Passwort: %(base_url)s"
#~ "%(password_reset_url)s Solltest du kein neues Passwort angefordert haben, "
#~ "dann ignoriere diese E-Mail.<br/>\n"
#~ "Dankeschön!\n"
#~ msgid ""
#~ "You're receiving this email because you requested a password reset for "
#~ "your user account at %(site_name)s.\n"
#~ "Please go to the following page and choose a new password: %(base_url)s"
#~ "%(password_reset_url)s\n"
#~ "If you didn't request a new password, ignore this e-mail.\n"
#~ "Thank you!\n"
#~ msgstr ""
#~ "Du erhälst diese E-Mail da du dein Passwort für deinen Account bei "
#~ "%(site_name)s zurücksetzen möchtest.\n"
#~ "Bitte folge diesem Link und wähle ein neues Passwort: %(base_url)s"
#~ "%(password_reset_url)s Solltest du kein neues Passwort angefordert haben, "
#~ "dann ignoriere diese E-Mail.\n"
#~ "Dankeschön!\n"
#~ msgid "Finish Configuration"
#~ msgstr "Konfiguration beenden"
#~ msgid "Your New VM %(vm_name)s at Data Center Light"
#~ msgstr "Deine neue VM %(vm_name)s bei Data Center Light"
#~ msgid "My Virtual Machines"
#~ msgstr "Meine virtuellen Maschinen"

View file

@ -1,14 +1,49 @@
{% extends "datacenterlight/emails/base_email_datacenterlight.html" %}
{% load i18n %}
{% block email_head %}
{% trans 'Password Reset' %}
{% endblock %}
{% block email_body %}
{% url 'hosting:reset_password_confirm' uidb64=uid token=token as password_reset_url %}
{% blocktrans %}
You're receiving this email because you requested a password reset for your user account at {{site_name}}.<br/>
Please go to the following page and choose a new password: {{base_url}}{{ password_reset_url }}<br/>
If you didn't request a new password, ignore this e-mail.<br/>
Thank you!
{% endblocktrans %}
{% endblock %}
{% load static i18n %}
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>{% trans "Password Reset" %}</title>
<link rel="shortcut icon" href="{% static 'datacenterlight/img/favicon.ico' %}" type="image/x-icon">
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Lato:300,400">
</head>
<body style="margin: 0; padding: 20px 0;">
<table style="width: 100%; margin: auto; border-spacing: 0; border-collapse: collapse; max-width: 560px; border: 1px solid #aaa;">
<tr>
<td style="padding-top: 25px; padding-left: 22px; padding-right: 30px; font-family: Lato, Arial, sans-serif;">
<img src="{{base_url}}{% static 'datacenterlight/img/logo_black.svg' %}" style="vertical-align: middle; width: 200px; height: 50px;">
</td>
</tr>
<tr>
<td style="padding-top: 15px; padding-left: 30px; padding-right: 30px;">
<h1 style="font-family: Lato, Arial, sans-serif; font-size: 25px; font-weight: 400; margin: 0;">{% trans "Password Reset" %}</h1>
</td>
</tr>
<tr>
<td style="padding-top: 25px; padding-left: 30px; padding-right: 30px;">
<p style="line-height: 1.75; font-family: Lato, Arial, sans-serif; font-weight: 300; margin-bottom: 10px; margin-top: 0;">
{% trans "We received a request to reset your password." %}<br>
{% trans "If you didn't make this request you can safely ignore this email." %}<br>
{% trans "Otherwise, click here to reset your password." %}
</p>
<p style="color: #4382c8; line-height: 1.2; font-family: Lato, Arial, sans-serif; font-weight: 300; margin: 0;">
{% url 'hosting:reset_password_confirm' uidb64=uid token=token as password_reset_url %}
{{base_url}}{{ password_reset_url }}
</p>
<p style="line-height: 1.75; font-family: Lato, Arial, sans-serif; font-weight: 300; margin-bottom: 0; margin-top: 10px;">
{% trans "Thank you!" %}
</p>
</td>
</tr>
<tr>
<td style="padding-top: 40px; padding-left: 30px; padding-right: 30px; padding-bottom: 25px;">
<h3 style="font-family: Lato, Arial, sans-serif; margin: 0; font-weight: 400; font-size: 18px;">{% trans "Your Data Center Light Team" %}</h3>
</td>
</tr>
</table>
</body>
</html>

View file

@ -1,11 +1,12 @@
{% extends "datacenterlight/emails/base_email_datacenterlight.txt" %}
{% load i18n %}
{% block email_head %}{% trans 'Password Reset' %}{% endblock %}
{% block email_body %}
{% trans "Password Reset" %}
{% trans "We received a request to reset your password." %}
{% trans "If you didn't make this request you can safely ignore this email." %}
{% trans "Otherwise, click here to reset your password." %}
{% url 'hosting:reset_password_confirm' uidb64=uid token=token as password_reset_url %}
{% blocktrans %}You're receiving this email because you requested a password reset for your user account at {{site_name}}.
Please go to the following page and choose a new password: {{base_url}}{{ password_reset_url }}
If you didn't request a new password, ignore this e-mail.
Thank you!
{% endblocktrans %}
{% endblock %}
{{base_url}}{{ password_reset_url }}
{% trans "Thank you!" %}
{% trans "Your Data Center Light Team" %}