Backport: FixedOffsetTimezone: fix display of negative offsets

diff --git a/babel/util.py b/babel/util.py
index a65fce36e3169d772a29c0951db49ede48564530..27377f3d2c3b12a051194c5ef60eed4612e2a999 100644 (file)
--- a/babel/util.py
+++ b/babel/util.py
@@ -255,7 +255,7 @@ class FixedOffsetTimezone(tzinfo):
     def __init__(self, offset, name=None):
         self._offset = timedelta(minutes=offset)
         if name is None:
-            name = 'Etc/GMT+%d' % offset
+            name = 'Etc/GMT%+d' % offset
         self.zone = name
 
     def __str__(self):

diff --git a/tests/test_util.py b/tests/test_util.py
index 321014c90bd28465f2984784c58bddecd6878519..c01c922663c2b0f3f10a9474e596d5a06dfea25d 100644 (file)
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -28,3 +28,15 @@ def test_pathmatch():
     assert not util.pathmatch('**.py', 'templates/index.html')
     assert util.pathmatch('**/templates/*.html', 'templates/index.html')
     assert not util.pathmatch('**/templates/*.html', 'templates/foo/bar.html')
+
+
+class FixedOffsetTimezoneTestCase(unittest.TestCase):
+    def test_zone_negative_offset(self):
+        self.assertEqual('Etc/GMT-60', util.FixedOffsetTimezone(-60).zone)
+
+    def test_zone_zero_offset(self):
+        self.assertEqual('Etc/GMT+0', util.FixedOffsetTimezone(0).zone)
+
+    def test_zone_positive_offset(self):
+        self.assertEqual('Etc/GMT+330', util.FixedOffsetTimezone(330).zone)
+