password reset email, user activation email redesigned

alplora/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-05-30 13:47+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"
@@ -18,137 +18,99 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: alplora/templates/alplora/contact.html:6
 msgid "New message"
 msgstr "Neue Nachricht"
 
-#: alplora/templates/alplora/contact.html:13
 msgid "Name:"
 msgstr "Name:"
 
-#: alplora/templates/alplora/contact.html:15
 msgid "What is your name ?"
 msgstr "Was ist Dein Name?"
 
-#: alplora/templates/alplora/contact.html:19
 msgid "From:"
 msgstr "Von:"
 
-#: alplora/templates/alplora/contact.html:21
 msgid "You email"
 msgstr "Deine Email"
 
-#: alplora/templates/alplora/contact.html:25
 msgid "Message:"
 msgstr "Nachricht:"
 
-#: alplora/templates/alplora/contact.html:27
 msgid "Leave us your message"
 msgstr "Schreibe hier Deine Nachricht"
 
-#: alplora/templates/alplora/contact.html:32
 msgid "Close"
 msgstr "schliessen"
 
-#: alplora/templates/alplora/contact.html:33
 msgid "Send message"
 msgstr "Nachricht senden"
 
-#: alplora/templates/alplora/contact_success.html:6
 msgid "Message Sent"
 msgstr "Nachricht gesendet"
 
-#: alplora/templates/alplora/contact_success.html:9
 msgid "Thank you, we will contact you as soon as possible"
 msgstr "Dankeschön! Wir melden uns sobald wie möglich!"
 
-#: alplora/templates/alplora/index.html:13
 msgid "Find your animal anywhere, anytime"
 msgstr "Finde deine Tiere"
 
-#: alplora/templates/alplora/index.html:99
-#: alplora/templates/alplora/index.html:463
 msgid "About"
 msgstr "Über"
 
-#: alplora/templates/alplora/index.html:102
-#: alplora/templates/alplora/index.html:248
-#: alplora/templates/alplora/index.html:469
 msgid "Why Alplora?"
 msgstr "Warum Alplora?"
 
-#: alplora/templates/alplora/index.html:105
-#: alplora/templates/alplora/index.html:466
 msgid "Usecase"
 msgstr ""
 
-#: alplora/templates/alplora/index.html:108
-#: alplora/templates/alplora/index.html:358
 msgid "Testimonials"
 msgstr "Referenzen"
 
-#: alplora/templates/alplora/index.html:111
-#: alplora/templates/alplora/index.html:423
-#: alplora/templates/alplora/index.html:477
 msgid "Contact"
 msgstr "Kontakt"
 
-#: alplora/templates/alplora/index.html:114
 msgid "Login"
 msgstr "Login"
 
-#: alplora/templates/alplora/index.html:137
 msgid "Find your herd anytime, anywhere"
 msgstr "Finde deine Herde jederzeit und überall"
 
-#: alplora/templates/alplora/index.html:138
 msgid "Perfect fit for Swiss Alps"
 msgstr "Perfekt für die Schweizer Alpen"
 
-#: alplora/templates/alplora/index.html:163
 msgid "What is Alplora?"
 msgstr "Was ist Alplora?"
 
-#: alplora/templates/alplora/index.html:164
 msgid ""
 "Alplora is an animal tracker made for outdoor grazing animals in Swiss Alps."
 msgstr ""
 "Alplora ist ein Sender, der speziell für Weidetiere in den Schweizer Alpen "
 "entwickelt wurde."
 
-#: alplora/templates/alplora/index.html:165
 msgid "Alplora is just like a cattle bell, but much better."
 msgstr "Alplora ist wie eine Kuhglocke, nur viel besser."
 
-#: alplora/templates/alplora/index.html:174
 msgid "LOST"
 msgstr "VERLOREN"
 
-#: alplora/templates/alplora/index.html:176
 msgid "When an animal gets separated from the herd and is lost."
 msgstr "Wenn ein Tier sich von der Herde absondert und verloren geht."
 
-#: alplora/templates/alplora/index.html:184
 msgid "WOLF"
 msgstr "WOLF"
 
-#: alplora/templates/alplora/index.html:186
 msgid "When a wolf gets close to the herd."
 msgstr "Wenn ein Wolf sich der Herde nähert."
 
-#: alplora/templates/alplora/index.html:193
 msgid "INJURED"
 msgstr "VERLETZT"
 
-#: alplora/templates/alplora/index.html:195
 msgid "When one of the animals is hurt."
 msgstr "Wenn eins der Tiere verletzt ist."
 
