[1.5.x] Updated xhtml2pdf URL in docs.

Backport of 4832c004e88a68b98b976b4f68a1c9fdb4ea3530 from master

.gitattributes

@@ -0,0 +1,2 @@
+# Normalize line endings to avoid spurious failures in the core test suite on Windows.
+*html text eol=lf

.gitignore

@@ -1,8 +1,9 @@
 *.egg-info
 *.pot
 *.py[co]
+__pycache__
 MANIFEST
 dist/
 docs/_build/
 tests/coverage_html/
-tests/.coverage
+tests/.coverage

.hgignore

@@ -3,6 +3,7 @@ syntax:glob
 *.egg-info
 *.pot
 *.py[co]
+__pycache__
 docs/_build/
 tests/coverage_html/
-tests/.coverage
+tests/.coverage

.tx/config

@@ -2,82 +2,82 @@
 host = https://www.transifex.com
 lang_map = sr@latin:sr_Latn
 
-[django.core]
+[django-core.core]
 file_filter = django/conf/locale/<lang>/LC_MESSAGES/django.po
 source_file = django/conf/locale/en/LC_MESSAGES/django.po
 source_lang = en
 
-[django.contrib-admin]
+[django-core.contrib-admin]
 file_filter = django/contrib/admin/locale/<lang>/LC_MESSAGES/django.po
 source_file = django/contrib/admin/locale/en/LC_MESSAGES/django.po
 source_lang = en
 
-[django.contrib-admin-js]
+[django-core.contrib-admin-js]
 file_filter = django/contrib/admin/locale/<lang>/LC_MESSAGES/djangojs.po
 source_file = django/contrib/admin/locale/en/LC_MESSAGES/djangojs.po
 source_lang = en
 
-[django.contrib-admindocs]
+[django-core.contrib-admindocs]
 file_filter = django/contrib/admindocs/locale/<lang>/LC_MESSAGES/django.po
 source_file = django/contrib/admindocs/locale/en/LC_MESSAGES/django.po
 source_lang = en
 
-[django.contrib-auth]
+[django-core.contrib-auth]
 file_filter = django/contrib/auth/locale/<lang>/LC_MESSAGES/django.po
 source_file = django/contrib/auth/locale/en/LC_MESSAGES/django.po
 source_lang = en
 
-[django.contrib-comments]
+[django-core.contrib-comments]
 file_filter = django/contrib/comments/locale/<lang>/LC_MESSAGES/django.po
 source_file = django/contrib/comments/locale/en/LC_MESSAGES/django.po
 source_lang = en
 
-[django.contrib-contenttypes]
+[django-core.contrib-contenttypes]
 file_filter = django/contrib/contenttypes/locale/<lang>/LC_MESSAGES/django.po
 source_file = django/contrib/contenttypes/locale/en/LC_MESSAGES/django.po
 source_lang = en
 
-[django.contrib-flatpages]
+[django-core.contrib-flatpages]
 file_filter = django/contrib/flatpages/locale/<lang>/LC_MESSAGES/django.po
 source_file = django/contrib/flatpages/locale/en/LC_MESSAGES/django.po
 source_lang = en
 
-[django.contrib-formtools]
+[django-core.contrib-formtools]
 file_filter = django/contrib/formtools/locale/<lang>/LC_MESSAGES/django.po
 source_file = django/contrib/formtools/locale/en/LC_MESSAGES/django.po
 source_lang = en
 
-[django.contrib-gis]
+[django-core.contrib-gis]
 file_filter = django/contrib/gis/locale/<lang>/LC_MESSAGES/django.po
 source_file = django/contrib/gis/locale/en/LC_MESSAGES/django.po
 source_lang = en
 
-[django.contrib-humanize]
+[django-core.contrib-humanize]
 file_filter = django/contrib/humanize/locale/<lang>/LC_MESSAGES/django.po
 source_file = django/contrib/humanize/locale/en/LC_MESSAGES/django.po
 source_lang = en
 
-[django.contrib-localflavor]
+[django-core.contrib-localflavor]
 file_filter = django/contrib/localflavor/locale/<lang>/LC_MESSAGES/django.po
 source_file = django/contrib/localflavor/locale/en/LC_MESSAGES/django.po
 source_lang = en
 
-[django.contrib-messages]
+[django-core.contrib-messages]
 file_filter = django/contrib/messages/locale/<lang>/LC_MESSAGES/django.po
 source_file = django/contrib/messages/locale/en/LC_MESSAGES/django.po
 source_lang = en
 
-[django.contrib-redirects]
+[django-core.contrib-redirects]
 file_filter = django/contrib/redirects/locale/<lang>/LC_MESSAGES/django.po
 source_file = django/contrib/redirects/locale/en/LC_MESSAGES/django.po
 source_lang = en
 
-[django.contrib-sessions]
+[django-core.contrib-sessions]
 file_filter = django/contrib/sessions/locale/<lang>/LC_MESSAGES/django.po
 source_file = django/contrib/sessions/locale/en/LC_MESSAGES/django.po
 source_lang = en
 
-[django.contrib-sites]
+[django-core.contrib-sites]
 file_filter = django/contrib/sites/locale/<lang>/LC_MESSAGES/django.po
 source_file = django/contrib/sites/locale/en/LC_MESSAGES/django.po
 source_lang = en

AUTHORS

@@ -125,6 +125,7 @@ answer newbie questions, and generally made Django that much better:
     Chris Chamberlin <dja@cdc.msbx.net>
     Amit Chakradeo <http://amit.chakradeo.net/>
     ChaosKCW
+    Simon Charette <charette.s@gmail.com>
     Kowito Charoenratchatabhan <kowito@felspar.com>
     Sengtha Chay <sengtha@e-khmer.com>
     ivan.chelubeev@gmail.com
@@ -140,6 +141,7 @@ answer newbie questions, and generally made Django that much better:
     crankycoder@gmail.com
     Paul Collier <paul@paul-collier.com>
     Robert Coup
