moep
/
dynamicweb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into task/3973/change_dcl_contact_info

This commit is contained in:
PCoder 2017-12-23 07:38:28 +01:00
parent 4870649e93 9df6bd354d
commit 815b5392ac
11 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Changelog
View File

@ -3,7 +3,9 @@ Next:
* #3972: [hosting] Add ungleich company info to invoice footer * #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 * #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 * [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 1.2.13: 2017-12-09
* [cms] Introduce UngleichHeaderBackgroundImageAndTextSliderPlugin that allows to have scrolling images and texts * [cms] Introduce UngleichHeaderBackgroundImageAndTextSliderPlugin that allows to have scrolling images and texts
* [cms] Remove <p> tag for ungleich cms customer item template * [cms] Remove <p> tag for ungleich cms customer item template

6
datacenterlight/locale/de/LC_MESSAGES/django.po
View File

@ -56,11 +56,11 @@ msgstr "Standort: Schweiz"
msgid "Please enter a value in range 1 - 48." msgid "Please enter a value in range 1 - 48."
msgstr "Bitte gib einen Wert von 1 bis 48 ein." msgstr "Bitte gib einen Wert von 1 bis 48 ein."
msgid "Please enter a value in range 2 - 200." msgid "Please enter a value in range 1 - 200."
msgstr "Bitte gib einen Wert von 2 bis 200 ein." msgstr "Bitte gib einen Wert von 1 bis 200 ein."
msgid "Please enter a value in range 10 - 2000." 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)" msgid "GB Storage (SSD)"
msgstr "GB Storage (SSD)" msgstr "GB Storage (SSD)"

2
datacenterlight/static/datacenterlight/js/main.js
View File

@ -16,7 +16,7 @@
'ram': { 'ram': {
'id': 'ramValue', 'id': 'ramValue',
'value': 2, 'value': 2,
'min': 2, 'min': 1,
'max': 200, 'max': 200,
'interval': 1 'interval': 1
}, },

4
datacenterlight/templates/datacenterlight/calculator_form.html
View File

@ -36,8 +36,8 @@
<div class="form-group"> <div class="form-group">
<div class="description input"> <div class="description input">
<i class="fa fa-minus-circle left" data-minus="ram" aria-hidden="true"></i> <i class="fa fa-minus-circle left" data-minus="ram" aria-hidden="true"></i>
<input id="ramValue" class="input-price select-number" type="number" min="2" max="200" name="ram" <input id="ramValue" class="input-price select-number" type="number" min="1" max="200" name="ram"
data-error="{% trans 'Please enter a value in range 2 - 200.' %}" required> data-error="{% trans 'Please enter a value in range 1 - 200.' %}" required>
<span> GB RAM</span> <span> GB RAM</span>
<i class="fa fa-plus-circle right" data-plus="ram" aria-hidden="true"></i> <i class="fa fa-plus-circle right" data-plus="ram" aria-hidden="true"></i>
</div> </div>

2
datacenterlight/views.py
View File

@ -209,7 +209,7 @@ class IndexView(CreateView):
raise ValidationError(_('Invalid number of cores')) raise ValidationError(_('Invalid number of cores'))
def validate_memory(self, value): def validate_memory(self, value):
if (value > 200) or (value < 2): if (value > 200) or (value < 1):
raise ValidationError(_('Invalid RAM size')) raise ValidationError(_('Invalid RAM size'))
def validate_storage(self, value): def validate_storage(self, value):

8
hosting/locale/de/LC_MESSAGES/django.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -128,11 +128,11 @@ msgstr "MwSt. inklusive"
msgid "Please enter a value in range 1 - 48." msgid "Please enter a value in range 1 - 48."
msgstr "Bitte gib einen Wert von 1 bis 48 ein." msgstr "Bitte gib einen Wert von 1 bis 48 ein."
msgid "Please enter a value in range 2 - 200." msgid "Please enter a value in range 1 - 200."
msgstr "Bitte gib einen Wert von 2 bis 200 ein." msgstr "Bitte gib einen Wert von 1 bis 200 ein."
msgid "Please enter a value in range 10 - 2000." 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)" msgid "GB Storage (SSD)"
msgstr "GB Storage (SSD)" msgstr "GB Storage (SSD)"