-#: alplora/templates/alplora/index.html:205
 msgid "How does Alplora track my animals?"
 msgstr "Wie kann Alplora meine Tiere verfolgen und ausfindig machen ?"
 
-#: alplora/templates/alplora/index.html:206
 msgid ""
 "Each animal will be wearing a small tracker,<P></P>and the tracker will be "
 "sending a signal every 30 to 60 minutes."
@@ -156,33 +118,27 @@ msgstr ""
 "Jedes Tier wird einen kleinen Sender tragen, <P></P> welcher alle 30 bis 60 "
 "Minuten ein Signal senden wird."
 
-#: alplora/templates/alplora/index.html:215
 msgid "Access app"
 msgstr "Zugang zur App"
 
-#: alplora/templates/alplora/index.html:217
 msgid ""
 "You can see the animal locations on a map by logging into our Alplora app."
 msgstr ""
 "Du kannst den Standort deiner Tiere jederzeit auf einer Karte verfolgen, "
 "indem du dich in unsere Alplora App einloggst."
 
-#: alplora/templates/alplora/index.html:225
 msgid "Get an alarm"
 msgstr "Erhalte ein Warnsignal"
 
-#: alplora/templates/alplora/index.html:227
 msgid ""
 "When certain signals for danger are detected, Alplora sends an alarm to you."
 msgstr ""
 "Wenn Anzeichen von Gefahr bestehen, sendet dir die Alplora App einen "
 "Warnsignal."
 
-#: alplora/templates/alplora/index.html:235
 msgid "Find your animal"
 msgstr "Finde deine Tiere"
 
-#: alplora/templates/alplora/index.html:238
 msgid ""
 "You can locate the animal in trouble on the realtime map and can take "
 "actions for keeping the animal safe."
@@ -190,11 +146,9 @@ msgstr ""
 "Du kannst dein Tier in Notsituationen auf einer Echtzeit-Karte lokalisieren "
 "und hast die Möglichkeit es in Sicherheit zu bringen."
 
-#: alplora/templates/alplora/index.html:255
 msgid "Perfect fit for Swiss mountains"
 msgstr "Perfekt für die Schweizer Alpen"
 
-#: alplora/templates/alplora/index.html:257
 msgid ""
 "Alplora is made and tested for Swiss Alps. It is a perfect fit for Swiss "
 "environment."
@@ -202,11 +156,9 @@ msgstr ""
 "Alplora wurde speziell für die Schweizer Alpen entwickelt und vor Ort "
 "getestet. Das Produkt passt perfekt in die Schweiz!"
 
-#: alplora/templates/alplora/index.html:263
 msgid "Energy efficient"
 msgstr "Energieeffizient"
 
-#: alplora/templates/alplora/index.html:265
 msgid ""
 "Alplora uses the latest wireless technology, our batteries last the whole "
 "alp season."
@@ -214,11 +166,9 @@ msgstr ""
 "Alplora arbeitet mit den neuesten Technologien, so dass der Akku die gesamte "
 "Alpsaison überdauert."
 
-#: alplora/templates/alplora/index.html:271
 msgid "Made with love"
 msgstr "Mit Liebe gemacht"
 
-#: alplora/templates/alplora/index.html:273
 msgid ""
 "With a lot of love and respect for Swiss agriculture and nature, Alplora is "
 "made by a Swiss company."
@@ -226,61 +176,49 @@ msgstr ""
 "Alplora wurde mit viel Liebe und Respekt für die Schweizer Natur und "
 "Landwirtschaft von einer Schweizer Firma entwickelt."
 
-#: alplora/templates/alplora/index.html:285
 msgid "Who needs Alplora?"
 msgstr "Wer benötigt Alplora?"
 
-#: alplora/templates/alplora/index.html:301
 msgid " Are your animals..."
 msgstr "Sind deine Tiere..."
 
-#: alplora/templates/alplora/index.html:304
 msgid "sheep, goats, cows or llamas living freely in the Alps?"
 msgstr "Schafe, Ziegen, Kühe oder Lamas, die frei in den Alpen leben?"
 
-#: alplora/templates/alplora/index.html:306
 msgid "wearing  bells?"
 msgstr "solche, die Glocken tragen?"
 
-#: alplora/templates/alplora/index.html:308
 msgid ""
 "sometimes getting confused and going too far away from where they are "
 "supposed to be?"
 msgstr ""
 "manchmal verwirrt und entfernen sich zu weit von ihrem vorgesehenen Standort?"
 
-#: alplora/templates/alplora/index.html:332
 msgid "Do you..."
 msgstr "Möchtest du..."
 
