diff --git a/Changelog b/Changelog index adc81a25..f1d46e23 100644 --- a/Changelog +++ b/Changelog @@ -3,7 +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 + * #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 diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.po b/datacenterlight/locale/de/LC_MESSAGES/django.po index 1dbdd2a0..859781b6 100644 --- a/datacenterlight/locale/de/LC_MESSAGES/django.po +++ b/datacenterlight/locale/de/LC_MESSAGES/django.po @@ -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)" diff --git a/datacenterlight/static/datacenterlight/js/main.js b/datacenterlight/static/datacenterlight/js/main.js index dd074397..4c50702e 100644 --- a/datacenterlight/static/datacenterlight/js/main.js +++ b/datacenterlight/static/datacenterlight/js/main.js @@ -16,7 +16,7 @@ 'ram': { 'id': 'ramValue', 'value': 2, - 'min': 2, + '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..118245e5 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,11 +128,11 @@ 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." +msgstr "Bitte gib einen Wert von 10 bis 2000 ein." msgid "GB Storage (SSD)" msgstr "GB Storage (SSD)" diff --git a/hosting/static/hosting/js/createvm.js b/hosting/static/hosting/js/createvm.js index 726513ad..8d525114 100644 --- a/hosting/static/hosting/js/createvm.js +++ b/hosting/static/hosting/js/createvm.js @@ -12,7 +12,7 @@ 'ram': { 'id': 'ramValue', 'value': 2, - 'min': 2, + '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 1839f85b..576b3534 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -944,7 +944,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): 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." %}