Fixed #12980 - Use raw strings for locale formats which contain single backslahes. Thanks for report and patch, Martin von Löwis and Ramiro Morales.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13050 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Jannis Leidel 2010-04-29 14:37:39 +00:00
parent 5f7732d059
commit 413ae251ac
7 changed files with 18 additions and 18 deletions

View File

@ -2,11 +2,11 @@
# This file is distributed under the same license as the Django package. # This file is distributed under the same license as the Django package.
# #
DATE_FORMAT = 'j \de F \de Y' DATE_FORMAT = r'j \de F \de Y'
TIME_FORMAT = 'G:i:s' TIME_FORMAT = 'G:i:s'
DATETIME_FORMAT = 'j \de F \de Y \\a \le\s G:i' DATETIME_FORMAT = r'j \de F \de Y \a \le\s G:i'
YEAR_MONTH_FORMAT = 'F \de\l Y' YEAR_MONTH_FORMAT = r'F \de\l Y'
MONTH_DAY_FORMAT = 'j \de F' MONTH_DAY_FORMAT = r'j \de F'
SHORT_DATE_FORMAT = 'd/m/Y' SHORT_DATE_FORMAT = 'd/m/Y'
SHORT_DATETIME_FORMAT = 'd/m/Y G:i' SHORT_DATETIME_FORMAT = 'd/m/Y G:i'
FIRST_DAY_OF_WEEK = 1 # Monday FIRST_DAY_OF_WEEK = 1 # Monday

View File

@ -2,11 +2,11 @@
# This file is distributed under the same license as the Django package. # This file is distributed under the same license as the Django package.
# #
DATE_FORMAT = 'j \de F \de Y' DATE_FORMAT = r'j \de F \de Y'
TIME_FORMAT = 'H:i:s' TIME_FORMAT = 'H:i:s'
DATETIME_FORMAT = 'j \de F \de Y \a \l\a\s H:i' DATETIME_FORMAT = r'j \de F \de Y \a \l\a\s H:i'
YEAR_MONTH_FORMAT = 'F \de Y' YEAR_MONTH_FORMAT = r'F \de Y'
MONTH_DAY_FORMAT = 'j \de F' MONTH_DAY_FORMAT = r'j \de F'
SHORT_DATE_FORMAT = 'd/m/Y' SHORT_DATE_FORMAT = 'd/m/Y'
SHORT_DATETIME_FORMAT = 'd/m/Y H:i' SHORT_DATETIME_FORMAT = 'd/m/Y H:i'
FIRST_DAY_OF_WEEK = 1 # Monday FIRST_DAY_OF_WEEK = 1 # Monday

View File

@ -2,7 +2,7 @@
# This file is distributed under the same license as the Django package. # This file is distributed under the same license as the Django package.
# #
DATE_FORMAT = 'Yeko M\re\n d\a' DATE_FORMAT = r'Yeko M\re\n d\a'
TIME_FORMAT = 'H:i:s' TIME_FORMAT = 'H:i:s'
# DATETIME_FORMAT = # DATETIME_FORMAT =
# YEAR_MONTH_FORMAT = # YEAR_MONTH_FORMAT =

View File

@ -2,7 +2,7 @@
# This file is distributed under the same license as the Django package. # This file is distributed under the same license as the Django package.
# #
DATE_FORMAT = 'Y \m. F j \d.' DATE_FORMAT = r'Y \m. F j \d.'
TIME_FORMAT = 'H:i:s' TIME_FORMAT = 'H:i:s'
# DATETIME_FORMAT = # DATETIME_FORMAT =
# YEAR_MONTH_FORMAT = # YEAR_MONTH_FORMAT =

View File

@ -2,12 +2,12 @@
# This file is distributed under the same license as the Django package. # This file is distributed under the same license as the Django package.
# #
DATE_FORMAT = 'Y. \g\a\d\a j. F' DATE_FORMAT = r'Y. \g\a\d\a j. F'
TIME_FORMAT = 'H:i:s' TIME_FORMAT = 'H:i:s'
# DATETIME_FORMAT = # DATETIME_FORMAT =
YEAR_MONTH_FORMAT = 'Y. \g. F' YEAR_MONTH_FORMAT = r'Y. \g. F'
MONTH_DAY_FORMAT = 'j. F' MONTH_DAY_FORMAT = 'j. F'
SHORT_DATE_FORMAT = 'Y. \g\a\d\a j. M' SHORT_DATE_FORMAT = r'Y. \g\a\d\a j. M'
# SHORT_DATETIME_FORMAT = # SHORT_DATETIME_FORMAT =
# FIRST_DAY_OF_WEEK = # FIRST_DAY_OF_WEEK =
# DATE_INPUT_FORMATS = # DATE_INPUT_FORMATS =

View File

@ -2,11 +2,11 @@
# This file is distributed under the same license as the Django package. # This file is distributed under the same license as the Django package.
# #
DATE_FORMAT = 'j \de F \de Y' DATE_FORMAT = r'j \de F \de Y'
TIME_FORMAT = 'H:i:s' TIME_FORMAT = 'H:i:s'
# DATETIME_FORMAT = # DATETIME_FORMAT =
YEAR_MONTH_FORMAT = 'F \de Y' YEAR_MONTH_FORMAT = r'F \de Y'
MONTH_DAY_FORMAT = 'j \de F' MONTH_DAY_FORMAT = r'j \de F'
SHORT_DATE_FORMAT = 'd/m/Y' SHORT_DATE_FORMAT = 'd/m/Y'
# SHORT_DATETIME_FORMAT = # SHORT_DATETIME_FORMAT =
# FIRST_DAY_OF_WEEK = # FIRST_DAY_OF_WEEK =

View File

@ -2,9 +2,9 @@
# This file is distributed under the same license as the Django package. # This file is distributed under the same license as the Django package.
# #
DATE_FORMAT = '\N\\y d \t\\n\g n \nă\m Y' DATE_FORMAT = r'\N\\y d \t\\n\g n \nă\m Y'
TIME_FORMAT = 'H:i:s' TIME_FORMAT = 'H:i:s'
DATETIME_FORMAT = 'H:i:s \N\\y d \t\\n\g n \nă\m Y' DATETIME_FORMAT = r'H:i:s \N\\y d \t\\n\g n \nă\m Y'
YEAR_MONTH_FORMAT = 'F Y' YEAR_MONTH_FORMAT = 'F Y'
MONTH_DAY_FORMAT = 'j F' MONTH_DAY_FORMAT = 'j F'
SHORT_DATE_FORMAT = 'd-m-Y' SHORT_DATE_FORMAT = 'd-m-Y'