From 1e96b44f71ab48e4a4436a827d617801e056a96e Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 19 Jun 2022 15:27:31 +0530 Subject: [PATCH] Nicer time left display for jobs --- src/calibre/gui2/jobs.py | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/calibre/gui2/jobs.py b/src/calibre/gui2/jobs.py index 314616e2c8..fa62941034 100644 --- a/src/calibre/gui2/jobs.py +++ b/src/calibre/gui2/jobs.py @@ -48,13 +48,19 @@ def human_readable_interval(secs): seconds = secs % 60 parts = [] if days > 0: - parts.append('%dd' % days) - if hours > 0: - parts.append('%dh' % hours) - if minutes > 0: - parts.append('%dm' % minutes) - if secs > 0: - parts.append('%ds' % seconds) + parts.append(_('{} days').format(days)) + if hours > 0: + parts.append(_('{} hours').format(hours)) + elif hours > 0: + parts.append(_('{} hours').format(hours)) + if minutes > 0: + parts.append(_('{} minutes').format(minutes)) + elif minutes > 0: + parts.append(_('{} minutes').format(minutes)) + if secs > 0: + parts.append(_('{} seconds').format(seconds)) + elif secs > 0: + parts.append(_('{} seconds').format(seconds)) return ' '.join(parts)