+    Brian Fabian Crain <http://www.bfc.do/>
     Pete Crosier <pete.crosier@gmail.com>
     Matt Croydon <http://www.postneo.com/>
     Jure Cuhalev <gandalf@owca.info>
@@ -234,6 +236,7 @@ answer newbie questions, and generally made Django that much better:
     Janos Guljas
     Thomas Güttler <hv@tbz-pariv.de>
     Horst Gutmann <zerok@zerokspot.com>
+    Bouke Haarsma <bouke@haarsma.eu>
     Antti Haapala <antti@industrialwebandmagic.com>
     Scot Hacker <shacker@birdhouse.org>
     dAniel hAhler
@@ -380,6 +383,7 @@ answer newbie questions, and generally made Django that much better:
     Christian Metts
     michal@plovarna.cz
     Slawek Mikula <slawek dot mikula at gmail dot com>
+    Katie Miller <katie@sub50.com>
     Shawn Milochik <shawn@milochik.com>
     mitakummaa@gmail.com
     Taylor Mitchell <taylor.mitchell@gmail.com>
@@ -510,6 +514,7 @@ answer newbie questions, and generally made Django that much better:
     Johan C. Stöver <johan@nilling.nl>
     Nowell Strite <http://nowell.strite.org/>
     Thomas Stromberg <tstromberg@google.com>
+    Ben Sturmfels <ben@sturm.com.au>
     Travis Swicegood <travis@domain51.com>
     Pascal Varet
     SuperJared
@@ -528,6 +533,7 @@ answer newbie questions, and generally made Django that much better:
     Terry Huang <terryh.tp@gmail.com>
     Travis Terry <tdterry7@gmail.com>
     thebjorn <bp@datakortet.no>
+    Lowe Thiderman <lowe.thiderman@gmail.com>
     Zach Thompson <zthompson47@gmail.com>
     Michael Thornhill <michael.thornhill@gmail.com>
     Deepak Thukral <deep.thukral@gmail.com>

MANIFEST.in

@@ -10,7 +10,9 @@ recursive-include docs *
 recursive-include scripts *
 recursive-include extras *
 recursive-include tests *
+recursive-include django/conf/app_template *
 recursive-include django/conf/locale *
