From e63e01458838e35d1bc8287a3251c52b23f02c40 Mon Sep 17 00:00:00 2001
From: "M.Ravi" <mondi.ravi@gmail.com>
Date: Sat, 17 Jun 2017 17:34:30 +0530
Subject: [PATCH 01/38] Added Lato font for sign up success text

---
 hosting/static/hosting/css/landing-page.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hosting/static/hosting/css/landing-page.css b/hosting/static/hosting/css/landing-page.css
index d7d72ee2..69392172 100644
--- a/hosting/static/hosting/css/landing-page.css
+++ b/hosting/static/hosting/css/landing-page.css
@@ -323,6 +323,7 @@ h6 {
     text-align: justify;
     font-size: 18px;
     line-height: 30px;
+    font-family: 'Lato' !important;
 }
 .sign-up-message a {
     font-size: 18px;

From ab50e58a72f7817a02ffbd0c9624bda0b325b9c2 Mon Sep 17 00:00:00 2001
From: "M.Ravi" <mondi.ravi@gmail.com>
Date: Sat, 17 Jun 2017 19:38:22 +0530
Subject: [PATCH 02/38] Updated signup and email confirmation views to work
 with translation

---
 hosting/locale/de/LC_MESSAGES/django.po | 347 +++++++++++++-----------
 hosting/views.py                        |  31 ++-
 2 files changed, 213 insertions(+), 165 deletions(-)

diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po
index 9ee6f63c..661fa0bd 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-05-30 13:47+0000\n"
+"POT-Creation-Date: 2017-06-17 19:32+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,72 +18,66 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: hosting/forms.py:63
+#: forms.py:28
+msgid "Your account is not activated yet."
+msgstr ""
+
+#: forms.py:65
 msgid "Paste here your public key"
 msgstr "Fügen Sie Ihren public key ein"
 
-#: hosting/templates/hosting/base_short.html:68
-#: hosting/templates/hosting/base_short.html:139
+#: templates/hosting/base_short.html:67
 msgid "My Virtual Machines"
 msgstr "Meine virtuellen Maschinen"
 
-#: hosting/templates/hosting/base_short.html:73
-#: hosting/templates/hosting/base_short.html:145
-#: hosting/templates/hosting/orders.html:12
+#: templates/hosting/base_short.html:72 templates/hosting/orders.html.py:12
 msgid "My Orders"
 msgstr "Meine Bestellungen"
 
-#: hosting/templates/hosting/base_short.html:78
-#: hosting/templates/hosting/base_short.html:152
+#: templates/hosting/base_short.html:81
 msgid "Keys"
 msgstr "Schlüssel"
 
-#: hosting/templates/hosting/base_short.html:83
-#: hosting/templates/hosting/base_short.html:158
+#: templates/hosting/base_short.html:86
 msgid "Notifications "
 msgstr "Benachrichtigungen"
 
-#: hosting/templates/hosting/base_short.html:90
+#: templates/hosting/base_short.html:89
 msgid "Logout"
 msgstr "Abmeleden"
 
-#: hosting/templates/hosting/base_short.html:95
+#: templates/hosting/base_short.html:94
 msgid "How it works"
 msgstr "Wie es funktioniert"
 
-#: hosting/templates/hosting/base_short.html:98
+#: templates/hosting/base_short.html:97
 msgid "Your infrastructure"
 msgstr "Ihre Infrastruktur"
 
-#: hosting/templates/hosting/base_short.html:101
+#: templates/hosting/base_short.html:100
 msgid "Our inftrastructure"
 msgstr "Unsere Infrastruktur"
 
-#: hosting/templates/hosting/base_short.html:104
+#: templates/hosting/base_short.html:103
 msgid "Pricing"
 msgstr "Preise"
 
-#: hosting/templates/hosting/base_short.html:107
+#: templates/hosting/base_short.html:106
 msgid "Contact"
 msgstr "Kontakt"
 
-#: hosting/templates/hosting/base_short.html:110
-#: hosting/templates/hosting/login.html:32
-#: hosting/templates/hosting/login.html:41
-#: hosting/templates/hosting/reset_password.html:31
-#: hosting/templates/hosting/signup.html:30
+#: templates/hosting/base_short.html:109
+#: templates/hosting/confirm_reset_password.html:38
+#: templates/hosting/login.html:17 templates/hosting/login.html.py:26
+#: templates/hosting/reset_password.html:32 templates/hosting/signup.html:30
 msgid "Login"
 msgstr "Anmelden"
 
-#: hosting/templates/hosting/base_short.html:134
-msgid "Home"
-msgstr "Home"
-
-#: templates/hosting/bill_detail.html:11 templates/hosting/order_detail.html:10
+#: templates/hosting/bill_detail.html:11 templates/hosting/order_detail.html:23
 msgid "Invoice"
 msgstr "Rechnung"
 
-#: templates/hosting/bill_detail.html:11 templates/hosting/order_detail.html:10
+#: templates/hosting/bill_detail.html:11 templates/hosting/order_detail.html:23
 msgid "Order #"
 msgstr "Rechnung #"
 
@@ -144,8 +138,7 @@ msgstr ""
 msgid "Customers"
 msgstr "Kunden"
 
-#: hosting/templates/hosting/bills.html:16
-#: hosting/templates/hosting/virtual_machine_key.html:42
+#: templates/hosting/bills.html:16 templates/hosting/user_keys.html.py:25
 msgid "Name"
 msgstr ""
 
@@ -157,19 +150,19 @@ msgstr ""
 msgid "View Bill"
 msgstr "Rechnung anzeigen"
 
-#: templates/hosting/bills.html:41 templates/hosting/orders.html.py:83
+#: templates/hosting/bills.html:41 templates/hosting/orders.html.py:82
 #: templates/hosting/virtual_machines.html:70
 msgid "previous"
 msgstr "vorherige"
 
-#: templates/hosting/bills.html:47 templates/hosting/orders.html.py:89
+#: templates/hosting/bills.html:47 templates/hosting/orders.html.py:88
 #: templates/hosting/virtual_machines.html:76
 msgid "next"
 msgstr "nächste"
 
 #: templates/hosting/confirm_reset_password.html:10
-#: templates/hosting/login.html:9 templates/hosting/reset_password.html.py:9
-#: templates/hosting/signup.html:8
+#: templates/hosting/login.html:12 templates/hosting/reset_password.html:10
+#: templates/hosting/signup.html:9 templates/hosting/signup_validate.html:9
 msgid "Your VM hosted in Switzerland"
 msgstr "Ihre VM in der Schweiz"
 
@@ -177,38 +170,43 @@ msgstr "Ihre VM in der Schweiz"
 msgid "Set your new password"
 msgstr "Setzen Ihr neues Passwort"
 
-#: hosting/templates/hosting/confirm_reset_password.html:28
-#: hosting/templates/hosting/reset_password.html:22
+#: templates/hosting/confirm_reset_password.html:29
+#: templates/hosting/reset_password.html:23
 msgid "Reset"
 msgstr "Zurücksetzen"
 
-#: hosting/templates/hosting/confirm_reset_password.html:32
-#: hosting/templates/hosting/reset_password.html:28
-#: hosting/templates/hosting/signup.html:27
+#: templates/hosting/confirm_reset_password.html:35
+#: templates/hosting/reset_password.html:29 templates/hosting/signup.html:27
 msgid "Already have an account ?"
 msgstr "Besitzen sie bereits ein Bentzerkonto"
 
-#: hosting/templates/hosting/confirm_reset_password.html:32
-msgid "Log in"
-msgstr "Anmelden"
-
-#: hosting/templates/hosting/create_virtual_machine.html:19
+#: templates/hosting/create_virtual_machine.html:20
 msgid "New Virtual Machine"
 msgstr "Neue virtuelle Maschine"
 
-#: hosting/templates/hosting/create_virtual_machine.html:24
-msgid "Select VM Template:"
+#: templates/hosting/create_virtual_machine.html:28
+#, fuzzy
+#| msgid "Select VM Template:"
+msgid "Step 1. Select VM Template:"
 msgstr "Wählen Sie eine Vorlage"
 
-#: hosting/templates/hosting/create_virtual_machine.html:32
-msgid "Select VM Configuration:"
+#: templates/hosting/create_virtual_machine.html:42
+#, fuzzy
+#| msgid "Select VM Configuration:"
+msgid "Step2. Select VM Configuration"
 msgstr "Wählen Sie eine Konfiguration"
 
-#: hosting/templates/hosting/create_virtual_machine.html:39
+#: templates/hosting/create_virtual_machine.html:59
+#, fuzzy
+#| msgid "Pricing"
+msgid "Price "
+msgstr "Preise"
+
+#: templates/hosting/create_virtual_machine.html:59
 msgid "CHF/Month"
 msgstr "CHF/Monat"
 
-#: templates/hosting/create_virtual_machine.html:45
+#: templates/hosting/create_virtual_machine.html:61
 msgid "Start VM"
 msgstr "Start VM"
 
@@ -236,21 +234,16 @@ msgstr ""
 msgid "The %(site_name)s team"
 msgstr ""
 
-#: hosting/templates/hosting/login.html:26
-msgid "You haven been logged out"
-msgstr "Sie wurden abgmeldet"
-
-#: hosting/templates/hosting/login.html:49
+#: templates/hosting/login.html:34
 msgid "Don't have an account yet ? "
 msgstr "Besitzen Sie kein Benutzerkonto?"
 
-#: hosting/templates/hosting/login.html:52
-#: hosting/templates/hosting/signup.html:13
-#: hosting/templates/hosting/signup.html:21
+#: templates/hosting/login.html:37 templates/hosting/signup.html.py:13
+#: templates/hosting/signup.html:21 views.py:223
 msgid "Sign up"
 msgstr "Registrieren"
 
-#: hosting/templates/hosting/login.html:54
+#: templates/hosting/login.html:39
 msgid "Forgot your password ? "
 msgstr "Passwort vergessen?"
 
@@ -278,47 +271,42 @@ msgstr "Als gelesen markieren"
 msgid "All notifications"
 msgstr "Alle Benachrichtigungen"
 
-#: templates/hosting/order_detail.html:16
-#: templates/hosting/order_detail.html:24
+#: templates/hosting/order_detail.html:29
+#: templates/hosting/order_detail.html:37
 msgid "Billed To:"
 msgstr ""
 
-#: templates/hosting/order_detail.html:26
+#: templates/hosting/order_detail.html:39
 msgid "Status:"
 msgstr ""
 
-#: templates/hosting/order_detail.html:38
+#: templates/hosting/order_detail.html:51
 msgid "Payment Method:"
 msgstr "Bezahlmethode"
 
-#: templates/hosting/order_detail.html:49
+#: templates/hosting/order_detail.html:62
 msgid "Order summary"
 msgstr "Bestellungsübersicht"
 
-#: hosting/templates/hosting/order_detail.html:52
-#: hosting/templates/hosting/payment.html:17
-#: hosting/templates/hosting/virtual_machine_detail.html:75
+#: templates/hosting/order_detail.html:65 templates/hosting/payment.html:17
+#: templates/hosting/virtual_machine_detail.html:76
 msgid "Cores"
 msgstr "Prozessorkerne"
 
-#: hosting/templates/hosting/order_detail.html:54
-#: hosting/templates/hosting/payment.html:20
-#: hosting/templates/hosting/virtual_machine_detail.html:81
-#: templates/hosting/order_detail.html:54
+#: templates/hosting/order_detail.html:67 templates/hosting/payment.html:20
 #: templates/hosting/virtual_machine_detail.html:82
 msgid "Memory"
 msgstr "Arbeitsspeicher"
 
-#: hosting/templates/hosting/order_detail.html:56
-#: hosting/templates/hosting/payment.html:23
+#: templates/hosting/order_detail.html:69 templates/hosting/payment.html:23
 msgid "Disk space"
 msgstr "Festplattenkapazität"
 
-#: templates/hosting/order_detail.html:58
+#: templates/hosting/order_detail.html:71
 msgid "Total"
 msgstr ""
 
-#: templates/hosting/order_detail.html:64
+#: templates/hosting/order_detail.html:77
 msgid "Finish Configuration"
 msgstr "Konfiguration beenden"
 
@@ -330,10 +318,9 @@ msgstr "Datum"
 msgid "Amount"
 msgstr "Betrag"
 
-#: hosting/templates/hosting/orders.html:19
-#: hosting/templates/hosting/virtual_machine_detail.html:30
-#: hosting/templates/hosting/virtual_machine_key.html:44
-#: hosting/templates/hosting/virtual_machines.html:31
+#: templates/hosting/orders.html:19 templates/hosting/user_keys.html.py:27
+#: templates/hosting/virtual_machine_detail.html:30
+#: templates/hosting/virtual_machines.html:31
 msgid "Status"
 msgstr ""
 
@@ -349,59 +336,104 @@ msgstr "Abgelehnt"
 msgid "View Detail"
 msgstr "Details anzeigen"
 
-#: templates/hosting/orders.html:41
+#: templates/hosting/orders.html:40
 msgid "Cancel Order"
 msgstr "Bestellung stornieren"
 
-#: templates/hosting/orders.html:56
-msgid "Do You want do delete your order?"
+#: templates/hosting/orders.html:55
+msgid "Do You want to delete your order?"
 msgstr "Wollen Sie ihre Bestellung löschen?"
 
-#: templates/hosting/orders.html:64
+#: templates/hosting/orders.html:63 templates/hosting/user_keys.html.py:62
 msgid "Close"
 msgstr "Schliessen"
 
-#: templates/hosting/orders.html:66
+#: templates/hosting/orders.html:65 templates/hosting/user_keys.html.py:64
 msgid "Delete"
 msgstr "Löschen"
 
-#: hosting/templates/hosting/payment.html:12
+#: templates/hosting/payment.html:12
 msgid "Billing Amount"
 msgstr "Rechnungsbetrag"
 
-#: hosting/templates/hosting/payment.html:35
+#: templates/hosting/payment.html:35
 msgid "Billing Address"
 msgstr "Rechnungsadresse"
 
-#: hosting/templates/hosting/payment.html:49
+#: templates/hosting/payment.html:49
 msgid "Payment Details"
 msgstr "Rechnungsdetails"
 
-#: hosting/templates/hosting/payment.html:61
-#: hosting/templates/hosting/payment.html:103
+#: templates/hosting/payment.html:62
 msgid "Submit Payment"
 msgstr "Betrag überweisen"
 
-#: hosting/templates/hosting/payment.html:70
+#: templates/hosting/payment.html:81
 msgid "CARD NUMBER"
 msgstr "Kreditkartennummer"
 
-#: hosting/templates/hosting/payment.html:75
+#: templates/hosting/payment.html:86
 msgid "Valid Card Number"
 msgstr "Gültige Kreditkartennummer"
 
-#: hosting/templates/hosting/payment.html:84
+#: templates/hosting/payment.html:95
 msgid "EXPIRATION DATE"
 msgstr "Ablaufdatum"
 
-#: hosting/templates/hosting/payment.html:95
+#: templates/hosting/payment.html:106
 msgid "CV CODE"
 msgstr "CV Code"
 
-#: hosting/templates/hosting/reset_password.html:14
+#: templates/hosting/reset_password.html:15
 msgid "Reset your password"
 msgstr "Passwort zurücksetzen"
 
+#: templates/hosting/user_key.html:11 templates/hosting/user_keys.html.py:9
+msgid "Access Key"
+msgstr "Zugriffsschlüssel"
+
+#: templates/hosting/user_key.html:24
+msgid "Upload your own key. "
+msgstr "Laden Sie ihren Schlüssel hoch"
+
+#: templates/hosting/user_key.html:28
+msgid "Or generate a new key pair."
+msgstr "Oder erstellen Sie ein neues Schlüsselpaar"
+
+#: templates/hosting/user_key.html:30
+msgid "Generate Key Pair"
+msgstr "Schlüsselpaar generieren"
+
+#: templates/hosting/user_key.html:40
+msgid "Warning!"
+msgstr "Achtung!"
+
+#: templates/hosting/user_key.html:40
+msgid "You can download your SSH  private key once. Don't lost your key"
+msgstr ""
+"Sie können ihren privaten SSH Schlüssel nur einmal herunterladen. Bewaren "
+"Sie ihn sicher auf."
+
+#: templates/hosting/user_keys.html:18
+msgid "Add Key"
+msgstr ""
+
+#: templates/hosting/user_keys.html:26
+msgid "Created at"
+msgstr "Erstellt am"
+
+#: templates/hosting/user_keys.html:42
+#, fuzzy
+#| msgid "Delete"
+msgid "Delete Key"
+msgstr "Löschen"
+
+#: templates/hosting/user_keys.html:55
+#, fuzzy
+#| msgid "Do You want do delete your order?"
+msgid "Do You want to delete this key?"
+msgstr "Wollen Sie ihre Bestellung löschen?"
+
 #: templates/hosting/virtual_machine_detail.html:19
 msgid "Settings"
 msgstr "Einstellungen"
@@ -446,68 +478,6 @@ msgstr "Sind Sie sicher, dass Sie ihre virtuelle Maschine beenden wollen "
 msgid "Cancel"
 msgstr "Beenden"
 
-#: templates/hosting/virtual_machine_key.html:11
-msgid "Access Key"
-msgstr "Zugriffsschlüssel"
-
-#: hosting/templates/hosting/virtual_machine_key.html:25
-msgid "Upload your own key. "
-msgstr "Laden Sie ihren Schlüssel hoch"
-
-#: hosting/templates/hosting/virtual_machine_key.html:29
-msgid "Upload Key"
-msgstr "Schlüssel hochladen"
-
-#: hosting/templates/hosting/virtual_machine_key.html:33
-msgid "Or generate a new key pair."
-msgstr "Oder erstellen Sie ein neues Schlüsselpaar"
-
-#: hosting/templates/hosting/virtual_machine_key.html:31
-msgid "Generate Key Pair"
-msgstr "Schlüsselpaar generieren"
-
-#: hosting/templates/hosting/virtual_machine_key.html:40
-msgid ""
-"Use your created key to access to the machine. If you lost it, contact us."
-msgstr ""
-"Verwenden Sie Ihren privaten SSH Schlüssel um sich mit Ihren Maschinen zu "
-"verbinden. Falls Sie ihn verloren haben kontaktieren Sie uns."
-
-#: hosting/templates/hosting/virtual_machine_key.html:43
-msgid "Created at"
-msgstr "Erstellt am"
-
-#: hosting/templates/hosting/virtual_machine_key.html:66
-#: hosting/templates/hosting/virtual_machine_key.html:79
-msgid "Warning!"
-msgstr "Achtung!"
-
-#: hosting/templates/hosting/virtual_machine_key.html:66
-msgid "You can download your SSH  private key once. Don't lost your key"
-msgstr ""
-"Sie können ihren privaten SSH Schlüssel nur einmal herunterladen. Bewaren "
-"Sie ihn sicher auf."
-
-#: hosting/templates/hosting/virtual_machine_key.html:74
-msgid "Copy to Clipboard"
-msgstr "Kopieren"
-
-#: hosting/templates/hosting/virtual_machine_key.html:75
-msgid "Download"
-msgstr ""
-
-#: hosting/templates/hosting/virtual_machine_key.html:79
-msgid ""
-"Your SSH private key was already generated and downloaded, if you lost it, "
-"contact us. "
-msgstr ""
-"Ihr privater SSH Schlüssel wurde bereits generiert und heruntergeladen, "
-"falls Sie ihn verloren haben kontaktieren Sie uns."
-
-#: hosting/templates/hosting/virtual_machine_key.html:82
-msgid "Generate my key"
-msgstr "Generiere meinen Schlüssel"
-
 #: templates/hosting/virtual_machines.html:9
 msgid "Virtual Machines"
 msgstr "Virtuelle Maschinen"
@@ -527,3 +497,68 @@ msgstr ""
 #: templates/hosting/virtual_machines.html:30
 msgid "Ipv6"
 msgstr ""
+
+#: views.py:213 views.py:232
+msgid "login"
+msgstr "einloggen"
+
+#: views.py:217
+msgid ""
+"Thank you for signing up. We have sent an email to you. Please follow the "
+"instructions in it to activate your account. Once activated, you can login "
+"using"
+msgstr ""
+"Danke für deine Anmeldung. Wir haben dir eine E-Mail geschickt. Bitte folge "
+"den Anweisungen um deinen Account zu aktivieren. Danach kannst du dich über "
+"diesen"
+
+#: views.py:218 views.py:243
+msgid "Go back to"
+msgstr ""
+
+#: views.py:233
+msgid "Account activation"
+msgstr "Accountaktivierung"
+
+#: views.py:236
+msgid "Your account has been activated."
+msgstr "Dein Account wurde aktiviert."
+
+#: views.py:237
+msgid "You can now"
+msgstr "Du kannst dich nun"
+
+#: views.py:242
+msgid "Sorry. Your request is invalid."
+msgstr ""
+
+#~ msgid "Home"
+#~ msgstr "Home"
+
+#~ msgid "Log in"
+#~ msgstr "Anmelden"
+
+#~ msgid "You haven been logged out"
+#~ msgstr "Sie wurden abgmeldet"
+
+#~ msgid "Upload Key"
+#~ msgstr "Schlüssel hochladen"
+
+#~ msgid ""
+#~ "Use your created key to access to the machine. If you lost it, contact us."
+#~ msgstr ""
+#~ "Verwenden Sie Ihren privaten SSH Schlüssel um sich mit Ihren Maschinen zu "
+#~ "verbinden. Falls Sie ihn verloren haben kontaktieren Sie uns."
+
+#~ msgid "Copy to Clipboard"
+#~ msgstr "Kopieren"
+
+#~ msgid ""
+#~ "Your SSH private key was already generated and downloaded, if you lost "
+#~ "it, contact us. "
+#~ msgstr ""
+#~ "Ihr privater SSH Schlüssel wurde bereits generiert und heruntergeladen, "
+#~ "falls Sie ihn verloren haben kontaktieren Sie uns."
+
+#~ msgid "Generate my key"
+#~ msgstr "Generiere meinen Schlüssel"
diff --git a/hosting/views.py b/hosting/views.py
index 87d5bad0..f63e5421 100644
--- a/hosting/views.py
+++ b/hosting/views.py
@@ -210,11 +210,17 @@ class SignupValidateView(TemplateView):
     
     def get_context_data(self, **kwargs):
         context = super(SignupValidateView, self).get_context_data(**kwargs)
-        login_url = reverse('hosting:login')
-        message= _("Thank you for signing up. We have sent an email to you. Please follow the instructions in it to activate your account. Once activated, you can login using ") + '<a href="' + login_url +'">login</a>'
-        section_title='Sign up'
+        login_url = '<a href="' + reverse('hosting:login') + '">' + str(_('login')) +'</a>'
+        home_url = '<a href="' + reverse('datacenterlight:index') + '">Data Center Light</a>'
+        message='{signup_success_message} {lurl}</a> \
+                 <br />{go_back} {hurl}.'.format(
+                  signup_success_message = _('Thank you for signing up. We have sent an email to you. Please follow the instructions in it to activate your account. Once activated, you can login using'),
+                  go_back = _('Go back to'),
+                  lurl = login_url,
+                  hurl = home_url
+                  )
         context['message'] = mark_safe(message)
-        context['section_title'] = section_title
+        context['section_title'] = _('Sign up')
         return context
 
 class SignupValidatedView(SignupValidateView):
@@ -223,13 +229,20 @@ class SignupValidatedView(SignupValidateView):
     def get_context_data(self, **kwargs):
         context = super(SignupValidateView, self).get_context_data(**kwargs)
         validated = CustomUser.validate_url(self.kwargs['validate_slug'])
-        login_url = reverse('hosting:login')
+        login_url = '<a href="' + reverse('hosting:login') + '">' + str(_('login')) +'</a>'
+        section_title=_('Account activation')
         if validated:
-            message= _("Your account has been activated. You can now ") + '<a href="' + login_url +'">login</a>'
-            section_title=_('Account activation')
+            message='{account_activation_string} <br /> {login_string} {lurl}.'.format(
+                             account_activation_string = _("Your account has been activated."),
+                             login_string = _("You can now"),
+                             lurl = login_url)
         else:
-            message= _("Sorry. Your request is invalid.") + '<a href="' + login_url +'">login</a>'
-            section_title=_('Account activation')
+            home_url = '<a href="' + reverse('datacenterlight:index') + '">Data Center Light</a>'
+            message = '{sorry_message} <br />{go_back_to} {hurl}'.format(
+                    sorry_message = _("Sorry. Your request is invalid."),
+                    go_back_to = _('Go back to'),
+                    hurl = home_url
+                )
         context['message'] = mark_safe(message)
         context['section_title'] = section_title
         return context

From 5e9330102eb2fafe2a2b7c845b96bb27223f0544 Mon Sep 17 00:00:00 2001
From: "M.Ravi" <mondi.ravi@gmail.com>
Date: Mon, 19 Jun 2017 12:29:22 +0530
Subject: [PATCH 03/38] Added dcl email parameters to base.py

---
 dynamicweb/settings/base.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/dynamicweb/settings/base.py b/dynamicweb/settings/base.py
index ec240691..d276f022 100644
--- a/dynamicweb/settings/base.py
+++ b/dynamicweb/settings/base.py
@@ -504,3 +504,8 @@ OPENNEBULA_PORT = env('OPENNEBULA_PORT')
 # The endpoint to which the XML RPC request needs to be sent to. The
 # default value is /RPC2
 OPENNEBULA_ENDPOINT = env('OPENNEBULA_ENDPOINT')
+
+
+# dcl email configurations
+DCL_TEXT = env('DCL_TEXT')
+DCL_SUPPORT_FROM_ADDRESS = env('DCL_SUPPORT_FROM_ADDRESS')

From 17dd8109450eeca1d46ea5dd49448fcd2edb7bcb Mon Sep 17 00:00:00 2001
From: "M.Ravi" <mondi.ravi@gmail.com>
Date: Mon, 19 Jun 2017 12:30:37 +0530
Subject: [PATCH 04/38] Now we get dcl_text and dcl support email from settings

---
 membership/models.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/membership/models.py b/membership/models.py
index 8bd9feec..2c8c0ad2 100644
--- a/membership/models.py
+++ b/membership/models.py
@@ -6,6 +6,7 @@ from django.contrib.auth.hashers import make_password
 from django.core.validators import RegexValidator
 from django.contrib.auth.models import User
 from django.contrib.sites.models import Site
+from django.conf import settings
 
 from utils.stripe_utils import StripeUtils
 from utils.mailer import DigitalGlarusRegistrationMailer
@@ -82,13 +83,17 @@ class CustomUser(AbstractBaseUser, PermissionsMixin):
                     dg = DigitalGlarusRegistrationMailer(user.validation_slug)
                     dg.send_mail(to=user.email)
                 elif app == 'dcl':
+                    dcl_text = settings.DCL_TEXT
+                    dcl_from_address = settings.DCL_SUPPORT_FROM_ADDRESS
                     user.is_active = False
                     email_data = {
-                        'subject': _('Activate your Data Center Light account'),
-                        'from_address': '(Data Center Light) Data Center Light Support <support@datacenterlight.ch>',
+                        'subject': _('Activate your ' + dcl_text + ' account'),
+                        'from_address': settings.DCL_SUPPORT_FROM_ADDRESS,
                         'to': user.email,
                         'context': {'base_url'  : base_url, 
-                                    'activation_link' : reverse('hosting:validate', kwargs={'validate_slug': user.validation_slug})},
+                                    'activation_link' : reverse('hosting:validate', kwargs={'validate_slug': user.validation_slug}),
+                                    'dcl_text' : dcl_text
+                                    },
                         'template_name': 'user_activation',
                         'template_path': 'datacenterlight/emails/'
                     }

