Mercurial > hg
comparison hgext/progress.py @ 13139:f4dd6aa16805
progress: explain format strings to translators
author | Martin Geisler <mg@aragost.com> |
---|---|
date | Wed, 15 Dec 2010 09:35:32 +0100 |
parents | 24e3349cba8e |
children | 43575c67add3 |
comparison
equal
deleted
inserted
replaced
13138:ce05c8130296 | 13139:f4dd6aa16805 |
---|---|
55 return (getattr(sys.stderr, 'isatty', None) and | 55 return (getattr(sys.stderr, 'isatty', None) and |
56 (sys.stderr.isatty() or ui.configbool('progress', 'assume-tty'))) | 56 (sys.stderr.isatty() or ui.configbool('progress', 'assume-tty'))) |
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): |
72 def __init__(self, ui): | 75 def __init__(self, ui): |
73 self.ui = ui | 76 self.ui = ui |