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

Merge branch 'master' into task/3973/change_dcl_contact_info

Browse source
This commit is contained in:
PCoder 2017-12-23 07:38:28 +01:00
commit 815b5392ac
11 changed files with 31 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

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."
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)"

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

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

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

@ -36,8 +36,8 @@
<div class="form-group">
<div class="description input">
<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"
data-error="{% trans 'Please enter a value in range 2 - 200.' %}" required>
<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 1 - 200.' %}" required>
<span> GB RAM</span>
<i class="fa fa-plus-circle right" data-plus="ram" aria-hidden="true"></i>
</div>

2
datacenterlight/views.py
View file

@ -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):