From 6d11348e40aa1621ab50ebbe8f9d656eb0e9c140 Mon Sep 17 00:00:00 2001 From: Alexander Burdeiny Date: Thu, 27 Oct 2016 04:15:10 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=BA=D0=BE=D0=BD=D1=84=D0=B8=D0=B3=D0=B8=20=D0=B8=20=D0=B7?= =?UTF-8?q?=D0=B0=D0=B2=D0=B8=D1=81=D0=B8=D0=BC=D0=BE=D1=81=D1=82=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- requirements.txt | 1 + support/d_dev/settings.py | 14 +++++++++++++- support/dev/settings.py | 14 +++++++++++++- support/prod/settings.py | 14 +++++++++++++- 4 files changed, 40 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 237868bd..e32f57f2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,6 +4,7 @@ beautifulsoup4==4.4.0 chardet==2.3.0 defusedxml==0.4.1 Django==1.5.12 +django-modeltranslation django-bitfield==1.6.4 django-ckeditor==4.0.2 django-crontab==0.6.0 diff --git a/support/d_dev/settings.py b/support/d_dev/settings.py index 4c1e7f95..5e78f6a7 100644 --- a/support/d_dev/settings.py +++ b/support/d_dev/settings.py @@ -314,6 +314,7 @@ SOCIAL_AUTH_LINKEDIN_SCOPE = ['email'] INSTALLED_APPS = ( + 'modeltranslation', 'django.contrib.admin', 'django.contrib.auth', 'django.contrib.contenttypes', @@ -514,7 +515,18 @@ C_CITY_CATALOG_KEY = 'conf_city_catalog' C_COUNTRY_CATALOG_KEY = 'conf_country_catalog' E_CITY_CATALOG_KEY = 'expo_city_catalog' E_COUNTRY_CATALOG_KEY = 'expo_country_catalog' - +PERIODIC = { + 0: '', + 1: _(u'Ежегодно'), + 2: _(u'2 раза в год'), + 3: _(u'3 раза в год'), + 4: _(u'4 раза в год'), + 5: _(u'5 раз в год'), + 6: _(u'Раз в 2 года'), + 7: _(u'Раз в 3 года'), + 8: _(u'Раз в 4 года'), + 9: _(u'Раз в 5 лет') +} try: from local import * except ImportError, e: diff --git a/support/dev/settings.py b/support/dev/settings.py index e7d1b112..fb0eb7b0 100644 --- a/support/dev/settings.py +++ b/support/dev/settings.py @@ -314,6 +314,7 @@ SOCIAL_AUTH_LINKEDIN_SCOPE = ['email'] INSTALLED_APPS = ( + 'modeltranslation', 'django.contrib.admin', 'django.contrib.auth', 'django.contrib.contenttypes', @@ -521,7 +522,18 @@ DEFAULT_DESCRIPTION = { 'c_description_ru': 'templates/client/includes/exposition/default_description_ru.html', 'c_description_en': 'templates/client/includes/exposition/default_description_en.html', } - +PERIODIC = { + 0: '', + 1: _(u'Ежегодно'), + 2: _(u'2 раза в год'), + 3: _(u'3 раза в год'), + 4: _(u'4 раза в год'), + 5: _(u'5 раз в год'), + 6: _(u'Раз в 2 года'), + 7: _(u'Раз в 3 года'), + 8: _(u'Раз в 4 года'), + 9: _(u'Раз в 5 лет') +} try: from local import * except ImportError, e: diff --git a/support/prod/settings.py b/support/prod/settings.py index d58f1f80..c1248597 100644 --- a/support/prod/settings.py +++ b/support/prod/settings.py @@ -314,6 +314,7 @@ SOCIAL_AUTH_LINKEDIN_SCOPE = ['email'] INSTALLED_APPS = ( + 'modeltranslation', 'django.contrib.admin', 'django.contrib.auth', 'django.contrib.contenttypes', @@ -520,7 +521,18 @@ DEFAULT_DESCRIPTION = { 'c_description_ru': 'templates/client/includes/exposition/default_description_ru.html', 'c_description_en': 'templates/client/includes/exposition/default_description_en.html', } - +PERIODIC = { + 0: '', + 1: _(u'Ежегодно'), + 2: _(u'2 раза в год'), + 3: _(u'3 раза в год'), + 4: _(u'4 раза в год'), + 5: _(u'5 раз в год'), + 6: _(u'Раз в 2 года'), + 7: _(u'Раз в 3 года'), + 8: _(u'Раз в 4 года'), + 9: _(u'Раз в 5 лет') +} try: from local import * except ImportError, e: