Show More
@@ -57,15 +57,18 b' def shouldprint(ui):' | |||||
57 |
|
57 | |||
58 | def fmtremaining(seconds): |
|
58 | def fmtremaining(seconds): | |
59 | if seconds < 60: |
|
59 | if seconds < 60: | |
|
60 | # i18n: format XX seconds as "XXs" | |||
60 | return _("%02ds") % (seconds) |
|
61 | return _("%02ds") % (seconds) | |
61 | minutes = seconds // 60 |
|
62 | minutes = seconds // 60 | |
62 | if minutes < 60: |
|
63 | if minutes < 60: | |
63 | seconds -= minutes * 60 |
|
64 | seconds -= minutes * 60 | |
|
65 | # i18n: format X minutes and YY seconds as "XmYYs" | |||
64 | return _("%dm%02ds") % (minutes, seconds) |
|
66 | return _("%dm%02ds") % (minutes, seconds) | |
65 | # we're going to ignore seconds in this case |
|
67 | # we're going to ignore seconds in this case | |
66 | minutes += 1 |
|
68 | minutes += 1 | |
67 | hours = minutes // 60 |
|
69 | hours = minutes // 60 | |
68 | minutes -= hours * 60 |
|
70 | minutes -= hours * 60 | |
|
71 | # i18n: format X hours and YY minutes as "XhYYm" | |||
69 | return _("%dh%02dm") % (hours, minutes) |
|
72 | return _("%dh%02dm") % (hours, minutes) | |
70 |
|
73 | |||
71 | class progbar(object): |
|
74 | class progbar(object): |
General Comments 0
You need to be logged in to leave comments.
Login now