Code

Ticket #14721: mark_unicode_strings2.diff

File mark_unicode_strings2.diff, 3.0 KB (added by claudep, 3 years ago)

Also add comments (and en/formats.py)

Line 
1commit 89536fef23ad1a720d3885d1e88bf0f0f31bd3b5
2Author: Claude Paroz <claude@2xlibre.net>
3Date:   Thu Nov 18 22:45:14 2010 +0100
4
5    Add missing 'u' prefix before Unicode strings in localized formats.py
6
7diff --git a/django/conf/locale/bg/formats.py b/django/conf/locale/bg/formats.py
8index 045543a..ea5f300 100644
9--- a/django/conf/locale/bg/formats.py
10+++ b/django/conf/locale/bg/formats.py
11@@ -14,5 +14,5 @@ SHORT_DATE_FORMAT = 'd.m.Y'
12 # TIME_INPUT_FORMATS =
13 # DATETIME_INPUT_FORMATS =
14 DECIMAL_SEPARATOR = ','
15-THOUSAND_SEPARATOR = ' '
16+THOUSAND_SEPARATOR = u' ' # Non-breaking space
17 # NUMBER_GROUPING =
18diff --git a/django/conf/locale/en/formats.py b/django/conf/locale/en/formats.py
19index 141f705..c59a94a 100644
20--- a/django/conf/locale/en/formats.py
21+++ b/django/conf/locale/en/formats.py
22@@ -32,7 +32,7 @@ DATETIME_INPUT_FORMATS = (
23     '%m/%d/%y %H:%M',        # '10/25/06 14:30'
24     '%m/%d/%y',              # '10/25/06'
25 )
26-DECIMAL_SEPARATOR = '.'
27-THOUSAND_SEPARATOR = ','
28+DECIMAL_SEPARATOR = u'.'
29+THOUSAND_SEPARATOR = u','
30 NUMBER_GROUPING = 3
31 
32diff --git a/django/conf/locale/et/formats.py b/django/conf/locale/et/formats.py
33index b96420c..101fcee 100644
34--- a/django/conf/locale/et/formats.py
35+++ b/django/conf/locale/et/formats.py
36@@ -14,5 +14,5 @@ SHORT_DATE_FORMAT = 'd.m.Y'
37 # TIME_INPUT_FORMATS =
38 # DATETIME_INPUT_FORMATS =
39 DECIMAL_SEPARATOR = ','
40-THOUSAND_SEPARATOR = ' '
41+THOUSAND_SEPARATOR = u' ' # Non-breaking space
42 # NUMBER_GROUPING =
43diff --git a/django/conf/locale/fi/formats.py b/django/conf/locale/fi/formats.py
44index 670e268..d6cc7d7 100644
45--- a/django/conf/locale/fi/formats.py
46+++ b/django/conf/locale/fi/formats.py
47@@ -14,5 +14,5 @@ SHORT_DATE_FORMAT = 'j.n.Y'
48 # TIME_INPUT_FORMATS =
49 # DATETIME_INPUT_FORMATS =
50 DECIMAL_SEPARATOR = ','
51-THOUSAND_SEPARATOR = ' '
52+THOUSAND_SEPARATOR = u' ' # Non-breaking space
53 # NUMBER_GROUPING =
54diff --git a/django/conf/locale/hu/formats.py b/django/conf/locale/hu/formats.py
55index 6ee2db0..cb93e2f 100644
56--- a/django/conf/locale/hu/formats.py
57+++ b/django/conf/locale/hu/formats.py
58@@ -14,5 +14,5 @@ SHORT_DATE_FORMAT = 'Y.m.d.'
59 # TIME_INPUT_FORMATS =
60 # DATETIME_INPUT_FORMATS =
61 DECIMAL_SEPARATOR = ','
62-THOUSAND_SEPARATOR = ' '
63+THOUSAND_SEPARATOR = u' ' # Non-breaking space
64 # NUMBER_GROUPING =
65diff --git a/django/conf/locale/lv/formats.py b/django/conf/locale/lv/formats.py
66index 8328b74..15637d1 100644
67--- a/django/conf/locale/lv/formats.py
68+++ b/django/conf/locale/lv/formats.py
69@@ -32,5 +32,5 @@ DATETIME_INPUT_FORMATS = (
70     '%d.%m.%y',              # '25.10.06'
71 )
72 DECIMAL_SEPARATOR = ','
73-THOUSAND_SEPARATOR = ' '
74+THOUSAND_SEPARATOR = u' ' # Non-breaking space
75 NUMBER_GROUPING = 3
76diff --git a/django/conf/locale/uk/formats.py b/django/conf/locale/uk/formats.py
77index 8e41bf0..8c01f3d 100644
78--- a/django/conf/locale/uk/formats.py
79+++ b/django/conf/locale/uk/formats.py
80@@ -14,5 +14,5 @@ SHORT_DATE_FORMAT = 'j M Y'
81 # TIME_INPUT_FORMATS =
82 # DATETIME_INPUT_FORMATS =
83 DECIMAL_SEPARATOR = ','
84-THOUSAND_SEPARATOR = ' '
85+THOUSAND_SEPARATOR = u' '
86 # NUMBER_GROUPING =