deskbar-applet r2246 - in trunk: . deskbar/handlers deskbar/ui/cuemiac

[sebp svn gnome org]

Author: sebp
Date: Mon Jul 14 20:41:51 2008
New Revision: 2246
URL: http://svn.gnome.org/viewvc/deskbar-applet?rev=2246&view=rev

Log:
Fixed bug #542638: Don't put dict keys in gettext call parameter
(patch by Claude Paroz <claude at 2xlibre dot net>)


Modified:
   trunk/ChangeLog
   trunk/deskbar/handlers/beagle-live.py
   trunk/deskbar/ui/cuemiac/CuemiacItems.py

Modified: trunk/deskbar/handlers/beagle-live.py
==============================================================================
--- trunk/deskbar/handlers/beagle-live.py	(original)
+++ trunk/deskbar/handlers/beagle-live.py	Mon Jul 14 20:41:51 2008
@@ -382,7 +382,9 @@
 class BeagleSearchMatch(deskbar.interfaces.Match):
     def __init__(self, term, cat_type, hit_type, **args):
     	deskbar.interfaces.Match.__init__(self, name=term, icon="system-search", category=cat_type, **args)
-    	verb = _("Additional results for category <b>%s</b>") % _(CATEGORIES[cat_type]['name'])
+    	# Prevent xgettext from extracting "name" key
+    	cat_name = CATEGORIES[cat_type]['name']
+     	verb = _("Additional results for category <b>%s</b>") % _(cat_name)
     	self.term = term
         self.cat_type = cat_type
     	self.add_action( BeagleSearchAction("Beagle Search", term, verb, hit_type) )

Modified: trunk/deskbar/ui/cuemiac/CuemiacItems.py
==============================================================================
--- trunk/deskbar/ui/cuemiac/CuemiacItems.py	(original)
+++ trunk/deskbar/ui/cuemiac/CuemiacItems.py	Mon Jul 14 20:41:51 2008
@@ -16,10 +16,13 @@
         self.__parent = parent
         
         try:
-            self.__name = gettext.gettext(CATEGORIES[id]["name"])
+            # Prevent xgettext from extracting "name" key
+            id_cat_name = CATEGORIES[id]["name"]
+            self.__name = gettext.gettext(id_cat_nam)
             self.__id = id
         except:
-            self.__name = gettext.gettext(CATEGORIES["default"]["name"])
+            default_cat_name = CATEGORIES["default"]["name"]
+            self.__name = gettext.gettext(default_cat_name)
             self.__id = "default"