From 98d0409219fdc373f9bc8dec77944f5f112a546e Mon Sep 17 00:00:00 2001 From: PCoder Date: Mon, 31 Jul 2017 00:59:33 +0530 Subject: [PATCH 1/8] Updated dcl .po, added DE translation for All rights reserved --- .../locale/de/LC_MESSAGES/django.po | 62 ++++++++++++------- 1 file changed, 39 insertions(+), 23 deletions(-) diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.po b/datacenterlight/locale/de/LC_MESSAGES/django.po index e221c123..ebaf1707 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-07-24 18:51+0300\n" +"POT-Creation-Date: 2017-07-30 18:57+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -61,48 +61,48 @@ msgstr "MwSt. inklusive" msgid "Hosted in Switzerland" msgstr "Standort: Schweiz" -#: templates/datacenterlight/calculator_form.html:21 +#: templates/datacenterlight/calculator_form.html:22 msgid "Please enter a value in range 1 - 48." msgstr "Bitte gib einen Wert von 1 bis 48 ein." -#: templates/datacenterlight/calculator_form.html:30 +#: templates/datacenterlight/calculator_form.html:40 msgid "Please enter a value in range 2 - 200." msgstr "Bitte gib einen Wert von 2 bis 200 ein." -#: templates/datacenterlight/calculator_form.html:39 +#: templates/datacenterlight/calculator_form.html:58 msgid "Please enter a value in range 10 - 2000." msgstr "Bitte gib einen Wert von 10 bis 200 ein." -#: templates/datacenterlight/calculator_form.html:40 +#: templates/datacenterlight/calculator_form.html:59 #: templates/datacenterlight/pricing.html:50 msgid "GB Storage (SSD)" msgstr "GB Storage (SSD)" -#: templates/datacenterlight/calculator_form.html:59 +#: templates/datacenterlight/calculator_form.html:86 msgid "Name" msgstr "" -#: templates/datacenterlight/calculator_form.html:60 +#: templates/datacenterlight/calculator_form.html:87 msgid "Your Name" msgstr "Dein Name" -#: templates/datacenterlight/calculator_form.html:60 +#: templates/datacenterlight/calculator_form.html:88 msgid "Please enter your name." msgstr "Bitte gib Deinen Namen ein." -#: templates/datacenterlight/calculator_form.html:74 +#: templates/datacenterlight/calculator_form.html:104 msgid "Email" msgstr "E-Mail-Adresse" -#: templates/datacenterlight/calculator_form.html:75 +#: templates/datacenterlight/calculator_form.html:106 msgid "Your Email" msgstr "Deine E-Mail" -#: templates/datacenterlight/calculator_form.html:75 +#: templates/datacenterlight/calculator_form.html:107 msgid "Please enter a valid email address." msgstr "Bitte gib eine gültige E-Mailadresse ein." -#: templates/datacenterlight/calculator_form.html:88 +#: templates/datacenterlight/calculator_form.html:122 msgid "Continue" msgstr "Weiter" @@ -192,8 +192,8 @@ msgstr "" #: templates/datacenterlight/includes/_footer.html:11 #: templates/datacenterlight/includes/_footer.html:31 -#: templates/datacenterlight/includes/_navbar.html:27 -#: templates/datacenterlight/includes/_navbar.html:28 +#: templates/datacenterlight/includes/_navbar.html:25 +#: templates/datacenterlight/includes/_navbar.html:26 #: templates/datacenterlight/index.html:19 #: templates/datacenterlight/index.html:46 msgid "Highlights" @@ -201,26 +201,26 @@ msgstr "" #: templates/datacenterlight/includes/_footer.html:14 #: templates/datacenterlight/includes/_footer.html:34 -#: templates/datacenterlight/includes/_navbar.html:30 +#: templates/datacenterlight/includes/_navbar.html:28 #: templates/datacenterlight/index.html:85 msgid "Scale out" msgstr "Skalierung" #: templates/datacenterlight/includes/_footer.html:17 #: templates/datacenterlight/includes/_footer.html:37 -#: templates/datacenterlight/includes/_navbar.html:31 +#: templates/datacenterlight/includes/_navbar.html:29 #: templates/datacenterlight/index.html:111 msgid "Reliable and light" msgstr "Zuverlässig und leicht" #: templates/datacenterlight/includes/_footer.html:20 -#: templates/datacenterlight/includes/_navbar.html:32 +#: templates/datacenterlight/includes/_navbar.html:30 msgid "Order VM" msgstr "VM bestellen" #: templates/datacenterlight/includes/_footer.html:23 #: templates/datacenterlight/includes/_footer.html:44 -#: templates/datacenterlight/includes/_navbar.html:39 +#: templates/datacenterlight/includes/_navbar.html:37 msgid "Contact" msgstr "Kontakt" @@ -232,7 +232,11 @@ msgstr "Home" msgid "Pricing" msgstr "Preise" -#: templates/datacenterlight/includes/_navbar.html:36 +#: templates/datacenterlight/includes/_footer.html:49 +msgid "All Rights Reserved" +msgstr "Alle Rechte vorbehalten" + +#: templates/datacenterlight/includes/_navbar.html:34 #: templates/datacenterlight/whydatacenterlight.html:12 msgid "Why Data Center Light?" msgstr "Warum Data Center Light?" @@ -311,11 +315,11 @@ msgstr "Bezahlbares VM Hosting in der Schweiz" msgid "Switzerland " msgstr "Schweiz" -#: templates/datacenterlight/index.html:183 +#: templates/datacenterlight/index.html:177 msgid "Questions?" msgstr "Fragen?" -#: templates/datacenterlight/index.html:183 +#: templates/datacenterlight/index.html:177 msgid "Contact us!" msgstr "Kontaktiere uns!" @@ -496,11 +500,23 @@ msgstr "Unser Angebot beginnt bei 15 CHF pro Monat. Probier's jetzt aus!" msgid "Actions speak louder than words. Let's do it, try our VM now." msgstr "Tagen sagen mehr als Worte – Teste jetzt unsere VM!" -#: views.py:235 +#: views.py:199 +msgid "Not a proper cores number" +msgstr "ist kein gültiger cores number" + +#: views.py:203 +msgid "Not a proper ram number" +msgstr "ist kein gültiger ram number" + +#: views.py:207 +msgid "Not a proper storage number" +msgstr "ist kein gültiger storage number" + +#: views.py:262 msgid "is not a proper name" msgstr "ist kein gültiger Name" -#: views.py:242 +#: views.py:269 msgid "is not a proper email" msgstr "ist keine gültige E-Mailadresse" From dc5d45d6748a3b31cf00b9f123c752e6eff4b095 Mon Sep 17 00:00:00 2001 From: PCoder Date: Mon, 31 Jul 2017 01:00:43 +0530 Subject: [PATCH 2/8] Added trans tag to All rights reserved --- datacenterlight/templates/datacenterlight/includes/_footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datacenterlight/templates/datacenterlight/includes/_footer.html b/datacenterlight/templates/datacenterlight/includes/_footer.html index f9d0758c..f77c3385 100644 --- a/datacenterlight/templates/datacenterlight/includes/_footer.html +++ b/datacenterlight/templates/datacenterlight/includes/_footer.html @@ -46,7 +46,7 @@ {% endif %} - + From 9fffc4dfc45f36da77dab2b96af4422988097a2e Mon Sep 17 00:00:00 2001 From: PCoder Date: Mon, 31 Jul 2017 01:02:41 +0530 Subject: [PATCH 3/8] Updated dcl .po, added DE translation for All rights reserved --- hosting/locale/de/LC_MESSAGES/django.po | 123 ++++++++++++------------ 1 file changed, 61 insertions(+), 62 deletions(-) diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po index d102e74a..159cc5dc 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-07-17 00:53+0530\n" +"POT-Creation-Date: 2017-07-30 19:03+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -26,52 +26,30 @@ msgstr "Dein Account wurde noch nicht aktiviert." msgid "Paste here your public key" msgstr "Fügen Sie Ihren public key ein" -#: templates/hosting/base_short.html:71 +#: templates/hosting/base_short.html:73 msgid "My Virtual Machines" msgstr "Meine virtuellen Maschinen" -#: templates/hosting/base_short.html:76 templates/hosting/orders.html.py:12 +#: templates/hosting/base_short.html:78 templates/hosting/orders.html.py:12 msgid "My Orders" msgstr "Meine Bestellungen" -#: templates/hosting/base_short.html:85 +#: templates/hosting/base_short.html:87 msgid "Keys" msgstr "Schlüssel" -#: templates/hosting/base_short.html:90 +#: templates/hosting/base_short.html:92 msgid "Notifications " msgstr "Benachrichtigungen" -#: templates/hosting/base_short.html:93 +#: templates/hosting/base_short.html:95 msgid "Logout" msgstr "Abmelden" -#: templates/hosting/base_short.html:98 -msgid "How it works" -msgstr "So funktioniert es" - -#: templates/hosting/base_short.html:101 -msgid "Your infrastructure" -msgstr "deine Infrastruktur" - -#: templates/hosting/base_short.html:104 -msgid "Our inftrastructure" -msgstr "Unsere Infrastruktur" - -#: templates/hosting/base_short.html:107 -msgid "Pricing" -msgstr "Preise" - -#: templates/hosting/base_short.html:110 -msgid "Contact" -msgstr "Kontakt" - -#: templates/hosting/base_short.html:113 -#: 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" +#: templates/hosting/base_short.html:117 +#: templates/hosting/includes/_footer.html:29 +msgid "All Rights Reserved" +msgstr "Alle Rechte vorbehalten" #: templates/hosting/bill_detail.html:11 msgid "Invoice" @@ -161,8 +139,8 @@ msgid "next" msgstr "nächste" #: templates/hosting/confirm_reset_password.html:10 -#: templates/hosting/login.html:12 templates/hosting/reset_password.html:10 -#: templates/hosting/signup.html:9 templates/hosting/signup_validate.html:9 +#: templates/hosting/login.html:17 templates/hosting/reset_password.html:15 +#: templates/hosting/signup.html:13 templates/hosting/signup_validate.html:9 msgid "Your VM hosted in Switzerland" msgstr "deine VM in der Schweiz" @@ -171,15 +149,21 @@ msgid "Set your new password" msgstr "Setze dein neues Passwort" #: templates/hosting/confirm_reset_password.html:29 -#: templates/hosting/reset_password.html:23 +#: templates/hosting/reset_password.html:28 msgid "Reset" msgstr "Zurücksetzen" #: templates/hosting/confirm_reset_password.html:35 -#: templates/hosting/reset_password.html:29 templates/hosting/signup.html:27 +#: templates/hosting/reset_password.html:34 templates/hosting/signup.html:31 msgid "Already have an account ?" msgstr "Hast Du bereits ein Benutzerkonto?" +#: templates/hosting/confirm_reset_password.html:38 +#: templates/hosting/login.html:22 templates/hosting/login.html.py:31 +#: templates/hosting/reset_password.html:37 templates/hosting/signup.html:34 +msgid "Login" +msgstr "Anmelden" + #: templates/hosting/create_virtual_machine.html:20 msgid "New Virtual Machine" msgstr "Neue virtuelle Maschine" @@ -228,16 +212,16 @@ msgstr "" msgid "The %(site_name)s team" msgstr "" -#: templates/hosting/login.html:34 +#: templates/hosting/login.html:39 msgid "Don't have an account yet ? " msgstr "Besitzt du kein Benutzerkonto?" -#: templates/hosting/login.html:37 templates/hosting/signup.html.py:13 -#: templates/hosting/signup.html:21 views.py:219 +#: templates/hosting/login.html:42 templates/hosting/signup.html.py:17 +#: templates/hosting/signup.html:25 views.py:219 msgid "Sign up" msgstr "Registrieren" -#: templates/hosting/login.html:39 +#: templates/hosting/login.html:44 msgid "Forgot your password ? " msgstr "Passwort vergessen?" @@ -269,45 +253,45 @@ msgstr "Alle Benachrichtigungen" msgid "Confirm Order" msgstr "Bestellung Bestätigen" -#: templates/hosting/order_detail.html:29 -msgid "Billed To:" -msgstr "Rechnungsadresse" - -#: templates/hosting/order_detail.html:37 templates/hosting/orders.html:17 +#: templates/hosting/order_detail.html:29 templates/hosting/orders.html:17 msgid "Date" msgstr "Datum" -#: templates/hosting/order_detail.html:39 +#: templates/hosting/order_detail.html:31 msgid "Status:" msgstr "" -#: templates/hosting/order_detail.html:51 +#: templates/hosting/order_detail.html:41 +msgid "Billed To:" +msgstr "Rechnungsadresse" + +#: templates/hosting/order_detail.html:52 msgid "Payment Method:" msgstr "Bezahlmethode" -#: templates/hosting/order_detail.html:62 +#: templates/hosting/order_detail.html:63 msgid "Order summary" msgstr "Bestellungsübersicht" -#: templates/hosting/order_detail.html:65 templates/hosting/payment.html:13 +#: templates/hosting/order_detail.html:66 templates/hosting/payment.html:13 #: templates/hosting/virtual_machine_detail.html:76 msgid "Cores" msgstr "Prozessorkerne" -#: templates/hosting/order_detail.html:67 templates/hosting/payment.html:16 +#: templates/hosting/order_detail.html:68 templates/hosting/payment.html:16 #: templates/hosting/virtual_machine_detail.html:82 msgid "Memory" msgstr "Arbeitsspeicher" -#: templates/hosting/order_detail.html:69 templates/hosting/payment.html:19 +#: templates/hosting/order_detail.html:70 templates/hosting/payment.html:19 msgid "Disk space" msgstr "Festplattenkapazität" -#: templates/hosting/order_detail.html:71 templates/hosting/payment.html:41 +#: templates/hosting/order_detail.html:72 templates/hosting/payment.html:41 msgid "Total" msgstr "Gesamt" -#: templates/hosting/order_detail.html:77 +#: templates/hosting/order_detail.html:78 msgid "Finish Configuration" msgstr "Konfiguration beenden" @@ -399,27 +383,27 @@ msgstr "" "Kreditkateninformationen wirst du auf die Bestellbestätigungsseite " "weitergeleitet." -#: templates/hosting/payment.html:101 templates/hosting/payment.html.py:143 +#: templates/hosting/payment.html:100 templates/hosting/payment.html.py:142 msgid "Submit" msgstr "Absenden" -#: templates/hosting/payment.html:113 +#: templates/hosting/payment.html:112 msgid "Card Number" msgstr "Kreditkartennummer" -#: templates/hosting/payment.html:117 +#: templates/hosting/payment.html:116 msgid "Expiry Date" msgstr "Ablaufdatum" -#: templates/hosting/payment.html:122 +#: templates/hosting/payment.html:121 msgid "CVC" msgstr "" -#: templates/hosting/payment.html:126 +#: templates/hosting/payment.html:125 msgid "Card Type" msgstr "Kartentyp" -#: templates/hosting/payment.html:135 +#: templates/hosting/payment.html:134 msgid "" "\n" " You are not making any payment " @@ -433,15 +417,15 @@ msgstr "" "Kreditkateninformationen wirst du auf die Bestellbestätigungsseite " "weitergeleitet." -#: templates/hosting/payment.html:178 +#: templates/hosting/payment.html:177 msgid "Processing" msgstr "Weiter" -#: templates/hosting/payment.html:179 +#: templates/hosting/payment.html:178 msgid "Enter your credit card number" msgstr "Deine Kreditkartennummer" -#: templates/hosting/reset_password.html:15 +#: templates/hosting/reset_password.html:20 msgid "Reset your password" msgstr "Passwort zurücksetzen" @@ -587,6 +571,21 @@ msgid "" "contact Data Center Light Support." msgstr "" +#~ msgid "How it works" +#~ msgstr "So funktioniert es" + +#~ msgid "Your infrastructure" +#~ msgstr "deine Infrastruktur" + +#~ msgid "Our inftrastructure" +#~ msgstr "Unsere Infrastruktur" + +#~ msgid "Pricing" +#~ msgstr "Preise" + +#~ msgid "Contact" +#~ msgstr "Kontakt" + #~ msgid "Billing Amount" #~ msgstr "Rechnungsbetrag" From ec5ed6874b3b66cd1ccaabbf71a127cf69fa6f9d Mon Sep 17 00:00:00 2001 From: PCoder Date: Mon, 31 Jul 2017 01:04:45 +0530 Subject: [PATCH 4/8] Added trans tag to All rights reserved --- hosting/templates/hosting/base_short.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosting/templates/hosting/base_short.html b/hosting/templates/hosting/base_short.html index 5cce6533..147bbcba 100644 --- a/hosting/templates/hosting/base_short.html +++ b/hosting/templates/hosting/base_short.html @@ -114,7 +114,7 @@ {% if request.user.is_authenticated %}
- +
{% else %} From 5ca7fd201c43607e0064fa3d343bd32c18278ea2 Mon Sep 17 00:00:00 2001 From: PCoder Date: Mon, 31 Jul 2017 01:06:23 +0530 Subject: [PATCH 5/8] Added trans tag to All rights reserved --- hosting/templates/hosting/includes/_footer.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hosting/templates/hosting/includes/_footer.html b/hosting/templates/hosting/includes/_footer.html index 270c9b61..65177315 100644 --- a/hosting/templates/hosting/includes/_footer.html +++ b/hosting/templates/hosting/includes/_footer.html @@ -26,8 +26,8 @@ Contact - + - \ No newline at end of file + From c1409d5ca1717c1719868a8a2e044be312975494 Mon Sep 17 00:00:00 2001 From: PCoder Date: Tue, 1 Aug 2017 00:01:19 +0530 Subject: [PATCH 6/8] Improved validation error message texts and their DE translations --- .../locale/de/LC_MESSAGES/django.po | 25 +++++++++++++------ datacenterlight/views.py | 6 ++--- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.po b/datacenterlight/locale/de/LC_MESSAGES/django.po index ebaf1707..7cfa18ca 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-07-30 18:57+0000\n" +"POT-Creation-Date: 2017-07-31 18:27+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -230,7 +230,7 @@ msgstr "Home" #: templates/datacenterlight/includes/_footer.html:40 msgid "Pricing" -msgstr "Preise" +msgstr "Preis" #: templates/datacenterlight/includes/_footer.html:49 msgid "All Rights Reserved" @@ -501,16 +501,16 @@ msgid "Actions speak louder than words. Let's do it, try our VM now." msgstr "Tagen sagen mehr als Worte – Teste jetzt unsere VM!" #: views.py:199 -msgid "Not a proper cores number" -msgstr "ist kein gültiger cores number" +msgid "Invalid number of cores" +msgstr "Ungültige Anzahle CPU-Kerne" #: views.py:203 -msgid "Not a proper ram number" -msgstr "ist kein gültiger ram number" +msgid "Invalid RAM size" +msgstr "Ungültige RAM-Grösse" #: views.py:207 -msgid "Not a proper storage number" -msgstr "ist kein gültiger storage number" +msgid "Invalid storage size" +msgstr "Ungültige Speicher-Grösse" #: views.py:262 msgid "is not a proper name" @@ -520,6 +520,15 @@ msgstr "ist kein gültiger Name" msgid "is not a proper email" msgstr "ist keine gültige E-Mailadresse" +#~ msgid "Not a proper cores number" +#~ msgstr "ist kein gültiger cores number" + +#~ msgid "Not a proper ram number" +#~ msgstr "ist kein gültiger ram number" + +#~ msgid "Not a proper storage number" +#~ msgstr "ist kein gültiger storage number" + #~ msgid "Please enter a value greater than or equal to 1." #~ msgstr "Bitte gib einen Wert größer oder gleich 1 ein." diff --git a/datacenterlight/views.py b/datacenterlight/views.py index 10e2d791..ac4621b9 100644 --- a/datacenterlight/views.py +++ b/datacenterlight/views.py @@ -196,15 +196,15 @@ class IndexView(CreateView): def validate_cores(self, value): if (value > 48) or (value < 1): - raise ValidationError(_('Not a proper cores number')) + raise ValidationError(_('Invalid number of cores')) def validate_memory(self, value): if (value > 200) or (value < 2): - raise ValidationError(_('Not a proper ram number')) + raise ValidationError(_('Invalid RAM size')) def validate_storage(self, value): if (value > 2000) or (value < 10): - raise ValidationError(_('Not a proper storage number')) + raise ValidationError(_('Invalid storage size')) @cache_control(no_cache=True, must_revalidate=True, no_store=True) def get(self, request, *args, **kwargs): From bf1e5c71de06eb76a8e3ed0004572e7ce44740fe Mon Sep 17 00:00:00 2001 From: PCoder Date: Tue, 1 Aug 2017 00:02:35 +0530 Subject: [PATCH 7/8] Changed Preise -> Preis for pricing --- hosting/locale/de/LC_MESSAGES/django.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po index 159cc5dc..519d2c8d 100644 --- a/hosting/locale/de/LC_MESSAGES/django.po +++ b/hosting/locale/de/LC_MESSAGES/django.po @@ -581,7 +581,7 @@ msgstr "" #~ msgstr "Unsere Infrastruktur" #~ msgid "Pricing" -#~ msgstr "Preise" +#~ msgstr "Preis" #~ msgid "Contact" #~ msgstr "Kontakt" From 9c2c5ba56a082939143f3797e795936f4ab08b4b Mon Sep 17 00:00:00 2001 From: PCoder Date: Tue, 1 Aug 2017 00:55:35 +0530 Subject: [PATCH 8/8] Changed Preis -> Preise in the Whydatacenterlight footer --- 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 7cfa18ca..3ba2fa69 100644 --- a/datacenterlight/locale/de/LC_MESSAGES/django.po +++ b/datacenterlight/locale/de/LC_MESSAGES/django.po @@ -230,7 +230,7 @@ msgstr "Home" #: templates/datacenterlight/includes/_footer.html:40 msgid "Pricing" -msgstr "Preis" +msgstr "Preise" #: templates/datacenterlight/includes/_footer.html:49 msgid "All Rights Reserved"