diff options
Diffstat (limited to 'music_sampler/actions/wait.py')
-rw-r--r-- | music_sampler/actions/wait.py | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/music_sampler/actions/wait.py b/music_sampler/actions/wait.py index ea42408..e6d07f2 100644 --- a/music_sampler/actions/wait.py +++ b/music_sampler/actions/wait.py | |||
@@ -16,21 +16,24 @@ def run(action, duration=0, music=None, set_wait_id=None, **kwargs): | |||
16 | action.sleep_event.wait() | 16 | action.sleep_event.wait() |
17 | 17 | ||
18 | def description(action, duration=0, music=None, set_wait_id=None, **kwargs): | 18 | def description(action, duration=0, music=None, set_wait_id=None, **kwargs): |
19 | formats = [] | ||
19 | message = "" | 20 | message = "" |
20 | if music is None: | 21 | if music is None: |
21 | message += "waiting {}s" \ | 22 | message += "waiting {}s" |
22 | .format(duration) | 23 | formats.append(duration) |
23 | elif duration == 0: | 24 | elif duration == 0: |
24 | message += "waiting the end of « {} »" \ | 25 | message += "waiting the end of « {} »" |
25 | .format(music.name) | 26 | formats.append(music.name) |
26 | else: | 27 | else: |
27 | message += "waiting the end of « {} » + {}s" \ | 28 | message += "waiting the end of « {} » + {}s" |
28 | .format(music.name, duration) | 29 | formats.append(music.name) |
30 | formats.append(duration) | ||
29 | 31 | ||
30 | if set_wait_id is not None: | 32 | if set_wait_id is not None: |
31 | message += " (setting id = {})".format(set_wait_id) | 33 | message += " (setting id = {})" |
34 | formats.append(set_wait_id) | ||
32 | 35 | ||
33 | return message | 36 | return _(message).format(*formats) |
34 | 37 | ||
35 | def interrupt(action, duration=0, music=None, **kwargs): | 38 | def interrupt(action, duration=0, music=None, **kwargs): |
36 | if action.sleep_event is not None: | 39 | if action.sleep_event is not None: |