From 158acb23c9546cefdca77f5d69d2b8ec2a9c6ebd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B0=D0=B7=D0=B0=D1=80=20=D0=9A=D0=BE=D1=82=D1=8E?= =?UTF-8?q?=D0=BA?= Date: Fri, 16 Jan 2015 17:19:37 +0200 Subject: [PATCH] some bugs --- functions/custom_views.py | 2 +- proj/settings.py | 2 +- .../client/includes/exposition/exposition_object.html | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/functions/custom_views.py b/functions/custom_views.py index 00594d7c..7e7bb98d 100644 --- a/functions/custom_views.py +++ b/functions/custom_views.py @@ -343,7 +343,7 @@ class ExpoSearchView(ListView): if self.request.GET: form = self.search_form(self.request.GET) if form.is_valid(): - form.data_with_parents = form.get_form_data() + form.data_with_parents = form.get_form_data() else: form = self.search_form() diff --git a/proj/settings.py b/proj/settings.py index 90a54445..dcf5d43e 100644 --- a/proj/settings.py +++ b/proj/settings.py @@ -38,7 +38,7 @@ CACHES = { # Hosts/domain names that are valid for this site; required if DEBUG is False # See https://docs.djangoproject.com/en/1.5/ref/settings/#allowed-hosts -ALLOWED_HOSTS = [] +ALLOWED_HOSTS = ['hit.expomap.ru', '195.66.79.152', '195.66.79.145'] # Local time zone for this installation. Choices can be found here: # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name diff --git a/templates/client/includes/exposition/exposition_object.html b/templates/client/includes/exposition/exposition_object.html index 287dba9f..21e8e38f 100644 --- a/templates/client/includes/exposition/exposition_object.html +++ b/templates/client/includes/exposition/exposition_object.html @@ -368,10 +368,10 @@ -->
{% trans 'Смотрите также:' %}
- {% trans "Выставки" %} {% if request.LANGUAGE_CODE == 'ru' %}{{ exposition.city.inflect }}{% else %}{% trans 'in' %} {{ exposition.city.name }}{% endif %} - {% trans "Выставки" %} {% if request.LANGUAGE_CODE == 'ru' %}{{ exposition.country.inflect }}{% else %}{% trans 'in' %} {{ exposition.country.name }}{% endif %} - {% trans "Выставки по тематике " %}«{{ exposition.theme.all.0.name|lower }}» {% if request.LANGUAGE_CODE == 'ru' %}{{ exposition.country.inflect }}{% else %}{% trans 'in' %} {{ exposition.country.name }}{% endif %} - {% trans "Выставки по тематике " %}«{{ exposition.theme.all.0.name|lower }}» {% if request.LANGUAGE_CODE == 'ru' %}{{ exposition.city.inflect }}{% else %}{% trans 'in' %} {{ exposition.city.name }}{% endif %} + {% trans "Выставки" %} {% if request.LANGUAGE_CODE == 'ru' and exposition.city.inflect %}{{ exposition.city.inflect }}{% else %}{% trans 'in' %} {{ exposition.city.name }}{% endif %} + {% trans "Выставки" %} {% if request.LANGUAGE_CODE == 'ru' and exposition.country.inflect %}{{ exposition.country.inflect }}{% else %}{% trans 'in' %} {{ exposition.country.name }}{% endif %} + {% trans "Выставки по тематике " %}«{{ exposition.theme.all.0.name|lower }}» {% if request.LANGUAGE_CODE == 'ru' and exposition.country.inflect %}{{ exposition.country.inflect }}{% else %}{% trans 'in' %} {{ exposition.country.name }}{% endif %} + {% trans "Выставки по тематике " %}«{{ exposition.theme.all.0.name|lower }}» {% if request.LANGUAGE_CODE == 'ru' and exposition.city.inflect %}{{ exposition.city.inflect }}{% else %}{% trans 'in' %} {{ exposition.city.name }}{% endif %}
{% endblock %}