handle 'at' value from en date format

diff --git a/babel/core.py b/babel/core.py
index 4d5a636729d5c2fde92687bced33732e101f3ca2..31cfec0bb8c32bde26d69593daa923d26e58b4be 100644 (file)
--- a/babel/core.py
+++ b/babel/core.py
@@ -585,7 +585,7 @@ class Locale(object):
         """Locale patterns for datetime formatting.
         
         >>> Locale('en').datetime_formats['full']
-        u'{1} {0}'
+        u"{1} 'at' {0}"
         >>> Locale('th').datetime_formats['medium']
         u'{1}, {0}'
         

diff --git a/babel/dates.py b/babel/dates.py
index 430da46353709d7c739b1de8aaf9e7d74e96195b..a1f46de3deda6c7b258b0140bb84722452d155a7 100644 (file)
--- a/babel/dates.py
+++ b/babel/dates.py
@@ -490,6 +490,7 @@ def format_datetime(datetime=None, format='medium', tzinfo=None,
     locale = Locale.parse(locale)
     if format in ('full', 'long', 'medium', 'short'):
         return get_datetime_format(format, locale=locale) \
+            .replace("'", "") \
             .replace('{0}', format_time(datetime, format, tzinfo=None,
                                         locale=locale)) \
             .replace('{1}', format_date(datetime, format, locale=locale))

diff --git a/babel/tests/dates.py b/babel/tests/dates.py
index 2e682d1a1a9635a551a3c63b1da7a385af5ca505..8ebecb77b81b493cdc0509466d1b1d922a5fbd88 100644 (file)
--- a/babel/tests/dates.py
+++ b/babel/tests/dates.py
@@ -255,8 +255,7 @@ class FormatDatetimeTestCase(unittest.TestCase):
         d = datetime(2012, 4, 1, 15, 30, 29, tzinfo=timezone('UTC'))
         epoch = float(calendar.timegm(d.timetuple()))
         formatted_string = dates.format_datetime(epoch, format='long', locale='en_US')
-        self.assertEqual(u'April 1, 2012 3:30:29 PM +0000', formatted_string)
-                         
+        self.assertEqual(u'April 1, 2012 at 3:30:29 PM +0000', formatted_string)
 
 
 class FormatTimeTestCase(unittest.TestCase):