From 4cdde79f74f15bdd476cb4c27ec2e68c030c2f04 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sat, 11 Feb 2012 16:41:58 +0100 Subject: [PATCH] Fixing some translation issues. --- python/pakfire/base.py | 4 ++-- python/pakfire/client/transport.py | 3 ++- python/pakfire/packages/make.py | 3 ++- python/pakfire/repository/database.py | 3 ++- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/python/pakfire/base.py b/python/pakfire/base.py index e25c989a2..663b4e493 100644 --- a/python/pakfire/base.py +++ b/python/pakfire/base.py @@ -331,8 +331,8 @@ class Pakfire(object): reinstall_pkgs.append(_pkgs[0]) #t.add("reinstall", _pkgs[0]) else: - log.warning(_("Multiple reinstall candidates for \"%s\": %s") \ - % (pattern, ", ".join(p.friendly_name for p in sorted(_pkgs)))) + log.warning(_("Multiple reinstall candidates for \"%(pattern)s\": %(pkgs)s") \ + % { "pattern" : pattern, "pkgs" : ", ".join(p.friendly_name for p in sorted(_pkgs)) }) if not reinstall_pkgs: log.info(_("Nothing to do")) diff --git a/python/pakfire/client/transport.py b/python/pakfire/client/transport.py index cb78c6668..7a933e28f 100644 --- a/python/pakfire/client/transport.py +++ b/python/pakfire/client/transport.py @@ -76,7 +76,8 @@ class XMLRPCMixin: if timeout > 60: timeout = 60 - log.warning(_("Trying again in %s seconds. %s tries left.") % (timeout, tries)) + log.warning(_("Trying again in %(timeout)s second(s). %(tries)s tries left.") \ + % { "timeout" : timeout, "tries" : tries }) time.sleep(timeout) else: diff --git a/python/pakfire/packages/make.py b/python/pakfire/packages/make.py index 7433ad84b..95e992776 100644 --- a/python/pakfire/packages/make.py +++ b/python/pakfire/packages/make.py @@ -473,7 +473,8 @@ class MakefilePackage(MakefileBase): continue # Let the user know what has been done. - log.info(_("Filter '%s' filtered %s.") % (filter.pattern, dep)) + log.info(_("Filter '%(pattern)s' filtered %(dep)s.") % \ + { "pattern" : filter.pattern, "dep" : dep }) # Yes, we found a match. filtered = True diff --git a/python/pakfire/repository/database.py b/python/pakfire/repository/database.py index 8c23ec57d..84f5a4ae5 100644 --- a/python/pakfire/repository/database.py +++ b/python/pakfire/repository/database.py @@ -221,7 +221,8 @@ class DatabaseLocal(Database): if self.format > DATABASE_FORMAT: raise DatabaseError, _("Cannot use database with version greater than %s.") % DATABASE_FORMAT - log.info(_("Migrating database from format %s to %s.") % (self.format, DATABASE_FORMAT)) + log.info(_("Migrating database from format %(old)s to %(new)s.") % \ + { "old" : self.format, "new" : DATABASE_FORMAT }) # Get a database cursor. c = self.cursor() -- 2.39.5