Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

E-book viewer: Fix clock showing hour as zero instead of 12 between 12 and 1 am/pm

Browse Source
This commit is contained in:
Kovid Goyal 2024-02-03 09:13:33 +05:30
parent eebec37dc8
commit 7e3ac04222
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pyj/date.pyj
View File

@ -41,6 +41,8 @@ def fd_format_hour(dt, ampm, hr, as_utc):
h = dt.getUTCHours() if as_utc else dt.getHours() h = dt.getUTCHours() if as_utc else dt.getHours()
if ampm: if ampm:
h %= 12 h %= 12
if h is 0:
h = 12
return h.toString() if hr.length is 1 else str.format('{:02d}', h) return h.toString() if hr.length is 1 else str.format('{:02d}', h)

3
src/pyj/test_date.pyj
View File

@ -13,6 +13,9 @@ def test_fd(date, fmt, ans):
@test @test
def date_formatting(): def date_formatting():
test_fd('1101-01-01T09:00:00+00:00', 'hh h', '09 9') test_fd('1101-01-01T09:00:00+00:00', 'hh h', '09 9')
test_fd('1101-01-01T12:15:00+00:00', 'h:m ap', '12:15 pm')
test_fd('1101-01-01T00:15:00+00:00', 'h:m ap', '12:15 am')
test_fd('1101-01-01T13:15:00+00:00', 'h:m ap', '1:15 pm')
test_fd('1101-01-01T09:01:00+00:00', 'h:mm AP', '9:01 AM') test_fd('1101-01-01T09:01:00+00:00', 'h:mm AP', '9:01 AM')
test_fd('1101-01-01T09:05:01.012+00:00', 'hh h mm m ss s z zzz ap AP a A yy yyyy', '09 9 05 5 01 1 12 012 am AM am AM 01 1101') test_fd('1101-01-01T09:05:01.012+00:00', 'hh h mm m ss s z zzz ap AP a A yy yyyy', '09 9 05 5 01 1 12 012 am AM am AM 01 1101')
test_fd('2001-01-02T09:00:00+00:00', 'M MM MMM MMMM', '1 01 Jan January') test_fd('2001-01-02T09:00:00+00:00', 'M MM MMM MMMM', '1 01 Jan January')