From: Alex Morega <alex@grep.ro>
Date: Fri, 5 Jul 2013 08:16:15 +0000 (+0200)
Subject: more changes in the french data
X-Git-Tag: 1.0~129^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8904e6bf3a7b141bc72376e406a4b5036490608e;p=thirdparty%2Fbabel.git

more changes in the french data
---

diff --git a/babel/dates.py b/babel/dates.py
index a1f46de3..ec9d63f1 100644
--- a/babel/dates.py
+++ b/babel/dates.py
@@ -520,7 +520,7 @@ def format_time(time=None, format='medium', tzinfo=None, locale=LC_TIME):
     >>> tzinfo = timezone('Europe/Paris')
     >>> t = tzinfo.localize(t)
     >>> format_time(t, format='full', tzinfo=tzinfo, locale='fr_FR')
-    u'15:30:00 Heure avanc\xe9e de l\u2019Europe centrale'
+    u'15:30:00 heure avanc\xe9e d\u2019Europe centrale'
     >>> format_time(t, "hh 'o''clock' a, zzzz", tzinfo=timezone('US/Eastern'),
     ...             locale='en')
     u"09 o'clock AM, Eastern Daylight Time"
@@ -541,7 +541,7 @@ def format_time(time=None, format='medium', tzinfo=None, locale=LC_TIME):
     >>> t = time(15, 30)
     >>> format_time(t, format='full', tzinfo=timezone('Europe/Paris'),
     ...             locale='fr_FR')
-    u'15:30:00 Heure normale de l\u2019Europe centrale'
+    u'15:30:00 heure normale de l\u2019Europe centrale'
     >>> format_time(t, format='full', tzinfo=timezone('US/Eastern'),
     ...             locale='en_US')
     u'3:30:00 PM Eastern Standard Time'
diff --git a/babel/tests/dates.py b/babel/tests/dates.py
index 120ac515..090de81b 100644
--- a/babel/tests/dates.py
+++ b/babel/tests/dates.py
@@ -191,20 +191,20 @@ class DateTimeFormatTestCase(unittest.TestCase):
     def test_timezone_name(self):
         tz = timezone('Europe/Paris')
         dt = datetime(2007, 4, 1, 15, 30, tzinfo=tz)
-        fmt = dates.DateTimeFormat(dt, locale='fr_CA')
-        self.assertEqual('France', fmt['v'])
+        fmt = dates.DateTimeFormat(dt, locale='fr_FR')
+        self.assertEqual('Heure : France', fmt['v'])
 
     def test_timezone_location_format(self):
         tz = timezone('Europe/Paris')
         dt = datetime(2007, 4, 1, 15, 30, tzinfo=tz)
         fmt = dates.DateTimeFormat(dt, locale='fr_FR')
-        self.assertEqual('France', fmt['VVVV'])
+        self.assertEqual('Heure : France', fmt['VVVV'])
 
     def test_timezone_walltime_short(self):
         tz = timezone('Europe/Paris')
         t = time(15, 30, tzinfo=tz)
         fmt = dates.DateTimeFormat(t, locale='fr_FR')
-        self.assertEqual('HEC', fmt['v'])
+        self.assertEqual('Heure : France', fmt['v'])
 
     def test_timezone_walltime_long(self):
         tz = timezone('Europe/Paris')