mirror of
https://github.com/django/django.git
synced 2025-10-31 09:41:08 +00:00
Fixed #17139 -- Corrected the French department names to contain accents.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
@@ -1,3 +1,4 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
from django.contrib.localflavor.fr.forms import (FRZipCodeField,
|
||||
FRPhoneNumberField, FRDepartmentSelect)
|
||||
|
||||
@@ -41,39 +42,39 @@ class FRLocalFlavorTests(SimpleTestCase):
|
||||
<option value="04">04 - Alpes-de-Haute-Provence</option>
|
||||
<option value="05">05 - Hautes-Alpes</option>
|
||||
<option value="06">06 - Alpes-Maritimes</option>
|
||||
<option value="07">07 - Ardeche</option>
|
||||
<option value="07">07 - Ardèche</option>
|
||||
<option value="08">08 - Ardennes</option>
|
||||
<option value="09">09 - Ariege</option>
|
||||
<option value="09">09 - Ariège</option>
|
||||
<option value="10">10 - Aube</option>
|
||||
<option value="11">11 - Aude</option>
|
||||
<option value="12">12 - Aveyron</option>
|
||||
<option value="13">13 - Bouches-du-Rhone</option>
|
||||
<option value="13">13 - Bouches-du-Rhône</option>
|
||||
<option value="14">14 - Calvados</option>
|
||||
<option value="15">15 - Cantal</option>
|
||||
<option value="16">16 - Charente</option>
|
||||
<option value="17">17 - Charente-Maritime</option>
|
||||
<option value="18">18 - Cher</option>
|
||||
<option value="19">19 - Correze</option>
|
||||
<option value="21">21 - Cote-d'Or</option>
|
||||
<option value="22">22 - Cotes-d'Armor</option>
|
||||
<option value="19">19 - Corrèze</option>
|
||||
<option value="21">21 - Côte-d'Or</option>
|
||||
<option value="22">22 - Côtes-d'Armor</option>
|
||||
<option value="23">23 - Creuse</option>
|
||||
<option value="24">24 - Dordogne</option>
|
||||
<option value="25">25 - Doubs</option>
|
||||
<option value="26">26 - Drome</option>
|
||||
<option value="26">26 - Drôme</option>
|
||||
<option value="27">27 - Eure</option>
|
||||
<option value="28">28 - Eure-et-Loire</option>
|
||||
<option value="29">29 - Finistere</option>
|
||||
<option value="29">29 - Finistère</option>
|
||||
<option value="2A">2A - Corse-du-Sud</option>
|
||||
<option value="2B">2B - Haute-Corse</option>
|
||||
<option value="30">30 - Gard</option>
|
||||
<option value="31">31 - Haute-Garonne</option>
|
||||
<option value="32">32 - Gers</option>
|
||||
<option value="33">33 - Gironde</option>
|
||||
<option value="34">34 - Herault</option>
|
||||
<option value="34">34 - Hérault</option>
|
||||
<option value="35">35 - Ille-et-Vilaine</option>
|
||||
<option value="36">36 - Indre</option>
|
||||
<option value="37">37 - Indre-et-Loire</option>
|
||||
<option value="38">38 - Isere</option>
|
||||
<option value="38">38 - Isère</option>
|
||||
<option value="39">39 - Jura</option>
|
||||
<option value="40">40 - Landes</option>
|
||||
<option value="41">41 - Loir-et-Cher</option>
|
||||
@@ -83,7 +84,7 @@ class FRLocalFlavorTests(SimpleTestCase):
|
||||
<option value="45">45 - Loiret</option>
|
||||
<option value="46">46 - Lot</option>
|
||||
<option value="47">47 - Lot-et-Garonne</option>
|
||||
<option value="48">48 - Lozere</option>
|
||||
<option value="48">48 - Lozère</option>
|
||||
<option value="49">49 - Maine-et-Loire</option>
|
||||
<option value="50">50 - Manche</option>
|
||||
<option value="51">51 - Marne</option>
|
||||
@@ -93,20 +94,20 @@ class FRLocalFlavorTests(SimpleTestCase):
|
||||
<option value="55">55 - Meuse</option>
|
||||
<option value="56">56 - Morbihan</option>
|
||||
<option value="57">57 - Moselle</option>
|
||||
<option value="58">58 - Nievre</option>
|
||||
<option value="58">58 - Nièvre</option>
|
||||
<option value="59">59 - Nord</option>
|
||||
<option value="60">60 - Oise</option>
|
||||
<option value="61">61 - Orne</option>
|
||||
<option value="62">62 - Pas-de-Calais</option>
|
||||
<option value="63">63 - Puy-de-Dome</option>
|
||||
<option value="64">64 - Pyrenees-Atlantiques</option>
|
||||
<option value="65">65 - Hautes-Pyrenees</option>
|
||||
<option value="66">66 - Pyrenees-Orientales</option>
|
||||
<option value="63">63 - Puy-de-Dôme</option>
|
||||
<option value="64">64 - Pyrénées-Atlantiques</option>
|
||||
<option value="65">65 - Hautes-Pyrénées</option>
|
||||
<option value="66">66 - Pyrénées-Orientales</option>
|
||||
<option value="67">67 - Bas-Rhin</option>
|
||||
<option value="68">68 - Haut-Rhin</option>
|
||||
<option value="69">69 - Rhone</option>
|
||||
<option value="70">70 - Haute-Saone</option>
|
||||
<option value="71">71 - Saone-et-Loire</option>
|
||||
<option value="69">69 - Rhône</option>
|
||||
<option value="70">70 - Haute-Saône</option>
|
||||
<option value="71">71 - Saône-et-Loire</option>
|
||||
<option value="72">72 - Sarthe</option>
|
||||
<option value="73">73 - Savoie</option>
|
||||
<option value="74">74 - Haute-Savoie</option>
|
||||
@@ -114,13 +115,13 @@ class FRLocalFlavorTests(SimpleTestCase):
|
||||
<option value="76">76 - Seine-Maritime</option>
|
||||
<option value="77">77 - Seine-et-Marne</option>
|
||||
<option value="78">78 - Yvelines</option>
|
||||
<option value="79">79 - Deux-Sevres</option>
|
||||
<option value="79">79 - Deux-Sèvres</option>
|
||||
<option value="80">80 - Somme</option>
|
||||
<option value="81">81 - Tarn</option>
|
||||
<option value="82">82 - Tarn-et-Garonne</option>
|
||||
<option value="83">83 - Var</option>
|
||||
<option value="84">84 - Vaucluse</option>
|
||||
<option value="85">85 - Vendee</option>
|
||||
<option value="85">85 - Vendée</option>
|
||||
<option value="86">86 - Vienne</option>
|
||||
<option value="87">87 - Haute-Vienne</option>
|
||||
<option value="88">88 - Vosges</option>
|
||||
@@ -134,12 +135,12 @@ class FRLocalFlavorTests(SimpleTestCase):
|
||||
<option value="971">971 - Guadeloupe</option>
|
||||
<option value="972">972 - Martinique</option>
|
||||
<option value="973">973 - Guyane</option>
|
||||
<option value="974">974 - La Reunion</option>
|
||||
<option value="974">974 - La Réunion</option>
|
||||
<option value="975">975 - Saint-Pierre-et-Miquelon</option>
|
||||
<option value="976">976 - Mayotte</option>
|
||||
<option value="984">984 - Terres Australes et Antarctiques</option>
|
||||
<option value="986">986 - Wallis et Futuna</option>
|
||||
<option value="987">987 - Polynesie Francaise</option>
|
||||
<option value="988">988 - Nouvelle-Caledonie</option>
|
||||
<option value="987">987 - Polynésie Française</option>
|
||||
<option value="988">988 - Nouvelle-Calédonie</option>
|
||||
</select>'''
|
||||
self.assertHTMLEqual(f.render('dep', 'Paris'), out)
|
||||
|
||||
Reference in New Issue
Block a user