-#: alplora/templates/alplora/index.html:335
 msgid "have animals which are staying outdoor during some time of the year?"
 msgstr ""
 "deine Tiere, die eine längere Zeit im Jahr unbeobachtet Draussen verbringen, "
 "schützen und überwachen können?"
 
-#: alplora/templates/alplora/index.html:337
 msgid "want to get an alarm when your animal is hurt, or in danger?"
 msgstr ""
 "alarmiert werden, wenn sich eines deiner Tiere verletzt oder in Gefahr "
 "befindet ?"
 
-#: alplora/templates/alplora/index.html:339
 msgid "want to see where your animals are on your cell phone map?"
 msgstr ""
 "mit deinem Smartphone auf einer Karte sehen können, wo sich deine Tiere "
 "befinden? "
 
-#: alplora/templates/alplora/index.html:341
 msgid "want to make sure 24/7 that your animals are safe?"
 msgstr ""
 "sicherstellen, dass sich deine Tiere rund um die Uhr in Sicherheit befinden?"
 
-#: alplora/templates/alplora/index.html:359
 msgid "What our customers say"
 msgstr ""
 
-#: alplora/templates/alplora/index.html:379
 msgid ""
 "“Alplora is an innovation in looking after my cows. I can check where my "
 "cows have been in the higher mountain all day while doing other works at the "
@@ -292,11 +230,9 @@ msgstr ""
 "selben Zeit andereDinge auf dem Hof unten im Dorf erledigen. Dank Alplora "
 "kann ich meinen Kühenmehr Sicherheit gewährleisten."
 
-#: alplora/templates/alplora/index.html:382
 msgid "Farmer in canton Glarus"
 msgstr "Bauern im Kanton Glarus"
 
-#: alplora/templates/alplora/index.html:388
 msgid ""
 "\"Alplora is exactly what I was waiting for. I have lost my sheep almost "
 "every year. Finally I have a way when I want to locate them.\""
@@ -305,11 +241,9 @@ msgstr ""
 "Schafe fastjedes Jahr aus den Augen verloren. Nun habe ich endlich die "
 "Möglichkeit, sie zulokalisieren.\""
 
-#: alplora/templates/alplora/index.html:391
 msgid "Owner of 50 sheep "
 msgstr "Besitzerin von 50 Schafen"
 
-#: alplora/templates/alplora/index.html:397
 msgid ""
 "\"I have a farm down all the way down in the village and y goats are always "
 "freely grazing in the Alps. There are times that I am worried about them but "
@@ -323,30 +257,23 @@ msgstr ""
 "noch um meineanderen Tiere kümmern muss. Mit Alplora kann ich nun ohne "
 "Probleme beides tun.\""
 
-#: alplora/templates/alplora/index.html:401
 msgid "Farmer at Berner Oberland"
 msgstr "Bauer aus dem Berner Oberland"
 
-#: alplora/templates/alplora/index.html:418
 msgid "How do I get Alplora?"
 msgstr "Wie kriege ich Zugriff zu Alplora?"
 
-#: alplora/templates/alplora/index.html:419
 msgid "Click the button below and leave us your contact."
 msgstr "Klicke unten auf Kontakt und hinterlasse uns deine Angaben."
 
-#: alplora/templates/alplora/index.html:419
 msgid "Team Alplora will contact you and visit you with a tracking device."
 msgstr "Das Alpora Team wird sich mit Dir schnellstens in Verbindung setzen."
 
-#: alplora/templates/alplora/index.html:459
 msgid "Home"
 msgstr "Startseite"
 
-#: alplora/templates/alplora/index.html:472
 msgid "Testimonials "
 msgstr "Referenzen"
 
-#: alplora/views.py:24
 msgid "Message Successfully Sent"
 msgstr ""

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-09-23 01:05+0530\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"
@@ -132,44 +132,40 @@ msgstr ""
 msgid "Thank you!"
 msgstr "Vielen Dank!"
 
-msgid "Account Activation"
+msgid "Data Center Light Account Activation"
-msgstr "Account Aktivierung"
+msgstr "Data Center Light Account Aktivierung"
 
 #, python-format
 msgid ""
-"\n"
+"You can activate your Data Center Light account by clicking <a href="
-"You can activate your Data Center Light account by <a href=\"%(base_url)s"
+"\"%(base_url)s%(activation_link)s\" style=\"text-decoration: none; color: "
-"%(activation_link)s\">clicking here</a>.<br/>\n"
+"#4382c8; font-weight: 400;\">here</a>."
-"You can also copy and paste the following link into the address bar of your "
-"browser<br/>\n"
-"to activate your Data Center Light account.<br/>\n"
-"%(base_url)s%(activation_link)s\n"
 msgstr ""
