From 9bc86255c4a5870c8e75a9abec427ad171a3d766 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Mon, 16 Oct 2017 01:04:49 +0530 Subject: [PATCH 1/5] user account details added and translation fix --- .../locale/de/LC_MESSAGES/django.po | 20 +++++++++++--- .../emails/user_activation.html | 12 +++++++++ .../emails/user_activation.txt | 11 ++++++++ hosting/locale/de/LC_MESSAGES/django.po | 26 ++++++++----------- 4 files changed, 50 insertions(+), 19 deletions(-) diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.po b/datacenterlight/locale/de/LC_MESSAGES/django.po index 52d9623e..36f84f26 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-10-10 21:35+0530\n" +"POT-Creation-Date: 2017-10-16 00:57+0530\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -144,6 +144,21 @@ msgid "" "browser to activate your Data Center Light account." msgstr "Kopiere den folgenden Link in die Adressleiste deines Browsers." +msgid "Your account details are as follows" +msgstr "" + +msgid "Username" +msgstr "Username" + +msgid "Your email address" +msgstr "Deine E-Mail-Adresse" + +msgid "Password" +msgstr "Passwort" + +msgid "You can reset your password here" +msgstr "Passwort zurücksetzen" + msgid "" "You can copy and paste the following link into the address bar of your " "browser to activate your Data Center Light account." @@ -546,9 +561,6 @@ msgstr "" #~ "kontaktiere uns unter support@datacenterlight.ch. Unser Team wird sich " #~ "umgehend um dein Anliegen kümmern!" -#~ msgid "Email Address" -#~ msgstr "E-Mail-Adresse" - #~ msgid "is not a proper name" #~ msgstr "ist kein gültiger Name" diff --git a/datacenterlight/templates/datacenterlight/emails/user_activation.html b/datacenterlight/templates/datacenterlight/emails/user_activation.html index 7008c1a1..8f270a3f 100644 --- a/datacenterlight/templates/datacenterlight/emails/user_activation.html +++ b/datacenterlight/templates/datacenterlight/emails/user_activation.html @@ -33,6 +33,18 @@

{{base_url}}{{activation_link}}

+

+ {% if account_details %} + {% url 'hosting:reset_password' as reset_password_url %} + {% trans "Your account details are as follows" %}: + + {% trans "Username" %} : {% trans "Your email address" %} + {% trans "Password" %} : {{account_details}} + + {% trans "You can reset your password here" %}: + {{base_url}}{{reset_password_url}} + {% endif %} +

