quick fix
This commit is contained in:
@@ -133,7 +133,7 @@ TEMPLATES = [
|
||||
# 'django.template.loaders.app_directories.Loader',
|
||||
# ],
|
||||
},
|
||||
|
||||
|
||||
},
|
||||
]
|
||||
|
||||
@@ -205,8 +205,8 @@ TIME_ZONE = 'UTC'
|
||||
TZ_DETECT_COUNTRIES = ('US','DE','GB','CZ','FR','IT')
|
||||
|
||||
LOCALE_PATHS = (
|
||||
os.path.join(BASE_DIR, 'locale'),
|
||||
# os.path.join(BASE_DIR, 'cvkbrno/locale'),
|
||||
os.path.join(BASE_DIR, 'locale'),
|
||||
# os.path.join(BASE_DIR, 'cvkbrno/locale'),
|
||||
)
|
||||
|
||||
LANGUAGES = (
|
||||
@@ -221,8 +221,8 @@ LANGUAGE_COOKIE_NAME = 'wm_lang'
|
||||
# https://docs.djangoproject.com/en/1.9/howto/static-files/
|
||||
|
||||
STATIC_URL = '/static/'
|
||||
STATIC_ROOT = BASE_DIR
|
||||
#STATIC_ROOT = os.path.join(BASE_DIR, 'static')
|
||||
#STATIC_ROOT = BASE_DIR
|
||||
STATIC_ROOT = os.path.join(BASE_DIR, 'static')
|
||||
|
||||
STATICFILES_DIRS = [os.path.join(BASE_DIR, 'static'),
|
||||
os.path.join(BASE_DIR, 'static/plots'),]
|
||||
@@ -452,7 +452,7 @@ try:
|
||||
BRAINTREE_MERCHANT_ACCOUNT_ID = CFG['braintree_merchant_account_id']
|
||||
except KeyError:
|
||||
BRAINTREE_MERCHANT_ACCOUNT_ID = 'rowsandallEUR'
|
||||
|
||||
|
||||
try:
|
||||
BRAINTREE_PUBLIC_KEY = CFG['braintree_public_key']
|
||||
except KeyError:
|
||||
|
||||
Reference in New Issue
Block a user