summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2017-10-14 20:46:57 +0200
committerClaude Paroz <claude@2xlibre.net>2017-10-14 21:09:44 +0200
commit6481795d6367fd5031b00513768d1099424d9421 (patch)
tree1d2fdf99fa5da49da49616fa69838fc3863fd093
parentcb42dc809bd63d942eaaeff20d7acf0eb185c20f (diff)
[2.0.x] Refs #28710 -- Simplified l10n format test
Backport of c1fa6672dd995e5ab4e06d5132db40ed0f41a47e from master.
-rw-r--r--tests/i18n/tests.py21
1 files changed, 9 insertions, 12 deletions
diff --git a/tests/i18n/tests.py b/tests/i18n/tests.py
index 8f881e83c8..83e2260a51 100644
--- a/tests/i18n/tests.py
+++ b/tests/i18n/tests.py
@@ -338,20 +338,17 @@ class FormattingTests(SimpleTestCase):
def test_all_format_strings(self):
all_locales = LANG_INFO.keys()
- today = datetime.date.today()
- now = datetime.datetime.now()
- current_year = str(today.year)
- current_day = str(today.day)
- current_minute = str(now.minute)
+ some_date = datetime.date(2017, 10, 14)
+ some_datetime = datetime.datetime(2017, 10, 14, 10, 23)
for locale in all_locales:
with self.subTest(locale=locale), translation.override(locale):
- self.assertIn(current_year, date_format(today)) # Uses DATE_FORMAT by default
- self.assertIn(current_minute, time_format(now)) # Uses TIME_FORMAT by default
- self.assertIn(current_year, date_format(now, format=get_format('DATETIME_FORMAT')))
- self.assertIn(current_year, date_format(today, format=get_format('YEAR_MONTH_FORMAT')))
- self.assertIn(current_day, date_format(today, format=get_format('MONTH_DAY_FORMAT')))
- self.assertIn(current_year, date_format(today, format=get_format('SHORT_DATE_FORMAT')))
- self.assertIn(current_year, date_format(now, format=get_format('SHORT_DATETIME_FORMAT')))
+ self.assertIn('2017', date_format(some_date)) # Uses DATE_FORMAT by default
+ self.assertIn('23', time_format(some_datetime)) # Uses TIME_FORMAT by default
+ self.assertIn('2017', date_format(some_datetime, format=get_format('DATETIME_FORMAT')))
+ self.assertIn('2017', date_format(some_date, format=get_format('YEAR_MONTH_FORMAT')))
+ self.assertIn('14', date_format(some_date, format=get_format('MONTH_DAY_FORMAT')))
+ self.assertIn('2017', date_format(some_date, format=get_format('SHORT_DATE_FORMAT')))
+ self.assertIn('2017', date_format(some_datetime, format=get_format('SHORT_DATETIME_FORMAT')))
def test_locale_independent(self):
"""