mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
string changes
This commit is contained in:
parent
f3b203d905
commit
5b963844d2
@ -17,7 +17,7 @@ from threading import Lock
|
|||||||
from calibre import as_unicode, prints
|
from calibre import as_unicode, prints
|
||||||
from calibre.constants import cache_dir, get_windows_number_formats, iswindows, preferred_encoding
|
from calibre.constants import cache_dir, get_windows_number_formats, iswindows, preferred_encoding
|
||||||
from calibre.utils.icu import lower as icu_lower
|
from calibre.utils.icu import lower as icu_lower
|
||||||
from calibre.utils.localization import canonicalize_lang
|
from calibre.utils.localization import canonicalize_lang, ngettext
|
||||||
from polyglot.builtins import iteritems, itervalues, string_or_bytes
|
from polyglot.builtins import iteritems, itervalues, string_or_bytes
|
||||||
|
|
||||||
|
|
||||||
@ -460,19 +460,19 @@ def human_readable_interval(secs):
|
|||||||
seconds = secs % 60
|
seconds = secs % 60
|
||||||
parts = []
|
parts = []
|
||||||
if days > 0:
|
if days > 0:
|
||||||
parts.append(_('{} days').format(days))
|
parts.append(ngettext('one day', '{} days', days).format(days))
|
||||||
if hours > 0:
|
if hours > 0:
|
||||||
parts.append(_('{} hours').format(hours))
|
parts.append(ngettext('one hour', '{} hours', hours).format(hours))
|
||||||
elif hours > 0:
|
elif hours > 0:
|
||||||
parts.append(_('{} hours').format(hours))
|
parts.append(ngettext('one hour', '{} hours', hours).format(hours))
|
||||||
if minutes > 0:
|
if minutes > 0:
|
||||||
parts.append(_('{} minutes').format(minutes))
|
parts.append(ngettext('one minute', '{} minutes', minutes).format(minutes))
|
||||||
elif minutes > 0:
|
elif minutes > 0:
|
||||||
parts.append(_('{} minutes').format(minutes))
|
parts.append(ngettext('one minute', '{} minutes', minutes).format(minutes))
|
||||||
if secs > 0:
|
if secs > 0:
|
||||||
parts.append(_('{} seconds').format(seconds))
|
parts.append(ngettext('one second', '{} seconds', seconds).format(seconds))
|
||||||
elif secs > 0:
|
elif secs > 0:
|
||||||
parts.append(_('{} seconds').format(seconds))
|
parts.append(ngettext('one second', '{} seconds', seconds).format(seconds))
|
||||||
return ' '.join(parts)
|
return ' '.join(parts)
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user