-"\n"
+"Klicke <a href=\"%(base_url)s%(activation_link)s\"style=\"text-decoration: "
-"<a href=\"%(base_url)s%(activation_link)s\">Klicke hier</a> um deinen Data "
+"none; color: #4382c8; font-weight: 400;\">here</a> um deinen Data Center "
-"Center Light Account zu aktivieren oder kopiere den folgenden Link in die "
+"Light Account zu aktivieren."
-"Adressleiste deines Browsers.<br/>\n"
-"%(base_url)s%(activation_link)s\n"
 
-#, python-format
 msgid ""
-"You can activate your Data Center Light account by clicking here.\n"
 "You can also copy and paste the following link into the address bar of your "
-"browser\n"
+"browser to activate your Data Center Light account."
-"to activate your Data Center Light account.\n"
-"%(base_url)s%(activation_link)s\n"
 msgstr ""
-"Klicke hier, um deinen Data Center Light Account zu aktivieren oder kopiere "
+"Kopiere den folgenden Link in die Adressleiste deines Browsers."
-"den folgenden Link in die Adressleiste deines Browsers.\n"
+
-"%(base_url)s%(activation_link)s\n"
+msgid ""
+"You can copy and paste the following link into the address bar of your "
+"browser to activate your Data Center Light account."
+msgstr ""
+"Kopiere den folgenden Link in die Adressleiste deines Browsers."
 
 msgid "Welcome to Data Center Light!"
 msgstr "Willkommen zu Data Center Light!"
 
 msgid ""
 "Thanks for joining us! We provide the most affordable virtual machines from "
-"the heart of Switzerland.<br>Try now, order a VM. VM price starts from only "
+"the heart of Switzerland."
-"15CHF per month."
+msgstr ""
+
+msgid "Try now, order a VM. VM price starts from only 15CHF per month."
 msgstr ""
 
 msgid "ORDER VM"

datacenterlight/templates/datacenterlight/emails/user_activation.html

@@ -1,14 +1,44 @@
-{% extends "datacenterlight/emails/base_email_datacenterlight.html" %}
+{% load static i18n %}
-{% load static from staticfiles %}
+<!DOCTYPE html>
-{% load i18n %}
+<html>
-{% block email_head %}
+
-{{dcl_text}} {% trans 'Account Activation' %}
+<head>
-{% endblock %}
+    <meta charset="UTF-8">
-{% block email_body %}
+    <meta name="viewport" content="width=device-width, initial-scale=1">
-{% blocktrans %}
+    <title>{% trans "Data Center Light Account Activation" %}</title>
-You can activate your Data Center Light account by <a href="{{base_url}}{{activation_link}}">clicking here</a>.<br/>
+    <link rel="shortcut icon" href="{% static 'datacenterlight/img/favicon.ico' %}" type="image/x-icon">
-You can also copy and paste the following link into the address bar of your browser<br/>
+    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Lato:300,400">
-to activate your Data Center Light account.<br/>
+</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 "Data Center Light Account Activation" %}</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;">
+                    {% blocktrans %}You can activate your Data Center Light account by clicking <a href="{{base_url}}{{activation_link}}" style="text-decoration: none; color: #4382c8; font-weight: 400;">here</a>.{% endblocktrans %}<br>
+                    {% blocktrans %}You can also copy and paste the following link into the address bar of your browser to activate your Data Center Light account.{% endblocktrans %}<br>
+                </p>
+                <p style="color: #4382c8; line-height: 1.2; font-family: Lato, Arial, sans-serif; font-weight: 300; margin: 0;">
                     {{base_url}}{{activation_link}}
-{% endblocktrans %}
+                </p>
-{% endblock %}
+            </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>

datacenterlight/templates/datacenterlight/emails/user_activation.txt

@@ -1,10 +1,9 @@
-{% extends "datacenterlight/emails/base_email_datacenterlight.txt" %}
 {% load i18n %}
-{% block email_head %}{{dcl_text}} {% trans 'Account Activation' %}{% endblock %}
+
-{% block email_body %}
+{% trans "Data Center Light Account Activation" %}
-{% blocktrans %}You can activate your Data Center Light account by clicking here.
+
-You can also copy and paste the following link into the address bar of your browser
+{% blocktrans %}You can copy and paste the following link into the address bar of your browser to activate your Data Center Light account.{% endblocktrans %}
-to activate your Data Center Light account.
+
 {{base_url}}{{activation_link}}
-{% endblocktrans %}
+
-{% endblock %}
+{% trans "Your Data Center Light Team" %}

datacenterlight/templates/datacenterlight/emails/welcome_user.html

