From 28661c0c4825beccae2559c8efde73bc2762ebfe Mon Sep 17 00:00:00 2001 From: PCoder Date: Mon, 18 Sep 2017 11:57:41 +0530 Subject: [PATCH 1/3] Replaced all occurrences of digitalglarus.ungliech.ch with digitalglarus.ch --- dynamicweb/settings/prod.py | 2 +- ungleich_page/templates/ungleich_page/includes/_about.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dynamicweb/settings/prod.py b/dynamicweb/settings/prod.py index a3d6bbeb..e8cfc64c 100644 --- a/dynamicweb/settings/prod.py +++ b/dynamicweb/settings/prod.py @@ -16,7 +16,7 @@ CACHES = { # MANAGERS = ADMINS -REGISTRATION_MESSAGE['message'] = REGISTRATION_MESSAGE['message'].format(host='digitalglarus.ungleich.ch', +REGISTRATION_MESSAGE['message'] = REGISTRATION_MESSAGE['message'].format(host='digitalglarus.ch', slug='{slug}') # flake8: noqa ALLOWED_HOSTS = [ diff --git a/ungleich_page/templates/ungleich_page/includes/_about.html b/ungleich_page/templates/ungleich_page/includes/_about.html index ebcbbdcb..e1abb545 100644 --- a/ungleich_page/templates/ungleich_page/includes/_about.html +++ b/ungleich_page/templates/ungleich_page/includes/_about.html @@ -64,7 +64,7 @@

{% trans "ungleich introduces HA-Hosting" %}

{% trans "and introduces affordable 24X7 support." %}

-

{% trans "ungleich launches" %} +

{% trans "ungleich launches" %} {% trans "Digital Glarus project" %}

@@ -79,4 +79,4 @@ - \ No newline at end of file + From 3eeaba871565c0cdd63da417d26b92682eb5bf42 Mon Sep 17 00:00:00 2001 From: PCoder Date: Thu, 21 Sep 2017 02:06:50 +0530 Subject: [PATCH 2/3] Added some translations --- hosting/locale/de/LC_MESSAGES/django.po | 59 ++++++++++++++++++------- 1 file changed, 43 insertions(+), 16 deletions(-) diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po index d684bec7..0c8460e1 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-14 12:27+0000\n" +"POT-Creation-Date: 2017-09-20 20:23+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -354,11 +354,35 @@ msgstr "Arbeitsspeicher" msgid "Disk space" msgstr "Festplattenkapazität" +msgid "Configuration" +msgstr "Konfiguration" + msgid "Total" msgstr "Gesamt" -msgid "Finish Configuration" -msgstr "Konfiguration beenden" +msgid "Month" +msgstr "Monat" + +#, python-format +msgid "" +"By clicking \"Place order\" this plan will charge your credit card account " +"with the fee of %(vm_price)sCHF/month" +msgstr "" +"Wenn Du \"bestellen\" auswählst, wird Deine Kreditkarte mit %(vm_price)sCHF " +"pro Monat belastet" + +msgid "Place order" +msgstr "Bestelle" + + +msgid "Processing..." +msgstr "" + +msgid "Hold tight, we are processing your request" +msgstr "Bitte warten - wir verbeiten Deine Anfrage gerade" + +msgid "Some problem encountered. Please try again later." +msgstr "" msgid "Order Nr." msgstr "Bestellung Nr." @@ -381,15 +405,9 @@ msgstr "" msgid "Your Order" msgstr "Deine Bestellung" -msgid "Configuration" -msgstr "Konfiguration" - msgid "including VAT" msgstr "inkl. Mehrwertsteuer" -msgid "Month" -msgstr "Monat" - msgid "Billing Address" msgstr "Rechnungsadresse" @@ -618,13 +636,19 @@ msgstr "" msgid "Invalid credit card" msgstr "Ungültige Kreditkarte" -#, python-format -msgid "Your New VM %(vm_name)s at Data Center Light" -msgstr "Deine neue VM %(vm_name)s bei Data Center Light" - msgid "Confirm Order" msgstr "Bestellung Bestätigen" +msgid "Thank you for the order." +msgstr "Danke für Deine Bestellung." + +msgid "" +"Your VM will be up and running in a few moments. We will send you a " +"confirmation email as soon as it is ready." +msgstr "" +"Deine VM ist gleich bereit. Wir senden Dir eine Bestätigungsemail, " +"sobald Du auf sie zugreifen kannst." + msgid "In order to create a VM, you need to create/upload your SSH KEY first." msgstr "" "Um eine VM zu erstellen musst du zuerst einen SSH-Key erstellen / hochladen." @@ -641,6 +665,12 @@ msgstr "VM Kündigung" msgid "VM %(VM_ID)s terminated successfully" msgstr "VM %(VM_ID)s erfolgreich beendet" +#~ msgid "Finish Configuration" +#~ msgstr "Konfiguration beenden" + +#~ msgid "Your New VM %(vm_name)s at Data Center Light" +#~ msgstr "Deine neue VM %(vm_name)s bei Data Center Light" + #~ msgid "My Virtual Machines" #~ msgstr "Meine virtuellen Maschinen" @@ -734,9 +764,6 @@ msgstr "VM %(VM_ID)s erfolgreich beendet" #~ msgid "Payment Details" #~ msgstr "Rechnungsdetails" -#~ msgid "Place Order" -#~ msgstr "Bestelle" - #~ msgid "CARD NUMBER" #~ msgstr "Kreditkartennummer" From 2c2ee0f4a45448cc2538348f328b95d8d44222c0 Mon Sep 17 00:00:00 2001 From: PCoder Date: Thu, 21 Sep 2017 02:18:39 +0530 Subject: [PATCH 3/3] Some more translations --- hosting/locale/de/LC_MESSAGES/django.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po index 0c8460e1..ede9b66f 100644 --- a/hosting/locale/de/LC_MESSAGES/django.po +++ b/hosting/locale/de/LC_MESSAGES/django.po @@ -376,13 +376,13 @@ msgstr "Bestelle" msgid "Processing..." -msgstr "" +msgstr "Abarbeitung..." msgid "Hold tight, we are processing your request" msgstr "Bitte warten - wir verbeiten Deine Anfrage gerade" msgid "Some problem encountered. Please try again later." -msgstr "" +msgstr "Ein Problem ist aufgetreten. Bitte versuche es später noch einmal." msgid "Order Nr." msgstr "Bestellung Nr."