10 files changed, 59 insertions, 41 deletions

diff --git a/music_sampler/actions/interrupt_wait.py b/music_sampler/actions/interrupt_wait.py
index 8f465f0..f85a3c4 100644
--- a/music_sampler/actions/interrupt_wait.py
+++ b/music_sampler/actions/interrupt_wait.py
@@ -2,4 +2,4 @@ def run(action, wait_id=None, **kwargs):
     action.mapping.interrupt_wait(wait_id)
 
 def description(action, wait_id=None, **kwargs):
-    return "interrupt wait with id {}".format(wait_id)
+    return _("interrupt wait with id {}").format(wait_id)
diff --git a/music_sampler/actions/pause.py b/music_sampler/actions/pause.py
index bb27734..4575f32 100644
--- a/music_sampler/actions/pause.py
+++ b/music_sampler/actions/pause.py
@@ -5,6 +5,6 @@ def run(action, music=None, **kwargs):
 
 def description(action, music=None, **kwargs):
     if music is not None:
-        return "pausing « {} »".format(music.name)
+        return _("pausing « {} »").format(music.name)
     else:
-        return "pausing all musics"
+        return _("pausing all musics")
diff --git a/music_sampler/actions/play.py b/music_sampler/actions/play.py
index fdba95b..f6057ad 100644
--- a/music_sampler/actions/play.py
+++ b/music_sampler/actions/play.py
@@ -19,26 +19,32 @@ def run(action, music=None, fade_in=0, start_at=0,
 
 def description(action, music=None, fade_in=0, start_at=0,
         restart_if_running=False, volume=100, loop=0, **kwargs):
+    formats = []
     message = "starting "
     if music is not None:
-        message += "« {} »".format(music.name)
+        message += "« {} »"
+        formats.append(music.name)
     else:
         message += "all musics"
 
     if start_at != 0:
-        message += " at {}s".format(start_at)
+        message += " at {}s"
+        formats.append(start_at)
 
     if fade_in != 0:
-        message += " with {}s fade_in".format(fade_in)
+        message += " with {}s fade_in"
+        formats.append(fade_in)
 
-    message += " at volume {}%".format(volume)
+    message += " at volume {}%"
+    formats.append(volume)
 
     if loop > 0:
-        message += " {} times".format(loop + 1)
+        message += " {} times"
+        formats.append(loop + 1)
     elif loop < 0:
         message += " in loop"
 
     if restart_if_running:
         message += " (restarting if already running)"
 
-    return message
+    return _(message).format(*formats)
diff --git a/music_sampler/actions/run_command.py b/music_sampler/actions/run_command.py
index 1e80c1e..df23056 100644
--- a/music_sampler/actions/run_command.py
+++ b/music_sampler/actions/run_command.py
@@ -6,8 +6,10 @@ def run(action, command="", wait=False, **kwargs):
         action.process.wait()
 
 def description(action, command="", wait=False, **kwargs):
-    message = "running command {}".format(command)
+    formats = []
+    message = "running command {}"
+    formats.append(command)
     if wait:
         message += " (waiting for its execution to finish)"
 
-    return message
+    return _(message).format(*formats)
diff --git a/music_sampler/actions/seek.py b/music_sampler/actions/seek.py
index 467af7d..9f19798 100644
--- a/music_sampler/actions/seek.py
+++ b/music_sampler/actions/seek.py
@@ -5,15 +5,15 @@ def run(action, music=None, value=0, delta=False, **kwargs):
 def description(action, music=None, value=0, delta=False, **kwargs):
     if delta:
         if music is not None:
-            return "moving music « {} » by {:+d}s" \
+            return _("moving music « {} » by {:+d}s") \
                     .format(music.name, value)
         else:
-            return "moving all musics by {:+d}s" \
+            return _("moving all musics by {:+d}s") \
                     .format(value)
     else:
         if music is not None:
-            return "moving music « {} » to position {}s" \
+            return _("moving music « {} » to position {}s") \
                     .format(music.name, value)
         else:
-            return "moving all musics to position {}s" \
+            return _("moving all musics to position {}s") \
                     .format(value)
diff --git a/music_sampler/actions/stop.py b/music_sampler/actions/stop.py
index 88cc66d..769c312 100644
--- a/music_sampler/actions/stop.py
+++ b/music_sampler/actions/stop.py
@@ -19,22 +19,25 @@ def run(action, music=None, fade_out=0, wait=False,
 def description(action, music=None, fade_out=0, wait=False,
         set_wait_id=None, **kwargs):
 
+    formats = []
     message = "stopping "
     if music is not None:
-        message += "music « {} »".format(music.name)
+        message += "music « {} »"
+        formats.append(music.name)
     else:
         message += "all musics"
 
     if fade_out > 0:
-        message += " with {}s fadeout".format(fade_out)
+        message += " with {}s fadeout"
+        formats.append(fade_out)
         if wait:
             if set_wait_id is not None:
-                message += " (waiting the end of fadeout, with id {})"\
-                        .format(set_wait_id)
+                message += " (waiting the end of fadeout, with id {})"
+                formats.append(set_wait_id)
             else:
                 message += " (waiting the end of fadeout)"
 
-    return message
+    return _(message).format(*formats)
 
 def interrupt(action, music=None, fade_out=0, wait=False,
         set_wait_id=None, **kwargs):
diff --git a/music_sampler/actions/stop_all_actions.py b/music_sampler/actions/stop_all_actions.py
index 4ea875a..14a1a94 100644
--- a/music_sampler/actions/stop_all_actions.py
+++ b/music_sampler/actions/stop_all_actions.py
@@ -11,4 +11,4 @@ def description(action, other_only=False, **kwargs):
     if other_only:
         message += " except this key"
 
-    return message
+    return _(message)
diff --git a/music_sampler/actions/unpause.py b/music_sampler/actions/unpause.py
index 5fa88c3..6505ab8 100644
--- a/music_sampler/actions/unpause.py
+++ b/music_sampler/actions/unpause.py
@@ -5,6 +5,6 @@ def run(action, music=None, **kwargs):
 
 def description(action, music=None, **kwargs):
     if music is not None:
-        return "unpausing « {} »".format(music.name)
+        return _("unpausing « {} »").format(music.name)
     else:
-        return "unpausing all musics"
+        return _("unpausing all musics")
diff --git a/music_sampler/actions/volume.py b/music_sampler/actions/volume.py
index 7dda3c1..e02cdfa 100644
--- a/music_sampler/actions/volume.py
+++ b/music_sampler/actions/volume.py
@@ -6,23 +6,27 @@ def run(action, music=None, value=100, fade=0, delta=False, **kwargs):
 
 def description(action, music=None,
         value=100, delta=False, fade=0, **kwargs):
+    formats = []
     message = ""
     if delta:
         if music is not None:
-            message += "{:+d}% to volume of « {} »" \
-                    .format(value, music.name)
+            message += "{:+d}% to volume of « {} »"
+            formats.append(value)
+            formats.append(music.name)
         else:
-            message += "{:+d}% to volume" \
-                    .format(value)
+            message += "{:+d}% to volume"
+            formats.append(value)
     else:
         if music is not None:
-            message += "setting volume of « {} » to {}%" \
-                    .format(music.name, value)
+            message += "setting volume of « {} » to {}%"
+            formats.append(music.name)
+            formats.append(value)
         else:
-            message += "setting volume to {}%" \
-                    .format(value)
+            message += "setting volume to {}%"
+            formats.append(value)
 
     if fade > 0:
-        message += " with {}s fade".format(fade)
+        message += " with {}s fade"
+        formats.append(fade)
 
-    return message
+    return _(message).format(*formats)
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):
     action.sleep_event.wait()
 
 def description(action, duration=0, music=None, set_wait_id=None, **kwargs):
+    formats = []
     message = ""
     if music is None:
-        message += "waiting {}s" \
-                .format(duration)
+        message += "waiting {}s"
+        formats.append(duration)
     elif duration == 0:
-        message += "waiting the end of « {} »" \
-                .format(music.name)
+        message += "waiting the end of « {} »"
+        formats.append(music.name)
     else:
-        message += "waiting the end of « {} » + {}s" \
-                .format(music.name, duration)
+        message += "waiting the end of « {} » + {}s"
+        formats.append(music.name)
+        formats.append(duration)
 
     if set_wait_id is not None:
-        message += " (setting id = {})".format(set_wait_id)
+        message += " (setting id = {})"
+        formats.append(set_wait_id)
 
-    return message
+    return _(message).format(*formats)
 
 def interrupt(action, duration=0, music=None, **kwargs):
     if action.sleep_event is not None: