Mercurial > babel > old > mirror
changeset 429:08e2d18163d9
Fix Catalog._set_mime_headers' handing of negative offsets.
Submitted by: Asheesh Laroia (Creative Commons)
Closes: #165
author | jruigrok |
---|---|
date | Mon, 16 Mar 2009 17:49:48 +0000 |
parents | 072300df53fc |
children | 70f72bc70a93 |
files | ChangeLog babel/messages/catalog.py babel/messages/tests/catalog.py |
diffstat | 3 files changed, 52 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ * Added `format_timedelta` function to support localized formatting of relative times with strings such as "2 days" or "1 month" (ticket #126). * Fixed Python 2.3 compatibility (ticket #146). + * Fixed negative offset handling of Catalog._set_mime_headers (ticket #165). Version 0.9.4
--- a/babel/messages/catalog.py +++ b/babel/messages/catalog.py @@ -349,11 +349,29 @@ elif name == 'pot-creation-date': # FIXME: this should use dates.parse_datetime as soon as that # is ready - value, tzoffset, _ = re.split('[+-](\d{4})$', value, 1) + value, tzoffset, _ = re.split('([+-]\d{4})$', value, 1) + tt = time.strptime(value, '%Y-%m-%d %H:%M') ts = time.mktime(tt) - tzoffset = FixedOffsetTimezone(int(tzoffset[:2]) * 60 + - int(tzoffset[2:])) + + # Seprate the offset into a sign component, hours, and minutes + plus_minus_s, rest = tzoffset[0], tzoffset[1:] + hours_offset_s, mins_offset_s = rest[:2], rest[2:] + + # Make them all integers + plus_minus = int(plus_minus_s + '1') + hours_offset = int(hours_offset_s) + mins_offset = int(mins_offset_s) + + # Calculate net offset + net_mins_offset = hours_offset * 60 + net_mins_offset += mins_offset + net_mins_offset *= plus_minus + + # Create an offset object + tzoffset = FixedOffsetTimezone(net_mins_offset) + + # Store the offset in a datetime object dt = datetime.fromtimestamp(ts) self.creation_date = dt.replace(tzinfo=tzoffset) elif name == 'po-revision-date': @@ -361,11 +379,29 @@ if 'YEAR' not in value: # FIXME: this should use dates.parse_datetime as soon as # that is ready - value, tzoffset, _ = re.split('[+-](\d{4})$', value, 1) + value, tzoffset, _ = re.split('([+-]\d{4})$', value, 1) tt = time.strptime(value, '%Y-%m-%d %H:%M') ts = time.mktime(tt) - tzoffset = FixedOffsetTimezone(int(tzoffset[:2]) * 60 + - int(tzoffset[2:])) + + # Seprate the offset into a sign component, hours, and + # minutes + plus_minus_s, rest = tzoffset[0], tzoffset[1:] + hours_offset_s, mins_offset_s = rest[:2], rest[2:] + + # Make them all integers + plus_minus = int(plus_minus_s + '1') + hours_offset = int(hours_offset_s) + mins_offset = int(mins_offset_s) + + # Calculate net offset + net_mins_offset = hours_offset * 60 + net_mins_offset += mins_offset + net_mins_offset *= plus_minus + + # Create an offset object + tzoffset = FixedOffsetTimezone(net_mins_offset) + + # Store the offset in a datetime object dt = datetime.fromtimestamp(ts) self.revision_date = dt.replace(tzinfo=tzoffset)
--- a/babel/messages/tests/catalog.py +++ b/babel/messages/tests/catalog.py @@ -269,6 +269,15 @@ localized_catalog.update(template) self.assertEqual(localized_catalog.revision_date, fake_rev_date) + def test_stores_datetime_correctly(self): + localized = catalog.Catalog() + localized.locale = 'de_DE' + localized[''] = catalog.Message('', + "POT-Creation-Date: 2009-03-09 15:47-0700\n" + + "PO-Revision-Date: 2009-03-09 15:47-0700\n") + for key, value in localized.mime_headers: + if key in ('POT-Creation-Date', 'PO-Revision-Date'): + self.assertEqual(value, '2009-03-09 15:47-0700') def suite(): suite = unittest.TestSuite()