@@ -24,13 +24,14 @@
         </tr>
         <tr>
             <td style="padding-top: 25px; padding-left: 30px; padding-right: 30px;">
-                <p style="line-height: 1.6; font-family: Lato, Arial, sans-serif; font-weight: 300; margin: 0;">
+                <p style="line-height: 1.75; font-family: Lato, Arial, sans-serif; font-weight: 300; margin: 0;">
-                    {% blocktrans %}Thanks for joining us! We provide the most affordable virtual machines from the heart of Switzerland.<br>Try now, order a VM. VM price starts from only 15CHF per month.{% endblocktrans %}
+                    {% blocktrans %}Thanks for joining us! We provide the most affordable virtual machines from the heart of Switzerland.{% endblocktrans %}<br>
+                    {% blocktrans %}Try now, order a VM. VM price starts from only 15CHF per month.{% endblocktrans %}
                 </p>
             </td>
         </tr>
         <tr>
-            <td style="padding-top: 20px; padding-left: 30px; padding-right: 30px;">
+            <td style="padding-top: 30px; padding-left: 30px; padding-right: 30px;">
                 <a class="btn" href="{{ base_url }}{% url 'hosting:create_virtual_machine' %}" style="font-family: Lato, Arial, sans-serif; text-decoration: none; background-color: #1596da; color: #fff; padding-top: 10px; padding-bottom: 10px; padding-left: 30px; padding-right: 30px; letter-spacing: 0.5px; border-radius: 3px; display: inline-block;">{% trans "ORDER VM" %}</a>
             </td>
         </tr>

datacenterlight/templates/datacenterlight/emails/welcome_user.txt

@@ -1,8 +1,9 @@
-{% load static i18n %}
+{% load i18n %}
 
 {% trans "Welcome to Data Center Light!" %}
 
-{% blocktrans %}Thanks for joining us! We provide the most affordable virtual machines from the heart of Switzerland.<br>Try now, order a VM. VM price starts from only 15CHF per month.{% endblocktrans %}
+{% blocktrans %}Thanks for joining us! We provide the most affordable virtual machines from the heart of Switzerland.{% endblocktrans %}
+{% blocktrans %}Try now, order a VM. VM price starts from only 15CHF per month.{% endblocktrans %}
 
 {{ base_url }}{% url 'hosting:create_virtual_machine' %}
 

datacenterlight/urls.py

@@ -11,7 +11,7 @@ from django.views.generic import TemplateView
 
 urlpatterns = [
     url(r'^test/$', TemplateView.as_view(
-        template_name='datacenterlight/emails/welcome_user.html')),
+        template_name='hosting/emails/password_reset_email.html')),
     url(r'^$', IndexView.as_view(), name='index'),
     url(r'^t/$', IndexView.as_view(), name='index_t'),
     url(r'^g/$', IndexView.as_view(), name='index_g'),

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-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 "We received a request to reset your password."
-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"
 
-#, python-format
+msgid "If you didn't make this request you can safely ignore this email."
-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"
+msgid "Otherwise, click here to reset your password."
-"Bitte folge diesem Link und wähle ein neues Passwort: %(base_url)s"
+msgstr ""
-"%(password_reset_url)s Solltest du kein neues Passwort angefordert haben, "
+
-"dann ignoriere diese E-Mail.\n"
+msgid "Thank you!"
-"Dankeschön!\n"
+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, "
+"Deine VM ist gleich bereit. Wir senden Dir eine Bestätigungsemail, sobald Du "
-"sobald Du auf sie zugreifen kannst."
+"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"
 

hosting/templates/hosting/emails/password_reset_email.html

@@ -1,14 +1,49 @@
-{% extends "datacenterlight/emails/base_email_datacenterlight.html" %}
+{% load static i18n %}
-{% load i18n %}
+<!DOCTYPE html>
-{% block email_head %}
+<html>
-{% trans 'Password Reset' %}
+
-{% endblock %}
+<head>
-{% block email_body %}
+    <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 %}
-{% blocktrans %}
+                    {{base_url}}{{ password_reset_url }}
-You're receiving this email because you requested a password reset for your user account at {{site_name}}.<br/>
+                </p>
-Please go to the following page and choose a new password: {{base_url}}{{ password_reset_url }}<br/>
+                <p style="line-height: 1.75; font-family: Lato, Arial, sans-serif; font-weight: 300; margin-bottom: 0; margin-top: 10px;">
-If you didn't request a new password, ignore this e-mail.<br/>
+                    {% trans "Thank you!" %}
-Thank you!
+                </p>
-{% endblocktrans %}
+            </td>
-{% endblock %}
+        </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>

