diff options
| author | Dejan Noveski <dr.mote@gmail.com> | 2014-09-22 12:37:07 +0200 |
|---|---|---|
| committer | Claude Paroz <claude@2xlibre.net> | 2014-09-22 18:04:57 +0200 |
| commit | 903d144d85f5d25c4968dc41bd5a5ea9434a9703 (patch) | |
| tree | 1a7e0b5f3760c83ae73dde682419fdc5ac9c7ceb | |
| parent | c6fd1e904cb15da1a627843c79b89b19beabe2a1 (diff) | |
Fixed #23532 -- Fixed Macedonian locale date formats
| -rw-r--r-- | django/conf/locale/mk/formats.py | 44 | ||||
| -rw-r--r-- | docs/releases/1.7.1.txt | 3 |
2 files changed, 24 insertions, 23 deletions
diff --git a/django/conf/locale/mk/formats.py b/django/conf/locale/mk/formats.py index 3c8387cc36..ea4b0c3402 100644 --- a/django/conf/locale/mk/formats.py +++ b/django/conf/locale/mk/formats.py @@ -7,37 +7,37 @@ from __future__ import unicode_literals # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'd F Y' TIME_FORMAT = 'H:i' -DATETIME_FORMAT = 'j. F Y. H:i' -YEAR_MONTH_FORMAT = 'F Y.' +DATETIME_FORMAT = 'j. F Y H:i' +YEAR_MONTH_FORMAT = 'F Y' MONTH_DAY_FORMAT = 'j. F' -SHORT_DATE_FORMAT = 'j.m.Y.' -SHORT_DATETIME_FORMAT = 'j.m.Y. H:i' +SHORT_DATE_FORMAT = 'j.m.Y' +SHORT_DATETIME_FORMAT = 'j.m.Y H:i' 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 DATE_INPUT_FORMATS = ( - '%d.%m.%Y.', '%d.%m.%y.', # '25.10.2006.', '25.10.06.' - '%d. %m. %Y.', '%d. %m. %y.', # '25. 10. 2006.', '25. 10. 06.' + '%d.%m.%Y', '%d.%m.%y', # '25.10.2006', '25.10.06' + '%d. %m. %Y', '%d. %m. %y', # '25. 10. 2006', '25. 10. 06' ) DATETIME_INPUT_FORMATS = ( - '%d.%m.%Y. %H:%M:%S', # '25.10.2006. 14:30:59' - '%d.%m.%Y. %H:%M:%S.%f', # '25.10.2006. 14:30:59.000200' - '%d.%m.%Y. %H:%M', # '25.10.2006. 14:30' - '%d.%m.%Y.', # '25.10.2006.' - '%d.%m.%y. %H:%M:%S', # '25.10.06. 14:30:59' - '%d.%m.%y. %H:%M:%S.%f', # '25.10.06. 14:30:59.000200' - '%d.%m.%y. %H:%M', # '25.10.06. 14:30' - '%d.%m.%y.', # '25.10.06.' - '%d. %m. %Y. %H:%M:%S', # '25. 10. 2006. 14:30:59' - '%d. %m. %Y. %H:%M:%S.%f', # '25. 10. 2006. 14:30:59.000200' - '%d. %m. %Y. %H:%M', # '25. 10. 2006. 14:30' - '%d. %m. %Y.', # '25. 10. 2006.' - '%d. %m. %y. %H:%M:%S', # '25. 10. 06. 14:30:59' - '%d. %m. %y. %H:%M:%S.%f', # '25. 10. 06. 14:30:59.000200' - '%d. %m. %y. %H:%M', # '25. 10. 06. 14:30' - '%d. %m. %y.', # '25. 10. 06.' + '%d.%m.%Y %H:%M:%S', # '25.10.2006 14:30:59' + '%d.%m.%Y %H:%M:%S.%f', # '25.10.2006 14:30:59.000200' + '%d.%m.%Y %H:%M', # '25.10.2006 14:30' + '%d.%m.%Y', # '25.10.2006' + '%d.%m.%y %H:%M:%S', # '25.10.06 14:30:59' + '%d.%m.%y %H:%M:%S.%f', # '25.10.06 14:30:59.000200' + '%d.%m.%y %H:%M', # '25.10.06 14:30' + '%d.%m.%y', # '25.10.06' + '%d. %m. %Y %H:%M:%S', # '25. 10. 2006 14:30:59' + '%d. %m. %Y %H:%M:%S.%f', # '25. 10. 2006 14:30:59.000200' + '%d. %m. %Y %H:%M', # '25. 10. 2006 14:30' + '%d. %m. %Y', # '25. 10. 2006' + '%d. %m. %y %H:%M:%S', # '25. 10. 06 14:30:59' + '%d. %m. %y %H:%M:%S.%f', # '25. 10. 06 14:30:59.000200' + '%d. %m. %y %H:%M', # '25. 10. 06 14:30' + '%d. %m. %y', # '25. 10. 06' ) DECIMAL_SEPARATOR = ',' diff --git a/docs/releases/1.7.1.txt b/docs/releases/1.7.1.txt index 4c04f695ec..0a75f22e4b 100644 --- a/docs/releases/1.7.1.txt +++ b/docs/releases/1.7.1.txt @@ -53,4 +53,5 @@ Bugfixes * Restored the ability to deepcopy ``F`` objects (:ticket:`23492`). * Formats for Welsh (``cy``) and several Chinese locales (``zh_CN``, - ``zh_Hans``, ``zh_Hant`` and ``zh_TW``) have been added. + ``zh_Hans``, ``zh_Hant`` and ``zh_TW``) have been added. Formats for + Macedonian have been fixed (trailing dot removed, :ticket:`23532`). |