Changeset 5609 for django/trunk/django/contrib/localflavor/no/no_municipalities.py

Timestamp:

07/04/07 07:11:04 (2 years ago)

Author:

mtredinnick

Message:

Merged Unicode branch into trunk (r4952:5608). This should be fully
backwards compatible for all practical purposes.

Fixed #2391, #2489, #2996, #3322, #3344, #3370, #3406, #3432, #3454, #3492, #3582, #3690, #3878, #3891, #3937, #4039, #4141, #4227, #4286, #4291, #4300, #4452, #4702

Files:

• django/trunk (modified) (1 prop)
• django/trunk/django/contrib/localflavor/no/no_municipalities.py (modified) (3 diffs)

django/trunk/django/contrib/localflavor/no/no_municipalities.py

@@ -1 @@
-iso-8859-1
+utf-8
-"""
-An alphabetical list of Norwegian municipalities (fylker) fro use as `choices`
@@ -16 +16 @@
-    ('hordaland', u'Hordaland'),
-    ('janmayen', u'Jan Mayen'),
-�
-�
+øre o
+øndel
-    ('nordland', u'Nordland'),
-    ('oppland', u'Oppland'),
@@ -24 +24 @@
-    ('sognogfjordane', u'Sogn og Fjordane'),
-    ('svalbard', u'Svalbard'),
-��
+ør-Trøndel
-    ('telemark', u'Telemark'),
-    ('troms', u'Troms'),
-    ('vestagder', u'Vest-Agder'),
-    ('vestfold', u'Vestfold'),
-�
+Øs
-)