обновил конфиги и зависимости

remotes/origin/stage6
Alexander Burdeiny 9 years ago
parent 46783868de
commit 6d11348e40
  1. 1
      requirements.txt
  2. 14
      support/d_dev/settings.py
  3. 14
      support/dev/settings.py
  4. 14
      support/prod/settings.py

@ -4,6 +4,7 @@ beautifulsoup4==4.4.0
chardet==2.3.0 chardet==2.3.0
defusedxml==0.4.1 defusedxml==0.4.1
Django==1.5.12 Django==1.5.12
django-modeltranslation
django-bitfield==1.6.4 django-bitfield==1.6.4
django-ckeditor==4.0.2 django-ckeditor==4.0.2
django-crontab==0.6.0 django-crontab==0.6.0

@ -314,6 +314,7 @@ SOCIAL_AUTH_LINKEDIN_SCOPE = ['email']
INSTALLED_APPS = ( INSTALLED_APPS = (
'modeltranslation',
'django.contrib.admin', 'django.contrib.admin',
'django.contrib.auth', 'django.contrib.auth',
'django.contrib.contenttypes', 'django.contrib.contenttypes',
@ -514,7 +515,18 @@ C_CITY_CATALOG_KEY = 'conf_city_catalog'
C_COUNTRY_CATALOG_KEY = 'conf_country_catalog' C_COUNTRY_CATALOG_KEY = 'conf_country_catalog'
E_CITY_CATALOG_KEY = 'expo_city_catalog' E_CITY_CATALOG_KEY = 'expo_city_catalog'
E_COUNTRY_CATALOG_KEY = 'expo_country_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: try:
from local import * from local import *
except ImportError, e: except ImportError, e:

@ -314,6 +314,7 @@ SOCIAL_AUTH_LINKEDIN_SCOPE = ['email']
INSTALLED_APPS = ( INSTALLED_APPS = (
'modeltranslation',
'django.contrib.admin', 'django.contrib.admin',
'django.contrib.auth', 'django.contrib.auth',
'django.contrib.contenttypes', 'django.contrib.contenttypes',
@ -521,7 +522,18 @@ DEFAULT_DESCRIPTION = {
'c_description_ru': 'templates/client/includes/exposition/default_description_ru.html', 'c_description_ru': 'templates/client/includes/exposition/default_description_ru.html',
'c_description_en': 'templates/client/includes/exposition/default_description_en.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: try:
from local import * from local import *
except ImportError, e: except ImportError, e:

@ -314,6 +314,7 @@ SOCIAL_AUTH_LINKEDIN_SCOPE = ['email']
INSTALLED_APPS = ( INSTALLED_APPS = (
'modeltranslation',
'django.contrib.admin', 'django.contrib.admin',
'django.contrib.auth', 'django.contrib.auth',
'django.contrib.contenttypes', 'django.contrib.contenttypes',
@ -520,7 +521,18 @@ DEFAULT_DESCRIPTION = {
'c_description_ru': 'templates/client/includes/exposition/default_description_ru.html', 'c_description_ru': 'templates/client/includes/exposition/default_description_ru.html',
'c_description_en': 'templates/client/includes/exposition/default_description_en.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: try:
from local import * from local import *
except ImportError, e: except ImportError, e:

Loading…
Cancel
Save