2
hosting/static/hosting/js/createvm.js
View File

@ -12,7 +12,7 @@
'ram': { 'ram': {
'id': 'ramValue', 'id': 'ramValue',
'value': 2, 'value': 2,
'min': 2, 'min': 1,
'max': 200, 'max': 200,
'interval': 1 'interval': 1
}, },

4
hosting/templates/hosting/calculator_form.html
View File

@ -29,8 +29,8 @@
<div class="form-group"> <div class="form-group">
<div class="description input"> <div class="description input">
<i class="fa fa-minus left" data-minus="ram" aria-hidden="true"></i> <i class="fa fa-minus left" data-minus="ram" aria-hidden="true"></i>
<input id="ramValue" class="input-price select-number" type="number" min="2" max="200" name="ram" <input id="ramValue" class="input-price select-number" type="number" min="1" max="200" name="ram"
data-error="{% trans 'Please enter a value in range 2 - 200.' %}" required> data-error="{% trans 'Please enter a value in range 1 - 200.' %}" required>
<span> GB RAM</span> <span> GB RAM</span>
<i class="fa fa-plus right" data-plus="ram" aria-hidden="true"></i> <i class="fa fa-plus right" data-plus="ram" aria-hidden="true"></i>
</div> </div>

2
hosting/views.py
View File

@ -944,7 +944,7 @@ class CreateVirtualMachinesView(LoginRequiredMixin, View):
raise ValidationError(_('Invalid number of cores')) raise ValidationError(_('Invalid number of cores'))
def validate_memory(self, value): def validate_memory(self, value):
if (value > 200) or (value < 2): if (value > 200) or (value < 1):
raise ValidationError(_('Invalid RAM size')) raise ValidationError(_('Invalid RAM size'))
def validate_storage(self, value): def validate_storage(self, value):

16
ungleich_page/locale/de/LC_MESSAGES/django.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -71,14 +71,14 @@ msgstr "Die Chronik von ungleich"
msgid "The first incarnation of ungleich" msgid "The first incarnation of ungleich"
msgstr "Die erste Inkarnation von ungleich" msgstr "Die erste Inkarnation von ungleich"
msgid "in Germany" msgid "in Germany."
msgstr "in Deutschland" msgstr "in Deutschland."
msgid "ungleich founded" msgid "ungleich founded"
msgstr "ungleich gegründet" msgstr "ungleich gegründet"
msgid "in Switzerland" msgid "in Switzerland."
msgstr "in der Schweiz" msgstr "in der Schweiz."
msgid "ungleich present at various conferences" msgid "ungleich present at various conferences"
msgstr "ungleich präsent an mehreren Konferenzen" msgstr "ungleich präsent an mehreren Konferenzen"
@ -107,7 +107,7 @@ msgstr "ungleich bietet einen PC-Grundkurs für Flüchtlinge an."
msgid "" msgid ""
"ungleich starts computer learning club for locals, \"Digitale Building " "ungleich starts computer learning club for locals, \"Digitale Building "
"ungleich.\"" "ungleich\"."
msgstr "" msgstr ""
"ungleich gründet den Verein Digitale Bildung ungleich für Ortsansässige." "ungleich gründet den Verein Digitale Bildung ungleich für Ortsansässige."
@ -116,7 +116,7 @@ msgid ""
"startup in canton Zürich." "startup in canton Zürich."
msgstr "" msgstr ""
"ungleich verkauft das Projekt <a href=\"https://www.alplora.ch/de/" "ungleich verkauft das Projekt <a href=\"https://www.alplora.ch/de/"
"\">AlpLora</a> an ein IoT-Startup aus dem Kanton Zürich" "\">AlpLora</a> an ein IoT-Startup aus dem Kanton Zürich."
msgid "" msgid ""
"ungleich showcases the most affordable Swiss VM hosting, Data Center Light." "ungleich showcases the most affordable Swiss VM hosting, Data Center Light."
@ -165,7 +165,7 @@ msgid ""
"smooth and safe." "smooth and safe."
msgstr "" msgstr ""
"Ruby on Rails. Java hosting, Django hosting, wir garantieren einen " "Ruby on Rails. Java hosting, Django hosting, wir garantieren einen "
"reibungslosen Ablauf" "reibungslosen Ablauf."
msgid "Configuration as a Service" msgid "Configuration as a Service"
msgstr "Konfiguration als Service" msgstr "Konfiguration als Service"