hosting/templates/hosting/emails/password_reset_email.txt

@@ -1,11 +1,12 @@
-{% extends "datacenterlight/emails/base_email_datacenterlight.txt" %}
+{% trans "Password Reset" %}
-{% load i18n %}
+
-{% block email_head %}{% trans 'Password Reset' %}{% endblock %}
+{% trans "We received a request to reset your password." %}
-{% block email_body %}
+{% 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}}.
+{{base_url}}{{ password_reset_url }}
-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.
+{% trans "Thank you!" %}
-Thank you!
+
-{% endblocktrans %}
+{% trans "Your Data Center Light Team" %}
-{% endblock %}

membership/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-06-23 02:05+0530\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"
@@ -18,42 +18,35 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: forms.py:43
 msgid "Name"
 msgstr ""
 
-#: forms.py:43
 msgid "Card number"
 msgstr ""
 
-#: forms.py:43
 msgid "Expiry date"
 msgstr ""
 
-#: forms.py:44
 msgid "CCV"
 msgstr ""
 
-#: models.py:66
 msgid "staff status"
 msgstr ""
 
-#: models.py:68
 msgid "Designates whether the user can log into this admin site."
 msgstr ""
 
-#: models.py:90
+msgid "Account Activation"
-msgid "Activate your "
+msgstr ""
-msgstr "Aktiviere deinen "
 
-#: models.py:90
-msgid " account"
-msgstr " Account"
-
-#: models.py:198
 msgid "Use this pattern(MM/YYYY)."
 msgstr ""
 
-#: models.py:199
 msgid "Wrong CCV number."
 msgstr ""
+
+#~ msgid "Activate your "
+#~ msgstr "Aktiviere deinen "
+
+#~ msgid " account"
+#~ msgstr " Account"

ungleich_page/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-05-30 13:47+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"
@@ -18,110 +18,81 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ungleich_page/templates/ungleich_page/includes/_about.html:8
 msgid "ABOUT"
 msgstr "Über ungleich"
 
-#: ungleich_page/templates/ungleich_page/includes/_about.html:9
 msgid "The timeline of ungleich"
 msgstr "Die Chronik von ungleich"
 
-#: ungleich_page/templates/ungleich_page/includes/_about.html:24
 msgid "The first incarnation of ungleich"
 msgstr "Die erste Inkarnation von ungleich"
 
-#: ungleich_page/templates/ungleich_page/includes/_about.html:25
 msgid "in Germany"
 msgstr "in Deutschland"
 
-#: ungleich_page/templates/ungleich_page/includes/_about.html:37
 msgid "ungleich founded"
 msgstr "ungleich gegründet"
 
-#: ungleich_page/templates/ungleich_page/includes/_about.html:38
 msgid "in Switzerland"
 msgstr "in der Schweiz"
 
-#: ungleich_page/templates/ungleich_page/includes/_about.html:51
 msgid "ungleich present at various conferences"
 msgstr "ungleich präsent an mehreren Konferenzen"
 
-#: ungleich_page/templates/ungleich_page/includes/_about.html:65
 msgid "ungleich introduces HA-Hosting"
 msgstr "ungleich führt HA-Hosting ein"
 
-#: ungleich_page/templates/ungleich_page/includes/_about.html:66
 msgid "and introduces affordable 24X7 support."
 msgstr "und führt kostengünstigen 24X7 Support ein."
 
-#: ungleich_page/templates/ungleich_page/includes/_about.html:67
 msgid "ungleich launches"
 msgstr "ungleich lanciert"
 
-#: ungleich_page/templates/ungleich_page/includes/_about.html:68
 msgid "Digital Glarus project"
 msgstr "Digital Glarus Projekt"
 
-#: ungleich_page/templates/ungleich_page/includes/_about.html:74
 msgid "and"
 msgstr "und"
 
-#: ungleich_page/templates/ungleich_page/includes/_about.html:74
 msgid "the story continues!"
 msgstr "Die Geschichte geht weiter!"
 
-#: ungleich_page/templates/ungleich_page/includes/_contact_us.html:15
-#: ungleich_page/templates/ungleich_page/includes/_contact_us.html:28
-#: ungleich_page/views.py:36
 msgid "Contact Us"
 msgstr "Kontaktieren Sie uns"
 
-#: ungleich_page/templates/ungleich_page/includes/_contact_us.html:18
 msgid "Join us at"
 msgstr "Schliessen Sie sich uns an"
 
-#: ungleich_page/templates/ungleich_page/includes/_contact_us.html:19
 msgid "Digital Glarus"
 msgstr "Digital Glarus"
 
