1.7.1dev: merge [17800] from 1.6-stable (babel)

git-svn-id: http://trac.edgewall.org/intertrac/log:/trunk@17801 af82e41b-90c4-0310-8c96-b1721e28e2e2
edgewall · May 6, 2024 · af69cc0 · af69cc0
2 parents ce4f985 + 85c9031
commit af69cc0
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/trac/util/tests/datefmt.py b/trac/util/tests/datefmt.py
@@ -1184,7 +1184,8 @@ def test_i18n_format_datetime(self):
             vi = Locale.parse('vi')
             self.assertIn(datefmt.format_datetime(t, tzinfo=tz, locale=vi),
                           ('13:45:56 28-08-2010',        # Babel < 2.2.0
-                           '13:45:56, 28 thg 8, 2010'))  # Babel 2.2.0
+                           '13:45:56, 28 thg 8, 2010',   # Babel >= 2.2.0
+                           '13:45:56 28 thg 8, 2010'))   # Babel >= 2.15.0
             zh_CN = Locale.parse('zh_CN')
             self.assertIn(datefmt.format_datetime(t, tzinfo=tz, locale=zh_CN),
                           ('2010-8-28 下午01:45:56',
@@ -1266,7 +1267,8 @@ def test_i18n_datetime_hint(self):
             self.assertIn(datefmt.get_datetime_format_hint(vi),
                           ('HH:mm:ss dd-MM-yyyy',
                            'HH:mm:ss dd-MM-y',
-                           'HH:mm:ss, d MMM, y'))  # Babel 2.2.0
+                           'HH:mm:ss, d MMM, y',   # Babel >= 2.2.0
+                           'HH:mm:ss d MMM, y'))   # Babel >= 2.15.0
             self.assertIn(datefmt.get_datetime_format_hint(zh_CN),
                           ('yyyy-M-d ahh:mm:ss',
                            'y年M月d日 ah:mm:ss',