From bf941539d7bee4cef89443856d2714b0af8635ea Mon Sep 17 00:00:00 2001
From: "M.Ravi" <mondi.ravi@gmail.com>
Date: Mon, 19 Jun 2017 12:32:08 +0530
Subject: [PATCH 05/38] Refactored user_activation.txt email template

---
 .../emails/user_activation.txt                | 136 ++----------------
 1 file changed, 9 insertions(+), 127 deletions(-)

diff --git a/datacenterlight/templates/datacenterlight/emails/user_activation.txt b/datacenterlight/templates/datacenterlight/emails/user_activation.txt
index 2948b797..e40ef956 100644
--- a/datacenterlight/templates/datacenterlight/emails/user_activation.txt
+++ b/datacenterlight/templates/datacenterlight/emails/user_activation.txt
@@ -1,129 +1,11 @@
 {% load static from staticfiles %}
-<!-- Inliner Build Version 4380b7741bb759d6cb997545f3add21ad48f010b -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<title>Oxygen Invoice</title>
-</head>
-<body bgcolor="#ffffff" style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%; color: white; margin: 0;">
-<style type="text/css">
-@media only screen and (max-width: 480px) {
-  table[class*="container-for-gmail-android"] {
-    min-width: 290px !important; width: 100% !important;
-  }
-  img[class="force-width-gmail"] {
-    display: none !important; width: 0 !important; height: 0 !important;
-  }
-  table[class="w320"] {
-    width: 320px !important;
-  }
-  td[class*="mobile-header-padding-left"] {
-    width: 160px !important; padding-left: 0 !important;
-  }
-  td[class*="mobile-header-padding-right"] {
-    width: 160px !important; padding-right: 0 !important;
-  }
-  td[class="header-lg"] {
-    font-size: 24px !important; padding-bottom: 5px !important;
-  }
-  td[class="content-padding"] {
-    padding: 5px 0 5px !important;
-  }
-  td[class="button"] {
-    padding: 5px 5px 30px !important;
-  }
-  td[class*="free-text"] {
-    padding: 10px 18px 30px !important;
-  }
-  td[class~="mobile-hide-img"] {
-    display: none !important; height: 0 !important; width: 0 !important; line-height: 0 !important;
-  }
-  td[class~="item"] {
-    width: 140px !important; vertical-align: top !important;
-  }
-  td[class~="quantity"] {
-    width: 50px !important;
-  }
-  td[class~="price"] {
-    width: 90px !important;
-  }
-  td[class="item-table"] {
-    padding: 30px 20px !important;
-  }
-  td[class="mini-container-left"] {
-    padding: 0 15px 15px !important; display: block !important; width: 290px !important;
-  }
-  td[class="mini-container-right"] {
-    padding: 0 15px 15px !important; display: block !important; width: 290px !important;
-  }
-}
-</style>
-<table align="center" cellpadding="0" cellspacing="0" class="container-for-gmail-android" width="100%" style="border-collapse: collapse !important; min-width: 600px; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
-<tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
-<td align="left" valign="top" width="100%" style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: center; line-height: 21px; background: #ffffff url(http://s3.amazonaws.com/swu-filepicker/4E687TRe69Ld95IDWyEg_bg_top_02.jpg) repeat-x;" bgcolor="#ffffff">
-      <center style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
-      <table cellspacing="0" cellpadding="0" width="100%" bgcolor="#ffffff" background="http://s3.amazonaws.com/swu-filepicker/4E687TRe69Ld95IDWyEg_bg_top_02.jpg" style="border-collapse: collapse !important; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; background: transparent;"><tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
-<td width="100%" height="80" valign="top" style="text-align: center; vertical-align: middle; border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; line-height: 21px; background-color: #ffffff" align="center">
-            <!--[if gte mso 9]>
-            <v:rect xmlns:v="urn:schemas-microsoft-com:vml" fill="true" stroke="false" style="mso-width-percent:1000;height:80px; v-text-anchor:middle;">
-              <v:fill type="tile" src="http://s3.amazonaws.com/swu-filepicker/4E687TRe69Ld95IDWyEg_bg_top_02.jpg" color="#ffffff" />
-              <v:textbox inset="0,0,0,0">
-            <![endif]-->
-              <center style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
-                <table cellpadding="0" cellspacing="0" width="600" class="w320" style="border-collapse: collapse !important; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;"><tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
-<td class="pull-left mobile-header-padding-left" style="vertical-align: middle; border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: left; line-height: 21px; width: 290px; padding-left: 10px;" align="left" valign="middle">
-                      <a href="{{base_url}}" style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; color: #676767; text-decoration: none !important;"><img width="137" src="{{base_url}}{% static 'datacenterlight/img/datacenterlight.png' %}" alt="logo" style="max-width: 600px; outline: none; text-decoration: none; -ms-interpolation-mode: bicubic; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; border: none;"></a>
-                    </td>
-                    <td class="pull-right mobile-header-padding-right" style="color: #4d4d4d; border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; text-align: right; line-height: 21px; width: 290px; padding-left: 10px;" align="right">
-                    </td>
-                  </tr></table>
-</center>
-              <!--[if gte mso 9]>
-              </v:textbox>
-            </v:rect>
-            <![endif]-->
-            </td>
-          </tr></table>
-</center>
-    </td>
-  </tr>
-<tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
-<td align="center" valign="top" width="100%" style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: center; line-height: 21px; background: #ffffff; padding: 20px 0 5px;" class="content-padding" bgcolor="#f7f7f7">
-      <center style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
-        <table cellspacing="0" cellpadding="0" width="600" class="w320" style="border-collapse: collapse !important; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
-<tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
-<td class="header-lg" style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 32px; color: #4d4d4d; text-align: left; line-height: normal; font-weight: 400; padding: 35px 5 0;" align="center">
-              Datacenterlight user activation
-            </td>
-          </tr>
-<tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
-<td class="free-text" style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: left; line-height: 21px; width: 100% !important; padding: 40px 7px 20px;" align="center">
-             <p>
-                You can activate your datacenterlight account by <a href="{{base_url}}{{activation_link}}">clicking here</a>.</br></br>
-                You can also copy and paste the following link into the address bar of your browser and follow the link in order to activate your datacenterlight account.</br>
-                {{base_url}}{{activation_link}}             
-             </p></td>
-          </tr>
-<tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
-<td class="button" style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: center; line-height: 21px; padding: 0;" align="center">&nbsp;</td>
-          </tr>
-</table>
-</center>
-    </td>
-  </tr>
-<tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
-<td align="center" valign="top" width="100%" style="height: 100px; border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: center; line-height: 21px; background: #ffffff;" bgcolor="#ffffff">
-      <center style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
-        <table cellspacing="0" cellpadding="0" width="600" class="w320" style="border-collapse: collapse !important; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;"><tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
-<td style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; font-weight: 600; color: #7293de; padding: 25px 9px 0px;text-align: left; line-height: 21px;;" align="left">Your data center light team<br style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
-</td>
-          </tr></table>
-</center>
-    </td>
-  </tr>
-</table>
-</body>
-</html>
+{% load i18n %}
+{{dcl_text}} {% trans 'account activation' %}
 
