Fixing some translation issues.

diff --git a/python/pakfire/base.py b/python/pakfire/base.py
index e25c989a28a8788febb94d73356a93478528b6fe..663b4e493e25384a88c4258b4aa95ecdd195a1b6 100644 (file)
--- 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 cb78c66684e1d9ec40e8dfb874f9ef854817d04e..7a933e28f7d8f7693fe5da9fac50fc12820fe6d6 100644 (file)
--- 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 7433ad84bf6692bb1dddebb034101aef31f13b8e..95e992776362b2905dffd1832d21eb3e72a7b2f5 100644 (file)
--- 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 8c23ec57d5f9696b1d673c4a42743d2c0088cedb..84f5a4ae5ce9c12d56dde3a17528d688e784bdcf 100644 (file)
--- 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()