+recursive-include django/conf/project_template *
 recursive-include django/contrib/*/locale *
 recursive-include django/contrib/admin/templates *
 recursive-include django/contrib/admin/static *

django/__init__.py

@@ -1,4 +1,4 @@
-VERSION = (1, 5, 0, 'alpha', 0)
+VERSION = (1, 5, 12, 'final', 0)
 
 def get_version(*args, **kwargs):
     # Don't litter django/__init__.py with all the get_version stuff.

django/bin/daily_cleanup.py

@@ -7,7 +7,13 @@ Can be run as a cronjob to clean out old data from the database (only expired
 sessions at the moment).
 """
 
+import warnings
+
 from django.core import management
 
 if __name__ == "__main__":
-    management.call_command('cleanup')
+    warnings.warn(
+        "The `daily_cleanup` script has been deprecated "
+        "in favor of `django-admin.py clearsessions`.",
+        PendingDeprecationWarning)
+    management.call_command('clearsessions')

django/conf/__init__.py

@@ -6,7 +6,9 @@ variable, and then from django.conf.global_settings; see the global settings fil
 a list of all possible variables.
 """
 
+import logging
 import os
+import sys
 import time     # Needed for Windows
 import warnings
 
@@ -55,6 +57,16 @@ class LazySettings(LazyObject):
         """
         Setup logging from LOGGING_CONFIG and LOGGING settings.
         """
+        if not sys.warnoptions:
+            try:
+                # Route warnings through python logging
+                logging.captureWarnings(True)
+                # Allow DeprecationWarnings through the warnings filters
+                warnings.simplefilter("default", DeprecationWarning)
+            except AttributeError:
+                # No captureWarnings on Python 2.6, DeprecationWarnings are on anyway
+                pass
+
         if self.LOGGING_CONFIG:
             from django.utils.log import DEFAULT_LOGGING
             # First find the logging configuration function ...
@@ -83,6 +95,7 @@ class LazySettings(LazyObject):
         for name, value in options.items():
             setattr(holder, name, value)
         self._wrapped = holder
+        self._configure_logging()
 
     @property
     def configured(self):
@@ -99,9 +112,6 @@ class BaseSettings(object):
     def __setattr__(self, name, value):
         if name in ("MEDIA_URL", "STATIC_URL") and value and not value.endswith('/'):
             raise ImproperlyConfigured("If set, %s must end with a slash" % name)
-        elif name == "ADMIN_MEDIA_PREFIX":
-            warnings.warn("The ADMIN_MEDIA_PREFIX setting has been removed; "
-                          "use STATIC_URL instead.", DeprecationWarning)
         elif name == "ALLOWED_INCLUDE_ROOTS" and isinstance(value, six.string_types):
             raise ValueError("The ALLOWED_INCLUDE_ROOTS setting must be set "
                 "to a tuple, not a string.")

django/conf/global_settings.py

@@ -29,6 +29,10 @@ ADMINS = ()
 #   * Receive x-headers
 INTERNAL_IPS = ()
 
+# Hosts/domain names that are valid for this site.
+# "*" matches anything, ".example.com" matches example.com and all subdomains
+ALLOWED_HOSTS = []
+
 # Local time zone for this installation. All choices can be found here:
 # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name (although not all
 # systems may support all possibilities). When USE_TZ is True, this is
@@ -45,10 +49,13 @@ LANGUAGE_CODE = 'en-us'
 # Languages we provide translations for, out of the box. The language name
 # should be the utf-8 encoded local name for the language.
 LANGUAGES = (
+    ('af', gettext_noop('Afrikaans')),
     ('ar', gettext_noop('Arabic')),
     ('az', gettext_noop('Azerbaijani')),
     ('bg', gettext_noop('Bulgarian')),
+    ('be', gettext_noop('Belarusian')),
     ('bn', gettext_noop('Bengali')),
+    ('br', gettext_noop('Breton')),
     ('bs', gettext_noop('Bosnian')),
     ('ca', gettext_noop('Catalan')),
     ('cs', gettext_noop('Czech')),
@@ -63,6 +70,7 @@ LANGUAGES = (
     ('es-ar', gettext_noop('Argentinian Spanish')),
     ('es-mx', gettext_noop('Mexican Spanish')),
     ('es-ni', gettext_noop('Nicaraguan Spanish')),
+    ('es-ve', gettext_noop('Venezuelan Spanish')),
     ('et', gettext_noop('Estonian')),
     ('eu', gettext_noop('Basque')),
     ('fa', gettext_noop('Persian')),
@@ -75,6 +83,7 @@ LANGUAGES = (
     ('hi', gettext_noop('Hindi')),
     ('hr', gettext_noop('Croatian')),
     ('hu', gettext_noop('Hungarian')),
+    ('ia', gettext_noop('Interlingua')),
     ('id', gettext_noop('Indonesian')),
     ('is', gettext_noop('Icelandic')),
     ('it', gettext_noop('Italian')),
@@ -84,6 +93,7 @@ LANGUAGES = (
     ('km', gettext_noop('Khmer')),
     ('kn', gettext_noop('Kannada')),
     ('ko', gettext_noop('Korean')),
+    ('lb', gettext_noop('Luxembourgish')),
     ('lt', gettext_noop('Lithuanian')),
     ('lv', gettext_noop('Latvian')),
     ('mk', gettext_noop('Macedonian')),
@@ -111,6 +121,7 @@ LANGUAGES = (
     ('th', gettext_noop('Thai')),
     ('tr', gettext_noop('Turkish')),
     ('tt', gettext_noop('Tatar')),
+    ('udm', gettext_noop('Udmurt')),
     ('uk', gettext_noop('Ukrainian')),
     ('ur', gettext_noop('Urdu')),
     ('vi', gettext_noop('Vietnamese')),
@@ -150,12 +161,8 @@ SERVER_EMAIL = 'root@localhost'
 # Whether to send broken-link emails.
 SEND_BROKEN_LINK_EMAILS = False
 
-# Database connection info.
+# Database connection info. If left empty, will default to the dummy backend.
-DATABASES = {
+DATABASES = {}
-    'default': {
-        'ENGINE': 'django.db.backends.dummy',
-    },
-}
 
 # Classes used to implement DB routing behavior.
 DATABASE_ROUTERS = []
@@ -449,6 +456,7 @@ MIDDLEWARE_CLASSES = (
 # SESSIONS #
 ############
 
+SESSION_CACHE_ALIAS = 'default'                         # Cache to store session data if using the cache session backend.
 SESSION_COOKIE_NAME = 'sessionid'                       # Cookie name. This can be whatever you want.
 SESSION_COOKIE_AGE = 60 * 60 * 24 * 7 * 2               # Age of cookie, in seconds (default: 2 weeks).
 SESSION_COOKIE_DOMAIN = None                            # A string like ".example.com", or None for standard domain cookie.
@@ -459,6 +467,7 @@ SESSION_SAVE_EVERY_REQUEST = False                      # Whether to save the se
 SESSION_EXPIRE_AT_BROWSER_CLOSE = False                 # Whether a user's session cookie expires when the Web browser is closed.
 SESSION_ENGINE = 'django.contrib.sessions.backends.db'  # The module to store session data
 SESSION_FILE_PATH = None                                # Directory to store session files if using the file session module. If None, the backend will use a sensible default.
+SESSION_SERIALIZER = 'django.contrib.sessions.serializers.PickleSerializer'  # class to serialize session data
 
 #########
 # CACHE #
@@ -510,6 +519,7 @@ PASSWORD_HASHERS = (
     'django.contrib.auth.hashers.BCryptPasswordHasher',
     'django.contrib.auth.hashers.SHA1PasswordHasher',
     'django.contrib.auth.hashers.MD5PasswordHasher',
+    'django.contrib.auth.hashers.UnsaltedSHA1PasswordHasher',
     'django.contrib.auth.hashers.UnsaltedMD5PasswordHasher',
     'django.contrib.auth.hashers.CryptPasswordHasher',
 )

django/conf/locale/__init__.py

@@ -1,6 +1,15 @@
 from __future__ import unicode_literals
 
+# About name_local: capitalize it as if your language name was appearing
+# inside a sentence in your language.
+
 LANG_INFO = {
+    'af': {
+        'bidi': False,
+        'code': 'af',
+        'name': 'Afrikaans',
+        'name_local': 'Afrikaans',
+    },
     'ar': {
         'bidi': True,
         'code': 'ar',
@@ -13,6 +22,12 @@ LANG_INFO = {
         'name': 'Azerbaijani',
         'name_local': 'az\u0259rbaycan dili',
     },
+    'be': {
+        'bidi': False,
+        'code': 'be',
+        'name': 'Belarusian',
+        'name_local': '\u0431\u0435\u043b\u0430\u0440\u0443\u0441\u043a\u0430\u044f',
+    },
     'bg': {
         'bidi': False,
         'code': 'bg',
@@ -25,6 +40,12 @@ LANG_INFO = {
         'name': 'Bengali',
         'name_local': '\u09ac\u09be\u0982\u09b2\u09be',
     },
+    'br': {
+        'bidi': False,
+        'code': 'br',
+        'name': 'Breton',
+        'name_local': 'brezhoneg',
+    },
     'bs': {
         'bidi': False,
         'code': 'bs',
@@ -53,7 +74,7 @@ LANG_INFO = {
         'bidi': False,
         'code': 'da',
         'name': 'Danish',
-        'name_local': 'Dansk',
+        'name_local': 'dansk',
     },
     'de': {
         'bidi': False,
@@ -109,6 +130,12 @@ LANG_INFO = {
         'name': 'Nicaraguan Spanish',
         'name_local': 'espa\xf1ol de Nicaragua',
     },
+    'es-ve': {
+        'bidi': False,
+        'code': 'es-ve',
+        'name': 'Venezuelan Spanish',
+        'name_local': 'espa\xf1ol de Venezuela',
+    },
     'et': {
         'bidi': False,
         'code': 'et',
@@ -137,7 +164,7 @@ LANG_INFO = {
         'bidi': False,
         'code': 'fr',
         'name': 'French',
-        'name_local': 'Fran\xe7ais',
+        'name_local': 'fran\xe7ais',
     },
     'fy-nl': {
         'bidi': False,
@@ -181,6 +208,12 @@ LANG_INFO = {
         'name': 'Hungarian',
         'name_local': 'Magyar',
     },
+    'ia': {
+        'bidi': False,
+        'code': 'ia',
+        'name': 'Interlingua',
+        'name_local': 'Interlingua',
+    },
     'id': {
         'bidi': False,
         'code': 'id',
@@ -235,6 +268,12 @@ LANG_INFO = {
         'name': 'Korean',
         'name_local': '\ud55c\uad6d\uc5b4',
     },
+    'lb': {
+        'bidi': False,
+        'code': 'lb',
+        'name': 'Luxembourgish',
+        'name_local': 'L\u00ebtzebuergesch',
+    },
     'lt': {
         'bidi': False,
         'code': 'lt',
@@ -269,7 +308,7 @@ LANG_INFO = {
         'bidi': False,
         'code': 'nb',
         'name': 'Norwegian Bokmal',
-        'name_local': 'Norsk (bokm\xe5l)',
+        'name_local': 'norsk (bokm\xe5l)',
     },
     'ne': {
         'bidi': False,
@@ -287,13 +326,13 @@ LANG_INFO = {
         'bidi': False,
         'code': 'nn',
         'name': 'Norwegian Nynorsk',
-        'name_local': 'Norsk (nynorsk)',
+        'name_local': 'norsk (nynorsk)',
     },
     'no': {
         'bidi': False,
         'code': 'no',
         'name': 'Norwegian',
-        'name_local': 'Norsk',
+        'name_local': 'norsk',
     },
     'pa': {
         'bidi': False,
@@ -365,7 +404,7 @@ LANG_INFO = {
         'bidi': False,
         'code': 'sv',
         'name': 'Swedish',
-        'name_local': 'Svenska',
+        'name_local': 'svenska',
     },
     'sw': {
         'bidi': False,
@@ -403,6 +442,12 @@ LANG_INFO = {
         'name': 'Tatar',
         'name_local': '\u0422\u0430\u0442\u0430\u0440\u0447\u0430',
     },
+    'udm': {
+        'bidi': False,
+        'code': 'udm',
+        'name': 'Udmurt',
+        'name_local': '\u0423\u0434\u043c\u0443\u0440\u0442',
+    },
     'uk': {
         'bidi': False,
         'code': 'uk',

django/conf/locale/ca/formats.py

@@ -19,10 +19,6 @@ DATE_INPUT_FORMATS = (
     # '31/12/2009', '31/12/09'
     '%d/%m/%Y', '%d/%m/%y'
 )
-TIME_INPUT_FORMATS = (
-    # '14:30:59', '14:30'
-    '%H:%M:%S', '%H:%M'
-)
 DATETIME_INPUT_FORMATS = (
     '%d/%m/%Y %H:%M:%S',
     '%d/%m/%Y %H:%M',

django/conf/locale/cs/formats.py

@@ -17,21 +17,26 @@ FIRST_DAY_OF_WEEK = 1 # Monday
 # The *_INPUT_FORMATS strings use the Python strftime format syntax,
 # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
 DATE_INPUT_FORMATS = (
-    '%d.%m.%Y', '%d.%m.%y',     # '25.10.2006', '25.10.06'
+    '%d.%m.%Y', '%d.%m.%y',     # '05.01.2006', '05.01.06'
-    '%Y-%m-%d', '%y-%m-%d',     # '2006-10-25', '06-10-25'
+    '%d. %m. %Y', '%d. %m. %y', # '5. 1. 2006', '5. 1. 06'
     # '%d. %B %Y', '%d. %b. %Y',  # '25. October 2006', '25. Oct. 2006'
 )
+# Kept ISO formats as one is in first position
 TIME_INPUT_FORMATS = (
-    '%H:%M:%S', # '14:30:59'
+    '%H:%M:%S', # '04:30:59'
-    '%H:%M',    # '14:30'
+    '%H.%M',    # '04.30'
+    '%H:%M',    # '04:30'
 )
 DATETIME_INPUT_FORMATS = (
-    '%d.%m.%Y %H:%M:%S',    # '25.10.2006 14:30:59'
+    '%d.%m.%Y %H:%M:%S',    # '05.01.2006 04:30:59'
-    '%d.%m.%Y %H:%M',       # '25.10.2006 14:30'
+    '%d.%m.%Y %H.%M',       # '05.01.2006 04.30'
-    '%d.%m.%Y',             # '25.10.2006'
+    '%d.%m.%Y %H:%M',       # '05.01.2006 04:30'
-    '%Y-%m-%d %H:%M:%S',    # '2006-10-25 14:30:59'
+    '%d.%m.%Y',             # '05.01.2006'
-    '%Y-%m-%d %H:%M',       # '2006-10-25 14:30'
+    '%d. %m. %Y %H:%M:%S',  # '05. 01. 2006 04:30:59'
-    '%Y-%m-%d',             # '2006-10-25'
+    '%d. %m. %Y %H.%M',     # '05. 01. 2006 04.30'
+    '%d. %m. %Y %H:%M',     # '05. 01. 2006 04:30'
+    '%d. %m. %Y',           # '05. 01. 2006'
+    '%Y-%m-%d %H.%M',       # '2006-01-05 04.30'
 )
 DECIMAL_SEPARATOR = ','
 THOUSAND_SEPARATOR = '\xa0' # non-breaking space

django/conf/locale/da/formats.py

@@ -18,10 +18,6 @@ FIRST_DAY_OF_WEEK = 1
 DATE_INPUT_FORMATS = (
     '%d.%m.%Y',                         # '25.10.2006'
 )
-TIME_INPUT_FORMATS = (
-    '%H:%M:%S',                         # '14:30:59'
-    '%H:%M',                            # '14:30'
-)
 DATETIME_INPUT_FORMATS = (
     '%d.%m.%Y %H:%M:%S',                # '25.10.2006 14:30:59'
     '%d.%m.%Y %H:%M',                   # '25.10.2006 14:30'

django/conf/locale/de/formats.py

@@ -17,20 +17,12 @@ FIRST_DAY_OF_WEEK = 1 # Monday
 # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
 DATE_INPUT_FORMATS = (
     '%d.%m.%Y', '%d.%m.%y',     # '25.10.2006', '25.10.06'
-    '%Y-%m-%d', '%y-%m-%d',     # '2006-10-25', '06-10-25'
     # '%d. %B %Y', '%d. %b. %Y',  # '25. October 2006', '25. Oct. 2006'
 )
-TIME_INPUT_FORMATS = (
-    '%H:%M:%S', # '14:30:59'
-    '%H:%M',    # '14:30'
-)
 DATETIME_INPUT_FORMATS = (
     '%d.%m.%Y %H:%M:%S',    # '25.10.2006 14:30:59'
     '%d.%m.%Y %H:%M',       # '25.10.2006 14:30'
     '%d.%m.%Y',             # '25.10.2006'
-    '%Y-%m-%d %H:%M:%S',    # '2006-10-25 14:30:59'
-    '%Y-%m-%d %H:%M',       # '2006-10-25 14:30'
-    '%Y-%m-%d',             # '2006-10-25'
 )
 DECIMAL_SEPARATOR = ','
 THOUSAND_SEPARATOR = '.'

django/conf/locale/de_CH/formats.py

@@ -19,20 +19,12 @@ FIRST_DAY_OF_WEEK = 1 # Monday
 # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
 DATE_INPUT_FORMATS = (
     '%d.%m.%Y', '%d.%m.%y',     # '25.10.2006', '25.10.06'
-    '%Y-%m-%d', '%y-%m-%d',     # '2006-10-25', '06-10-25'
     # '%d. %B %Y', '%d. %b. %Y',  # '25. October 2006', '25. Oct. 2006'
 )
-TIME_INPUT_FORMATS = (
-    '%H:%M:%S', # '14:30:59'
-    '%H:%M',    # '14:30'
-)
 DATETIME_INPUT_FORMATS = (
     '%d.%m.%Y %H:%M:%S',    # '25.10.2006 14:30:59'
     '%d.%m.%Y %H:%M',       # '25.10.2006 14:30'
     '%d.%m.%Y',             # '25.10.2006'
-    '%Y-%m-%d %H:%M:%S',    # '2006-10-25 14:30:59'
-    '%Y-%m-%d %H:%M',       # '2006-10-25 14:30'
-    '%Y-%m-%d',             # '2006-10-25'
 )
 
 # these are the separators for non-monetary numbers. For monetary numbers,

django/conf/locale/en/LC_MESSAGES/django.po

@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-15 10:55+0200\n"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
 "PO-Revision-Date: 2010-05-13 15:35+0200\n"
 "Last-Translator: Django team\n"
 "Language-Team: English <en@li.org>\n"
@@ -14,286 +14,314 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: conf/global_settings.py:48
-msgid "Arabic"
+msgid "Afrikaans"
 msgstr ""
 
 #: conf/global_settings.py:49
-msgid "Azerbaijani"
+msgid "Arabic"
 msgstr ""
 
 #: conf/global_settings.py:50
-msgid "Bulgarian"
+msgid "Azerbaijani"
 msgstr ""
 
 #: conf/global_settings.py:51
-msgid "Bengali"
+msgid "Bulgarian"
 msgstr ""
 
 #: conf/global_settings.py:52
-msgid "Bosnian"
+msgid "Belarusian"
 msgstr ""
 
 #: conf/global_settings.py:53
-msgid "Catalan"
+msgid "Bengali"
 msgstr ""
 
 #: conf/global_settings.py:54
-msgid "Czech"
+msgid "Breton"
 msgstr ""
 
 #: conf/global_settings.py:55
-msgid "Welsh"
+msgid "Bosnian"
 msgstr ""
 
 #: conf/global_settings.py:56
-msgid "Danish"
+msgid "Catalan"
 msgstr ""
 
 #: conf/global_settings.py:57
-msgid "German"
+msgid "Czech"
 msgstr ""
 
 #: conf/global_settings.py:58
-msgid "Greek"
+msgid "Welsh"
 msgstr ""
 
 #: conf/global_settings.py:59
-msgid "English"
+msgid "Danish"
 msgstr ""
 
 #: conf/global_settings.py:60
-msgid "British English"
+msgid "German"
 msgstr ""
 
 #: conf/global_settings.py:61
-msgid "Esperanto"
+msgid "Greek"
 msgstr ""
 
 #: conf/global_settings.py:62
-msgid "Spanish"
+msgid "English"
 msgstr ""
 
 #: conf/global_settings.py:63
-msgid "Argentinian Spanish"
+msgid "British English"
 msgstr ""
 
 #: conf/global_settings.py:64
-msgid "Mexican Spanish"
+msgid "Esperanto"
 msgstr ""
 
 #: conf/global_settings.py:65
-msgid "Nicaraguan Spanish"
+msgid "Spanish"
 msgstr ""
 
 #: conf/global_settings.py:66
-msgid "Estonian"
+msgid "Argentinian Spanish"
 msgstr ""
 
 #: conf/global_settings.py:67
-msgid "Basque"
+msgid "Mexican Spanish"
 msgstr ""
 
 #: conf/global_settings.py:68
-msgid "Persian"
+msgid "Nicaraguan Spanish"
 msgstr ""
 
 #: conf/global_settings.py:69
-msgid "Finnish"
+msgid "Venezuelan Spanish"
 msgstr ""
 
 #: conf/global_settings.py:70
-msgid "French"
+msgid "Estonian"
 msgstr ""
 
 #: conf/global_settings.py:71
-msgid "Frisian"
+msgid "Basque"
 msgstr ""
 
 #: conf/global_settings.py:72
-msgid "Irish"
+msgid "Persian"
 msgstr ""
 
 #: conf/global_settings.py:73
-msgid "Galician"
+msgid "Finnish"
 msgstr ""
 
 #: conf/global_settings.py:74
-msgid "Hebrew"
+msgid "French"
 msgstr ""
 
 #: conf/global_settings.py:75
-msgid "Hindi"
+msgid "Frisian"
 msgstr ""
 
 #: conf/global_settings.py:76
-msgid "Croatian"
+msgid "Irish"
 msgstr ""
 
 #: conf/global_settings.py:77
-msgid "Hungarian"
+msgid "Galician"
 msgstr ""
 
 #: conf/global_settings.py:78
-msgid "Indonesian"
+msgid "Hebrew"
 msgstr ""
 
 #: conf/global_settings.py:79
-msgid "Icelandic"
+msgid "Hindi"
 msgstr ""
 
 #: conf/global_settings.py:80
-msgid "Italian"
+msgid "Croatian"
 msgstr ""
 
 #: conf/global_settings.py:81
-msgid "Japanese"
+msgid "Hungarian"
 msgstr ""
 
 #: conf/global_settings.py:82
-msgid "Georgian"
+msgid "Interlingua"
 msgstr ""
 
 #: conf/global_settings.py:83
-msgid "Kazakh"
+msgid "Indonesian"
 msgstr ""
 
 #: conf/global_settings.py:84
-msgid "Khmer"
+msgid "Icelandic"
 msgstr ""
 
 #: conf/global_settings.py:85
-msgid "Kannada"
+msgid "Italian"
 msgstr ""
 
 #: conf/global_settings.py:86
-msgid "Korean"
+msgid "Japanese"
 msgstr ""
 
 #: conf/global_settings.py:87
-msgid "Lithuanian"
+msgid "Georgian"
 msgstr ""
 
 #: conf/global_settings.py:88
-msgid "Latvian"
+msgid "Kazakh"
 msgstr ""
 
 #: conf/global_settings.py:89
-msgid "Macedonian"
+msgid "Khmer"
 msgstr ""
 
 #: conf/global_settings.py:90
-msgid "Malayalam"
+msgid "Kannada"
 msgstr ""
 
 #: conf/global_settings.py:91
-msgid "Mongolian"
+msgid "Korean"
 msgstr ""
 
 #: conf/global_settings.py:92
-msgid "Norwegian Bokmal"
+msgid "Luxembourgish"
 msgstr ""
 
 #: conf/global_settings.py:93
-msgid "Nepali"
+msgid "Lithuanian"
 msgstr ""
 
 #: conf/global_settings.py:94
-msgid "Dutch"
+msgid "Latvian"
 msgstr ""
 
 #: conf/global_settings.py:95
-msgid "Norwegian Nynorsk"
+msgid "Macedonian"
 msgstr ""
 
 #: conf/global_settings.py:96
-msgid "Punjabi"
+msgid "Malayalam"
 msgstr ""
 
 #: conf/global_settings.py:97
-msgid "Polish"
+msgid "Mongolian"
 msgstr ""
 
 #: conf/global_settings.py:98
-msgid "Portuguese"
+msgid "Norwegian Bokmal"
 msgstr ""
 
 #: conf/global_settings.py:99
-msgid "Brazilian Portuguese"
+msgid "Nepali"
 msgstr ""
 
 #: conf/global_settings.py:100
-msgid "Romanian"
+msgid "Dutch"
 msgstr ""
 
 #: conf/global_settings.py:101
-msgid "Russian"
+msgid "Norwegian Nynorsk"
 msgstr ""
 
 #: conf/global_settings.py:102
-msgid "Slovak"
+msgid "Punjabi"
 msgstr ""
 
 #: conf/global_settings.py:103
-msgid "Slovenian"
+msgid "Polish"
 msgstr ""
 
 #: conf/global_settings.py:104
-msgid "Albanian"
+msgid "Portuguese"
 msgstr ""
 
 #: conf/global_settings.py:105
-msgid "Serbian"
+msgid "Brazilian Portuguese"
 msgstr ""
 
 #: conf/global_settings.py:106
-msgid "Serbian Latin"
+msgid "Romanian"
 msgstr ""
 
 #: conf/global_settings.py:107
-msgid "Swedish"
+msgid "Russian"
 msgstr ""
 
 #: conf/global_settings.py:108
-msgid "Swahili"
+msgid "Slovak"
 msgstr ""
 
 #: conf/global_settings.py:109
-msgid "Tamil"
+msgid "Slovenian"
 msgstr ""
 
 #: conf/global_settings.py:110
-msgid "Telugu"
+msgid "Albanian"
 msgstr ""
 
 #: conf/global_settings.py:111
-msgid "Thai"
+msgid "Serbian"
 msgstr ""
 
 #: conf/global_settings.py:112
-msgid "Turkish"
+msgid "Serbian Latin"
 msgstr ""
 
 #: conf/global_settings.py:113
-msgid "Tatar"
+msgid "Swedish"
 msgstr ""
 
 #: conf/global_settings.py:114
-msgid "Ukrainian"
+msgid "Swahili"
 msgstr ""
 
 #: conf/global_settings.py:115
-msgid "Urdu"
+msgid "Tamil"
 msgstr ""
 
 #: conf/global_settings.py:116
-msgid "Vietnamese"
+msgid "Telugu"
 msgstr ""
 
 #: conf/global_settings.py:117
-msgid "Simplified Chinese"
+msgid "Thai"
 msgstr ""
 
 #: conf/global_settings.py:118
+msgid "Turkish"
+msgstr ""
+
+#: conf/global_settings.py:119
+msgid "Tatar"
+msgstr ""
+
+#: conf/global_settings.py:120
+msgid "Udmurt"
+msgstr ""
+
+#: conf/global_settings.py:121
+msgid "Ukrainian"
+msgstr ""
+
+#: conf/global_settings.py:122
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:123
+msgid "Vietnamese"
+msgstr ""
+
+#: conf/global_settings.py:124
+msgid "Simplified Chinese"
+msgstr ""
+
+#: conf/global_settings.py:125
 msgid "Traditional Chinese"
 msgstr ""
 
@@ -355,16 +383,16 @@ msgid ""
 "%(show_value)d)."
 msgstr ""
 
-#: db/models/base.py:843
+#: db/models/base.py:857
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
 msgstr ""
 
-#: db/models/base.py:866 forms/models.py:573
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr ""
 
-#: db/models/base.py:867 db/models/fields/__init__.py:70
+#: db/models/base.py:881 db/models/fields/__init__.py:70
 #, python-format
 msgid "%(model_name)s with this %(field_label)s already exists."
 msgstr ""
@@ -536,37 +564,32 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
-#: db/models/fields/files.py:211
+#: db/models/fields/files.py:216
-#, python-format
-msgid "Filename is %(extra)d characters too long."
-msgstr ""
-
-#: db/models/fields/files.py:221
 msgid "File"
 msgstr ""
 
-#: db/models/fields/files.py:347
+#: db/models/fields/files.py:323
 msgid "Image"
 msgstr ""
 
-#: db/models/fields/related.py:950
+#: db/models/fields/related.py:979
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr ""
 
-#: db/models/fields/related.py:952
+#: db/models/fields/related.py:981
 msgid "Foreign Key (type determined by related field)"
 msgstr ""
 
-#: db/models/fields/related.py:1082
+#: db/models/fields/related.py:1111
 msgid "One-to-one relationship"
 msgstr ""
 
-#: db/models/fields/related.py:1149
+#: db/models/fields/related.py:1178
 msgid "Many-to-many relationship"
 msgstr ""
 
-#: db/models/fields/related.py:1174
+#: db/models/fields/related.py:1203
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
@@ -647,15 +670,15 @@ msgstr ""
 msgid "Select a valid choice. %(value)s is not one of the available choices."
 msgstr ""
 
-#: forms/fields.py:747 forms/fields.py:835 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr ""
 
-#: forms/formsets.py:323 forms/formsets.py:325
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr ""
 
-#: forms/formsets.py:327
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr ""
 
@@ -680,20 +703,20 @@ msgstr ""
 msgid "Please correct the duplicate values below."
 msgstr ""
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr ""
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr ""
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr ""
@@ -717,15 +740,15 @@ msgstr ""
 msgid "Clear"
 msgstr ""
 
-#: forms/widgets.py:591
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr ""
 
-#: forms/widgets.py:592
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr ""
 
-#: forms/widgets.py:593
+#: forms/widgets.py:596
 msgid "No"
 msgstr ""
 
@@ -1126,11 +1149,11 @@ msgstr ""
 msgid ", %(number)d %(type)s"
 msgstr ""
 
-#: views/static.py:55
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
 msgstr ""
 
-#: views/static.py:57
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr ""
@@ -1178,16 +1201,16 @@ msgstr ""
 msgid "No %(verbose_name)s found matching the query"
 msgstr ""
 
-#: views/generic/list.py:49
+#: views/generic/list.py:51
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr ""
 
-#: views/generic/list.py:54
+#: views/generic/list.py:56
 #, python-format
-msgid "Invalid page (%(page_number)s)"
+msgid "Invalid page (%(page_number)s): %(message)s"
 msgstr ""
 
-#: views/generic/list.py:134
+#: views/generic/list.py:137
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr ""

django/conf/locale/en/formats.py

@@ -15,6 +15,7 @@ FIRST_DAY_OF_WEEK = 0 # Sunday
 
 # The *_INPUT_FORMATS strings use the Python strftime format syntax,
 # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
+# Kept ISO formats as they are in first position
 DATE_INPUT_FORMATS = (
     '%Y-%m-%d', '%m/%d/%Y', '%m/%d/%y', # '2006-10-25', '10/25/2006', '10/25/06'
     # '%b %d %Y', '%b %d, %Y',            # 'Oct 25 2006', 'Oct 25, 2006'
@@ -22,10 +23,6 @@ DATE_INPUT_FORMATS = (
     # '%B %d %Y', '%B %d, %Y',            # 'October 25 2006', 'October 25, 2006'
     # '%d %B %Y', '%d %B, %Y',            # '25 October 2006', '25 October, 2006'
 )
-TIME_INPUT_FORMATS = (
-    '%H:%M:%S',     # '14:30:59'
-    '%H:%M',        # '14:30'
-)
 DATETIME_INPUT_FORMATS = (
     '%Y-%m-%d %H:%M:%S',     # '2006-10-25 14:30:59'
     '%Y-%m-%d %H:%M',        # '2006-10-25 14:30'

django/conf/locale/en_GB/formats.py

@@ -17,16 +17,11 @@ FIRST_DAY_OF_WEEK = 0                   # Sunday
 # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
 DATE_INPUT_FORMATS = (
     '%d/%m/%Y', '%d/%m/%y',             # '25/10/2006', '25/10/06'
-    '%Y-%m-%d',                         # '2006-10-25'
     # '%b %d %Y', '%b %d, %Y',          # 'Oct 25 2006', 'Oct 25, 2006'
     # '%d %b %Y', '%d %b, %Y',          # '25 Oct 2006', '25 Oct, 2006'
     # '%B %d %Y', '%B %d, %Y',          # 'October 25 2006', 'October 25, 2006'
     # '%d %B %Y', '%d %B, %Y',          # '25 October 2006', '25 October, 2006'
 )
-TIME_INPUT_FORMATS = (
-    '%H:%M:%S',                         # '14:30:59'
-    '%H:%M',                            # '14:30'
-)
 DATETIME_INPUT_FORMATS = (
     '%Y-%m-%d %H:%M:%S',                # '2006-10-25 14:30:59'
     '%Y-%m-%d %H:%M',                   # '2006-10-25 14:30'

django/conf/locale/es/formats.py

@@ -19,10 +19,6 @@ DATE_INPUT_FORMATS = (
     # '31/12/2009', '31/12/09'
     '%d/%m/%Y', '%d/%m/%y'
 )
-TIME_INPUT_FORMATS = (
-    # '14:30:59', '14:30'
-    '%H:%M:%S', '%H:%M'
-)
 DATETIME_INPUT_FORMATS = (
     '%d/%m/%Y %H:%M:%S',
     '%d/%m/%Y %H:%M',

django/conf/locale/es_AR/formats.py

@@ -19,10 +19,6 @@ DATE_INPUT_FORMATS = (
     '%d/%m/%Y', # '31/12/2009'
     '%d/%m/%y', # '31/12/09'
 )
-TIME_INPUT_FORMATS = (
-    '%H:%M:%S', # '14:30:59'
-    '%H:%M',    # '14:30'
-)
 DATETIME_INPUT_FORMATS = (
     '%d/%m/%Y %H:%M:%S',
     '%d/%m/%Y %H:%M',

django/conf/locale/es_MX/formats.py

@@ -15,9 +15,6 @@ DATE_INPUT_FORMATS = (
     '%d/%m/%Y', '%d/%m/%y',             # '25/10/2006', '25/10/06'
     '%Y%m%d',                           # '20061025'
 )
-TIME_INPUT_FORMATS = (
-    '%H:%M:%S', '%H:%M',		# '14:30:59', '14:30'
-)
 DATETIME_INPUT_FORMATS = (
     '%d/%m/%Y %H:%M:%S',
     '%d/%m/%Y %H:%M',

django/conf/locale/es_NI/formats.py

@@ -15,9 +15,6 @@ DATE_INPUT_FORMATS = (
     '%Y%m%d',                          	# '20061025'
 
 )
-TIME_INPUT_FORMATS = (
-    '%H:%M:%S', '%H:%M',		# '14:30:59', '14:30'
-)
 DATETIME_INPUT_FORMATS = (
     '%d/%m/%Y %H:%M:%S',
     '%d/%m/%Y %H:%M',

django/conf/locale/fr/formats.py

@@ -19,13 +19,8 @@ FIRST_DAY_OF_WEEK = 1 # Monday
 DATE_INPUT_FORMATS = (
     '%d/%m/%Y', '%d/%m/%y', # '25/10/2006', '25/10/06'
     '%d.%m.%Y', '%d.%m.%y', # Swiss (fr_CH), '25.10.2006', '25.10.06'
-    '%Y-%m-%d', '%y-%m-%d', # '2006-10-25', '06-10-25'
     # '%d %B %Y', '%d %b %Y', # '25 octobre 2006', '25 oct. 2006'
 )
-TIME_INPUT_FORMATS = (
-    '%H:%M:%S', # '14:30:59'
-    '%H:%M',    # '14:30'
-)
 DATETIME_INPUT_FORMATS = (
     '%d/%m/%Y %H:%M:%S',    # '25/10/2006 14:30:59'
     '%d/%m/%Y %H:%M',       # '25/10/2006 14:30'
@@ -33,9 +28,6 @@ DATETIME_INPUT_FORMATS = (
     '%d.%m.%Y %H:%M:%S',    # Swiss (fr_CH), '25.10.2006 14:30:59'
     '%d.%m.%Y %H:%M',       # Swiss (fr_CH), '25.10.2006 14:30'
     '%d.%m.%Y',             # Swiss (fr_CH), '25.10.2006'
-    '%Y-%m-%d %H:%M:%S',    # '2006-10-25 14:30:59'
-    '%Y-%m-%d %H:%M',       # '2006-10-25 14:30'
-    '%Y-%m-%d',             # '2006-10-25'
 )
 DECIMAL_SEPARATOR = ','
 THOUSAND_SEPARATOR = '\xa0' # non-breaking space

django/conf/locale/hr/formats.py

@@ -15,15 +15,12 @@ FIRST_DAY_OF_WEEK = 1
 
 # The *_INPUT_FORMATS strings use the Python strftime format syntax,
 # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
+# Kept ISO formats as they are in first position
 DATE_INPUT_FORMATS = (
     '%Y-%m-%d',                     # '2006-10-25'
     '%d.%m.%Y.', '%d.%m.%y.',       # '25.10.2006.', '25.10.06.'
     '%d. %m. %Y.', '%d. %m. %y.',   # '25. 10. 2006.', '25. 10. 06.'
 )
-TIME_INPUT_FORMATS = (
-    '%H:%M:%S',     # '14:30:59'
-    '%H:%M',        # '14:30'
-)
 DATETIME_INPUT_FORMATS = (
     '%Y-%m-%d %H:%M:%S',      # '2006-10-25 14:30:59'
     '%Y-%m-%d %H:%M',         # '2006-10-25 14:30'

django/conf/locale/it/formats.py

@@ -20,10 +20,6 @@ DATE_INPUT_FORMATS = (
     '%d-%m-%Y', '%Y-%m-%d',  # '25-10-2006', '2008-10-25'
     '%d-%m-%y', '%d/%m/%y',  # '25-10-06', '25/10/06'
 )
-TIME_INPUT_FORMATS = (
-    '%H:%M:%S',     # '14:30:59'
-    '%H:%M',        # '14:30'
-)
 DATETIME_INPUT_FORMATS = (
     '%d/%m/%Y %H:%M:%S',     # '25/10/2006 14:30:59'
     '%d/%m/%Y %H:%M',        # '25/10/2006 14:30'