-#: ungleich_page/templates/ungleich_page/includes/_contact_us.html:20
 msgid "a great co-working space in the middle of Alps!"
 msgstr "ein wunderschöner Co-Working Space mitten in den Alpen"
 
-#: ungleich_page/templates/ungleich_page/includes/_contact_us.html:21
 msgid "You can contact us at"
 msgstr "Sie können uns kontaktieren unter"
 
-#: ungleich_page/templates/ungleich_page/includes/_contact_us.html:26
 msgid "or"
 msgstr "oder"
 
-#: ungleich_page/templates/ungleich_page/includes/_contact_us.html:60
 msgid "Submit"
 msgstr "Absenden"
 
-#: ungleich_page/templates/ungleich_page/includes/_footer.html:8
 msgid "Copyright © ungleich GmbH "
 msgstr "Copyright © ungleich GmbH"
 
-#: ungleich_page/templates/ungleich_page/includes/_footer.html:22
 msgid "ungleich Home"
 msgstr "ungleich Home"
 
-#: ungleich_page/templates/ungleich_page/includes/_header.html:11
 msgid "We  Design, Configure &amp; Maintain <br> Your Linux Infrastructure "
 msgstr "Wir designen, erstellen und warten Ihre Linux-Infrastruktur"
 
-#: ungleich_page/templates/ungleich_page/includes/_portfolio.html:8
-#: ungleich_page/templates/ungleich_page/includes/_portfolio.html:9
 msgid "Hosting Products "
 msgstr "Hosting Produkte"
 
-#: ungleich_page/templates/ungleich_page/includes/_portfolio.html:16
 msgid "HA Hosting"
 msgstr "HA Hosting"
 
-#: ungleich_page/templates/ungleich_page/includes/_portfolio.html:18
 msgid ""
 "We offer high availablity hosting (HA) in Germany and in Switzerland. Our "
 "infrastructure is powered by Free and Open Source Software like OpenNebula, "
@@ -131,22 +102,18 @@ msgstr ""
 "Schweiz. Unsere Infrastruktur ist unterstützt durch Free and Open  Source "
 "Software wie OpenNebula."
 
-#: ungleich_page/templates/ungleich_page/includes/_portfolio.html:24
 msgid "Rails Hosting"
 msgstr "Rails Hosting"
 
-#: ungleich_page/templates/ungleich_page/includes/_portfolio.html:26
 msgid ""
 "Ready to go live with your Ruby on Rails application? We offer you ready-to-"
 "deploy virtual machines or configure your existing infrastructure for Ruby "
 "on Rails."
 msgstr "Sind bereit mit ihrem Ruby on Rails Applikation live zu gehen?"
 
-#: ungleich_page/templates/ungleich_page/includes/_portfolio.html:32
 msgid " Configuration as a Service"
 msgstr "Konfiguration als Service"
 
-#: ungleich_page/templates/ungleich_page/includes/_portfolio.html:34
 msgid ""
 "You are in need for a configuration?<br>With ungleich you have found an "
 "experienced team that configure your systems to provide service like DNS, E-"
@@ -156,27 +123,22 @@ msgstr ""
 "gefunden, dass ihnen die Konfiguration von DNS, E-Mail, Datenbanken oder "
 "Webservern für ihr System anbietet"
 
-#: ungleich_page/templates/ungleich_page/includes/_services.html:8
 msgid "our services"
 msgstr "Unsere Dienstleistungen"
 
-#: ungleich_page/templates/ungleich_page/includes/_services.html:10
 msgid "We support our clients in all areas of Unix infrastructure."
 msgstr ""
 "Wir unterstützen unsere Klienten in allen Bereichen der Unix Infrastruktur."
 
-#: ungleich_page/templates/ungleich_page/includes/_services.html:11
 msgid ""
 "Our top notch configuration management is refreshingly simple and reliable."
 msgstr ""
 "Unser erstklassiges Konfigurationsmanagement ist erfrischend einfach und "
 "zuverlässig."
 
-#: ungleich_page/templates/ungleich_page/includes/_services.html:20
 msgid "Hosting"
 msgstr "Hosting"
 
-#: ungleich_page/templates/ungleich_page/includes/_services.html:22
 msgid ""
 "Ruby on Rails. Java hosting, Django hosting, we make it everything run "
 "smooth and safe."
@@ -184,11 +146,9 @@ msgstr ""
 "Ruby on Rails. Java hosting, Django hosting, wir garantieren einen "
 "reibungslosen Ablauf"
 
-#: ungleich_page/templates/ungleich_page/includes/_services.html:30
 msgid "Configuration as a Service"
 msgstr "Konfiguration als Service"
 
