From 4dff4e07cb7614d0589e844c59e696376f790ed1 Mon Sep 17 00:00:00 2001 From: PCoder Date: Thu, 21 Dec 2017 01:25:52 +0100 Subject: [PATCH 1/7] Change minimum required RAM from 2GB to 1GB --- datacenterlight/locale/de/LC_MESSAGES/django.po | 14 ++++++++++---- datacenterlight/static/datacenterlight/js/main.js | 4 ++-- .../templates/datacenterlight/calculator_form.html | 4 ++-- datacenterlight/views.py | 2 +- hosting/locale/de/LC_MESSAGES/django.po | 9 ++++++--- hosting/static/hosting/js/createvm.js | 4 ++-- hosting/templates/hosting/calculator_form.html | 4 ++-- hosting/views.py | 2 +- 8 files changed, 26 insertions(+), 17 deletions(-) diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.po b/datacenterlight/locale/de/LC_MESSAGES/django.po index c69f83d1..76cd5c9c 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-11-13 17:59+0000\n" +"POT-Creation-Date: 2017-12-21 00:20+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -56,11 +56,11 @@ msgstr "Standort: Schweiz" msgid "Please enter a value in range 1 - 48." msgstr "Bitte gib einen Wert von 1 bis 48 ein." -msgid "Please enter a value in range 2 - 200." -msgstr "Bitte gib einen Wert von 2 bis 200 ein." +msgid "Please enter a value in range 1 - 200." +msgstr "Bitte gib einen Wert von 1 bis 200 ein." msgid "Please enter a value in range 10 - 2000." -msgstr "Bitte gib einen Wert von 10 bis 200 ein." +msgstr "Bitte gib einen Wert von 10 bis 2000 ein." msgid "GB Storage (SSD)" msgstr "GB Storage (SSD)" @@ -316,6 +316,9 @@ msgstr "" msgid "Forgot password?" msgstr "Passwort vergessen?" +msgid "Resend activation link" +msgstr "Aktivierungslink noch einmal senden" + msgid "Sign up" msgstr "Registrieren" @@ -517,6 +520,9 @@ msgstr "" "Deine VM ist gleich bereit. Wir senden Dir eine Bestätigungsemail, sobald Du " "auf sie zugreifen kannst." +#~ msgid "Please enter a value in range 2 - 200." +#~ msgstr "Bitte gib einen Wert von 2 bis 200 ein." + #~ msgid "Affordable VM hosting based in Switzerland" #~ msgstr "Bezahlbares VM Hosting in der Schweiz" diff --git a/datacenterlight/static/datacenterlight/js/main.js b/datacenterlight/static/datacenterlight/js/main.js index dd074397..aa33c0d6 100644 --- a/datacenterlight/static/datacenterlight/js/main.js +++ b/datacenterlight/static/datacenterlight/js/main.js @@ -15,8 +15,8 @@ }, 'ram': { 'id': 'ramValue', - 'value': 2, - 'min': 2, + 'value': 1, + 'min': 1, 'max': 200, 'interval': 1 }, diff --git a/datacenterlight/templates/datacenterlight/calculator_form.html b/datacenterlight/templates/datacenterlight/calculator_form.html index 1733a719..dcab80b3 100644 --- a/datacenterlight/templates/datacenterlight/calculator_form.html +++ b/datacenterlight/templates/datacenterlight/calculator_form.html @@ -36,8 +36,8 @@
- + GB RAM
diff --git a/datacenterlight/views.py b/datacenterlight/views.py index bd1a7f51..fda8c9c9 100644 --- a/datacenterlight/views.py +++ b/datacenterlight/views.py @@ -209,7 +209,7 @@ class IndexView(CreateView): raise ValidationError(_('Invalid number of cores')) def validate_memory(self, value): - if (value > 200) or (value < 2): + if (value > 200) or (value < 1): raise ValidationError(_('Invalid RAM size')) def validate_storage(self, value): diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po index 2be2ae6d..19cffda5 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-26 03:21+0530\n" +"POT-Creation-Date: 2017-12-21 00:23+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -128,8 +128,8 @@ msgstr "MwSt. inklusive" msgid "Please enter a value in range 1 - 48." msgstr "Bitte gib einen Wert von 1 bis 48 ein." -msgid "Please enter a value in range 2 - 200." -msgstr "Bitte gib einen Wert von 2 bis 200 ein." +msgid "Please enter a value in range 1 - 200." +msgstr "Bitte gib einen Wert von 1 bis 200 ein." msgid "Please enter a value in range 10 - 2000." msgstr "Bitte gib einen Wert von 10 bis 200 ein." @@ -722,6 +722,9 @@ msgstr "" "Es gab einen Fehler bei der Bearbeitung Deine Anfrage. Bitte versuche es " "noch einmal." +#~ msgid "Please enter a value in range 2 - 200." +#~ msgstr "Bitte gib einen Wert von 2 bis 200 ein." + #~ msgid "Reset your password" #~ msgstr "Passwort zurücksetzen" diff --git a/hosting/static/hosting/js/createvm.js b/hosting/static/hosting/js/createvm.js index 726513ad..219fb3b7 100644 --- a/hosting/static/hosting/js/createvm.js +++ b/hosting/static/hosting/js/createvm.js @@ -11,8 +11,8 @@ }, 'ram': { 'id': 'ramValue', - 'value': 2, - 'min': 2, + 'value': 1, + 'min': 1, 'max': 200, 'interval': 1 }, diff --git a/hosting/templates/hosting/calculator_form.html b/hosting/templates/hosting/calculator_form.html index 18bdd3cb..02bb36ea 100644 --- a/hosting/templates/hosting/calculator_form.html +++ b/hosting/templates/hosting/calculator_form.html @@ -29,8 +29,8 @@
- + GB RAM
diff --git a/hosting/views.py b/hosting/views.py index 978abf28..70ca259e 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -943,7 +943,7 @@ class CreateVirtualMachinesView(LoginRequiredMixin, View): raise ValidationError(_('Invalid number of cores')) def validate_memory(self, value): - if (value > 200) or (value < 2): + if (value > 200) or (value < 1): raise ValidationError(_('Invalid RAM size')) def validate_storage(self, value): From 3852ce04de0b1982bd14b3fc155b7f34e011a118 Mon Sep 17 00:00:00 2001 From: PCoder Date: Thu, 21 Dec 2017 08:41:26 +0100 Subject: [PATCH 2/7] Set default RAM value to 2G in landing and hosting VM calculators --- datacenterlight/static/datacenterlight/js/main.js | 2 +- hosting/static/hosting/js/createvm.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/datacenterlight/static/datacenterlight/js/main.js b/datacenterlight/static/datacenterlight/js/main.js index aa33c0d6..4c50702e 100644 --- a/datacenterlight/static/datacenterlight/js/main.js +++ b/datacenterlight/static/datacenterlight/js/main.js @@ -15,7 +15,7 @@ }, 'ram': { 'id': 'ramValue', - 'value': 1, + 'value': 2, 'min': 1, 'max': 200, 'interval': 1 diff --git a/hosting/static/hosting/js/createvm.js b/hosting/static/hosting/js/createvm.js index 219fb3b7..8d525114 100644 --- a/hosting/static/hosting/js/createvm.js +++ b/hosting/static/hosting/js/createvm.js @@ -11,7 +11,7 @@ }, 'ram': { 'id': 'ramValue', - 'value': 1, + 'value': 2, 'min': 1, 'max': 200, 'interval': 1 From 57c5255708292f68675de60216bc01c18abe12c1 Mon Sep 17 00:00:00 2001 From: PCoder Date: Fri, 22 Dec 2017 23:37:49 +0100 Subject: [PATCH 3/7] Update translation in DE : 200 to 2000 --- 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 19cffda5..3575cc61 100644 --- a/hosting/locale/de/LC_MESSAGES/django.po +++ b/hosting/locale/de/LC_MESSAGES/django.po @@ -132,7 +132,7 @@ msgid "Please enter a value in range 1 - 200." msgstr "Bitte gib einen Wert von 1 bis 200 ein." msgid "Please enter a value in range 10 - 2000." -msgstr "Bitte gib einen Wert von 10 bis 200 ein." +msgstr "Bitte gib einen Wert von 10 bis 2000 ein." msgid "GB Storage (SSD)" msgstr "GB Storage (SSD)" From 6c017d15819ac13d1cbacd3479da3eeb9555d382 Mon Sep 17 00:00:00 2001 From: PCoder Date: Fri, 22 Dec 2017 23:59:51 +0100 Subject: [PATCH 4/7] Remove commented translation --- datacenterlight/locale/de/LC_MESSAGES/django.po | 3 --- hosting/locale/de/LC_MESSAGES/django.po | 3 --- 2 files changed, 6 deletions(-) diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.po b/datacenterlight/locale/de/LC_MESSAGES/django.po index e9875d2f..859781b6 100644 --- a/datacenterlight/locale/de/LC_MESSAGES/django.po +++ b/datacenterlight/locale/de/LC_MESSAGES/django.po @@ -520,9 +520,6 @@ msgstr "" "Deine VM ist gleich bereit. Wir senden Dir eine Bestätigungsemail, sobald Du " "auf sie zugreifen kannst." -#~ msgid "Please enter a value in range 2 - 200." -#~ msgstr "Bitte gib einen Wert von 2 bis 200 ein." - #~ msgid "Affordable VM hosting based in Switzerland" #~ msgstr "Bezahlbares VM Hosting in der Schweiz" diff --git a/hosting/locale/de/LC_MESSAGES/django.po b/hosting/locale/de/LC_MESSAGES/django.po index 3575cc61..118245e5 100644 --- a/hosting/locale/de/LC_MESSAGES/django.po +++ b/hosting/locale/de/LC_MESSAGES/django.po @@ -722,9 +722,6 @@ msgstr "" "Es gab einen Fehler bei der Bearbeitung Deine Anfrage. Bitte versuche es " "noch einmal." -#~ msgid "Please enter a value in range 2 - 200." -#~ msgstr "Bitte gib einen Wert von 2 bis 200 ein." - #~ msgid "Reset your password" #~ msgstr "Passwort zurücksetzen" From 810a540d0864808b6f7131c81066a650186e1f85 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Sat, 23 Dec 2017 05:22:21 +0530 Subject: [PATCH 5/7] punctuation fix --- ungleich_page/locale/de/LC_MESSAGES/django.po | 16 ++++++++-------- .../templates/ungleich_page/includes/_about.html | 10 +++++----- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ungleich_page/locale/de/LC_MESSAGES/django.po b/ungleich_page/locale/de/LC_MESSAGES/django.po index 935c625e..9b4ef07b 100644 --- a/ungleich_page/locale/de/LC_MESSAGES/django.po +++ b/ungleich_page/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-12-23 04:12+0530\n" +"POT-Creation-Date: 2017-12-23 05:18+0530\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -71,14 +71,14 @@ msgstr "Die Chronik von ungleich" msgid "The first incarnation of ungleich" msgstr "Die erste Inkarnation von ungleich" -msgid "in Germany" -msgstr "in Deutschland" +msgid "in Germany." +msgstr "in Deutschland." msgid "ungleich founded" msgstr "ungleich gegründet" -msgid "in Switzerland" -msgstr "in der Schweiz" +msgid "in Switzerland." +msgstr "in der Schweiz." msgid "ungleich present at various conferences" msgstr "ungleich präsent an mehreren Konferenzen" @@ -107,7 +107,7 @@ msgstr "ungleich bietet einen PC-Grundkurs für Flüchtlinge an." msgid "" "ungleich starts computer learning club for locals, \"Digitale Building " -"ungleich.\"" +"ungleich\"." msgstr "" "ungleich gründet den Verein Digitale Bildung ungleich für Ortsansässige." @@ -116,7 +116,7 @@ msgid "" "startup in canton Zürich." msgstr "" "ungleich verkauft das Projekt AlpLora an ein IoT-Startup aus dem Kanton Zürich" +"\">AlpLora an ein IoT-Startup aus dem Kanton Zürich." msgid "" "ungleich showcases the most affordable Swiss VM hosting, Data Center Light." @@ -165,7 +165,7 @@ msgid "" "smooth and safe." msgstr "" "Ruby on Rails. Java hosting, Django hosting, wir garantieren einen " -"reibungslosen Ablauf" +"reibungslosen Ablauf." msgid "Configuration as a Service" msgstr "Konfiguration als Service" diff --git a/ungleich_page/templates/ungleich_page/includes/_about.html b/ungleich_page/templates/ungleich_page/includes/_about.html index 2d1660e8..ba6717fc 100644 --- a/ungleich_page/templates/ungleich_page/includes/_about.html +++ b/ungleich_page/templates/ungleich_page/includes/_about.html @@ -17,7 +17,7 @@

{% trans "The first incarnation of ungleich" %}

-

{% trans "in Germany" %}

+

{% trans "in Germany." %}

@@ -31,7 +31,7 @@

{% trans "ungleich founded" %}

-

{% trans "in Switzerland" %}

+

{% trans "in Switzerland." %}

@@ -44,7 +44,7 @@

2014

-

{% trans "ungleich present at various conferences" %}:
Linuxtag, UCMS, Linux Erfa, ETH Zurich
+

{% trans "ungleich present at various conferences" %}:
Linuxtag, UCMS, Linux Erfa, ETH Zurich.

@@ -62,7 +62,7 @@

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

{% trans "ungleich launches" %} - {% trans "Digital Glarus project" %} + {% trans "Digital Glarus project" %}.

@@ -102,7 +102,7 @@

2017

-

{% trans 'ungleich starts computer learning club for locals, "Digitale Building ungleich."' %}

+

{% trans 'ungleich starts computer learning club for locals, "Digitale Building ungleich".' %}

{% blocktrans %}ungleich sells Alplora to an IoT startup in canton Zürich.{% endblocktrans %}

{% trans "ungleich showcases the most affordable Swiss VM hosting, Data Center Light." %}

From f013ac3db4d6c8ff576e94202a02ce06b6dca084 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Sat, 23 Dec 2017 05:38:24 +0530 Subject: [PATCH 6/7] Update Changelog --- Changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/Changelog b/Changelog index adc81a25..343eb552 100644 --- a/Changelog +++ b/Changelog @@ -4,6 +4,7 @@ Next: * #3974: [hosting] Improve invoice number: Show 404 for invoice resources that do not belong to the user * [ungleich] Add video cover to the header on ungleich.ch landing page and add corresponding cms plugin * #3774: [hosting] |Update Stripe subscription on vm delete + * [ungleich] update text on landing page 1.2.13: 2017-12-09 * [cms] Introduce UngleichHeaderBackgroundImageAndTextSliderPlugin that allows to have scrolling images and texts * [cms] Remove

tag for ungleich cms customer item template From 9df6bd354db2022096274d847160f2079faa1d74 Mon Sep 17 00:00:00 2001 From: PCoder Date: Sat, 23 Dec 2017 07:12:07 +0100 Subject: [PATCH 7/7] Update Changelog --- Changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index 343eb552..f1d46e23 100644 --- a/Changelog +++ b/Changelog @@ -3,8 +3,9 @@ Next: * #3972: [hosting] Add ungleich company info to invoice footer * #3974: [hosting] Improve invoice number: Show 404 for invoice resources that do not belong to the user * [ungleich] Add video cover to the header on ungleich.ch landing page and add corresponding cms plugin - * #3774: [hosting] |Update Stripe subscription on vm delete - * [ungleich] update text on landing page + * #3774: [hosting] Update Stripe subscription on vm delete + * [ungleich] Update text on landing page + * #3601: [dcl, hosting] Change minimum required RAM from 2GB to 1GB 1.2.13: 2017-12-09 * [cms] Introduce UngleichHeaderBackgroundImageAndTextSliderPlugin that allows to have scrolling images and texts * [cms] Remove

tag for ungleich cms customer item template