+{% blocktrans %}
+Hi,
+
+You can activate your {{dcl_text}} account by clicking here {{base_url}}{{activation_link}}
+{% endblocktrans %}
+
+{% trans 'Your' %} {{dcl_text}} {% trans 'team' %}

From a7e9946a4ff161a96b0728cf259354cad302722a Mon Sep 17 00:00:00 2001
From: "M.Ravi" <mondi.ravi@gmail.com>
Date: Mon, 19 Jun 2017 12:34:01 +0530
Subject: [PATCH 06/38] Refactored user activation html email template to use
 proper translation and parameters

---
 .../datacenterlight/emails/user_activation.html   | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/datacenterlight/templates/datacenterlight/emails/user_activation.html b/datacenterlight/templates/datacenterlight/emails/user_activation.html
index 2948b797..bf688127 100644
--- a/datacenterlight/templates/datacenterlight/emails/user_activation.html
+++ b/datacenterlight/templates/datacenterlight/emails/user_activation.html
@@ -1,11 +1,12 @@
 {% load static from staticfiles %}
+{% load i18n %}
 <!-- Inliner Build Version 4380b7741bb759d6cb997545f3add21ad48f010b -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
-<title>Oxygen Invoice</title>
+<title>{{dcl_text}}</title>
 </head>
 <body bgcolor="#ffffff" style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%; color: white; margin: 0;">
 <style type="text/css">
@@ -95,15 +96,17 @@
         <table cellspacing="0" cellpadding="0" width="600" class="w320" style="border-collapse: collapse !important; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
 <tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
 <td class="header-lg" style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 32px; color: #4d4d4d; text-align: left; line-height: normal; font-weight: 400; padding: 35px 5 0;" align="center">
-              Datacenterlight user activation
+              {{dcl_text}} {% trans 'account activation' %}
             </td>
           </tr>
 <tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
 <td class="free-text" style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: left; line-height: 21px; width: 100% !important; padding: 40px 7px 20px;" align="center">
              <p>
-                You can activate your datacenterlight account by <a href="{{base_url}}{{activation_link}}">clicking here</a>.</br></br>
-                You can also copy and paste the following link into the address bar of your browser and follow the link in order to activate your datacenterlight account.</br>
-                {{base_url}}{{activation_link}}             
+                {% blocktrans %}
+                You can activate your {{dcl_text}} account by <a href="{{base_url}}{{activation_link}}">clicking here</a>.<br/><br/>
+                You can also copy and paste the following link into the address bar of your browser and follow the link in order to activate your datacenterlight account.<br/>
+                {{base_url}}{{activation_link}}
+                {% endblocktrans %}
              </p></td>
           </tr>
 <tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
@@ -117,7 +120,7 @@
 <td align="center" valign="top" width="100%" style="height: 100px; border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: center; line-height: 21px; background: #ffffff;" bgcolor="#ffffff">
       <center style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
         <table cellspacing="0" cellpadding="0" width="600" class="w320" style="border-collapse: collapse !important; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;"><tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
-<td style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; font-weight: 600; color: #7293de; padding: 25px 9px 0px;text-align: left; line-height: 21px;;" align="left">Your data center light team<br style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
+<td style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; font-weight: 600; color: #7293de; padding: 25px 9px 0px;text-align: left; line-height: 21px;;" align="left">{% trans 'Your' %} {{dcl_text}} {% trans 'team' %}<br style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
 </td>
           </tr></table>
 </center>

From 47632c6bd182fcbf6b5f57046cb9d565af215d62 Mon Sep 17 00:00:00 2001
From: "M.Ravi" <mondi.ravi@gmail.com>
Date: Mon, 19 Jun 2017 12:34:58 +0530
Subject: [PATCH 07/38] Updated the django.po for datacenterlight

---
 .../locale/de/LC_MESSAGES/django.po           | 55 ++++++++++++++++---
 1 file changed, 46 insertions(+), 9 deletions(-)

diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.po b/datacenterlight/locale/de/LC_MESSAGES/django.po
index 72977d27..613cc85e 100644
--- a/datacenterlight/locale/de/LC_MESSAGES/django.po
+++ b/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-06-15 23:57+0530\n"
+"POT-Creation-Date: 2017-06-19 12:22+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"
@@ -83,6 +83,51 @@ msgstr ""
 msgid "Thank you!"
 msgstr "Vielen Dank!"
 
+#: templates/datacenterlight/emails/user_activation.html:99
+#: templates/datacenterlight/emails/user_activation.txt:3
+msgid "account activation"
+msgstr "Accountaktivierung"
+
+#: templates/datacenterlight/emails/user_activation.html:105
+#, python-format
+msgid ""
+"\n"
+"                You can activate your %(dcl_text)s account by <a href="
+"\"%(base_url)s%(activation_link)s\">clicking here</a>.<br/><br/>\n"
+"                You can also copy and paste the following link into the "
+"address bar of your browser and follow the link in order to activate your "
+"datacenterlight account.<br/>\n"
+"                %(base_url)s%(activation_link)s\n"
+"                "
+msgstr "<a href="
+"\"%(base_url)s%(activation_link)s\">Klicke hier</a> um deinen %(dcl_text)s zu aktivieren.<br/><br/>Oder kopiere den folgenden Link in die Adressleiste deines Browsers und folge dann dem Link um deinen Data Center Light Account zu aktivieren.<br/>"
+"%(base_url)s%(activation_link)s\n"
+
+#: templates/datacenterlight/emails/user_activation.html:123
+#: templates/datacenterlight/emails/user_activation.txt:11
+#| msgid "Your Name"
+msgid "Your"
+msgstr "Dein"
+
+#: templates/datacenterlight/emails/user_activation.html:123
+#: templates/datacenterlight/emails/user_activation.txt:11
+msgid "team"
+msgstr "Team"
+
+#: templates/datacenterlight/emails/user_activation.txt:5
+#, python-format
+msgid ""
+"\n"
+"Hi,\n"
+"\n"
+"You can activate your %(dcl_text)s account by clicking here %(base_url)s"
+"%(activation_link)s\n"
+msgstr ""
+"\n"
+"Hi,\n"
+"\n"
+"You can activate your %(dcl_text)s account by clicking here %(base_url)s"
+"%(activation_link)s\n"
 #: templates/datacenterlight/includes/_footer.html:11
 #: templates/datacenterlight/includes/_footer.html:31
 #: templates/datacenterlight/includes/_navbar.html:27
@@ -184,7 +229,6 @@ msgstr ""
 "Angebot ist aufgrund unserer leichten Infrastruktur überaus kostengünstig."
 
 #: templates/datacenterlight/index.html:133
-#: templates/datacenterlight/order.html:87
 #: templates/datacenterlight/pricing.html:86
 msgid "Simple and affordable: Try our virtual machine with featherlight price."
 msgstr ""
@@ -196,7 +240,6 @@ msgid "Affordable VM hosting based in Switzerland"
 msgstr "Bezahlbares VM Hosting in der Schweiz"
 
 #: templates/datacenterlight/index.html:145
-#: templates/datacenterlight/order.html:22
 #: templates/datacenterlight/pricing.html:22
 msgid "VM hosting"
 msgstr ""
@@ -206,19 +249,16 @@ msgid "month"
 msgstr "Monat"
 
 #: templates/datacenterlight/index.html:151
-#: templates/datacenterlight/order.html:28
 #: templates/datacenterlight/pricing.html:28
 msgid "VAT included"
 msgstr "MwSt. inklusive"
 
 #: templates/datacenterlight/index.html:156
-#: templates/datacenterlight/order.html:33
 #: templates/datacenterlight/pricing.html:33
 msgid "Hosted in Switzerland"
 msgstr "Standort: Schweiz"
 
 #: templates/datacenterlight/index.html:173
-#: templates/datacenterlight/order.html:50
 #: templates/datacenterlight/pricing.html:50
 msgid "GB Storage (SSD)"
 msgstr "GB Storage (SSD)"
@@ -240,7 +280,6 @@ msgid "Your Email"
 msgstr "Deine E-Mail"
 
 #: templates/datacenterlight/index.html:197
-#: templates/datacenterlight/order.html:77
 #: templates/datacenterlight/pricing.html:79
 msgid "Order Now!"
 msgstr "Bestelle jetzt!"
@@ -257,12 +296,10 @@ msgstr "Fragen?"
 msgid "Contact us!"
 msgstr "Kontaktiere uns!"
 
-#: templates/datacenterlight/order.html:9
 #: templates/datacenterlight/pricing.html:9
 msgid "We are cutting down the costs significantly!"
 msgstr "Wir sorgen dafür, dass die Kosten für Dich signifikant abnehmen"
 
-#: templates/datacenterlight/order.html:90
 #: templates/datacenterlight/pricing.html:89
 msgid ""
 "Our VMs are hosted in Glarus, Switzerland, and our website is currently "

From ed26ac8b5907ba7954e6d767fff1013cf6c6f8db Mon Sep 17 00:00:00 2001
From: "M.Ravi" <mondi.ravi@gmail.com>
Date: Mon, 19 Jun 2017 12:44:48 +0530
Subject: [PATCH 08/38] Updated dcl's django.po to resolve some conflict

---
 datacenterlight/locale/de/LC_MESSAGES/django.po | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.po b/datacenterlight/locale/de/LC_MESSAGES/django.po
index 613cc85e..a578b242 100644
--- a/datacenterlight/locale/de/LC_MESSAGES/django.po
+++ b/datacenterlight/locale/de/LC_MESSAGES/django.po
@@ -99,9 +99,11 @@ msgid ""
 "datacenterlight account.<br/>\n"
 "                %(base_url)s%(activation_link)s\n"
 "                "
-msgstr "<a href="
-"\"%(base_url)s%(activation_link)s\">Klicke hier</a> um deinen %(dcl_text)s zu aktivieren.<br/><br/>Oder kopiere den folgenden Link in die Adressleiste deines Browsers und folge dann dem Link um deinen Data Center Light Account zu aktivieren.<br/>"
-"%(base_url)s%(activation_link)s\n"
+msgstr "\n"
+"                <a href=\"%(base_url)s%(activation_link)s\">Klicke hier</a> um deinen %(dcl_text)s zu aktivieren.<br/><br/>\n"
+"                Oder kopiere den folgenden Link in die Adressleiste deines Browsers und folge dann dem Link um deinen Data Center Light Account zu aktivieren.<br/>\n"
+"                %(base_url)s%(activation_link)s\n"
+"                "
 
 #: templates/datacenterlight/emails/user_activation.html:123
 #: templates/datacenterlight/emails/user_activation.txt:11

