From e63e01458838e35d1bc8287a3251c52b23f02c40 Mon Sep 17 00:00:00 2001 From: "M.Ravi" 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" 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 \n" "Language-Team: LANGUAGE \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 ") + 'login' - section_title='Sign up' + login_url = '' + str(_('login')) +'' + home_url = 'Data Center Light' + message='{signup_success_message} {lurl} \ +
{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 = '' + str(_('login')) +'' + section_title=_('Account activation') if validated: - message= _("Your account has been activated. You can now ") + 'login' - section_title=_('Account activation') + message='{account_activation_string}
{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.") + 'login' - section_title=_('Account activation') + home_url = 'Data Center Light' + message = '{sorry_message}
{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" 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" 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 ', + '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" 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 %} - - - - - - -Oxygen Invoice - - - - - - - - - - - - - -
-
- - -
- -
- - - -
- logo - -
-
- -
-
-
-
- - - - - - - - - - -
- Datacenterlight user activation -
-

- You can activate your datacenterlight account by clicking here.

- 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.
- {{base_url}}{{activation_link}} -

 
-
-
-
- - -
Your data center light team
-
-
-
- - +{% 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" 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 %} -Oxygen Invoice +{{dcl_text}}