From 1fb94537233fe29ed584dcd248ace5ab66fcf4aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Rapinat?= Date: Fri, 16 Dec 2011 12:37:34 +0000 Subject: [PATCH] 5392: Addon check type strings are not translatable svn: r18609 --- src/gui/viewmanager.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/gui/viewmanager.py b/src/gui/viewmanager.py index 1cd3344c5..d4bca14d6 100644 --- a/src/gui/viewmanager.py +++ b/src/gui/viewmanager.py @@ -404,7 +404,7 @@ class ViewManager(CLIManager): if "update" in whattypes: if (not config.get('behavior.do-not-show-previously-seen-updates') or plugin_dict["i"] not in config.get('behavior.previously-seen-updates')): - addon_update_list.append(("Updated", + addon_update_list.append((_("Updated"), "%s/download/%s" % (ADDONS_URL, plugin_dict["z"]), @@ -416,7 +416,7 @@ class ViewManager(CLIManager): if "new" in whattypes: if (not config.get('behavior.do-not-show-previously-seen-updates') or plugin_dict["i"] not in config.get('behavior.previously-seen-updates')): - addon_update_list.append(("New", + addon_update_list.append((_("New"), "%s/download/%s" % (ADDONS_URL, plugin_dict["z"]), @@ -429,7 +429,7 @@ class ViewManager(CLIManager): LOG.debug("Done checking!") # List of translated strings used here # Dead code for l10n - _('new'), _('update'), _('New'), _('Updated') + _('new'), _('update') if addon_update_list: self.update_addons(addon_update_list) elif force: @@ -472,13 +472,13 @@ class ViewManager(CLIManager): {"name": '', "type": TOGGLE}, # 6 visible? bool ], list_mode="tree") pos = None - addon_update_list.sort(key=lambda x: "%s %s" % (_(x[0]), x[2]["t"])) + addon_update_list.sort(key=lambda x: "%s %s" % (x[0], x[2]["t"])) last_category = None for (status,plugin_url,plugin_dict) in addon_update_list: count = get_count(addon_update_list, plugin_dict["t"]) - category = _("%(adjective)s %(addon)s") % { - "adjective": _(status), - "addon": ngettext(plugin_dict["t"], plugin_dict["t"] + "s", count)} + category = _("%(adjective)s: %(addon)s") % { + "adjective": status, + "addon": _(plugin_dict["t"])} if last_category != category: last_category = category node = self.list.add([False, # initially selected? @@ -489,7 +489,7 @@ class ViewManager(CLIManager): "", False]) # checkbox visible? iter = self.list.add([False, # initially selected? - "%s %s" % (_(status), plugin_dict["t"]), + "%s %s" % (status, _(plugin_dict["t"])), "%s (%s)" % (plugin_dict["n"], plugin_dict["v"]), plugin_dict["d"],