Commit 7f363eb6 authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

Fixed #15553 -- Updated Macedonian locale. Thanks to vasiliyeah for the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15768 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 6bf1c343
Loading
Loading
Loading
Loading
+36 −10
Original line number Diff line number Diff line
@@ -6,18 +6,44 @@
# see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
DATE_FORMAT = 'd F Y'
TIME_FORMAT = 'H:i:s'
# DATETIME_FORMAT = 
# YEAR_MONTH_FORMAT = 
# MONTH_DAY_FORMAT = 
SHORT_DATE_FORMAT = 'd.n.Y'
# SHORT_DATETIME_FORMAT = 
# FIRST_DAY_OF_WEEK = 
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'
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 = 
# TIME_INPUT_FORMATS = 
# DATETIME_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.'
    '%Y-%m-%d',                     # '2006-10-25'
)

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.'
    '%d.%m.%y. %H:%M:%S',     # '25.10.06. 14:30:59'
    '%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',      # '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',      # '25. 10. 06. 14:30'
    '%d. %m. %y.',            # '25. 10. 06.'
    '%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 = '.'
# NUMBER_GROUPING = 
NUMBER_GROUPING = 3