From 3cf7f8bd57898be9503137110830f95c09ad216a Mon Sep 17 00:00:00 2001
From: "M.Ravi" <mondi.ravi@gmail.com>
Date: Mon, 19 Jun 2017 12:55:14 +0530
Subject: [PATCH 09/38] Updated css to center align text in registration
 success message

---
 hosting/static/hosting/css/landing-page.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hosting/static/hosting/css/landing-page.css b/hosting/static/hosting/css/landing-page.css
index 69392172..8343b081 100644
--- a/hosting/static/hosting/css/landing-page.css
+++ b/hosting/static/hosting/css/landing-page.css
@@ -320,7 +320,7 @@ h6 {
 
 .sign-up-message {
     padding: 25px 30px 25px 30px;
-    text-align: justify;
+    text-align: center;
     font-size: 18px;
     line-height: 30px;
     font-family: 'Lato' !important;

From 062416a280c6fa79cd151f6188fee2862e47dccf Mon Sep 17 00:00:00 2001
From: "M.Ravi" <mondi.ravi@gmail.com>
Date: Mon, 19 Jun 2017 23:39:19 +0530
Subject: [PATCH 10/38] Updated/corrected de translations for hosting

---
 hosting/locale/de/LC_MESSAGES/django.po | 53 ++++++++++++-------------
 1 file changed, 26 insertions(+), 27 deletions(-)

diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po
index 661fa0bd..c7f28259 100644
--- a/hosting/locale/de/LC_MESSAGES/django.po
+++ b/hosting/locale/de/LC_MESSAGES/django.po
@@ -20,7 +20,7 @@ msgstr ""
 
 #: forms.py:28
 msgid "Your account is not activated yet."
-msgstr ""
+msgstr "Dein Account wurde noch nicht aktiviert"
 
 #: forms.py:65
 msgid "Paste here your public key"
@@ -44,15 +44,15 @@ msgstr "Benachrichtigungen"
 
 #: templates/hosting/base_short.html:89
 msgid "Logout"
-msgstr "Abmeleden"
+msgstr "Abmelden"
 
 #: templates/hosting/base_short.html:94
 msgid "How it works"
-msgstr "Wie es funktioniert"
+msgstr "So funktioniert es"
 
 #: templates/hosting/base_short.html:97
 msgid "Your infrastructure"
-msgstr "Ihre Infrastruktur"
+msgstr "deine Infrastruktur"
 
 #: templates/hosting/base_short.html:100
 msgid "Our inftrastructure"
@@ -164,11 +164,11 @@ msgstr "nächste"
 #: templates/hosting/login.html:12 templates/hosting/reset_password.html:10
 #: templates/hosting/signup.html:9 templates/hosting/signup_validate.html:9
 msgid "Your VM hosted in Switzerland"
-msgstr "Ihre VM in der Schweiz"
+msgstr "deine VM in der Schweiz"
 
 #: templates/hosting/confirm_reset_password.html:14
 msgid "Set your new password"
-msgstr "Setzen Ihr neues Passwort"
+msgstr "Setze dein neues Passwort"
 
 #: templates/hosting/confirm_reset_password.html:29
 #: templates/hosting/reset_password.html:23
@@ -178,7 +178,7 @@ msgstr "Zurücksetzen"
 #: templates/hosting/confirm_reset_password.html:35
 #: templates/hosting/reset_password.html:29 templates/hosting/signup.html:27
 msgid "Already have an account ?"
-msgstr "Besitzen sie bereits ein Bentzerkonto"
+msgstr "Hast Du bereits ein Benutzerkonto?"
 
 #: templates/hosting/create_virtual_machine.html:20
 msgid "New Virtual Machine"
@@ -188,19 +188,19 @@ msgstr "Neue virtuelle Maschine"
 #, fuzzy
 #| msgid "Select VM Template:"
 msgid "Step 1. Select VM Template:"
-msgstr "Wählen Sie eine Vorlage"
+msgstr "Wähle eine Vorlage"
 
 #: templates/hosting/create_virtual_machine.html:42
 #, fuzzy
 #| msgid "Select VM Configuration:"
 msgid "Step2. Select VM Configuration"
-msgstr "Wählen Sie eine Konfiguration"
+msgstr "Wähle eine Konfiguration"
 
 #: templates/hosting/create_virtual_machine.html:59
 #, fuzzy
 #| msgid "Pricing"
 msgid "Price "
-msgstr "Preise"
+msgstr "Preis"
 
 #: templates/hosting/create_virtual_machine.html:59
 msgid "CHF/Month"
@@ -208,7 +208,7 @@ msgstr "CHF/Monat"
 
 #: templates/hosting/create_virtual_machine.html:61
 msgid "Start VM"
-msgstr "Start VM"
+msgstr "VM jetzt starten"
 
 #: templates/hosting/emails/password_reset_email.html:2
 #: templates/hosting/emails/password_reset_email.txt:2
@@ -236,7 +236,7 @@ msgstr ""
 
 #: templates/hosting/login.html:34
 msgid "Don't have an account yet ? "
-msgstr "Besitzen Sie kein Benutzerkonto?"
+msgstr "Besitzt du kein Benutzerkonto?"
 
 #: templates/hosting/login.html:37 templates/hosting/signup.html.py:13
 #: templates/hosting/signup.html:21 views.py:223
@@ -342,7 +342,7 @@ msgstr "Bestellung stornieren"
 
 #: templates/hosting/orders.html:55
 msgid "Do You want to delete your order?"
-msgstr "Wollen Sie ihre Bestellung löschen?"
+msgstr "Willst du deine Bestellung löschen?"
 
 #: templates/hosting/orders.html:63 templates/hosting/user_keys.html.py:62
 msgid "Close"
@@ -394,11 +394,11 @@ msgstr "Zugriffsschlüssel"
 
 #: templates/hosting/user_key.html:24
 msgid "Upload your own key. "
-msgstr "Laden Sie ihren Schlüssel hoch"
+msgstr "Lade deinen Schlüssel hoch"
 
 #: templates/hosting/user_key.html:28
 msgid "Or generate a new key pair."
-msgstr "Oder erstellen Sie ein neues Schlüsselpaar"
+msgstr "Oder erstelle dein neues Schlüsselpaar"
 
 #: templates/hosting/user_key.html:30
 msgid "Generate Key Pair"
@@ -411,12 +411,11 @@ msgstr "Achtung!"
 #: templates/hosting/user_key.html:40
 msgid "You can download your SSH  private key once. Don't lost your key"
 msgstr ""
-"Sie können ihren privaten SSH Schlüssel nur einmal herunterladen. Bewaren "
-"Sie ihn sicher auf."
+"Du kannst deinen privaten SSH Schlüssel nur einmal herunterladen. Beware ihn sicher auf."
 
 #: templates/hosting/user_keys.html:18
 msgid "Add Key"
-msgstr ""
+msgstr "Schlüssel hinzufügen"
 
 #: templates/hosting/user_keys.html:26
 msgid "Created at"
@@ -432,7 +431,7 @@ msgstr "Löschen"
 #, fuzzy
 #| msgid "Do You want do delete your order?"
 msgid "Do You want to delete this key?"
-msgstr "Wollen Sie ihre Bestellung löschen?"
+msgstr "Möchtest Du den Schlüssel löschen?"
 
 #: templates/hosting/virtual_machine_detail.html:19
 msgid "Settings"
@@ -492,11 +491,11 @@ msgstr ""
 
 #: templates/hosting/virtual_machines.html:29
 msgid "Ipv4"
-msgstr ""
+msgstr "IPv4"
 
 #: templates/hosting/virtual_machines.html:30
 msgid "Ipv6"
-msgstr ""
+msgstr "IPv6"
 
 #: views.py:213 views.py:232
 msgid "login"
@@ -514,7 +513,7 @@ msgstr ""
 
 #: views.py:218 views.py:243
 msgid "Go back to"
-msgstr ""
+msgstr "Zurück"
 
 #: views.py:233
 msgid "Account activation"
@@ -530,7 +529,7 @@ msgstr "Du kannst dich nun"
 
 #: views.py:242
 msgid "Sorry. Your request is invalid."
-msgstr ""
+msgstr "Entschuldigung, deine Anfrage ist ungültig."
 
 #~ msgid "Home"
 #~ msgstr "Home"
@@ -547,8 +546,8 @@ msgstr ""
 #~ msgid ""
 #~ "Use your created key to access to the machine. If you lost it, contact us."
 #~ msgstr ""
-#~ "Verwenden Sie Ihren privaten SSH Schlüssel um sich mit Ihren Maschinen zu "
-#~ "verbinden. Falls Sie ihn verloren haben kontaktieren Sie uns."
+#~ "Verwende deinen privaten SSH Schlüssel, um dich mit deinen Maschinen zu verbinden. Solltest du deinen "
+#~ "privaten Schlüssel verloren haben, dann kontaktiere uns."
 
 #~ msgid "Copy to Clipboard"
 #~ msgstr "Kopieren"
@@ -557,8 +556,8 @@ msgstr ""
 #~ "Your SSH private key was already generated and downloaded, if you lost "
 #~ "it, contact us. "
 #~ msgstr ""
-#~ "Ihr privater SSH Schlüssel wurde bereits generiert und heruntergeladen, "
-#~ "falls Sie ihn verloren haben kontaktieren Sie uns."
+#~ "Dein privater SSH Schlüssel wurde bereits generiert und heruntergeladen. Falls du ihn verloren hast, "
+#~ "kontaktiere uns."
 
 #~ msgid "Generate my key"
 #~ msgstr "Generiere meinen Schlüssel"

From 8dca67e63811722b23984959fd196d9d5cab2f74 Mon Sep 17 00:00:00 2001
From: "M.Ravi" <mondi.ravi@gmail.com>
Date: Mon, 19 Jun 2017 23:53:25 +0530
Subject: [PATCH 11/38] Increased top margin for email confirmation and
 validation forms

---
 hosting/static/hosting/css/landing-page.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hosting/static/hosting/css/landing-page.css b/hosting/static/hosting/css/landing-page.css
index 8343b081..0c927239 100644
--- a/hosting/static/hosting/css/landing-page.css
+++ b/hosting/static/hosting/css/landing-page.css
@@ -270,7 +270,7 @@ h6 {
 
 .auth-box .section-heading{
     color: #5a5a5a;
-    padding-top: 20px;
+    padding-top: 30px;
     padding-bottom: 5px;
     text-align: center;
     text-transform: uppercase;

From ec761d9e5fa9d77c443a12009c009391b6e6de45 Mon Sep 17 00:00:00 2001
From: "M.Ravi" <mondi.ravi@gmail.com>
Date: Tue, 20 Jun 2017 00:12:50 +0530
Subject: [PATCH 12/38] Corrected with sanghee translations on github

---
 hosting/locale/de/LC_MESSAGES/django.po | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po
index c7f28259..129a1fe1 100644
--- a/hosting/locale/de/LC_MESSAGES/django.po
+++ b/hosting/locale/de/LC_MESSAGES/django.po
@@ -20,7 +20,7 @@ msgstr ""
 
 #: forms.py:28
 msgid "Your account is not activated yet."
-msgstr "Dein Account wurde noch nicht aktiviert"
+msgstr "Dein Account wurde noch nicht aktiviert."
 
 #: forms.py:65
 msgid "Paste here your public key"
@@ -79,7 +79,7 @@ msgstr "Rechnung"
 
 #: templates/hosting/bill_detail.html:11 templates/hosting/order_detail.html:23
 msgid "Order #"
-msgstr "Rechnung #"
+msgstr "Bestellung #"
 
 #: templates/hosting/bill_detail.html:25
 msgid "ungleich GmbH"
@@ -394,11 +394,11 @@ msgstr "Zugriffsschlüssel"
 
 #: templates/hosting/user_key.html:24
 msgid "Upload your own key. "
-msgstr "Lade deinen Schlüssel hoch"
+msgstr "Lade deinen Key hoch"
 
 #: templates/hosting/user_key.html:28
 msgid "Or generate a new key pair."
-msgstr "Oder erstelle dein neues Schlüsselpaar"
+msgstr "Oder erstelle dein neues Keypaar"
 
 #: templates/hosting/user_key.html:30
 msgid "Generate Key Pair"

From b971751e2ba950fc83476a87952eaf80c1cf77c5 Mon Sep 17 00:00:00 2001
From: "M.Ravi" <mondi.ravi@gmail.com>
Date: Tue, 20 Jun 2017 00:22:12 +0530
Subject: [PATCH 13/38] Updated click here text in de

---
 datacenterlight/locale/de/LC_MESSAGES/django.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.po b/datacenterlight/locale/de/LC_MESSAGES/django.po
index a578b242..83a03f33 100644
--- a/datacenterlight/locale/de/LC_MESSAGES/django.po
+++ b/datacenterlight/locale/de/LC_MESSAGES/django.po
@@ -100,8 +100,8 @@ msgid ""
 "                %(base_url)s%(activation_link)s\n"
 "                "
 msgstr "\n"
-"                <a href=\"%(base_url)s%(activation_link)s\">Klicke hier</a> um deinen %(dcl_text)s zu aktivieren.<br/><br/>\n"
-"                Oder kopiere den folgenden Link in die Adressleiste deines Browsers und folge dann dem Link um deinen Data Center Light Account zu aktivieren.<br/>\n"
+"                Du kannst deinen Account aktivieren, indem du <a href=\"%(base_url)s%(activation_link)s\">hier klickst</a>.<br/><br/>\n"
+"                Oder kopiere den folgenden Link in die Adressleiste deines Browsers und folge dann dem Link um deinen %(dcl_text)s Account zu aktivieren.<br/>\n"
 "                %(base_url)s%(activation_link)s\n"
 "                "
 

From 543a52baf94680efa86567ac9d6f3083b22afc1c Mon Sep 17 00:00:00 2001
From: "M.Ravi" <mondi.ravi@gmail.com>
Date: Tue, 20 Jun 2017 01:00:48 +0530
Subject: [PATCH 14/38] Fixed some more translations

---
 datacenterlight/locale/de/LC_MESSAGES/django.po | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.po b/datacenterlight/locale/de/LC_MESSAGES/django.po
index 83a03f33..db86e0a3 100644
--- a/datacenterlight/locale/de/LC_MESSAGES/django.po
+++ b/datacenterlight/locale/de/LC_MESSAGES/django.po
@@ -100,8 +100,8 @@ msgid ""
 "                %(base_url)s%(activation_link)s\n"
 "                "
 msgstr "\n"
-"                Du kannst deinen Account aktivieren, indem du <a href=\"%(base_url)s%(activation_link)s\">hier klickst</a>.<br/><br/>\n"
-"                Oder kopiere den folgenden Link in die Adressleiste deines Browsers und folge dann dem Link um deinen %(dcl_text)s Account zu aktivieren.<br/>\n"
+"                <a href=\"%(base_url)s%(activation_link)s\">Klicke hier</a> um deinen %(dcl_text)s zu aktivieren.<br/><br/>\n"
+"                Oder kopiere den folgenden Link in die Adressleiste deines Browsers und folge dann dem Link um deinen Data Center Light Account zu aktivieren.<br/>\n"
 "                %(base_url)s%(activation_link)s\n"
 "                "
 
@@ -126,9 +126,9 @@ msgid ""
 "%(activation_link)s\n"
 msgstr ""
 "\n"
-"Hi,\n"
+"Hallo,\n"
 "\n"
-"You can activate your %(dcl_text)s account by clicking here %(base_url)s"
+"Du kannst deinen %(dcl_text)s Account aktivieren, indem du hier klickst %(base_url)s"
 "%(activation_link)s\n"
 #: templates/datacenterlight/includes/_footer.html:11
 #: templates/datacenterlight/includes/_footer.html:31

From b27342b4934b04ebe34732402aa44a32145c72d9 Mon Sep 17 00:00:00 2001
From: "M.Ravi" <mondi.ravi@gmail.com>
Date: Tue, 20 Jun 2017 23:44:10 +0530
Subject: [PATCH 15/38] Added dcl_text instead the hardcoded text

---
 datacenterlight/locale/de/LC_MESSAGES/django.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.po b/datacenterlight/locale/de/LC_MESSAGES/django.po
index db86e0a3..f6628b9f 100644
--- a/datacenterlight/locale/de/LC_MESSAGES/django.po
+++ b/datacenterlight/locale/de/LC_MESSAGES/django.po
@@ -101,7 +101,7 @@ msgid ""
 "                "
 msgstr "\n"
 "                <a href=\"%(base_url)s%(activation_link)s\">Klicke hier</a> um deinen %(dcl_text)s zu aktivieren.<br/><br/>\n"
-"                Oder kopiere den folgenden Link in die Adressleiste deines Browsers und folge dann dem Link um deinen Data Center Light Account zu aktivieren.<br/>\n"
+"                Oder kopiere den folgenden Link in die Adressleiste deines Browsers und folge dann dem Link um deinen %(dcl_text)s Account zu aktivieren.<br/>\n"
 "                %(base_url)s%(activation_link)s\n"
 "                "
 

From c50b2455c2a5bb162eb45376fbd905c5b221c0dc Mon Sep 17 00:00:00 2001
From: "M.Ravi" <mondi.ravi@gmail.com>
Date: Tue, 20 Jun 2017 23:45:25 +0530
Subject: [PATCH 16/38] Separated email subject for translation

---
 membership/models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/membership/models.py b/membership/models.py
index 2c8c0ad2..115e8cb1 100644
--- a/membership/models.py
+++ b/membership/models.py
@@ -87,7 +87,7 @@ class CustomUser(AbstractBaseUser, PermissionsMixin):
                     dcl_from_address = settings.DCL_SUPPORT_FROM_ADDRESS
                     user.is_active = False
                     email_data = {
-                        'subject': _('Activate your ' + dcl_text + ' account'),
+                        'subject': _('Activate your ') + dcl_text + _(' account'),
                         'from_address': settings.DCL_SUPPORT_FROM_ADDRESS,
                         'to': user.email,
                         'context': {'base_url'  : base_url, 

From 29591598638f9b5c544c4bdd5a8e5e383b8f7eba Mon Sep 17 00:00:00 2001
From: "M.Ravi" <mondi.ravi@gmail.com>
Date: Wed, 21 Jun 2017 01:40:55 +0530
Subject: [PATCH 17/38] Added cache_control decorator to control cache while
 returning back to the index page

---
 datacenterlight/views.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/datacenterlight/views.py b/datacenterlight/views.py
index 427f8c70..2b304606 100644
--- a/datacenterlight/views.py
+++ b/datacenterlight/views.py
@@ -10,6 +10,7 @@ from django.shortcuts import render
 from django.shortcuts import redirect
 from django import forms
 from django.core.exceptions import ValidationError
+from django.views.decorators.cache import cache_control
 
 from opennebula_api.models import OpenNebulaManager
 from opennebula_api.serializers import VirtualMachineTemplateSerializer
@@ -170,6 +171,7 @@ class IndexView(CreateView):
     success_url = "/datacenterlight#requestform"
     success_message = "Thank you, we will contact you as soon as possible"
     
+    @cache_control(no_cache=True, must_revalidate=True, no_store=True) 
     def get(self, request, *args, **kwargs):
         try:
             manager = OpenNebulaManager()

From 385df4e069a8b78f129a4f9c019b033512ddcbe4 Mon Sep 17 00:00:00 2001
From: "M.Ravi" <mondi.ravi@gmail.com>
Date: Wed, 21 Jun 2017 13:13:10 +0530
Subject: [PATCH 18/38] Added vm_name parameter to create_vm

---
 opennebula_api/models.py | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/opennebula_api/models.py b/opennebula_api/models.py
index 397c0f0c..8059c82b 100644
--- a/opennebula_api/models.py
+++ b/opennebula_api/models.py
@@ -239,7 +239,7 @@ class OpenNebulaManager():
             )
         )
 
-    def create_vm(self, template_id, specs, ssh_key=None):
+    def create_vm(self, template_id, specs, ssh_key=None, vm_name=None):
 
         template = self.get_template(template_id)
         vm_specs_formatter = """<TEMPLATE>
@@ -286,15 +286,17 @@ class OpenNebulaManager():
                         """.format(size=1024 * int(specs['disk_size']),
                                    image=image,
                                    image_uname=image_uname)
-                        
-                                
+       
+        if vm_name is not None:
+            vm_specs += """<NAME>{template_vm_name}</NAME>
+                        """.format(template_vm_name=vm_name)                        
+        vm_specs += "<CONTEXT>"
         if ssh_key:
-            vm_specs += """<CONTEXT>
-                    <SSH_PUBLIC_KEY>{ssh}</SSH_PUBLIC_KEY>
-                    <NETWORK>YES</NETWORK>
+            vm_specs += "<SSH_PUBLIC_KEY>{ssh}</SSH_PUBLIC_KEY>".format(ssh=ssh_key)
+        vm_specs += """<NETWORK>YES</NETWORK>
                    </CONTEXT>
-                              </TEMPLATE>
-                """.format(ssh=ssh_key)
+                </TEMPLATE>
+                """
         vm_id = self.client.call(oca.VmTemplate.METHODS['instantiate'],
                                  template.id,
                                  '',

From 52524a97a6381de25bc84f9a54c5b7b1af858eeb Mon Sep 17 00:00:00 2001
From: "M.Ravi" <mondi.ravi@gmail.com>
Date: Wed, 21 Jun 2017 13:14:58 +0530
Subject: [PATCH 19/38] Added PaymentOrderView

---
 datacenterlight/views.py | 179 ++++++++++++++++++++++++++++++++++-----
 1 file changed, 160 insertions(+), 19 deletions(-)

diff --git a/datacenterlight/views.py b/datacenterlight/views.py
index 2b304606..19100aba 100644
--- a/datacenterlight/views.py
+++ b/datacenterlight/views.py
@@ -11,9 +11,15 @@ from django.shortcuts import redirect
 from django import forms
 from django.core.exceptions import ValidationError
 from django.views.decorators.cache import cache_control
+from django.conf import settings
+from utils.forms import BillingAddressForm, UserBillingAddressForm
+from membership.models import StripeCustomer
+from hosting.models import HostingOrder, HostingBill
+from utils.stripe_utils import StripeUtils
+from datetime import datetime
 
 from opennebula_api.models import OpenNebulaManager
-from opennebula_api.serializers import VirtualMachineTemplateSerializer
+from opennebula_api.serializers import VirtualMachineTemplateSerializer, VirtualMachineSerializer
 
 class LandingProgramView(TemplateView):
     template_name = "datacenterlight/landing.html"
@@ -21,6 +27,14 @@ class LandingProgramView(TemplateView):
 class SuccessView(TemplateView):
     template_name = "datacenterlight/success.html"
 
+    def get(self, request, *args, **kwargs):
+        if 'specs' not in request.session or 'user' not in request.session:
+            return HttpResponseRedirect(reverse('datacenterlight:index'))
+        else :
+            del request.session['specs']
+            del request.session['user']
+        return render(request, self.template_name)
+
 class PricingView(TemplateView):
     template_name = "datacenterlight/pricing.html"
 
@@ -171,8 +185,12 @@ class IndexView(CreateView):
     success_url = "/datacenterlight#requestform"
     success_message = "Thank you, we will contact you as soon as possible"
     
-    @cache_control(no_cache=True, must_revalidate=True, no_store=True) 
+    @cache_control(no_cache=True, must_revalidate=True, no_store=True)
     def get(self, request, *args, **kwargs):
+        if 'specs' in request.session :
+            del request.session['specs']
+        if 'user' in request.session :
+            del request.session['user']
         try:
             manager = OpenNebulaManager()
             templates = manager.get_templates()
@@ -215,26 +233,22 @@ class IndexView(CreateView):
             messages.add_message(self.request, messages.ERROR, '%(value) is not a proper email.'.format(email))
             return HttpResponseRedirect(reverse('datacenterlight:index'))
 
-        context = {
-            'name': name,
-            'email': email,
-            'cores': cores,
+        specs = {
+            'cpu': cores,
             'memory': memory,
-            'storage': storage,
-            'price': price,
-            'template': template_data['name'],
+            'disk_size': storage,
+            'price': price
         }
-        email_data = {
-            'subject': "Data Center Light Order from %s" % context['email'],
-            'from_email': '(datacenterlight) datacenterlight Support <support@datacenterlight.ch>',
-            'to': ['info@ungleich.ch'],
-            'body': "\n".join(["%s=%s" % (k, v) for (k, v) in context.items()]),
-            'reply_to': [context['email']],
+        
+        this_user = {
+            'name': name,
+            'email': email
         }
-        email = EmailMessage(**email_data)
-        email.send()        
-
-        return HttpResponseRedirect(reverse('datacenterlight:order_success'))
+        
+        request.session['specs'] = specs
+        request.session['template'] = template_data
+        request.session['user'] = this_user
+        return HttpResponseRedirect(reverse('datacenterlight:payment'))
 
     def get_success_url(self):
         success_url = reverse('datacenterlight:index')
@@ -283,3 +297,130 @@ class IndexView(CreateView):
 
         messages.add_message(self.request, messages.SUCCESS, self.success_message)
         return super(IndexView, self).form_valid(form)
+
+
+class PaymentOrderView(FormView):
+    template_name = 'hosting/payment.html'
+    form_class = BillingAddressForm
+
+    def get_context_data(self, **kwargs):
+        context = super(PaymentOrderView, self).get_context_data(**kwargs)
+        context.update({
+            'stripe_key': settings.STRIPE_API_PUBLIC_KEY
+        })
+        return context
+
+    @cache_control(no_cache=True, must_revalidate=True, no_store=True)
+    def get(self, request, *args, **kwargs):
+        if 'specs' not in request.session or 'user' not in request.session:
+            return HttpResponseRedirect(reverse('datacenterlight:index'))
+        return self.render_to_response(self.get_context_data())
+
+    def post(self, request, *args, **kwargs):
+        form = self.get_form()
+        if form.is_valid():
+            # Get billing address data
+            billing_address_data = form.cleaned_data
+            context = self.get_context_data()
+            template = request.session.get('template')
+            specs = request.session.get('specs')
+            user = request.session.get('user')
+            vm_template_id = template.get('id', 1)
+            final_price = specs.get('price')
+            token = form.cleaned_data.get('token')
+            owner = self.request.user
+        
+            # Get or create stripe customer
+            customer = StripeCustomer.get_or_create(email=user.get('email'),
+                                                    token=token)
+            if not customer:
+                form.add_error("__all__", "Invalid credit card")
+                return self.render_to_response(self.get_context_data(form=form))
+        
+            # Create Billing Address
+            billing_address = form.save()
+        
+            # Make stripe charge to a customer
+            stripe_utils = StripeUtils()
+            charge_response = stripe_utils.make_charge(amount=final_price,
+                                                       customer=customer.stripe_id)
+            charge = charge_response.get('response_object')
+        
+            # Check if the payment was approved
+            if not charge:
+                context.update({
+                    'paymentError': charge_response.get('error'),
+                    'form': form
+                })
+                return render(request, self.template_name, context)
+        
+            charge = charge_response.get('response_object')
+        
+            # Create OpenNebulaManager
+            manager = OpenNebulaManager(email=settings.OPENNEBULA_USERNAME,
+                                        password=settings.OPENNEBULA_PASSWORD)
+            
+            # Create a vm using logged user
+            vm_id = manager.create_vm(
+                template_id=vm_template_id,
+                specs=specs,
+                name="{email}-{template_name}-{date}".format(
+                       email=user.get('email'), 
+                       template_name=template.get('name'),
+                       date=int(datetime.now().strftime("%s")))
+            )
+
+            # Create a Hosting Order
+            #order = HostingOrder.create(
+            #    price=final_price,
+            #    vm_id=vm_id,
+            #    customer=customer,
+            #    billing_address=billing_address
+            #)
+        
+            ## Create a Hosting Bill
+            #bill = HostingBill.create(
+            #    customer=customer, billing_address=billing_address)
+            #
+            ## Create Billing Address for User if he does not have one
+            #if not customer.user.billing_addresses.count():
+            #    billing_address_data.update({
+            #        'user': customer.user.id
+            #    })
+            #    billing_address_user_form = UserBillingAddressForm(
+            #        billing_address_data)
+            #    billing_address_user_form.is_valid()
+            #    billing_address_user_form.save()
+            #
+            ## Associate an order with a stripe payment
+            #order.set_stripe_charge(charge)
+        
+            # If the Stripe payment was successed, set order status approved
+            #order.set_approved()
+
+            vm = VirtualMachineSerializer(manager.get_vm(vm_id)).data
+            
+            context = {
+                'name': user.get('name'),
+                'email': user.get('email'),
+                'cores': specs.get('cpu'),
+                'memory': specs.get('memory'),
+                'storage': specs.get('disk_size'),
+                'price': specs.get('price'),
+                'template': template.get('name'),
+                'vm.name': vm['name'],
+                'vm.id': vm['vm_id'],
+                'order id': order.id 
+            }
+            email_data = {
+                'subject': "Data Center Light Order from %s" % context['email'],
+                'from_email': '(Data Center Light) Data Center Light Support <support@datacenterlight.ch>',
+                'to': ['info@ungleich.ch'],
+                'body': "\n".join(["%s=%s" % (k, v) for (k, v) in context.items()]),
+                'reply_to': [context['email']],
+            }
+            email = EmailMessage(**email_data)
+            email.send()
+            return HttpResponseRedirect(reverse('datacenterlight:order_success'))
+        else:
+            return self.form_invalid(form)

From 66f82572f1ce1a93e5dd35bf9724b1257e05d35a Mon Sep 17 00:00:00 2001
From: "M.Ravi" <mondi.ravi@gmail.com>
Date: Wed, 21 Jun 2017 13:15:37 +0530
Subject: [PATCH 20/38] Added payment url

---
 datacenterlight/urls.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/datacenterlight/urls.py b/datacenterlight/urls.py
index aad6442e..8dac321e 100644
--- a/datacenterlight/urls.py
+++ b/datacenterlight/urls.py
@@ -1,6 +1,6 @@
 from django.conf.urls import url
 
-from .views import IndexView, BetaProgramView, LandingProgramView, BetaAccessView, PricingView, SuccessView
+from .views import IndexView, BetaProgramView, LandingProgramView, BetaAccessView, PricingView, SuccessView, PaymentOrderView
 
 
 urlpatterns = [
@@ -8,6 +8,7 @@ urlpatterns = [
     url(r'^/beta-program/?$', BetaProgramView.as_view(), name='beta'),
     url(r'^/landing/?$', LandingProgramView.as_view(), name='landing'),
     url(r'^/pricing/?$', PricingView.as_view(), name='pricing'),
+    url(r'^/payment/?$', PaymentOrderView.as_view(), name='payment'),
     url(r'^/order-success/?$', SuccessView.as_view(), name='order_success'),
     url(r'^/beta_access?$', BetaAccessView.as_view(), name='beta_access'),
 ]

From bbfc7e851549dbc5615dd6c9a05635c5426eebd1 Mon Sep 17 00:00:00 2001
From: "M.Ravi" <mondi.ravi@gmail.com>
Date: Wed, 21 Jun 2017 23:37:36 +0530
Subject: [PATCH 21/38] Not persisting stripe details to db

---
 datacenterlight/views.py | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/datacenterlight/views.py b/datacenterlight/views.py
index 19100aba..fd024c94 100644
--- a/datacenterlight/views.py
+++ b/datacenterlight/views.py
@@ -331,19 +331,22 @@ class PaymentOrderView(FormView):
             owner = self.request.user
         
             # Get or create stripe customer
-            customer = StripeCustomer.get_or_create(email=user.get('email'),
-                                                    token=token)
-            if not customer:
+            stripe_utils = StripeUtils()
+            stripe_data = stripe_utils.create_customer(token, user.get('email'))
+            customer_stripe_id = None
+            if stripe_data.get('response_object'):
+                customer_stripe_id = stripe_data.get('response_object').get('id')
+
+            if customer_stripe_id is None:
                 form.add_error("__all__", "Invalid credit card")
                 return self.render_to_response(self.get_context_data(form=form))
-        
-            # Create Billing Address
+
             billing_address = form.save()
         
             # Make stripe charge to a customer
             stripe_utils = StripeUtils()
             charge_response = stripe_utils.make_charge(amount=final_price,
-                                                       customer=customer.stripe_id)
+                                                       customer=customer_stripe_id)
             charge = charge_response.get('response_object')
         
             # Check if the payment was approved
@@ -364,7 +367,7 @@ class PaymentOrderView(FormView):
             vm_id = manager.create_vm(
                 template_id=vm_template_id,
                 specs=specs,
-                name="{email}-{template_name}-{date}".format(
+                vm_name="{email}-{template_name}-{date}".format(
                        email=user.get('email'), 
                        template_name=template.get('name'),
                        date=int(datetime.now().strftime("%s")))
@@ -395,7 +398,7 @@ class PaymentOrderView(FormView):
             ## Associate an order with a stripe payment
             #order.set_stripe_charge(charge)
         
-            # If the Stripe payment was successed, set order status approved
+            # If the Stripe payment is success, set order status approved
             #order.set_approved()
 
             vm = VirtualMachineSerializer(manager.get_vm(vm_id)).data
@@ -409,8 +412,7 @@ class PaymentOrderView(FormView):
                 'price': specs.get('price'),
                 'template': template.get('name'),
                 'vm.name': vm['name'],
-                'vm.id': vm['vm_id'],
-                'order id': order.id 
+                'vm.id': vm['vm_id']
             }
             email_data = {
                 'subject': "Data Center Light Order from %s" % context['email'],

From 387c45b96951a076788d645ed4970c05a79996fd Mon Sep 17 00:00:00 2001
From: "M.Ravi" <mondi.ravi@gmail.com>
Date: Wed, 21 Jun 2017 23:38:35 +0530
Subject: [PATCH 22/38] We need the logo in the payment page even when user is
 not logged in

---
 hosting/templates/hosting/base_short.html | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/hosting/templates/hosting/base_short.html b/hosting/templates/hosting/base_short.html
index cf9f54d9..0ccfe5f9 100644
--- a/hosting/templates/hosting/base_short.html
+++ b/hosting/templates/hosting/base_short.html
@@ -46,7 +46,7 @@
 
 
     <!-- Navigation -->
-    {% if request.user.is_authenticated %}
+    
     <nav class="navbar navbar-default  navbar-fixed-top topnav" role="navigation">
         <div class="container topnav">
             <!-- Brand and toggle get grouped for better mobile display -->
@@ -59,6 +59,7 @@
                 </button>
                 <a class="navbar-brand topnav" href="{{ request.session.hosting_url}}"><img src="{% static 'datacenterlight/img/logo_black.svg' %}"></a>
             </div>
+            {% if request.user.is_authenticated %}
             <!-- Collect the nav links, forms, and other content for toggling -->
             <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
                 <ul class="nav navbar-nav navbar-right">
@@ -110,12 +111,13 @@
                         </li>  -->
                 </ul>
             </div>
+            {% endif %}
             <!-- /.navbar-collapse -->
         </div>
         <!-- /.container -->
     </nav>
 
-    {% endif %}
+
 
     <div class="content-dashboard">
         {% block content %}

From da0d8bf937a92b3b4bbf2d332494260c880444d7 Mon Sep 17 00:00:00 2001
From: "M.Ravi" <mondi.ravi@gmail.com>
Date: Thu, 22 Jun 2017 00:17:53 +0530
Subject: [PATCH 23/38] Added one.vm.rename xml-rpc call to rename a created vm

---
 opennebula_api/models.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/opennebula_api/models.py b/opennebula_api/models.py
index 8059c82b..d18524c5 100644
--- a/opennebula_api/models.py
+++ b/opennebula_api/models.py
@@ -286,10 +286,7 @@ class OpenNebulaManager():
                         """.format(size=1024 * int(specs['disk_size']),
                                    image=image,
                                    image_uname=image_uname)
-       
-        if vm_name is not None:
-            vm_specs += """<NAME>{template_vm_name}</NAME>
-                        """.format(template_vm_name=vm_name)                        
+
         vm_specs += "<CONTEXT>"
         if ssh_key:
             vm_specs += "<SSH_PUBLIC_KEY>{ssh}</SSH_PUBLIC_KEY>".format(ssh=ssh_key)
@@ -309,6 +306,13 @@ class OpenNebulaManager():
             'release',
             vm_id
         )
+        
+        if vm_name is not None:
+            self.oneadmin_client.call(
+                'vm.rename',
+                vm_id,
+                vm_name
+            )
         return vm_id
 
     def delete_vm(self, vm_id):

From 041352ac6d5049fef6d77211f25265d69e9dd750 Mon Sep 17 00:00:00 2001
From: "M.Ravi" <mondi.ravi@gmail.com>
Date: Thu, 22 Jun 2017 00:28:44 +0530
Subject: [PATCH 24/38] Cleaned up some commented code

---
 datacenterlight/views.py | 28 ----------------------------
 1 file changed, 28 deletions(-)

diff --git a/datacenterlight/views.py b/datacenterlight/views.py
index fd024c94..0c576f3a 100644
--- a/datacenterlight/views.py
+++ b/datacenterlight/views.py
@@ -373,34 +373,6 @@ class PaymentOrderView(FormView):
                        date=int(datetime.now().strftime("%s")))
             )
 
-            # Create a Hosting Order
-            #order = HostingOrder.create(
-            #    price=final_price,
-            #    vm_id=vm_id,
-            #    customer=customer,
-            #    billing_address=billing_address
-            #)
-        
-            ## Create a Hosting Bill
-            #bill = HostingBill.create(
-            #    customer=customer, billing_address=billing_address)
-            #
-            ## Create Billing Address for User if he does not have one
-            #if not customer.user.billing_addresses.count():
-            #    billing_address_data.update({
-            #        'user': customer.user.id
-            #    })
-            #    billing_address_user_form = UserBillingAddressForm(
-            #        billing_address_data)
-            #    billing_address_user_form.is_valid()
-            #    billing_address_user_form.save()
-            #
-            ## Associate an order with a stripe payment
-            #order.set_stripe_charge(charge)
-        
-            # If the Stripe payment is success, set order status approved
-            #order.set_approved()
-
             vm = VirtualMachineSerializer(manager.get_vm(vm_id)).data
             
             context = {

From e848c318d0813a203c5d0d8bce9e35b96f07d1d6 Mon Sep 17 00:00:00 2001
From: "M.Ravi" <mondi.ravi@gmail.com>
Date: Thu, 22 Jun 2017 13:18:54 +0530
Subject: [PATCH 25/38] Addd order confirmation url

---
 datacenterlight/urls.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/datacenterlight/urls.py b/datacenterlight/urls.py
index 8dac321e..65401b13 100644
--- a/datacenterlight/urls.py
+++ b/datacenterlight/urls.py
@@ -1,6 +1,6 @@
 from django.conf.urls import url
 
-from .views import IndexView, BetaProgramView, LandingProgramView, BetaAccessView, PricingView, SuccessView, PaymentOrderView
+from .views import IndexView, BetaProgramView, LandingProgramView, BetaAccessView, PricingView, SuccessView, PaymentOrderView, OrderConfirmationView
 
 
 urlpatterns = [
@@ -9,6 +9,7 @@ urlpatterns = [
     url(r'^/landing/?$', LandingProgramView.as_view(), name='landing'),
     url(r'^/pricing/?$', PricingView.as_view(), name='pricing'),
     url(r'^/payment/?$', PaymentOrderView.as_view(), name='payment'),
+    url(r'^/order-confirmation/(?P<pk>\d+)/?$', OrderConfirmationView.as_view(), name='order_confirmation'),
     url(r'^/order-success/?$', SuccessView.as_view(), name='order_success'),
     url(r'^/beta_access?$', BetaAccessView.as_view(), name='beta_access'),
 ]

From c4c110b50672973d03a55d3a07fdffc01b683671 Mon Sep 17 00:00:00 2001
From: "M.Ravi" <mondi.ravi@gmail.com>
Date: Thu, 22 Jun 2017 13:21:07 +0530
Subject: [PATCH 26/38] Added OrderConfirmationView to dcl

---
 datacenterlight/views.py | 95 +++++++++++++++++++++++++++++++++-------
 1 file changed, 79 insertions(+), 16 deletions(-)

diff --git a/datacenterlight/views.py b/datacenterlight/views.py
index 0c576f3a..b9372514 100644
--- a/datacenterlight/views.py
+++ b/datacenterlight/views.py
@@ -1,4 +1,4 @@
-from django.views.generic import FormView, CreateView, TemplateView
+from django.views.generic import FormView, CreateView, TemplateView, DetailView
 from django.http import HttpResponseRedirect
 from .forms import BetaAccessForm
 from .models import BetaAccess, BetaAccessVMType, BetaAccessVM
@@ -17,6 +17,7 @@ from membership.models import StripeCustomer
 from hosting.models import HostingOrder, HostingBill
 from utils.stripe_utils import StripeUtils
 from datetime import datetime
+from membership.models import CustomUser, StripeCustomer
 
 from opennebula_api.models import OpenNebulaManager
 from opennebula_api.serializers import VirtualMachineTemplateSerializer, VirtualMachineSerializer
@@ -328,27 +329,33 @@ class PaymentOrderView(FormView):
             vm_template_id = template.get('id', 1)
             final_price = specs.get('price')
             token = form.cleaned_data.get('token')
-            owner = self.request.user
-        
-            # Get or create stripe customer
-            stripe_utils = StripeUtils()
-            stripe_data = stripe_utils.create_customer(token, user.get('email'))
-            customer_stripe_id = None
-            if stripe_data.get('response_object'):
-                customer_stripe_id = stripe_data.get('response_object').get('id')
+            custom_user = CustomUser.objects.get(email=user.get('email'))
+            if custom_user is None:
+                password = CustomUser.get_random_password()
+                # Register the user, and do not send emails
+                CustomUser.register(user.get('name'), 
+                                    password, 
+                                    user.get('email'), 
+                                    app='dcl', 
+                                    base_url=None, send_email=False)
 
-            if customer_stripe_id is None:
+
+            # Get or create stripe customer
+            customer = StripeCustomer.get_or_create(email=user.get('name'),
+                                                    token=token)
+            if not customer:
                 form.add_error("__all__", "Invalid credit card")
                 return self.render_to_response(self.get_context_data(form=form))
 
+            # Create Billing Address
             billing_address = form.save()
-        
+
             # Make stripe charge to a customer
             stripe_utils = StripeUtils()
             charge_response = stripe_utils.make_charge(amount=final_price,
-                                                       customer=customer_stripe_id)
+                                                       customer=customer.stripe_id)
             charge = charge_response.get('response_object')
-        
+
             # Check if the payment was approved
             if not charge:
                 context.update({
@@ -356,7 +363,7 @@ class PaymentOrderView(FormView):
                     'form': form
                 })
                 return render(request, self.template_name, context)
-        
+
             charge = charge_response.get('response_object')
         
             # Create OpenNebulaManager
@@ -372,7 +379,35 @@ class PaymentOrderView(FormView):
                        template_name=template.get('name'),
                        date=int(datetime.now().strftime("%s")))
             )
+            
+            # Create a Hosting Order
+            order = HostingOrder.create(
+                price=final_price,
+                vm_id=vm_id,
+                customer=customer,
+                billing_address=billing_address
+            )
+            
+            # Create a Hosting Bill
+            bill = HostingBill.create(
+                customer=customer, billing_address=billing_address)
 
+            # Create Billing Address for User if he does not have one
+            if not customer.user.billing_addresses.count():
+                billing_address_data.update({
+                    'user': customer.user.id
+                })
+                billing_address_user_form = UserBillingAddressForm(
+                    billing_address_data)
+                billing_address_user_form.is_valid()
+                billing_address_user_form.save()
+
+            # Associate an order with a stripe payment
+            order.set_stripe_charge(charge)
+
+            # If the Stripe payment was successed, set order status approved
+            order.set_approved()
+            
             vm = VirtualMachineSerializer(manager.get_vm(vm_id)).data
             
             context = {
@@ -384,7 +419,8 @@ class PaymentOrderView(FormView):
                 'price': specs.get('price'),
                 'template': template.get('name'),
                 'vm.name': vm['name'],
-                'vm.id': vm['vm_id']
+                'vm.id': vm['vm_id'],
+                'order.id': order.id
             }
             email_data = {
                 'subject': "Data Center Light Order from %s" % context['email'],
@@ -395,6 +431,33 @@ class PaymentOrderView(FormView):
             }
             email = EmailMessage(**email_data)
             email.send()
-            return HttpResponseRedirect(reverse('datacenterlight:order_success'))
+            return HttpResponseRedirect(reverse('datacenterlight:order_confirmation', kwargs={'pk': order.id}))
         else:
             return self.form_invalid(form)
+
+class OrderConfirmationView(DetailView):
+    template_name = "datacenterlight/order_detail.html"
+    context_object_name = "order"
+    model = HostingOrder
+    def get_context_data(self, **kwargs):
+        # Get context
+        context = super(DetailView, self).get_context_data(**kwargs)
+        obj = self.get_object()
+        manager = OpenNebulaManager(email=settings.OPENNEBULA_USERNAME,
+                                    password=settings.OPENNEBULA_PASSWORD)
+        try:
+            vm = manager.get_vm(obj.vm_id)
+            context['vm'] = VirtualMachineSerializer(vm).data
+            context['next_url'] = reverse('datacenterlight:order_success')
+        except WrongIdError:
+            messages.error(self.request,
+                           'The VM you are looking for is unavailable at the moment. \
+                            Please contact Data Center Light support.'
+                           )
+            self.kwargs['error'] = 'WrongIdError'
+            context['error'] = 'WrongIdError'
+        except ConnectionRefusedError:
+            messages.error(self.request,
+                           'In order to create a VM, you need to create/upload your SSH KEY first.'
+                           )
+        return context

From b4c3172a4d5bae18240e10399197e13af4d0cb98 Mon Sep 17 00:00:00 2001
From: "M.Ravi" <mondi.ravi@gmail.com>
Date: Thu, 22 Jun 2017 13:22:14 +0530
Subject: [PATCH 27/38] Added send_email flag to send/not send email on user
 registration. Added get_random_password method to CustomUser

---
 membership/models.py | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/membership/models.py b/membership/models.py
index 8bd9feec..44da4ef7 100644
--- a/membership/models.py
+++ b/membership/models.py
@@ -6,6 +6,7 @@ from django.contrib.auth.hashers import make_password
 from django.core.validators import RegexValidator
 from django.contrib.auth.models import User
 from django.contrib.sites.models import Site
+from django.utils.crypto import get_random_string
 
 from utils.stripe_utils import StripeUtils
 from utils.mailer import DigitalGlarusRegistrationMailer
@@ -73,7 +74,7 @@ class CustomUser(AbstractBaseUser, PermissionsMixin):
     REQUIRED_FIELDS = ['name', 'password']
 
     @classmethod
-    def register(cls, name, password, email, app='digital_glarus', base_url=None):
+    def register(cls, name, password, email, app='digital_glarus', base_url=None, send_email=True):
         user = cls.objects.filter(email=email).first()
         if not user:
             user = cls.objects.create_user(name=name, email=email, password=password)
@@ -83,17 +84,18 @@ class CustomUser(AbstractBaseUser, PermissionsMixin):
                     dg.send_mail(to=user.email)
                 elif app == 'dcl':
                     user.is_active = False
-                    email_data = {
-                        'subject': _('Activate your Data Center Light account'),
-                        'from_address': '(Data Center Light) Data Center Light Support <support@datacenterlight.ch>',
-                        'to': user.email,
-                        'context': {'base_url'  : base_url, 
-                                    'activation_link' : reverse('hosting:validate', kwargs={'validate_slug': user.validation_slug})},
-                        'template_name': 'user_activation',
-                        'template_path': 'datacenterlight/emails/'
-                    }
-                    email = BaseEmail(**email_data)
-                    email.send()
+                    if send_email is True:
+                        email_data = {
+                            'subject': _('Activate your Data Center Light account'),
+                            'from_address': '(Data Center Light) Data Center Light Support <support@datacenterlight.ch>',
+                            'to': user.email,
+                            'context': {'base_url'  : base_url, 
+                                        'activation_link' : reverse('hosting:validate', kwargs={'validate_slug': user.validation_slug})},
+                            'template_name': 'user_activation',
+                            'template_path': 'datacenterlight/emails/'
+                        }
+                        email = BaseEmail(**email_data)
+                        email.send()
                 return user
             else:
                 return None
@@ -113,6 +115,10 @@ class CustomUser(AbstractBaseUser, PermissionsMixin):
             return True
         return False
 
+    @classmethod
+    def get_random_password(cls):
+        return get_random_string(24)
+
     def is_superuser(self):
         return False
 

From 31c389e72cd9732092bb86094b64f07038c78613 Mon Sep 17 00:00:00 2001
From: "M.Ravi" <mondi.ravi@gmail.com>
Date: Thu, 22 Jun 2017 13:23:13 +0530
Subject: [PATCH 28/38] Added order_detail.html for dcl

---
 .../datacenterlight/order_detail.html         | 84 +++++++++++++++++++
 1 file changed, 84 insertions(+)
 create mode 100644 datacenterlight/templates/datacenterlight/order_detail.html

diff --git a/datacenterlight/templates/datacenterlight/order_detail.html b/datacenterlight/templates/datacenterlight/order_detail.html
new file mode 100644
index 00000000..a866dac8
--- /dev/null
+++ b/datacenterlight/templates/datacenterlight/order_detail.html
@@ -0,0 +1,84 @@
+{% extends "hosting/base_short.html" %}
+{% load staticfiles bootstrap3 %}
+{% load i18n %}
+{% block content %} 
+
+<div class="order-detail-container">
+   {% if messages %}
+    <div class="row">
+        <div class="col-xs-12 col-md-8 col-md-offset-2">
+            <br/>
+                <div class="alert alert-warning">
+                    {% for message in messages %}
+                    <span>{{ message }}</span>
+                    {% endfor %}
+                </div>
+        </div>
+    </div>
+    {% endif %}
+    {% if not error %}
+    <div class="row">  
+        <div class="col-xs-12 col-md-8 col-md-offset-2">
+    		<div class="invoice-title">
+    			<h2>{% trans "Invoice"%}</h2><h3 class="pull-right">{% trans "Order #"%} {{order.id}}</h3>
+    		</div>
+    		<hr>
+    		<div class="row">
+    			<div class="col-xs-6">
+    				<address>
+                    <h3><b>{% trans "Billed To:"%}</b></h3>
+    					{{user.name}}<br>
+                        {{order.billing_address.street_address}},{{order.billing_address.postal_code}}<br>
+                        {{order.billing_address.city}}, {{order.billing_address.country}}.
+    				</address>
+    			</div>
+                <div class="col-xs-6 text-right">
+                    <address>
+                        <strong>{% trans "Billed To:"%}</strong><br>
+                        {{order.created_at}}<br><br>
+                        <strong>{% trans "Status:"%}</strong><br>
+                        <strong class="{% if order.status == 'Approved' %}text-success
+                                       {%else%} text-danger
+                                       {% endif %}">{{order.status}}</strong>
+                        <br><br>
+                    </address>
+
+                </div>
+    		</div>
+    		<div class="row">
+    			<div class="col-xs-6">
+    				<address>
+    					<strong>{% trans "Payment Method:"%}</strong><br>
+    					{{order.cc_brand}} ending **** {{order.last4}}<br>
+    					{{user.email}}
+    				</address>
+    			</div>
+    		</div>
+    	</div>
+    </div>
+    
+    <div class="row">
+        <div class="col-md-8 col-md-offset-2">
+            <h3><b>{% trans "Order summary"%}</b></h3>
+            <hr>
+            <div class="content">
+                <p><b>{% trans "Cores"%}</b> <span class="pull-right">{{vm.cores}}</span></p>
+                <hr>
+                <p><b>{% trans "Memory"%}</b> <span class="pull-right">{{vm.memory}} GB</span></p>
+                <hr>
+                <p><b>{% trans "Disk space"%}</b> <span class="pull-right">{{vm.disk_size}} GB</span></p>
+                <hr>
+                <h4>{% trans "Total"%}<p class="pull-right"><b>{{vm.price}} CHF</b></p></h4>
+            </div>
+            <br/>
+            {% url 'datacenterlight:payment' as payment_url %}
+            {% if payment_url in request.META.HTTP_REFERER  %}
+            <div class=" content pull-right">
+                <a href="{{next_url}}" ><button class="btn btn-info">{% trans "Finish Configuration"%}</button></a>
+            </div>
+            {% endif %}
+        </div>
+    </div>
+    {% endif %}
+</div>
+{%endblock%}

From 5caa79f1990066df954faf0664b0536dc49bebe5 Mon Sep 17 00:00:00 2001
From: "M.Ravi" <mondi.ravi@gmail.com>
Date: Thu, 22 Jun 2017 13:40:39 +0530
Subject: [PATCH 29/38] Added CustomUser.DoesNotExist error exception

---
 datacenterlight/views.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/datacenterlight/views.py b/datacenterlight/views.py
index b9372514..9708eb24 100644
--- a/datacenterlight/views.py
+++ b/datacenterlight/views.py
@@ -329,8 +329,9 @@ class PaymentOrderView(FormView):
             vm_template_id = template.get('id', 1)
             final_price = specs.get('price')
             token = form.cleaned_data.get('token')
-            custom_user = CustomUser.objects.get(email=user.get('email'))
-            if custom_user is None:
+            try:
+                custom_user = CustomUser.objects.get(email=user.get('email'))
+            except CustomUser.DoesNotExist:
                 password = CustomUser.get_random_password()
                 # Register the user, and do not send emails
                 CustomUser.register(user.get('name'), 

From d4e7eb9511b2adc4ad15f55ac775727a12fcc50f Mon Sep 17 00:00:00 2001
From: "M.Ravi" <mondi.ravi@gmail.com>
Date: Thu, 22 Jun 2017 23:48:14 +0530
Subject: [PATCH 30/38] Added CustomUser model reload code

---
 membership/models.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/membership/models.py b/membership/models.py
index 44da4ef7..e491031e 100644
--- a/membership/models.py
+++ b/membership/models.py
@@ -176,16 +176,14 @@ class StripeCustomer(models.Model):
             return stripe_customer
 
         except StripeCustomer.DoesNotExist:
+            CustomUser.refresh_from_db()
             user = CustomUser.objects.get(email=email)
-
             stripe_utils = StripeUtils()
             stripe_data = stripe_utils.create_customer(token, email)
             if stripe_data.get('response_object'):
                 stripe_cus_id = stripe_data.get('response_object').get('id')
-
                 stripe_customer = StripeCustomer.objects.\
                     create(user=user, stripe_id=stripe_cus_id)
-
                 return stripe_customer
             else:
                 return None

From e5929b8f769ec0f546308835da35d9be72673870 Mon Sep 17 00:00:00 2001
From: "M.Ravi" <mondi.ravi@gmail.com>
Date: Fri, 23 Jun 2017 00:15:47 +0530
Subject: [PATCH 31/38] Removed call to refresh_from_db as it was wrongly used

---
 membership/models.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/membership/models.py b/membership/models.py
index e491031e..72b56d3c 100644
--- a/membership/models.py
+++ b/membership/models.py
@@ -176,7 +176,6 @@ class StripeCustomer(models.Model):
             return stripe_customer
 
         except StripeCustomer.DoesNotExist:
-            CustomUser.refresh_from_db()
             user = CustomUser.objects.get(email=email)
             stripe_utils = StripeUtils()
             stripe_data = stripe_utils.create_customer(token, email)

From 5b8a26eeb3db3b2fdb0662136066a1a54f7fd703 Mon Sep 17 00:00:00 2001
From: "M.Ravi" <mondi.ravi@gmail.com>
Date: Fri, 23 Jun 2017 00:31:08 +0530
Subject: [PATCH 32/38] Fixed a blunder mistake. Was using name instead of
 email

---
 datacenterlight/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/datacenterlight/views.py b/datacenterlight/views.py
index 9708eb24..e4329b89 100644
--- a/datacenterlight/views.py
+++ b/datacenterlight/views.py
@@ -342,7 +342,7 @@ class PaymentOrderView(FormView):
 
 
             # Get or create stripe customer
-            customer = StripeCustomer.get_or_create(email=user.get('name'),
+            customer = StripeCustomer.get_or_create(email=user.get('email'),
                                                     token=token)
             if not customer:
                 form.add_error("__all__", "Invalid credit card")

From 9aba565ec02f1aabaee885780c9dcee9d43fb1a3 Mon Sep 17 00:00:00 2001
From: "M.Ravi" <mondi.ravi@gmail.com>
Date: Fri, 23 Jun 2017 01:15:48 +0530
Subject: [PATCH 33/38] Added + corrected de translations

---
 hosting/locale/de/LC_MESSAGES/django.po | 55 ++++++++++++-------------
 1 file changed, 27 insertions(+), 28 deletions(-)

diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po
index 661fa0bd..129a1fe1 100644
--- a/hosting/locale/de/LC_MESSAGES/django.po
+++ b/hosting/locale/de/LC_MESSAGES/django.po
@@ -20,7 +20,7 @@ msgstr ""
 
 #: forms.py:28
 msgid "Your account is not activated yet."
-msgstr ""
+msgstr "Dein Account wurde noch nicht aktiviert."
 
 #: forms.py:65
 msgid "Paste here your public key"
@@ -44,15 +44,15 @@ msgstr "Benachrichtigungen"
 
 #: templates/hosting/base_short.html:89
 msgid "Logout"
-msgstr "Abmeleden"
+msgstr "Abmelden"
 
 #: templates/hosting/base_short.html:94
 msgid "How it works"
-msgstr "Wie es funktioniert"
+msgstr "So funktioniert es"
 
 #: templates/hosting/base_short.html:97
 msgid "Your infrastructure"
-msgstr "Ihre Infrastruktur"
+msgstr "deine Infrastruktur"
 
 #: templates/hosting/base_short.html:100
 msgid "Our inftrastructure"
@@ -79,7 +79,7 @@ msgstr "Rechnung"
 
 #: templates/hosting/bill_detail.html:11 templates/hosting/order_detail.html:23
 msgid "Order #"
-msgstr "Rechnung #"
+msgstr "Bestellung #"
 
 #: templates/hosting/bill_detail.html:25
 msgid "ungleich GmbH"
@@ -164,11 +164,11 @@ msgstr "nächste"
 #: templates/hosting/login.html:12 templates/hosting/reset_password.html:10
 #: templates/hosting/signup.html:9 templates/hosting/signup_validate.html:9
 msgid "Your VM hosted in Switzerland"
-msgstr "Ihre VM in der Schweiz"
+msgstr "deine VM in der Schweiz"
 
 #: templates/hosting/confirm_reset_password.html:14
 msgid "Set your new password"
-msgstr "Setzen Ihr neues Passwort"
+msgstr "Setze dein neues Passwort"
 
 #: templates/hosting/confirm_reset_password.html:29
 #: templates/hosting/reset_password.html:23
@@ -178,7 +178,7 @@ msgstr "Zurücksetzen"
 #: templates/hosting/confirm_reset_password.html:35
 #: templates/hosting/reset_password.html:29 templates/hosting/signup.html:27
 msgid "Already have an account ?"
-msgstr "Besitzen sie bereits ein Bentzerkonto"
+msgstr "Hast Du bereits ein Benutzerkonto?"
 
 #: templates/hosting/create_virtual_machine.html:20
 msgid "New Virtual Machine"
@@ -188,19 +188,19 @@ msgstr "Neue virtuelle Maschine"
 #, fuzzy
 #| msgid "Select VM Template:"
 msgid "Step 1. Select VM Template:"
-msgstr "Wählen Sie eine Vorlage"
+msgstr "Wähle eine Vorlage"
 
 #: templates/hosting/create_virtual_machine.html:42
 #, fuzzy
 #| msgid "Select VM Configuration:"
 msgid "Step2. Select VM Configuration"
-msgstr "Wählen Sie eine Konfiguration"
+msgstr "Wähle eine Konfiguration"
 
 #: templates/hosting/create_virtual_machine.html:59
 #, fuzzy
 #| msgid "Pricing"
 msgid "Price "
-msgstr "Preise"
+msgstr "Preis"
 
 #: templates/hosting/create_virtual_machine.html:59
 msgid "CHF/Month"
@@ -208,7 +208,7 @@ msgstr "CHF/Monat"
 
 #: templates/hosting/create_virtual_machine.html:61
 msgid "Start VM"
-msgstr "Start VM"
+msgstr "VM jetzt starten"
 
 #: templates/hosting/emails/password_reset_email.html:2
 #: templates/hosting/emails/password_reset_email.txt:2
@@ -236,7 +236,7 @@ msgstr ""
 
 #: templates/hosting/login.html:34
 msgid "Don't have an account yet ? "
-msgstr "Besitzen Sie kein Benutzerkonto?"
+msgstr "Besitzt du kein Benutzerkonto?"
 
 #: templates/hosting/login.html:37 templates/hosting/signup.html.py:13
 #: templates/hosting/signup.html:21 views.py:223
@@ -342,7 +342,7 @@ msgstr "Bestellung stornieren"
 
 #: templates/hosting/orders.html:55
 msgid "Do You want to delete your order?"
-msgstr "Wollen Sie ihre Bestellung löschen?"
+msgstr "Willst du deine Bestellung löschen?"
 
 #: templates/hosting/orders.html:63 templates/hosting/user_keys.html.py:62
 msgid "Close"
@@ -394,11 +394,11 @@ msgstr "Zugriffsschlüssel"
 
 #: templates/hosting/user_key.html:24
 msgid "Upload your own key. "
-msgstr "Laden Sie ihren Schlüssel hoch"
+msgstr "Lade deinen Key hoch"
 
 #: templates/hosting/user_key.html:28
 msgid "Or generate a new key pair."
-msgstr "Oder erstellen Sie ein neues Schlüsselpaar"
+msgstr "Oder erstelle dein neues Keypaar"
 
 #: templates/hosting/user_key.html:30
 msgid "Generate Key Pair"
@@ -411,12 +411,11 @@ msgstr "Achtung!"
 #: templates/hosting/user_key.html:40
 msgid "You can download your SSH  private key once. Don't lost your key"
 msgstr ""
-"Sie können ihren privaten SSH Schlüssel nur einmal herunterladen. Bewaren "
-"Sie ihn sicher auf."
+"Du kannst deinen privaten SSH Schlüssel nur einmal herunterladen. Beware ihn sicher auf."
 
 #: templates/hosting/user_keys.html:18
 msgid "Add Key"
-msgstr ""
+msgstr "Schlüssel hinzufügen"
 
 #: templates/hosting/user_keys.html:26
 msgid "Created at"
@@ -432,7 +431,7 @@ msgstr "Löschen"
 #, fuzzy
 #| msgid "Do You want do delete your order?"
 msgid "Do You want to delete this key?"
-msgstr "Wollen Sie ihre Bestellung löschen?"
+msgstr "Möchtest Du den Schlüssel löschen?"
 
 #: templates/hosting/virtual_machine_detail.html:19
 msgid "Settings"
@@ -492,11 +491,11 @@ msgstr ""
 
 #: templates/hosting/virtual_machines.html:29
 msgid "Ipv4"
-msgstr ""
+msgstr "IPv4"
 
 #: templates/hosting/virtual_machines.html:30
 msgid "Ipv6"
-msgstr ""
+msgstr "IPv6"
 
 #: views.py:213 views.py:232
 msgid "login"
@@ -514,7 +513,7 @@ msgstr ""
 
 #: views.py:218 views.py:243
 msgid "Go back to"
-msgstr ""
+msgstr "Zurück"
 
 #: views.py:233
 msgid "Account activation"
@@ -530,7 +529,7 @@ msgstr "Du kannst dich nun"
 
 #: views.py:242
 msgid "Sorry. Your request is invalid."
-msgstr ""
+msgstr "Entschuldigung, deine Anfrage ist ungültig."
 
 #~ msgid "Home"
 #~ msgstr "Home"
@@ -547,8 +546,8 @@ msgstr ""
 #~ msgid ""
 #~ "Use your created key to access to the machine. If you lost it, contact us."
 #~ msgstr ""
-#~ "Verwenden Sie Ihren privaten SSH Schlüssel um sich mit Ihren Maschinen zu "
-#~ "verbinden. Falls Sie ihn verloren haben kontaktieren Sie uns."
+#~ "Verwende deinen privaten SSH Schlüssel, um dich mit deinen Maschinen zu verbinden. Solltest du deinen "
+#~ "privaten Schlüssel verloren haben, dann kontaktiere uns."
 
 #~ msgid "Copy to Clipboard"
 #~ msgstr "Kopieren"
@@ -557,8 +556,8 @@ msgstr ""
 #~ "Your SSH private key was already generated and downloaded, if you lost "
 #~ "it, contact us. "
 #~ msgstr ""
-#~ "Ihr privater SSH Schlüssel wurde bereits generiert und heruntergeladen, "
-#~ "falls Sie ihn verloren haben kontaktieren Sie uns."
+#~ "Dein privater SSH Schlüssel wurde bereits generiert und heruntergeladen. Falls du ihn verloren hast, "
+#~ "kontaktiere uns."
 
 #~ msgid "Generate my key"
 #~ msgstr "Generiere meinen Schlüssel"

From 3ca7153414484f0b22f7cac437a5e9f785542e58 Mon Sep 17 00:00:00 2001
From: "M.Ravi" <mondi.ravi@gmail.com>
Date: Fri, 23 Jun 2017 01:34:31 +0530
Subject: [PATCH 34/38] Changed invoice text

---
 datacenterlight/templates/datacenterlight/order_detail.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/datacenterlight/templates/datacenterlight/order_detail.html b/datacenterlight/templates/datacenterlight/order_detail.html
index a866dac8..ebde2171 100644
--- a/datacenterlight/templates/datacenterlight/order_detail.html
+++ b/datacenterlight/templates/datacenterlight/order_detail.html
@@ -20,7 +20,7 @@
     <div class="row">  
         <div class="col-xs-12 col-md-8 col-md-offset-2">
     		<div class="invoice-title">
-    			<h2>{% trans "Invoice"%}</h2><h3 class="pull-right">{% trans "Order #"%} {{order.id}}</h3>
+    			<h2>{% trans "Confirm Order"%}</h2><h3 class="pull-right">{% trans "Order #"%} {{order.id}}</h3>
     		</div>
     		<hr>
     		<div class="row">

From 165dfa49abd792688149c249fa66e8b72e1de795 Mon Sep 17 00:00:00 2001
From: "M.Ravi" <mondi.ravi@gmail.com>
Date: Fri, 23 Jun 2017 01:42:37 +0530
Subject: [PATCH 35/38] Fixed __proxy__ to string conversion issue

---
 membership/models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/membership/models.py b/membership/models.py
index 115e8cb1..db0155b5 100644
--- a/membership/models.py
+++ b/membership/models.py
@@ -87,7 +87,7 @@ class CustomUser(AbstractBaseUser, PermissionsMixin):
                     dcl_from_address = settings.DCL_SUPPORT_FROM_ADDRESS
                     user.is_active = False
                     email_data = {
-                        'subject': _('Activate your ') + dcl_text + _(' account'),
+                        'subject': str(_('Activate your ')) + dcl_text + str(_(' account')),
                         'from_address': settings.DCL_SUPPORT_FROM_ADDRESS,
                         'to': user.email,
                         'context': {'base_url'  : base_url, 

From 82e8c377af9076ac5db2641e1f34b5c60d27a8bb Mon Sep 17 00:00:00 2001
From: "M.Ravi" <mondi.ravi@gmail.com>
Date: Fri, 23 Jun 2017 02:14:54 +0530
Subject: [PATCH 36/38] Added membership django.po

---
 membership/locale/de/LC_MESSAGES/django.po | 59 ++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 membership/locale/de/LC_MESSAGES/django.po

diff --git a/membership/locale/de/LC_MESSAGES/django.po b/membership/locale/de/LC_MESSAGES/django.po
new file mode 100644
index 00000000..42846dab
--- /dev/null
+++ b/membership/locale/de/LC_MESSAGES/django.po
@@ -0,0 +1,59 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-06-23 02:05+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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"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 "Activate your "
+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 ""

From 654d73e51d7d838483ff4c7794a0a47a3867f640 Mon Sep 17 00:00:00 2001
From: "M.Ravi" <mondi.ravi@gmail.com>
Date: Fri, 23 Jun 2017 02:33:59 +0530
Subject: [PATCH 37/38] Add some de translations and invoice now called
 'Confirm Order'

---
 hosting/locale/de/LC_MESSAGES/django.po     | 37 +++++++++++++--------
 hosting/templates/hosting/order_detail.html |  4 +--
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po
index 129a1fe1..674f3db4 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-06-17 19:32+0530\n"
+"POT-Creation-Date: 2017-06-23 02:28+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"
@@ -73,7 +73,7 @@ msgstr "Kontakt"
 msgid "Login"
 msgstr "Anmelden"
 
-#: templates/hosting/bill_detail.html:11 templates/hosting/order_detail.html:23
+#: templates/hosting/bill_detail.html:11
 msgid "Invoice"
 msgstr "Rechnung"
 
@@ -271,10 +271,17 @@ msgstr "Als gelesen markieren"
 msgid "All notifications"
 msgstr "Alle Benachrichtigungen"
 
+#: templates/hosting/order_detail.html:23
+msgid "Confirm Order"
+msgstr "Bestellung Bestätigen"
+
 #: templates/hosting/order_detail.html:29
-#: templates/hosting/order_detail.html:37
 msgid "Billed To:"
-msgstr ""
+msgstr "Rechnungsadresse"
+
+#: templates/hosting/order_detail.html:37 templates/hosting/orders.html:17
+msgid "Date"
+msgstr "Datum"
 
 #: templates/hosting/order_detail.html:39
 msgid "Status:"
@@ -310,10 +317,6 @@ msgstr ""
 msgid "Finish Configuration"
 msgstr "Konfiguration beenden"
 
-#: templates/hosting/orders.html:17
-msgid "Date"
-msgstr "Datum"
-
 #: templates/hosting/orders.html:18
 msgid "Amount"
 msgstr "Betrag"
@@ -411,7 +414,8 @@ msgstr "Achtung!"
 #: templates/hosting/user_key.html:40
 msgid "You can download your SSH  private key once. Don't lost your key"
 msgstr ""
-"Du kannst deinen privaten SSH Schlüssel nur einmal herunterladen. Beware ihn sicher auf."
+"Du kannst deinen privaten SSH Schlüssel nur einmal herunterladen. Beware ihn "
+"sicher auf."
 
 #: templates/hosting/user_keys.html:18
 msgid "Add Key"
@@ -531,6 +535,12 @@ msgstr "Du kannst dich nun"
 msgid "Sorry. Your request is invalid."
 msgstr "Entschuldigung, deine Anfrage ist ungültig."
 
+#: views.py:760
+msgid ""
+"We could not find the requested VM. Please                            "
+"contact Data Center Light Support."
+msgstr ""
+
 #~ msgid "Home"
 #~ msgstr "Home"
 
@@ -546,8 +556,9 @@ msgstr "Entschuldigung, deine Anfrage ist ungültig."
 #~ msgid ""
 #~ "Use your created key to access to the machine. If you lost it, contact us."
 #~ msgstr ""
-#~ "Verwende deinen privaten SSH Schlüssel, um dich mit deinen Maschinen zu verbinden. Solltest du deinen "
-#~ "privaten Schlüssel verloren haben, dann kontaktiere uns."
+#~ "Verwende deinen privaten SSH Schlüssel, um dich mit deinen Maschinen zu "
+#~ "verbinden. Solltest du deinen privaten Schlüssel verloren haben, dann "
+#~ "kontaktiere uns."
 
 #~ msgid "Copy to Clipboard"
 #~ msgstr "Kopieren"
@@ -556,8 +567,8 @@ msgstr "Entschuldigung, deine Anfrage ist ungültig."
 #~ "Your SSH private key was already generated and downloaded, if you lost "
 #~ "it, contact us. "
 #~ msgstr ""
-#~ "Dein privater SSH Schlüssel wurde bereits generiert und heruntergeladen. Falls du ihn verloren hast, "
-#~ "kontaktiere uns."
+#~ "Dein privater SSH Schlüssel wurde bereits generiert und heruntergeladen. "
+#~ "Falls du ihn verloren hast, kontaktiere uns."
 
 #~ msgid "Generate my key"
 #~ msgstr "Generiere meinen Schlüssel"
diff --git a/hosting/templates/hosting/order_detail.html b/hosting/templates/hosting/order_detail.html
index 1eec7f99..e859752e 100644
--- a/hosting/templates/hosting/order_detail.html
+++ b/hosting/templates/hosting/order_detail.html
@@ -20,7 +20,7 @@
     <div class="row">  
         <div class="col-xs-12 col-md-8 col-md-offset-2">
     		<div class="invoice-title">
-    			<h2>{% trans "Invoice"%}</h2><h3 class="pull-right">{% trans "Order #"%} {{order.id}}</h3>
+    			<h2>{% trans "Confirm Order"%}</h2><h3 class="pull-right">{% trans "Order #"%} {{order.id}}</h3>
     		</div>
     		<hr>
     		<div class="row">
@@ -34,7 +34,7 @@
     			</div>
                 <div class="col-xs-6 text-right">
                     <address>
-                        <strong>{% trans "Billed To:"%}</strong><br>
+                        <strong>{% trans "Date"%}:</strong><br>
                         {{order.created_at}}<br><br>
                         <strong>{% trans "Status:"%}</strong><br>
                         <strong class="{% if order.status == 'Approved' %}text-success

From 796fbbe1f83b1f3132ca90ec3350076dc1eec1c8 Mon Sep 17 00:00:00 2001
From: "M.Ravi" <mondi.ravi@gmail.com>
Date: Fri, 23 Jun 2017 04:38:10 +0530
Subject: [PATCH 38/38] Removed status from the order page

---
 .../templates/datacenterlight/order_detail.html            | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/datacenterlight/templates/datacenterlight/order_detail.html b/datacenterlight/templates/datacenterlight/order_detail.html
index ebde2171..cb412558 100644
--- a/datacenterlight/templates/datacenterlight/order_detail.html
+++ b/datacenterlight/templates/datacenterlight/order_detail.html
@@ -34,13 +34,8 @@
     			</div>
                 <div class="col-xs-6 text-right">
                     <address>
-                        <strong>{% trans "Billed To:"%}</strong><br>
+                        <strong>{% trans "Date"%}:</strong><br>
                         {{order.created_at}}<br><br>
-                        <strong>{% trans "Status:"%}</strong><br>
-                        <strong class="{% if order.status == 'Approved' %}text-success
-                                       {%else%} text-danger
-                                       {% endif %}">{{order.status}}</strong>
-                        <br><br>
                     </address>
 
                 </div>