X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=djsite%2Fsettings_common.py;h=9805ae33b8c735c71512fa9edf9d9674a57e6636;hb=cd8253e868b0130f11f40bc13f50e2c35319f52b;hp=101d83337fecb79b29c4ab5a55374dc12e96d124;hpb=163826b4bf061c2d03cab6cc6027e78e710db407;p=djsite.git diff --git a/djsite/settings_common.py b/djsite/settings_common.py index 101d833..9805ae3 100644 --- a/djsite/settings_common.py +++ b/djsite/settings_common.py @@ -15,7 +15,6 @@ import os BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) - # Quick-start development settings - unsuitable for production # See https://docs.djangoproject.com/en/1.8/howto/deployment/checklist/ @@ -79,7 +78,7 @@ WSGI_APPLICATION = 'djsite.wsgi.application' # Internationalization # https://docs.djangoproject.com/en/1.8/topics/i18n/ -LANGUAGE_CODE = 'en-us' +LANGUAGE_CODE = 'en-GB' TIME_ZONE = 'Europe/London' @@ -89,6 +88,11 @@ USE_L10N = True USE_TZ = True +# DATE_INPUT_FORMATS = [ +# "%d/%m/%Y", # 12/11/2016 for 12th Nov 2016 +# "%Y-%m-%d", # 2016-11-12 for 12th Nov 2016 +# ] + # Static files (CSS, JavaScript, Images) # https://docs.djangoproject.com/en/1.8/howto/static-files/ # STATIC_URL overridden in settings-{dev,prod}.py @@ -99,4 +103,5 @@ TINYMCE_DEFAULT_CONFIG = { 'theme_advanced_buttons2' : '', 'theme_advanced_buttons3' : "", 'plugins': 'table', + 'valid_elements': 'a,b,strong,u,i,em,ul,ol,li,p,br' }