diff --git a/datacenterlight/templates/datacenterlight/emails/user_activation.txt b/datacenterlight/templates/datacenterlight/emails/user_activation.txt index 13b3e7bf..4f66e239 100644 --- a/datacenterlight/templates/datacenterlight/emails/user_activation.txt +++ b/datacenterlight/templates/datacenterlight/emails/user_activation.txt @@ -6,4 +6,15 @@ {{base_url}}{{activation_link}} +{% if account_details %} + {% url 'hosting:reset_password' as reset_password_url %} + {% trans "Your account details are as follows" %}: + + {% trans "Username" %} : {% trans "Your email address" %} + {% trans "Password" %} : {{account_details}} + + {% trans "You can reset your password here" %}: + {{base_url}}{{reset_password_url}} +{% endif %} + {% trans "Your Data Center Light Team" %} \ No newline at end of file diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po index 60090cb6..d63ead32 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-10-10 21:35+0530\n" +"POT-Creation-Date: 2017-10-16 00:57+0530\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -198,9 +198,8 @@ msgstr "Deine Neue VM %(vm_name)s" msgid "You have ordered a new virtual machine!" msgstr "Du hast eine neue virtuelle Maschine bestellt!" -#, python-format -msgid "Your order of [ %(vm_name)s ] has been charged." -msgstr "Deine Bestellung von [ %(vm_name)s ] wurde erhoben." +msgid "Your order of %(vm_name)s has been charged." +msgstr "Deine Bestellung von %(vm_name)s wurde erhoben." msgid "You can view your VM detail by clicking the button below." msgstr "Um die Rechnung zu sehen, klicke auf den Button unten." @@ -211,9 +210,8 @@ msgstr "Details anzeigen" msgid "Your Data Center Light Team" msgstr "Dein Data Center Light Team" -#, python-format -msgid "Your order of [%(vm_name)s] has been charged." -msgstr "Deine Bestellung von [%(vm_name)s] wurde erhoben." +msgid "Your order of %(vm_name)s has been charged." +msgstr "Deine Bestellung von %(vm_name)s wurde erhoben." msgid "You can view your VM detail by following the link below." msgstr "Um die Rechnung zu sehen, klicke auf den Link unten." @@ -238,13 +236,12 @@ msgstr "Dankeschön!" msgid "Virtual Machine Cancellation" msgstr "VM Kündigung" -#, python-format msgid "" -"You are receiving this email because your virutal machine [ " -"%(vm_name)s ] has been cancelled." +"You are receiving this email because your virutal machine " +"%(vm_name)s has been cancelled." msgstr "" -"Du erhälst diese E-Mail, da deine virtuelle Maschine [ %(vm_name)s ] gekündigt wurde." +"Du erhälst diese E-Mail, da deine virtuelle Maschine %(vm_name)s gekündigt wurde." msgid "You can always order a new VM by clicking the button below." msgstr "" @@ -254,12 +251,11 @@ msgstr "" msgid "CREATE VM" msgstr "NEUE VM" -#, python-format msgid "" -"You are receiving this email because your virutal machine [%(vm_name)s] has " +"You are receiving this email because your virutal machine %(vm_name)s has " "been cancelled." msgstr "" -"Du erhälst diese E-Mail, da deine virtuelle Maschine [%(vm_name)s] gekündigt " +"Du erhälst diese E-Mail, da deine virtuelle Maschine %(vm_name)s gekündigt " "wurde." msgid "You can always order a new VM by following the link below." From 88be7be180fd996a869e8434c49ec8cb8b81be1a Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Mon, 16 Oct 2017 01:07:54 +0530 Subject: [PATCH 2/5] translation fix --- hosting/locale/de/LC_MESSAGES/django.po | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po index d63ead32..fa24637a 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-10-16 00:57+0530\n" +"POT-Creation-Date: 2017-10-16 01:06+0530\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -198,6 +198,7 @@ msgstr "Deine Neue VM %(vm_name)s" msgid "You have ordered a new virtual machine!" msgstr "Du hast eine neue virtuelle Maschine bestellt!" +#, python-format msgid "Your order of %(vm_name)s has been charged." msgstr "Deine Bestellung von %(vm_name)s wurde erhoben." @@ -210,6 +211,7 @@ msgstr "Details anzeigen" msgid "Your Data Center Light Team" msgstr "Dein Data Center Light Team" +#, python-format msgid "Your order of %(vm_name)s has been charged." msgstr "Deine Bestellung von %(vm_name)s wurde erhoben." @@ -236,6 +238,7 @@ msgstr "Dankeschön!" msgid "Virtual Machine Cancellation" msgstr "VM Kündigung" +#, python-format msgid "" "You are receiving this email because your virutal machine " "%(vm_name)s has been cancelled." @@ -251,6 +254,7 @@ msgstr "" msgid "CREATE VM" msgstr "NEUE VM" +#, python-format msgid "" "You are receiving this email because your virutal machine %(vm_name)s has " "been cancelled." From 387cad476f273837b6cafc9ee811b3069bc251ed Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Tue, 17 Oct 2017 00:19:03 +0530 Subject: [PATCH 3/5] Update translations for user activation email --- 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 36f84f26..ac796b95 100644 --- a/datacenterlight/locale/de/LC_MESSAGES/django.po +++ b/datacenterlight/locale/de/LC_MESSAGES/django.po @@ -145,7 +145,7 @@ msgid "" msgstr "Kopiere den folgenden Link in die Adressleiste deines Browsers." msgid "Your account details are as follows" -msgstr "" +msgstr "Deine Account Details sind unten aufgelistet" msgid "Username" msgstr "Username" @@ -157,7 +157,7 @@ msgid "Password" msgstr "Passwort" msgid "You can reset your password here" -msgstr "Passwort zurücksetzen" +msgstr "Du kannst dein Passwort hier zurück setzen" msgid "" "You can copy and paste the following link into the address bar of your " From 24cce4eed7b0067e92284f0bb56a4c50d6ccbcc5 Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Mon, 16 Oct 2017 20:53:51 +0200 Subject: [PATCH 4/5] - Remove registration link from DG registration email - Remove multiple declared settings --- dynamicweb/settings/base.py | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/dynamicweb/settings/base.py b/dynamicweb/settings/base.py index 5af1a6ca..170ae3a8 100644 --- a/dynamicweb/settings/base.py +++ b/dynamicweb/settings/base.py @@ -347,8 +347,6 @@ MEDIA_ROOT = os.path.join(PROJECT_DIR, 'media') MEDIA_URL = APP_ROOT_ENDPOINT + 'media/' FILE_UPLOAD_PERMISSIONS = 0o644 -META_SITE_PROTOCOL = 'http' -META_USE_SITES = True MIGRATION_MODULES = { 'cms': 'cms.migrations', # 'filer': 'filer.migrations_django', @@ -359,9 +357,6 @@ MIGRATION_MODULES = { 'djangocms_link': 'djangocms_link.migrations_django', 'djangocms_teaser': 'djangocms_teaser.migrations_django', 'djangocms_column': 'djangocms_column.migrations_django', - 'djangocms_flash': 'djangocms_flash.migrations_django', - 'djangocms_googlemap': 'djangocms_googlemap.migrations_django', - 'djangocms_inherit': 'djangocms_inherit.migrations_django', 'djangocms_style': 'djangocms_style.migrations_django', 'cmsplugin_filer_image': 'cmsplugin_filer_image.migrations_django', 'cmsplugin_filer_file': 'cmsplugin_filer_file.migrations_django', @@ -495,11 +490,10 @@ AUTH_USER_MODEL = 'membership.CustomUser' STRIPE_DESCRIPTION_ON_PAYMENT = "Payment for ungleich GmbH services" # EMAIL MESSAGES -REGISTRATION_MESSAGE = {'subject': "Validation mail", - 'message': 'Thank You for registering for account on Digital Glarus.\n' - 'Please verify Your account under following link ' - 'http://{host}/en-us/digitalglarus/login/validate/{slug}', - } +REGISTRATION_MESSAGE = { + 'subject': "Digital Glarus registration", + 'message': 'Thank You for registering for account on Digital Glarus.' +} STRIPE_API_PRIVATE_KEY = env('STRIPE_API_PRIVATE_KEY') STRIPE_API_PUBLIC_KEY = env('STRIPE_API_PUBLIC_KEY') STRIPE_API_PRIVATE_KEY_TEST = env('STRIPE_API_PRIVATE_KEY_TEST') From daaf55b343ae60dc4bbd9f3331cff541de4b5992 Mon Sep 17 00:00:00 2001 From: "M.Ravi" Date: Mon, 16 Oct 2017 21:18:03 +0200 Subject: [PATCH 5/5] Update Changelog --- Changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/Changelog b/Changelog index cb3d23fa..0ed32a90 100644 --- a/Changelog +++ b/Changelog @@ -5,6 +5,7 @@ Next release: * #3794: [dcl, hosting] Update email styles * #3828: [dcl, hosting] invoice period set to show monthly subscription * #3838: [hosting] restyle signup/login/password reset/password pages + * Bugfix: [dg] Remove validate email link in the registration email 1.2.6: 2017-10-10 * Bugfix: [dcl] Refactor and optimize images, links in glasfaser page * Bugfix: [dcl] Fix email not being sent issue