From 4dff4e07cb7614d0589e844c59e696376f790ed1 Mon Sep 17 00:00:00 2001 From: PCoder Date: Thu, 21 Dec 2017 01:25:52 +0100 Subject: [PATCH 1/4] 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/4] 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/4] 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/4] 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"