ungleich-public/dynamicweb
6
0
Fork 0
Code Issues 1 Pull requests 2 Projects Releases Wiki Activity

#2905

Browse source
This commit is contained in:
Levi 2017-01-09 09:34:25 -05:00
parent f9387cd6b8
commit ef07f5da83
4 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
datacenterlight/locale/de/LC_MESSAGES/django.mo
View file

Binary file not shown.

19
datacenterlight/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-01-06 10:01-0500\n" "POT-Creation-Date: 2017-01-06 10:45-0500\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"
@ -49,11 +49,11 @@ msgstr "Endlich: bezahlbares VM Hosting in der Schweiz"
#: templates/datacenterlight/index.html:111 #: templates/datacenterlight/index.html:111
msgid "What is it?" msgid "What is it?"
msgstr "Was ist es?"" msgstr "Was ist es?"
#: templates/datacenterlight/index.html:114 #: templates/datacenterlight/index.html:114
msgid "I want it!" msgid "I want it!"
msgstr "" msgstr "Das will ich haben!"
#: templates/datacenterlight/index.html:137 #: templates/datacenterlight/index.html:137
msgid "How it works :" msgid "How it works :"
@ -92,9 +92,10 @@ msgid ""
"internet connection. Our VM costs less thanks to our featherlight " "internet connection. Our VM costs less thanks to our featherlight "
"infrastructure." "infrastructure."
msgstr "" msgstr ""
"Unser Datacenter befindet sich in der Schweiz und" "Unser Datacenter befindet sich in der Schweiz undist mit zuverlässiger "
"ist mit zuverlässiger Energieversorgung sowie schneller Internetverbindung ausgestattet." "Energieversorgung sowie schneller Internetverbindung ausgestattet.Unser "
"Unser Angebot ist aufgrund unserer federleichten Infrastruktur überaus kostengünstig." "Angebot ist aufgrund unserer federleichten Infrastruktur überaus "
"kostengünstig."
#: templates/datacenterlight/index.html:209 #: templates/datacenterlight/index.html:209
msgid "We are cutting down the costs significantly!" msgid "We are cutting down the costs significantly!"
@ -138,12 +139,16 @@ msgstr "Beantrage Beta-Zugang"
#: templates/datacenterlight/index.html:298 #: templates/datacenterlight/index.html:298
msgid "QUESTIONS?" msgid "QUESTIONS?"
msgstr "FRAGEN?" msgstr "Fragen?"
#: templates/datacenterlight/index.html:299 #: templates/datacenterlight/index.html:299
msgid "CONTACT US!" msgid "CONTACT US!"
msgstr "Kontaktiere uns!" msgstr "Kontaktiere uns!"
#: templates/datacenterlight/index.html:303
msgid "Switzerland "
msgstr "Schweiz"
#: templates/datacenterlight/index.html:328 #: templates/datacenterlight/index.html:328
msgid "Home" msgid "Home"
msgstr "Home" msgstr "Home"

2
datacenterlight/templates/datacenterlight/index.html
View file

@ -300,7 +300,7 @@
<h3>ungleich GmbH </h3> <h3>ungleich GmbH </h3>
<p><i class="fa fa-envelope-o"></i> info@datacenterlight.ch</p> <p><i class="fa fa-envelope-o"></i> info@datacenterlight.ch</p>
<p>In der Au 7, Schwanden 8762</p> <p>In der Au 7, Schwanden 8762</p>
<p>Switzerland</p> <p>{% trans "Switzerland " %}</p>
<button type="button" class="btn btn-default"> <button type="button" class="btn btn-default">
<a href="https://twitter.com/ungleich"> <a href="https://twitter.com/ungleich">

6
digitalglarus/forms.py
View file

@ -123,9 +123,11 @@ class BookingDateForm(forms.Form):
raise forms.ValidationError("Your end date must be greather than your start date.") raise forms.ValidationError("Your end date must be greather than your start date.")
q1 = Q(bookingorder__customer__user=self.user, q1 = Q(bookingorder__customer__user=self.user,
start_date__lte=start_date, end_date__gte=start_date) start_date__lte=start_date, end_date__gte=start_date,
bookingorder__status=BookingOrder.APPROVED)
q2 = Q(bookingorder__customer__user=self.user, q2 = Q(bookingorder__customer__user=self.user,
start_date__gt=start_date, start_date__lte=end_date) start_date__gt=start_date, start_date__lte=end_date,
bookingorder__status=BookingOrder.APPROVED)
if Booking.objects.filter(q1 | q2).exists(): if Booking.objects.filter(q1 | q2).exists():
raise forms.ValidationError("You already have a booking in these dates.") raise forms.ValidationError("You already have a booking in these dates.")