From 7a13c8667705bac684bd1a55fae97adfeb5a4e04 Mon Sep 17 00:00:00 2001
From: fpeters <>
Date: Mon, 26 Apr 2004 12:17:38 +0000
Subject: [PATCH] =?UTF-8?q?des=20pays=20(et=20vir=C3=A9=20plein=20de=20tab?=
 =?UTF-8?q?s)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shared/common/geography.py | 34 +++++++++++++++++++---------------
 shared/web/geography.py    |  3 ++-
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/shared/common/geography.py b/shared/common/geography.py
index b60d9db1..268027c5 100644
--- a/shared/common/geography.py
+++ b/shared/common/geography.py
@@ -315,6 +315,7 @@ africaanCountries = [
     'ke',
     'ls',
     'lr',
+    'ly',
     'mg',
     'mw',
     'ml',
@@ -386,7 +387,8 @@ asianCountries = [
     'ae',
     'uz',
     'vn',
-    'ye'
+    'ye',
+    'ps',
 ]
 
 atlanticOceanCountries = [
@@ -416,24 +418,24 @@ centralAmericaCountries = [
     ]
 
 europeanCountries = [
-    'al',	
-    'ad',	
+    'al',
+    'ad',
     'at',
     'by',
     'be',
-    'ba',	
-    'bg',	
-    'hr',	
-    'cz',	
-    'dk',	
-    'ee',	
+    'ba',
+    'bg',
+    'hr',
+    'cz',
+    'dk',
+    'ee',
     'es',
-    'fi',	
-    'fr',	
-    'de',	
-    'gi',	
-    'gr',	
-    'hu',	
+    'fi',
+    'fr',
+    'de',
+    'gi',
+    'gr',
+    'hu',
     'is',
     'ie',
     'it',
@@ -511,5 +513,7 @@ frenchRegions = [
     'poitoucharentes',
     'paca',
     'rhonealpes',
+    'haute-normandie',
+    'basse-normandie',
     ]
 
diff --git a/shared/web/geography.py b/shared/web/geography.py
index 8697fb19..d22ce1d2 100644
--- a/shared/web/geography.py
+++ b/shared/web/geography.py
@@ -305,7 +305,8 @@ frenchRegionLabels = {
     'lorraine' : 'Lorraine',
     'midipyrenees' : 'Midi-Pyrenees',
     'nordpasdecalais' : 'Nord-Pas de Calais',
-    'normandie' : 'Normandie',
+    'haute-normandie' : 'Haute Normandie',
+    'basse-normandie' : 'Basse Normandie',
     'paysdelaloire' : 'Pays de la Loire',
     'picardie' : 'Picardie',
     'poitoucharentes' : 'Poitou-Charentes',