summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJannis Leidel <jannis@leidel.info>2010-04-29 14:37:39 +0000
committerJannis Leidel <jannis@leidel.info>2010-04-29 14:37:39 +0000
commit413ae251acba11cafd643086d5cd75d1eb021d01 (patch)
tree770902eec06d5f10242ffbe96556c8a6a504a3c2
parent5f7732d059f53a12eaa2555bc706192e0db8fbe5 (diff)
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
-rw-r--r--django/conf/locale/ca/formats.py8
-rw-r--r--django/conf/locale/es/formats.py8
-rw-r--r--django/conf/locale/eu/formats.py2
-rw-r--r--django/conf/locale/lt/formats.py2
-rw-r--r--django/conf/locale/lv/formats.py6
-rw-r--r--django/conf/locale/pt/formats.py6
-rw-r--r--django/conf/locale/vi/formats.py4
7 files changed, 18 insertions, 18 deletions
diff --git a/django/conf/locale/ca/formats.py b/django/conf/locale/ca/formats.py
index aebaea3d07..171f48fb3d 100644
--- a/django/conf/locale/ca/formats.py
+++ b/django/conf/locale/ca/formats.py
@@ -2,11 +2,11 @@
# 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'
-DATETIME_FORMAT = 'j \de F \de Y \\a \le\s G:i'
-YEAR_MONTH_FORMAT = 'F \de\l Y'
-MONTH_DAY_FORMAT = 'j \de F'
+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'
SHORT_DATE_FORMAT = 'd/m/Y'
SHORT_DATETIME_FORMAT = 'd/m/Y G:i'
FIRST_DAY_OF_WEEK = 1 # Monday
diff --git a/django/conf/locale/es/formats.py b/django/conf/locale/es/formats.py
index 349810f0fe..58fd5fc602 100644
--- a/django/conf/locale/es/formats.py
+++ b/django/conf/locale/es/formats.py
@@ -2,11 +2,11 @@
# 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'
-DATETIME_FORMAT = 'j \de F \de Y \a \l\a\s H:i'
-YEAR_MONTH_FORMAT = 'F \de Y'
-MONTH_DAY_FORMAT = 'j \de F'
+DATETIME_FORMAT = r'j \de F \de Y \a \l\a\s H:i'
+YEAR_MONTH_FORMAT = r'F \de Y'
+MONTH_DAY_FORMAT = r'j \de F'
SHORT_DATE_FORMAT = 'd/m/Y'
SHORT_DATETIME_FORMAT = 'd/m/Y H:i'
FIRST_DAY_OF_WEEK = 1 # Monday
diff --git a/django/conf/locale/eu/formats.py b/django/conf/locale/eu/formats.py
index 475f924fe8..822dbfa511 100644
--- a/django/conf/locale/eu/formats.py
+++ b/django/conf/locale/eu/formats.py
@@ -2,7 +2,7 @@
# 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'
# DATETIME_FORMAT =
# YEAR_MONTH_FORMAT =
diff --git a/django/conf/locale/lt/formats.py b/django/conf/locale/lt/formats.py
index d9fb0c86f7..0b2cc785df 100644
--- a/django/conf/locale/lt/formats.py
+++ b/django/conf/locale/lt/formats.py
@@ -2,7 +2,7 @@
# 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'
# DATETIME_FORMAT =
# YEAR_MONTH_FORMAT =
diff --git a/django/conf/locale/lv/formats.py b/django/conf/locale/lv/formats.py
index 5dc211cfc0..2da030587e 100644
--- a/django/conf/locale/lv/formats.py
+++ b/django/conf/locale/lv/formats.py
@@ -2,12 +2,12 @@
# 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'
# DATETIME_FORMAT =
-YEAR_MONTH_FORMAT = 'Y. \g. F'
+YEAR_MONTH_FORMAT = r'Y. \g. 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 =
# FIRST_DAY_OF_WEEK =
# DATE_INPUT_FORMATS =
diff --git a/django/conf/locale/pt/formats.py b/django/conf/locale/pt/formats.py
index 053a48af53..738afa931d 100644
--- a/django/conf/locale/pt/formats.py
+++ b/django/conf/locale/pt/formats.py
@@ -2,11 +2,11 @@
# 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'
# DATETIME_FORMAT =
-YEAR_MONTH_FORMAT = 'F \de Y'
-MONTH_DAY_FORMAT = 'j \de F'
+YEAR_MONTH_FORMAT = r'F \de Y'
+MONTH_DAY_FORMAT = r'j \de F'
SHORT_DATE_FORMAT = 'd/m/Y'
# SHORT_DATETIME_FORMAT =
# FIRST_DAY_OF_WEEK =
diff --git a/django/conf/locale/vi/formats.py b/django/conf/locale/vi/formats.py
index 049333ca9c..3a4207966d 100644
--- a/django/conf/locale/vi/formats.py
+++ b/django/conf/locale/vi/formats.py
@@ -2,9 +2,9 @@
# This file is distributed under the same license as the Django package.
#
-DATE_FORMAT = '\N\gà\y d \t\há\n\g n \nă\m Y'
+DATE_FORMAT = r'\N\gà\y d \t\há\n\g n \nă\m Y'
TIME_FORMAT = 'H:i:s'
-DATETIME_FORMAT = 'H:i:s \N\gà\y d \t\há\n\g n \nă\m Y'
+DATETIME_FORMAT = r'H:i:s \N\gà\y d \t\há\n\g n \nă\m Y'
YEAR_MONTH_FORMAT = 'F Y'
MONTH_DAY_FORMAT = 'j F'
SHORT_DATE_FORMAT = 'd-m-Y'