diff --git a/rowsandall_app/settings.py b/rowsandall_app/settings.py index 5863adaa..de0f9951 100644 --- a/rowsandall_app/settings.py +++ b/rowsandall_app/settings.py @@ -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: diff --git a/rowsandall_app/settings_dev.py b/rowsandall_app/settings_dev.py index 3f161559..0c8fd8af 100644 --- a/rowsandall_app/settings_dev.py +++ b/rowsandall_app/settings_dev.py @@ -20,7 +20,7 @@ except KeyError: if 'test' in sys.argv: TESTING = True - + if TESTING or use_sqlite: DATABASES = { 'default': { @@ -33,7 +33,7 @@ if TESTING or use_sqlite: # 'CHARSET': 'utf8', # 'COLLATION': 'utf8_general_ci', # }, - + # 'slave': { # 'ENGINE': 'django.db.backends.mysql', # 'NAME': 'rowsanda_107501', @@ -41,8 +41,8 @@ if TESTING or use_sqlite: # } } - - + + BROKER_URL = 'redis://localhost:6379/0' CELERY_RESULT_BACKEND = 'redis://localhost:6379/0' CELERY_IGNORE_RESULT = False @@ -78,6 +78,7 @@ CACHES = { STATIC_URL = '/static/' #STATIC_ROOT = 'C:/python/rowsandallapp' +STATIC_ROOT = BASE_DIR INTERNAL_IPS = ['127.0.0.1'] @@ -108,4 +109,3 @@ EMAIL_USE_TLS = CFG['email_use_tls'] DEFAULT_FROM_EMAIL = 'info@rowsandall.com' SETTINGS_NAME = 'rowsandall_app.settings_dev' -