10
ungleich_page/templates/ungleich_page/includes/_about.html
View File

@ -17,7 +17,7 @@
</div> </div>
<div class="timeline-body"> <div class="timeline-body">
<p>{% trans "The first incarnation of ungleich" %}</p> <p>{% trans "The first incarnation of ungleich" %}</p>
<p>{% trans "in Germany" %}</p> <p>{% trans "in Germany." %}</p>
</div> </div>
</div> </div>
</li> </li>
@ -31,7 +31,7 @@
</div> </div>
<div class="timeline-body"> <div class="timeline-body">
<p>{% trans "ungleich founded" %} </p> <p>{% trans "ungleich founded" %} </p>
<p>{% trans "in Switzerland" %}</p> <p>{% trans "in Switzerland." %}</p>
</div> </div>
</div> </div>
</li> </li>
@ -44,7 +44,7 @@
<h4>2014</h4> <h4>2014</h4>
</div> </div>
<div class="timeline-body"> <div class="timeline-body">
<p>{% trans "ungleich present at various conferences" %}: <br><a href="http://www.linuxtag.org/2014/en/program/talk-details/?eventid=1238">Linuxtag</a>, <a href="https://www.usenix.org/conference/ucms14/summit-program/presentation/schottelius">UCMS</a>, Linux Erfa, <a href="https://www.ethz.ch/en.html">ETH Zurich</a><br> <p>{% trans "ungleich present at various conferences" %}: <br><a href="http://www.linuxtag.org/2014/en/program/talk-details/?eventid=1238">Linuxtag</a>, <a href="https://www.usenix.org/conference/ucms14/summit-program/presentation/schottelius">UCMS</a>, Linux Erfa, <a href="https://www.ethz.ch/en.html">ETH Zurich</a>.<br>
</p> </p>
</div> </div>
</div> </div>
@ -62,7 +62,7 @@
<p>{% trans "and introduces affordable 24X7 support." %}</p> <p>{% trans "and introduces affordable 24X7 support." %}</p>
<p> <p>
{% trans "ungleich launches" %} {% trans "ungleich launches" %}
<a href="https://digitalglarus.ch">{% trans "Digital Glarus project" %}</a> <a href="https://digitalglarus.ch">{% trans "Digital Glarus project" %}</a>.
</p> </p>
</div> </div>
</div> </div>
@ -102,7 +102,7 @@
<h4>2017</h4> <h4>2017</h4>
</div> </div>
<div class="timeline-body"> <div class="timeline-body">
<p>{% trans 'ungleich starts computer learning club for locals, "Digitale Building ungleich."' %}</p> <p>{% trans 'ungleich starts computer learning club for locals, "Digitale Building ungleich".' %}</p>
<p>{% blocktrans %}ungleich sells <a href="https://www.alplora.ch/de/">Alplora</a> to an IoT startup in canton Zürich.{% endblocktrans %}</p> <p>{% blocktrans %}ungleich sells <a href="https://www.alplora.ch/de/">Alplora</a> to an IoT startup in canton Zürich.{% endblocktrans %}</p>
<p>{% trans "ungleich showcases the most affordable Swiss VM hosting, Data Center Light." %}</p> <p>{% trans "ungleich showcases the most affordable Swiss VM hosting, Data Center Light." %}</p>
</div> </div>