MycroftAI
/
mycroft-core
mirror of https://github.com/MycroftAI/mycroft-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1412 from MycroftAI/feature/fix_nice_time 

Fix bug in nice_time() for times before noon
pull/1858/head^2
Åke 2018-02-08 14:08:42 +01:00 committed by GitHub
parent 9e8461b087 420b21e40e
commit 708d3ecce1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mycroft/util/lang/format_en.py
View File

@ -202,7 +202,7 @@ def nice_time_en(dt, speech=True, use_24hour=False, use_ampm=False):
if dt.hour == 0:
speak = pronounce_number_en(12)
elif dt.hour < 13:
speak = pronounce_number_en(dt.hour-12)
speak = pronounce_number_en(dt.hour)
else:
speak = pronounce_number_en(dt.hour-12)

20
test/unittests/util/test_format.py
View File

@ -227,6 +227,26 @@ class TestNiceDateFormat(unittest.TestCase):
self.assertEqual(nice_time(dt, use_24hour=True, use_ampm=False),
"zero zero zero two")
dt = datetime.datetime(2018, 2, 8,
1, 2, 33)
self.assertEqual(nice_time(dt),
"one oh two")
self.assertEqual(nice_time(dt, use_ampm=True),
"one oh two AM")
self.assertEqual(nice_time(dt, speech=False),
"1:02")
self.assertEqual(nice_time(dt, speech=False, use_ampm=True),
"1:02 AM")
self.assertEqual(nice_time(dt, speech=False, use_24hour=True),
"01:02")
self.assertEqual(nice_time(dt, speech=False, use_24hour=True,
use_ampm=True),
"01:02")
self.assertEqual(nice_time(dt, use_24hour=True, use_ampm=True),
"zero one zero two")
self.assertEqual(nice_time(dt, use_24hour=True, use_ampm=False),
"zero one zero two")
if __name__ == "__main__":
unittest.main()