Commit 903d144d authored by Dejan Noveski's avatar Dejan Noveski Committed by Claude Paroz
Browse files

Fixed #23532 -- Fixed Macedonian locale date formats

parent c6fd1e90

django/conf/locale/mk/formats.py

+22 −22
Original line number Diff line number Diff line
@@ -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 = ','

docs/releases/1.7.1.txt

+2 −1
Original line number Diff line number Diff line
@@ -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`).