test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #23532 -- Fixed Macedonian locale date formats

This commit is contained in:
Dejan Noveski 2014-09-22 12:37:07 +02:00 committed by Claude Paroz
parent c6fd1e904c
commit 903d144d85
2 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
django/conf/locale/mk/formats.py
View File

@ -7,37 +7,37 @@ from __future__ import unicode_literals
# see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
DATE_FORMAT = 'd F Y' DATE_FORMAT = 'd F Y'
TIME_FORMAT = 'H:i' TIME_FORMAT = 'H:i'
DATETIME_FORMAT = 'j. F Y. H:i' DATETIME_FORMAT = 'j. F Y H:i'
YEAR_MONTH_FORMAT = 'F Y.' YEAR_MONTH_FORMAT = 'F Y'
MONTH_DAY_FORMAT = 'j. F' MONTH_DAY_FORMAT = 'j. F'
SHORT_DATE_FORMAT = 'j.m.Y.' SHORT_DATE_FORMAT = 'j.m.Y'
SHORT_DATETIME_FORMAT = 'j.m.Y. H:i' SHORT_DATETIME_FORMAT = 'j.m.Y H:i'
FIRST_DAY_OF_WEEK = 1 FIRST_DAY_OF_WEEK = 1
# The *_INPUT_FORMATS strings use the Python strftime format syntax, # The *_INPUT_FORMATS strings use the Python strftime format syntax,
# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior
DATE_INPUT_FORMATS = ( 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 = ( DATETIME_INPUT_FORMATS = (
'%d.%m.%Y. %H:%M:%S', # '25.10.2006. 14:30:59' '%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:%S.%f', # '25.10.2006 14:30:59.000200'
'%d.%m.%Y. %H:%M', # '25.10.2006. 14:30' '%d.%m.%Y %H:%M', # '25.10.2006 14:30'
'%d.%m.%Y.', # '25.10.2006.' '%d.%m.%Y', # '25.10.2006'
'%d.%m.%y. %H:%M:%S', # '25.10.06. 14:30:59' '%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:%S.%f', # '25.10.06 14:30:59.000200'
'%d.%m.%y. %H:%M', # '25.10.06. 14:30' '%d.%m.%y %H:%M', # '25.10.06 14:30'
'%d.%m.%y.', # '25.10.06.' '%d.%m.%y', # '25.10.06'
'%d. %m. %Y. %H:%M:%S', # '25. 10. 2006. 14:30:59' '%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:%S.%f', # '25. 10. 2006 14:30:59.000200'
'%d. %m. %Y. %H:%M', # '25. 10. 2006. 14:30' '%d. %m. %Y %H:%M', # '25. 10. 2006 14:30'
'%d. %m. %Y.', # '25. 10. 2006.' '%d. %m. %Y', # '25. 10. 2006'
'%d. %m. %y. %H:%M:%S', # '25. 10. 06. 14:30:59' '%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:%S.%f', # '25. 10. 06 14:30:59.000200'
'%d. %m. %y. %H:%M', # '25. 10. 06. 14:30' '%d. %m. %y %H:%M', # '25. 10. 06 14:30'
'%d. %m. %y.', # '25. 10. 06.' '%d. %m. %y', # '25. 10. 06'
) )
DECIMAL_SEPARATOR = ',' DECIMAL_SEPARATOR = ','

3
docs/releases/1.7.1.txt
View File

@ -53,4 +53,5 @@ Bugfixes
* Restored the ability to deepcopy ``F`` objects (:ticket:`23492`). * Restored the ability to deepcopy ``F`` objects (:ticket:`23492`).
* Formats for Welsh (``cy``) and several Chinese locales (``zh_CN``, * 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`).