From 0ee0d96e0fc30b188a2b4ce292b0b9606b48e78d Mon Sep 17 00:00:00 2001 From: PCoder Date: Sat, 26 Aug 2017 02:56:05 +0530 Subject: [PATCH 01/16] Added default text plugin for the cms page title --- dynamicweb/settings/base.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dynamicweb/settings/base.py b/dynamicweb/settings/base.py index 08ce457d..4950da5e 100644 --- a/dynamicweb/settings/base.py +++ b/dynamicweb/settings/base.py @@ -317,6 +317,15 @@ CMS_PLACEHOLDER_CONF = { }, ] }, + 'datacenterlight_cms_page_title': { + 'name': _('Data Center Light Title Text'), + 'default_plugins': [ + { + 'plugin_type': 'TextPlugin', + 'values': {'body': '

'}, + }, + ] + }, } CACHES = { From 0be3266ed36324eefc87cc7dbc7e3f2b2d13254a Mon Sep 17 00:00:00 2001 From: PCoder Date: Sat, 26 Aug 2017 20:46:51 +0530 Subject: [PATCH 02/16] Moved cms toolbar before title tag --- datacenterlight/templates/datacenterlight/base.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/datacenterlight/templates/datacenterlight/base.html b/datacenterlight/templates/datacenterlight/base.html index 671d894e..18ce14eb 100644 --- a/datacenterlight/templates/datacenterlight/base.html +++ b/datacenterlight/templates/datacenterlight/base.html @@ -10,9 +10,10 @@ - - Data Center Light - - {% block title %}VM hosting made in Switzerland{% endblock %} + {% cms_toolbar %} + + {% block title %}{% page_attribute page_title %}{% endblock %} + @@ -41,7 +42,6 @@ - {% cms_toolbar %} {% include "datacenterlight/includes/_navbar.html" %} From af713a0e965ea46a28fb44ba818ffad825cc9631 Mon Sep 17 00:00:00 2001 From: PCoder Date: Sat, 26 Aug 2017 20:49:17 +0530 Subject: [PATCH 03/16] cms_page.html: Added placeholder for title tag --- datacenterlight/templates/datacenterlight/cms_page.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/datacenterlight/templates/datacenterlight/cms_page.html b/datacenterlight/templates/datacenterlight/cms_page.html index f42528e4..7b43c02b 100644 --- a/datacenterlight/templates/datacenterlight/cms_page.html +++ b/datacenterlight/templates/datacenterlight/cms_page.html @@ -1,10 +1,12 @@ {% extends "datacenterlight/base.html" %} {% load staticfiles cms_tags sekizai_tags %} +{% block title %} +{% placeholder 'datacenterlight_cms_page_title_tag' %} +{% endblock %} {% block content %} {% addtoblock "css" %} {% endaddtoblock %} -
From 67880d5d60789ed201cec0f9cd761fcb5ed52b01 Mon Sep 17 00:00:00 2001 From: PCoder Date: Sat, 26 Aug 2017 20:52:47 +0530 Subject: [PATCH 04/16] Added configuration for datacenterlight_cms_page_title_tag --- dynamicweb/settings/base.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dynamicweb/settings/base.py b/dynamicweb/settings/base.py index 4950da5e..f6839783 100644 --- a/dynamicweb/settings/base.py +++ b/dynamicweb/settings/base.py @@ -317,12 +317,21 @@ CMS_PLACEHOLDER_CONF = { }, ] }, + 'datacenterlight_cms_page_title_tag': { + 'name': _('Data Center Light Title Tag Text'), + 'default_plugins': [ + { + 'plugin_type': 'TextPlugin', + 'values': {'body': ''}, + }, + ] + }, 'datacenterlight_cms_page_title': { 'name': _('Data Center Light Title Text'), 'default_plugins': [ { 'plugin_type': 'TextPlugin', - 'values': {'body': '

'}, + 'values': {'body': ''}, }, ] }, From 6c1307d1d389e0dfbc40dac874ecd1f1dcd24e15 Mon Sep 17 00:00:00 2001 From: PCoder Date: Sat, 26 Aug 2017 21:01:21 +0530 Subject: [PATCH 05/16] Reverted back to original title in base.html --- datacenterlight/templates/datacenterlight/base.html | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/datacenterlight/templates/datacenterlight/base.html b/datacenterlight/templates/datacenterlight/base.html index 18ce14eb..45b30cad 100644 --- a/datacenterlight/templates/datacenterlight/base.html +++ b/datacenterlight/templates/datacenterlight/base.html @@ -11,9 +11,8 @@ {% cms_toolbar %} - - {% block title %}{% page_attribute page_title %}{% endblock %} - + Data Center Light - + {% block title %}VM hosting made in Switzerland{% endblock %} From 51190a5546aa4cda999c29b2bfc7c493640ff481 Mon Sep 17 00:00:00 2001 From: PCoder Date: Thu, 31 Aug 2017 00:36:19 +0530 Subject: [PATCH 06/16] Added page_title in the title tag and the page title text --- datacenterlight/templates/datacenterlight/cms_page.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/datacenterlight/templates/datacenterlight/cms_page.html b/datacenterlight/templates/datacenterlight/cms_page.html index 7b43c02b..3e3b038a 100644 --- a/datacenterlight/templates/datacenterlight/cms_page.html +++ b/datacenterlight/templates/datacenterlight/cms_page.html @@ -1,7 +1,7 @@ {% extends "datacenterlight/base.html" %} {% load staticfiles cms_tags sekizai_tags %} {% block title %} -{% placeholder 'datacenterlight_cms_page_title_tag' %} +{% page_attribute page_title %} {% endblock %} {% block content %} {% addtoblock "css" %} @@ -13,7 +13,7 @@
-

{% placeholder 'datacenterlight_cms_page_title' %}

+

{% page_attribute page_title %}

From b3b2ca7193c436ef5d672fb71e124b27eb59ffba Mon Sep 17 00:00:00 2001 From: PCoder Date: Thu, 31 Aug 2017 00:39:36 +0530 Subject: [PATCH 07/16] Removed unused placeholder configuration --- dynamicweb/settings/base.py | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/dynamicweb/settings/base.py b/dynamicweb/settings/base.py index f6839783..08ce457d 100644 --- a/dynamicweb/settings/base.py +++ b/dynamicweb/settings/base.py @@ -317,24 +317,6 @@ CMS_PLACEHOLDER_CONF = { }, ] }, - 'datacenterlight_cms_page_title_tag': { - 'name': _('Data Center Light Title Tag Text'), - 'default_plugins': [ - { - 'plugin_type': 'TextPlugin', - 'values': {'body': ''}, - }, - ] - }, - 'datacenterlight_cms_page_title': { - 'name': _('Data Center Light Title Text'), - 'default_plugins': [ - { - 'plugin_type': 'TextPlugin', - 'values': {'body': ''}, - }, - ] - }, } CACHES = { From 79cf5e416c372890e3066fca9933d79abd33ed9b Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Fri, 1 Sep 2017 23:56:01 +0530 Subject: [PATCH 08/16] modal btn min width, modal width increased --- hosting/static/hosting/css/commons.css | 18 ++++++---- hosting/static/hosting/css/user_keys.css | 1 + hosting/templates/hosting/user_keys.html | 35 +++++++------------ .../hosting/virtual_machine_detail.html | 6 ++-- 4 files changed, 28 insertions(+), 32 deletions(-) diff --git a/hosting/static/hosting/css/commons.css b/hosting/static/hosting/css/commons.css index cb7cdd8e..699f417c 100644 --- a/hosting/static/hosting/css/commons.css +++ b/hosting/static/hosting/css/commons.css @@ -109,7 +109,7 @@ text-align: center; width: 100%; float: left; - padding: 0px 40px 15px 30px; + padding: 0px 30px 15px 30px; } .modal-body .modal-icon i { font-size: 80px; @@ -117,7 +117,7 @@ color: #999; } .modal-body .modal-icon { - margin-bottom: 10px; + margin-bottom: 15px; } .modal-title { margin: 0; @@ -128,9 +128,12 @@ font-weight: 300; } .modal-text { - padding-top: 15px; + padding-top: 5px; font-size: 16px; } +.modal-text p:not(:last-of-type){ + margin-bottom: 5px; +} .modal-footer { border-top: 0px solid #e5e5e5; width: 100%; @@ -138,11 +141,8 @@ text-align: center; padding: 15px 15px; } -.modal-footer button[type="submit"] { - min-width: 80px; -} @media (min-width: 1300px) { - .modal-dialog {/* top: 30%; */width: 35%;} + .modal-dialog {/* top: 30%; */width: 40%;} } @media (max-width: 1299px) { .modal-dialog { @@ -239,4 +239,8 @@ -webkit-transform: translate(-50%,-50%); -ms-transform: translate(-50%,-50%); transform: translate(-50%,-50%); +} + +.btn-wide { + min-width: 100px; } \ No newline at end of file diff --git a/hosting/static/hosting/css/user_keys.css b/hosting/static/hosting/css/user_keys.css index 4b788da6..6039ae0e 100644 --- a/hosting/static/hosting/css/user_keys.css +++ b/hosting/static/hosting/css/user_keys.css @@ -299,6 +299,7 @@ } .key_contain { word-break: break-all; + margin-bottom: 15px; } .custom_form_button{ border-radius: 0; diff --git a/hosting/templates/hosting/user_keys.html b/hosting/templates/hosting/user_keys.html index 31332929..1cfb880c 100644 --- a/hosting/templates/hosting/user_keys.html +++ b/hosting/templates/hosting/user_keys.html @@ -33,8 +33,7 @@ {{user_key.name}} - @@ -42,20 +41,18 @@
- +
-
- -

{% trans "Do you want to delete this key?"%}

+
+ +
+

{% trans "Do you want to delete this key?"%}

+
{% csrf_token %}
- +
@@ -64,23 +61,18 @@
-

+

{% trans "Show" %}

-
-
- {% trans "OK" %} +
+ {% trans "OK" %} +
From 654f7715c8f34f749b95b8f9b608e7787574ab18 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Sat, 2 Sep 2017 01:39:53 +0530 Subject: [PATCH 09/16] Updated changelog 1.1.1 -> 1.2 --- Changelog | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Changelog b/Changelog index 1f5b70e6..924c8605 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,11 @@ +1.2: 2017-09-01 + * #3703: [hosting] Added a new dashboard + * #3717: [datacenterlight, hosting] Changed warning color for box + * #3748: [datacenterlight] Changed order msg position for mobile + * #3762: [hosting] Text fix View details to See Invoice + * #3765: [hosting] Text fix Your SSH Keys to My SSH Keys + * #3639: [datacenterlight] Added navbar menu after payment page on landing + * #3735: [hosting] enlarged modal width and modal button width 1.1.1: 2017-08-29 * #3709: [datacenterlight] Added faq tos cms template * #3657: [datacenterlight] Added a new contact section at landing From 6f091279d78fdb8cf74c3ac04f3f2f03c015a5fb Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Sat, 2 Sep 2017 01:45:07 +0530 Subject: [PATCH 10/16] translation fix on vm list page --- 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 fac8cc5a..e70d2add 100644 --- a/hosting/locale/de/LC_MESSAGES/django.po +++ b/hosting/locale/de/LC_MESSAGES/django.po @@ -458,7 +458,7 @@ msgid "Virtual Machines" msgstr "Virtuelle Maschinen" msgid "To create a new virtual machine, click \"Create VM\"" -msgstr "" +msgstr "Um eine neue VM zu erzeugen, klicke \"Neue VM erzeugen\"" msgid "CREATE VM" msgstr "NEUE VM" From 1426cba3a5703bcc84d030f606442ad7922d4419 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Sat, 2 Sep 2017 01:48:51 +0530 Subject: [PATCH 11/16] approved, declined translations added --- hosting/locale/de/LC_MESSAGES/django.po | 14 +++++++------- hosting/templates/hosting/orders.html | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po index e70d2add..598bcff6 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-08-31 23:46+0530\n" +"POT-Creation-Date: 2017-09-02 01:47+0530\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -275,6 +275,12 @@ msgstr "Betrag" msgid "Status" msgstr "" +msgid "Approved" +msgstr "Akzeptiert" + +msgid "Declined" +msgstr "Abgelehnt" + msgid "See Invoice" msgstr "Rechnung" @@ -507,12 +513,6 @@ msgstr "Kontaktiere den Data Center Light Support." #~ msgid "Your SSH Keys" #~ msgstr "Deine SSH Keys" -#~ msgid "Approved" -#~ msgstr "Akzeptiert" - -#~ msgid "Declined" -#~ msgstr "Abgelehnt" - #~ msgid "Cancel Order" #~ msgstr "Bestellung stornieren" diff --git a/hosting/templates/hosting/orders.html b/hosting/templates/hosting/orders.html index 5515a0ab..3699e9a2 100644 --- a/hosting/templates/hosting/orders.html +++ b/hosting/templates/hosting/orders.html @@ -34,9 +34,9 @@ {{ order.price }} {% if order.approved %} - Approved + {% trans "Approved" %} {% else %} - Declined + {% trans "Declined" %} {% endif %} From 979844e55b96339511b9a5fb47e2dd10bdabc5b4 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Sat, 2 Sep 2017 02:02:05 +0530 Subject: [PATCH 12/16] hosting payment and datacenterlight payment files supported --- .../datacenterlight/landing_payment.html | 217 ++++++++++++++++++ datacenterlight/views.py | 4 +- hosting/templates/hosting/payment.html | 4 - 3 files changed, 219 insertions(+), 6 deletions(-) create mode 100644 datacenterlight/templates/datacenterlight/landing_payment.html diff --git a/datacenterlight/templates/datacenterlight/landing_payment.html b/datacenterlight/templates/datacenterlight/landing_payment.html new file mode 100644 index 00000000..f4974a56 --- /dev/null +++ b/datacenterlight/templates/datacenterlight/landing_payment.html @@ -0,0 +1,217 @@ +{% extends "hosting/base_short.html" %} +{% load staticfiles bootstrap3 i18n %} + +{% block navbar %} + {% include "datacenterlight/includes/_navbar.html" %} +{% endblock navbar %} + +{% block content %} + + +
+
+
+
+

{%trans "Your Order" %}

+
+
+ {%trans "Cores" %} +
+
+ {%trans "Memory" %} +
+
+ {%trans "Disk space" %} +
+
+ {%trans "Configuration" %} +
+
+
+
+ {{request.session.specs.cpu|floatformat}} +
+
+ {{request.session.specs.memory|floatformat}} GB +
+
+ {{request.session.specs.disk_size|floatformat}} GB +
+
+ {{request.session.template.name}} +
+
+
+
+ {%trans "Total" %} {%trans "including VAT" %} +
+
+
+
{{request.session.specs.price}} + CHF/{% trans "Month" %} +
+
+
+
+
+
+
+
+

{%trans "Billing Address"%}

+
+
+ {% for field in form %} + {% csrf_token %} + {% bootstrap_field field show_label=False type='fields'%} + {% endfor %} +
+
+
+

{%trans "Credit Card"%}

+
+
+
+

+ {% blocktrans %} + Please fill in your credit card information below. We are using Stripe for payment and do not store + your information in our database. + {% endblocktrans %} +

+
+
+
+ {% if credit_card_data.last4 %} +
+
Credit Card
+
Last 4: *****{{credit_card_data.last4}}
+
Type: {{credit_card_data.cc_brand}}
+ +
+
+
+ {% if not messages and not form.non_field_errors %} +

+ {% trans "You are not making any payment yet. After submitting your card information, you will be taken to the Confirm Order Page." %} +

+ {% endif %} +
+ {% for message in messages %} + {% if 'failed_payment' or 'make_charge_error' in message.tags %} +
  • +

    {{ message|safe }}

    +
+ {% endif %} + {% endfor %} + {% for error in form.non_field_errors %} +

+ {{ error|escape }} +

+ {% endfor %} +
+
+
+
+ +
+
+
+ + {% else %} +
+ +
+
+
+ +
+
+
+ +
+
+
+
+ +
+
+
+ + +
+
+
+ +
+
+ {% if not messages and not form.non_field_errors %} +

+ {% trans "You are not making any payment yet. After submitting your card information, you will be taken to the Confirm Order Page." %} +

+ {% endif %} +
+ {% for message in messages %} + {% if 'failed_payment' or 'make_charge_error' in message.tags %} +
  • +

    {{ message|safe }}

    +
+ {% endif %} + {% endfor %} + + {% for error in form.non_field_errors %} +

+ {{ error|escape }} +

+ {% endfor %} +
+
+
+
+ +
+
+
+ + +
+ + {% endif %} +
+
+
+
+
+
+
+ + +{% if stripe_key %} +{% get_current_language as LANGUAGE_CODE %} + +{%endif%} + +{% if credit_card_data.last4 and credit_card_data.cc_brand %} + +{%endif%} + +{%endblock%} diff --git a/datacenterlight/views.py b/datacenterlight/views.py index b6a644e4..0521ffef 100644 --- a/datacenterlight/views.py +++ b/datacenterlight/views.py @@ -406,7 +406,7 @@ class WhyDataCenterLightView(IndexView): class PaymentOrderView(FormView): - template_name = 'hosting/payment.html' + template_name = 'datacenterlight/landing_payment.html' form_class = BillingAddressForm def get_form_kwargs(self): @@ -478,7 +478,7 @@ class PaymentOrderView(FormView): class OrderConfirmationView(DetailView): template_name = "datacenterlight/order_detail.html" - payment_template_name = 'hosting/payment.html' + payment_template_name = 'datacenterlight/landing_payment.html' context_object_name = "order" model = HostingOrder diff --git a/hosting/templates/hosting/payment.html b/hosting/templates/hosting/payment.html index f4974a56..b9a04e43 100644 --- a/hosting/templates/hosting/payment.html +++ b/hosting/templates/hosting/payment.html @@ -1,10 +1,6 @@ {% extends "hosting/base_short.html" %} {% load staticfiles bootstrap3 i18n %} -{% block navbar %} - {% include "datacenterlight/includes/_navbar.html" %} -{% endblock navbar %} - {% block content %} From b9f0a886e0b9f24a1cc709fe65d62e0f2620ebc9 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Sat, 2 Sep 2017 03:09:02 +0530 Subject: [PATCH 13/16] translation fixes --- .../locale/de/LC_MESSAGES/django.po | 119 +++++++++++++----- hosting/locale/de/LC_MESSAGES/django.po | 21 ++-- hosting/templates/hosting/order_detail.html | 22 ++-- hosting/templates/hosting/orders.html | 2 +- 4 files changed, 111 insertions(+), 53 deletions(-) diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.po b/datacenterlight/locale/de/LC_MESSAGES/django.po index c0dc55ca..c5723bf0 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-08-24 11:28+0000\n" +"POT-Creation-Date: 2017-09-02 03:08+0530\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -95,7 +95,9 @@ msgid "Message" msgstr "Nachricht" msgid "Sorry, there was an unexpected error. Kindly retry." -msgstr "Bitte entschuldige, es scheint ein unerwarteter Fehler aufgetreten zu sein. Versuche es doch bitte noch einmal." +msgstr "" +"Bitte entschuldige, es scheint ein unerwarteter Fehler aufgetreten zu sein. " +"Versuche es doch bitte noch einmal." msgid "SUBMIT" msgstr "ABSENDEN" @@ -166,6 +168,9 @@ msgstr "" "Du kannst deinen %(dcl_text)s Account aktivieren, indem du hier klickst " "%(base_url)s%(activation_link)s\n" +msgid "Home" +msgstr "Home" + msgid "Highlights" msgstr "" @@ -175,18 +180,15 @@ msgstr "Skalierung" msgid "Reliable and light" msgstr "Zuverlässig und leicht" +msgid "Pricing" +msgstr "Preise" + msgid "Order VM" msgstr "VM bestellen" msgid "Contact" msgstr "Kontakt" -msgid "Home" -msgstr "Home" - -msgid "Pricing" -msgstr "Preise" - msgid "All Rights Reserved" msgstr "Alle Rechte vorbehalten" @@ -256,25 +258,10 @@ msgid "Contact us" msgstr "Kontaktiere uns" msgid "Switzerland " -msgstr "Schweiz" +msgstr "Schweiz " -msgid "Confirm Order" -msgstr "Bestellung Bestätigen" - -msgid "Date" -msgstr "Datum" - -msgid "Billed To:" -msgstr "Rechnungsadresse" - -msgid "Payment Method:" -msgstr "Bezahlmethode" - -msgid "ending" -msgstr "endend in" - -msgid "Order summary" -msgstr "Bestellungsübersicht" +msgid "Your Order" +msgstr "Deine Bestellung" msgid "Cores" msgstr "Prozessorkerne" @@ -289,13 +276,82 @@ msgid "Configuration" msgstr "Konfiguration" msgid "Total" -msgstr "" +msgstr "Gesamt" + +msgid "including VAT" +msgstr "inkl. Mehrwertsteuer" -#, fuzzy -#| msgid "month" msgid "Month" msgstr "Monat" +msgid "Billing Address" +msgstr "Rechnungsadresse" + +msgid "Credit Card" +msgstr "Kreditkarte" + +msgid "" +"\n" +" Please fill in your credit card information " +"below. We are using Stripe for payment and do not store\n" +" your information in our database.\n" +" " +msgstr "" +"\n" +"Bitte füll Deine Kreditkarteninformationen unten aus. Wir nutzen Stripe für die Bezahlung und " +"speichern keine Informationen in unserer Datenbank." + +msgid "" +"You are not making any payment yet. After submitting your card information, " +"you will be taken to the Confirm Order Page." +msgstr "" +"Es wird noch keine Bezahlung vorgenommen. Die Bezahlung wird erst ausgelöst, " +"nachdem Du die Bestellung auf der nächsten Seite bestätigt hast." + +msgid "Submit" +msgstr "Absenden" + +msgid "Card Number" +msgstr "Kreditkartennummer" + +msgid "Expiry Date" +msgstr "Ablaufdatum" + +msgid "CVC" +msgstr "" + +msgid "Card Type" +msgstr "Kartentyp" + +msgid "Processing" +msgstr "Weiter" + +msgid "Enter your credit card number" +msgstr "Deine Kreditkartennummer" + +msgid "Confirm Order" +msgstr "Bestellung Bestätigen" + +msgid "Date" +msgstr "Datum" + +msgid "Billed To:" +msgstr "Rechnungsadresse" + +msgid "Payment Method:" +msgstr "Bezahlmethode" + +#, fuzzy +#| msgid "ending in" +msgid "ending" +msgstr "endend in" + +msgid "Order summary" +msgstr "Bestellungsübersicht" + #, python-format msgid "" "By clicking \"Place order\" this plan will charge your credit card account " @@ -331,7 +387,7 @@ msgstr "" msgid "Thank you for order! Our team will contact you via email" msgstr "" "Vielen Dank für die Bestellung. Unser Team setzt sich sobald wie möglich mit " -"Ihnen via E-Mail in Verbindung." +"Dir via E-Mail in Verbindung." msgid "as soon as possible!" msgstr "" @@ -495,9 +551,6 @@ msgstr "ist keine gültige E-Mailadresse" #~ msgid "Buy Now!" #~ msgstr "Kaufe jetzt!" -#~ msgid "Email address" -#~ msgstr "E-Mail Adresse" - #~ msgid "Our promise" #~ msgstr "Unser Versprechen" diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po index 598bcff6..b7919369 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-09-02 01:47+0530\n" +"POT-Creation-Date: 2017-09-02 03:08+0530\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -37,7 +37,7 @@ msgid "My Virtual Machines" msgstr "Meine virtuellen Maschinen" msgid "My Orders" -msgstr "Meine Bestellungen" +msgstr "Meine Rechnungen" msgid "SSH Keys" msgstr "SSH Key" @@ -73,7 +73,7 @@ msgid "Mwst-Nummer: CHE-109.549.333 MWST" msgstr "" msgid "Total:" -msgstr "" +msgstr "Gesamt:" #, python-format msgid "Alles Preise in CHF mit 8%% Mehrwertsteuer." @@ -242,12 +242,21 @@ msgstr "Datum" msgid "Status:" msgstr "" +msgid "Approved" +msgstr "Akzeptiert" + +msgid "Declined" +msgstr "Abgelehnt" + msgid "Billed To:" msgstr "Rechnungsadresse" msgid "Payment Method:" msgstr "Bezahlmethode" +msgid "ending in" +msgstr "endend in" + msgid "Order summary" msgstr "Bestellungsübersicht" @@ -275,12 +284,6 @@ msgstr "Betrag" msgid "Status" msgstr "" -msgid "Approved" -msgstr "Akzeptiert" - -msgid "Declined" -msgstr "Abgelehnt" - msgid "See Invoice" msgstr "Rechnung" diff --git a/hosting/templates/hosting/order_detail.html b/hosting/templates/hosting/order_detail.html index 8a5f39f6..64c0b5d3 100644 --- a/hosting/templates/hosting/order_detail.html +++ b/hosting/templates/hosting/order_detail.html @@ -1,7 +1,7 @@ {% extends "hosting/base_short.html" %} {% load staticfiles bootstrap3 %} {% load i18n %} -{% block content %} +{% block content %}
{% if messages %} @@ -17,7 +17,7 @@
{% endif %} {% if not error %} -
+

{{page_header_text}}

{% trans "Order #"%} {{order.id}}

@@ -29,9 +29,11 @@ {% trans "Date"%}:
{{order.created_at|date:'Y-m-d H:i'}}

{% trans "Status:"%}
- {{order.status}} + {% if order.status == 'Approved' %} + {% trans "Approved" %} + {% else %} + {% trans "Declined" %} + {% endif %}

@@ -44,20 +46,20 @@ {{order.billing_address.city}}, {{order.billing_address.country}}.
- +
{% trans "Payment Method:"%}
- {{order.cc_brand}} ending **** {{order.last4}}
+ {{order.cc_brand}} {% trans "ending in" %} **** {{order.last4}}
{{user.email}}
- +

{% trans "Order summary"%}

@@ -83,8 +85,8 @@ {% endif %}
- -