Ticket #4590: global_settings.py.patch

File global_settings.py.patch, 2.8 KB (added by Jonas von Poser, 17 years ago)

The changes against globlal_settings.

  • django/conf/global_settings.py

     
    2424#   * Receive x-headers
    2525INTERNAL_IPS = ()
    2626
    27 # Local time zone for this installation. All choices can be found here:
    28 # http://www.postgresql.org/docs/8.1/static/datetime-keywords.html#DATETIME-TIMEZONE-SET-TABLE
    29 TIME_ZONE = 'America/Chicago'
    30 
    3127# Language code for this installation. All choices can be found here:
    3228# http://www.w3.org/TR/REC-html40/struct/dirlang.html#langcodes
    3329# http://blogs.law.harvard.edu/tech/stories/storyReader$15
     
    213209# Example: "http://media.lawrence.com"
    214210MEDIA_URL = ''
    215211
    216 # Default formatting for date objects. See all available format strings here:
    217 # http://www.djangoproject.com/documentation/templates/#now
    218 DATE_FORMAT = 'N j, Y'
    219 
    220 # Default formatting for datetime objects. See all available format strings here:
    221 # http://www.djangoproject.com/documentation/templates/#now
    222 DATETIME_FORMAT = 'N j, Y, P'
    223 
    224 # Default formatting for time objects. See all available format strings here:
    225 # http://www.djangoproject.com/documentation/templates/#now
    226 TIME_FORMAT = 'P'
    227 
    228 # Default formatting for date objects when only the year and month are relevant.
    229 # See all available format strings here:
    230 # http://www.djangoproject.com/documentation/templates/#now
    231 YEAR_MONTH_FORMAT = 'F Y'
    232 
    233 # Default formatting for date objects when only the month and day are relevant.
    234 # See all available format strings here:
    235 # http://www.djangoproject.com/documentation/templates/#now
    236 MONTH_DAY_FORMAT = 'F j'
    237 
    238212# Do you want to manage transactions manually?
    239213# Hint: you really don't!
    240214TRANSACTIONS_MANAGED = False
     
    244218from django import get_version
    245219URL_VALIDATOR_USER_AGENT = "Django/%s (http://www.djangoproject.com)" % get_version()
    246220
     221#################
     222# DATE AND TIME #
     223#################
     224# Date and time notation according to international standard ISO 8601.
     225# More information here:
     226# http://www.w3.org/QA/Tips/iso-date
     227# http://www.cl.cam.ac.uk/~mgk25/iso-time.html
     228# http://en.wikipedia.org/wiki/ISO_8601
     229
     230# See all available format strings here:
     231# http://www.djangoproject.com/documentation/templates/#now
     232
     233# Default local time zone.
     234TIME_ZONE = 'UTC'
     235
     236# Default formatting for date objects.
     237DATE_FORMAT = 'Y-m-d'
     238
     239# Default formatting for datetime objects.
     240DATETIME_FORMAT = 'Y-m-d H:iZ'
     241#DATETIME_FORMAT = 'Y-m-d H:i:sZ'   # With seconds.
     242
     243# Default formatting for time objects.
     244TIME_FORMAT = 'H:iZ'
     245#TIME_FORMAT = 'H:i:sZ'             # With seconds.
     246
     247# Default formatting for date objects when only the year and month are relevant.
     248YEAR_MONTH_FORMAT = 'Y-m'
     249
     250# Default formatting for date objects when only the month and day are relevant.
     251# Format doesn't valid in ISO-8601.
     252MONTH_DAY_FORMAT = ''
     253
    247254##############
    248255# MIDDLEWARE #
    249256##############
Back to Top