From 3446dcc4697f44a546c389d637424e37fe0564fd Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Sat, 12 May 2018 21:47:58 +0530 Subject: [PATCH 1/2] calculator translation --- datacenterlight/locale/de/LC_MESSAGES/django.po | 5 ++++- .../templates/datacenterlight/includes/_calculator_form.html | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.po b/datacenterlight/locale/de/LC_MESSAGES/django.po index a092641d..4a95c2fc 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: 2018-05-12 03:46+0530\n" +"POT-Creation-Date: 2018-05-12 21:43+0530\n" "PO-Revision-Date: 2018-03-30 23:22+0000\n" "Last-Translator: b'Anonymous User '\n" "Language-Team: LANGUAGE \n" @@ -143,6 +143,9 @@ msgstr "Monat" msgid "VAT included" msgstr "MwSt. inklusive" +msgid "You save" +msgstr "Du sparst" + msgid "Hosted in Switzerland" msgstr "Standort: Schweiz" diff --git a/datacenterlight/templates/datacenterlight/includes/_calculator_form.html b/datacenterlight/templates/datacenterlight/includes/_calculator_form.html index 4b4aa04f..72ca5a05 100644 --- a/datacenterlight/templates/datacenterlight/includes/_calculator_form.html +++ b/datacenterlight/templates/datacenterlight/includes/_calculator_form.html @@ -24,7 +24,7 @@

{% if vm_pricing.vat_inclusive %}{% trans "VAT included" %}
{% endif %} {% if vm_pricing.discount_amount %} - You save {{ vm_pricing.discount_amount }} CHF + {% trans "You save" %} {{ vm_pricing.discount_amount }} CHF {% endif %}

From 8fb0d9a48acdaf1b9607d1cdb5bb510171da6f1b Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Sat, 12 May 2018 21:59:06 +0530 Subject: [PATCH 2/2] order detail divider lines full width --- .../templates/datacenterlight/order_detail.html | 12 ++++++++++-- hosting/templates/hosting/order_detail.html | 12 ++++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/datacenterlight/templates/datacenterlight/order_detail.html b/datacenterlight/templates/datacenterlight/order_detail.html index 8480e132..49347ba2 100644 --- a/datacenterlight/templates/datacenterlight/order_detail.html +++ b/datacenterlight/templates/datacenterlight/order_detail.html @@ -65,8 +65,12 @@ {% trans "Disk space" %}: {{vm.disk_size|intcomma}} GB

+ +

- {% if vm.vat > 0 or vm.discount.amount > 0 %} +
+ {% if vm.vat > 0 or vm.discount.amount > 0 %} +
{% if vm.vat > 0 %}

@@ -86,8 +90,12 @@

{% endif %}
+
+

- {% endif %} +
+ {% endif %} +

{% trans "Total" %} {{vm.total_price|floatformat:2|intcomma}} CHF diff --git a/hosting/templates/hosting/order_detail.html b/hosting/templates/hosting/order_detail.html index 7def5b49..e2e38c35 100644 --- a/hosting/templates/hosting/order_detail.html +++ b/hosting/templates/hosting/order_detail.html @@ -127,8 +127,12 @@ {% trans "Disk space" %}: {{vm.disk_size}} GB

+
+

- {% if vm.vat > 0 or vm.discount.amount > 0 %} +
+ {% if vm.vat > 0 or vm.discount.amount > 0 %} +
{% if vm.vat > 0 %}

@@ -148,8 +152,12 @@

{% endif %}
+
+

- {% endif %} +
+ {% endif %} +

{% trans "Total" %} {% if vm.total_price %}{{vm.total_price|floatformat:2|intcomma}}{% else %}{{vm.price|floatformat:2|intcomma}}{% endif %} CHF