-#: ungleich_page/templates/ungleich_page/includes/_services.html:32
 msgid ""
 "Ruby on Rails, Django, Java, Webserver, Mailserver, any infrastructure that "
 "needs to configured, we provide comprehensive solutions. Amazon, rackspace "
@@ -198,11 +158,9 @@ msgstr ""
 "welche eine Konfiguration braucht, wir offerieren umfassende Lösungen, "
 "Amazon, Rackspace oder Bare Metal Servers, wir konfigurieren alles."
 
-#: ungleich_page/templates/ungleich_page/includes/_services.html:40
 msgid "Linux System Engineering"
 msgstr "Linux System Engineering"
 
-#: ungleich_page/templates/ungleich_page/includes/_services.html:43
 msgid ""
 "Let your developers develop! We take care of your system administration. "
 "Gentoo, Archlinux, Debian, Ubuntu, and many more."
@@ -210,15 +168,12 @@ msgstr ""
 "Lassen sie ihre Entwickler entwickeln! Wir kümmern uns um ihre "
 "Systemadministration. Gentoo, Archlinux, Debian, Ubuntu und viele mehr."
 
-#: ungleich_page/templates/ungleich_page/includes/_team.html:8
 msgid "Why ungleich?*"
 msgstr "Warum ungleich?"
 
-#: ungleich_page/templates/ungleich_page/includes/_team.html:9
 msgid "What our customers say"
 msgstr "Was unsere Kunden sagen"
 
-#: ungleich_page/templates/ungleich_page/includes/_team.html:29
 msgid ""
 "\n"
 "\t\t\t    \"ungleich helped us getting started with our internal\n"
@@ -247,7 +202,6 @@ msgstr ""
 "Infrastruktur-Einrichtung erhalten, welche es unseren Technikern ermöglicht "
 "effizienter und bequemer zu arbeiten als zuvor."
 
-#: ungleich_page/templates/ungleich_page/includes/_team.html:51
 msgid ""
 "\n"
 "\t\t\t    \"Thanks to ungleich team, who has designed and\n"
@@ -265,7 +219,6 @@ msgstr ""
 "nur in der Kosteneinsparung aber auch zur Zeiteinsparung, was für IT-Firmen "
 "sehr wichtig ist."
 
-#: ungleich_page/templates/ungleich_page/includes/_team.html:67
 msgid ""
 "\n"
 "\t\t\t    \"ungleich provided an excellent service in designing\n"
@@ -292,7 +245,6 @@ msgstr ""
 "allen Firmen empfehlen, bei denen eine solide Infrastruktur stark gefragt "
 "ist."
 
-#: ungleich_page/templates/ungleich_page/includes/_team.html:82
 msgid ""
 "\n"
 "\t\t\t    <strong>- Sebastian Plattner,</strong>\n"
@@ -300,47 +252,37 @@ msgid ""
 "\t\t\t    "
 msgstr ""
 
-#: ungleich_page/templates/ungleich_page/includes/_team.html:95
 msgid "*ungleich means not equal to (≠) U+2260."
 msgstr "*ungleich bedeutet nicht gleich wie (≠) U+2260."
 
-#: ungleich_page/templates/ungleich_page/landing.html:85
 #, fuzzy
 #| msgid "our services"
 msgid "Services"
 msgstr "Unsere Dienstleistungen"
 
-#: ungleich_page/templates/ungleich_page/landing.html:90
 msgid "products"
 msgstr "PRODUKTE"
 
-#: ungleich_page/templates/ungleich_page/landing.html:93
 msgid "About"
 msgstr "Über"
 
-#: ungleich_page/templates/ungleich_page/landing.html:96
 msgid "WHY UNGLEICH?"
 msgstr "WARUM UNGLEICH?"
 
-#: ungleich_page/templates/ungleich_page/landing.html:99
 msgid "BLOG"
 msgstr "BLOG"
 
-#: ungleich_page/templates/ungleich_page/landing.html:102
 msgid "CONTACT"
 msgstr "KONTAKT"
 
-#: ungleich_page/urls.py:8
 #, fuzzy
 #| msgid "Contact Us"
 msgid "contact/$"
 msgstr "Kontaktieren Sie uns"
 
-#: ungleich_page/views.py:26
 msgid "Message Successfully Sent"
 msgstr "Nachricht erfolgreich versendet"
 
-#: ungleich_page/views.py:37
 msgid "If you have any question, just send us an email."
 msgstr ""
 "Wenn Sie irgendwelche Fragen haben, schicken Sie uns einfach eine E-Mail."

utils/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 11:50+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"
@@ -769,7 +769,8 @@ 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 ""