Mercurial > babel > old > babel-test
diff babel/dates.py @ 379:1c0915da48c6 stable-0.9.x
Ported [407:415/trunk] back to 0.9.x branch.
author | cmlenz |
---|---|
date | Tue, 08 Jul 2008 21:01:28 +0000 |
parents | 7e2983180f6d |
children | 61cb2233fa49 |
line wrap: on
line diff
--- a/babel/dates.py +++ b/babel/dates.py @@ -185,11 +185,11 @@ >>> get_timezone_gmt(dt, 'short', locale='en') u'-0800' - The long format depends on the locale, for example in France a different - string is used for GMT: + The long format depends on the locale, for example in France the acronym + UTC string is used instead of GMT: >>> get_timezone_gmt(dt, 'long', locale='fr_FR') - u'HMG-08:00' + u'UTC-08:00' :param datetime: the ``datetime`` object; if `None`, the current date and time in UTC is used @@ -488,7 +488,7 @@ if datetime is None: datetime = datetime_.utcnow() elif isinstance(datetime, (int, long)): - datetime = datetime.utcfromtimestamp(datetime) + datetime = datetime_.utcfromtimestamp(datetime) elif isinstance(datetime, time): datetime = datetime_.combine(date.today(), datetime) if datetime.tzinfo is None: