Commit c1acda6d authored by Jannis Leidel's avatar Jannis Leidel
Browse files

Updated a few localization formats to stop the changes done in r17473 from breaking the tests. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17486 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 8ae02fde

django/conf/locale/ca/LC_MESSAGES/django.po

+4 −4
Original line number Diff line number Diff line
@@ -1064,11 +1064,11 @@ msgstr ", %(number)d %(type)s" 


#: utils/translation/trans_real.py:568

msgid "DATE_FORMAT"

msgstr "j \\de F \\de Y"

msgstr "j \\d\\e F \\d\\e Y"



#: utils/translation/trans_real.py:569

msgid "DATETIME_FORMAT"

msgstr "j \\de F \\de Y, H:i"

msgstr "j \\d\\e F \\d\\e Y, H:i"



#: utils/translation/trans_real.py:570

msgid "TIME_FORMAT"
@@ -1076,11 +1076,11 @@ msgstr "H:i" 


#: utils/translation/trans_real.py:591

msgid "YEAR_MONTH_FORMAT"

msgstr "F \\de Y"

msgstr "F \\d\\e Y"



#: utils/translation/trans_real.py:592

msgid "MONTH_DAY_FORMAT"

msgstr "j \\de F"

msgstr "j \\d\\e F"



#: views/generic/create_update.py:121

#, python-format

django/conf/locale/ca/formats.py

+4 −4
Original line number Diff line number Diff line
@@ -4,11 +4,11 @@ 


# The *_FORMAT strings use the Django date format syntax,

# see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date

DATE_FORMAT = r'j \de F \de Y'

DATE_FORMAT = r'j \d\e F \d\e Y'

TIME_FORMAT = 'G:i:s'

DATETIME_FORMAT = r'j \de F \de Y \a \le\s G:i'

YEAR_MONTH_FORMAT = r'F \de\l Y'

MONTH_DAY_FORMAT = r'j \de F'

DATETIME_FORMAT = r'j \d\e F \d\e Y \a \l\e\s G:i'

YEAR_MONTH_FORMAT = r'F \d\e\l Y'

MONTH_DAY_FORMAT = r'j \d\e F'

SHORT_DATE_FORMAT = 'd/m/Y'

SHORT_DATETIME_FORMAT = 'd/m/Y G:i'

FIRST_DAY_OF_WEEK = 1 # Monday

django/conf/locale/es/LC_MESSAGES/django.po

+1 −1
Original line number Diff line number Diff line
@@ -1084,7 +1084,7 @@ msgstr "F Y" 


#: utils/translation/trans_real.py:602

msgid "MONTH_DAY_FORMAT"

msgstr "j \\de F"

msgstr "j \\d\\e F"



#: views/generic/create_update.py:121

#, python-format