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

E-book viewer: Fix clock being displayed in 24 hr format on some systems even though system locale is set to use 12 hr format.

Browse Source
This commit is contained in:
Kovid Goyal 2021-01-14 20:13:14 +05:30
parent b657953478
commit 6daa33600d
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pyj/date.pyj
View File

@ -40,7 +40,7 @@ def fmt_date_pat():
def fd_format_hour(dt, ampm, hr, as_utc): 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 = h % 12 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)
@ -128,7 +128,7 @@ fd_function_index = {
def am_pm_pat(): def am_pm_pat():
ans = am_pm_pat.ans ans = am_pm_pat.ans
if not ans?: if not ans?:
ans = am_pm_pat.ans = /(ap)|(a)/ ans = am_pm_pat.ans = /(ap)|(a)|(AP)|(A)/
return ans return ans