From 97bab1747047eefc2109119a1651deb25b30691f Mon Sep 17 00:00:00 2001
From: Gonzalo Odiard <godiard@gmail.com>
Date: Fri, 10 Feb 2012 14:28:26 +0000
Subject: Use named parameters in gettext strings -v2

When there are more than one parameter with the same type
gettext need named parameters to enable the translators to change
the order if needed.
Pootle server complain about this format strings in Record activity,
and you can see the same error doing "./setup.py genpot"

v2: Fixed typo

Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
---
diff --git a/glive.py b/glive.py
index fd9a5af..97fc0e1 100644
--- a/glive.py
+++ b/glive.py
@@ -393,7 +393,8 @@ class Glive:
         stringType = constants.MEDIA_INFO[type]['istr']
         
         # Translators: photo by photographer, e.g. "Photo by Mary"
-        tl[gst.TAG_TITLE] = _('%s by %s') % (stringType, self.model.get_nickname())
+        tl[gst.TAG_TITLE] = _('%(type)s by %(name)s') % {'type': stringType,
+                'name': self.model.get_nickname()}
         return tl
 
     def blockedCb(self, x, y, z):
diff --git a/model.py b/model.py
index 884325b..d47671c 100644
--- a/model.py
+++ b/model.py
@@ -180,7 +180,8 @@ class Model:
 
         mins = value / 60
         secs = value % 60
-        text = _('%d:%02d remaining') % (mins, secs)
+        text = _('%(mins)d:%(secs)02d remaining') % {'mins': mins,
+                'secs': secs}
 
         self.set_progress(progress_value, text)
 
@@ -381,7 +382,8 @@ class Model:
         stringType = constants.MEDIA_INFO[type]['istr']
 
         # Translators: photo by photographer, e.g. "Photo by Mary"
-        recd.title = _('%s by %s') % (stringType, recd.recorderName)
+        recd.title = _('%(type)s by %(name)s') % {'type': stringType,
+                'name': recd.recorderName}
 
         color = sugar.profile.get_color()
         recd.colorStroke = color.get_stroke_color()
--
cgit v0.9.1