From e5cd091d8c33cf4e4083f761716f81447b629a7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Wed, 8 Feb 2017 13:04:10 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D1=81=D1=82=D1=80=D0=BE=D0=BA=D0=B8=20?= =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D0=BB=D0=BE=D0=BA=D0=B0=D0=BB=D0=B8=D0=B7?= =?UTF-8?q?=D1=86=D0=B0=D0=B8=D0=B8.=20=D0=98=D1=81=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=20?= =?UTF-8?q?=D0=B8=D0=BD=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=86=D0=B8=D0=B8=20?= =?UTF-8?q?=D0=BE=20=D0=B0=D0=B2=D1=82=D0=BE=D0=B7=D0=B0=D0=B2=D0=B8=D1=81?= =?UTF-8?q?=D0=B8=D0=BC=D1=8B=D1=85=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D0=B0?= =?UTF-8?q?=D1=85.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pym/builder/builder.py | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/pym/builder/builder.py b/pym/builder/builder.py index 3e3b1df..3a7fccc 100644 --- a/pym/builder/builder.py +++ b/pym/builder/builder.py @@ -1406,8 +1406,8 @@ class Builder(Update): key=lambda x:x[0])): package, required_pkgs = data - self.startTask("Check (%d of %d) %s" % ( - i + 1, len(check_data), package)) + self.startTask(_("Check ({cur} of {maxval}) {package}").format( + cur=i + 1, maxval=len(check_data), package=package)) if not required_pkgs: self.endTask(True) @@ -1416,7 +1416,7 @@ class Builder(Update): pretend = list(self.pretend_emerge_list(builder_path, package)) if not pretend: self.endTask(False) - self.printERROR("Failed to receive package list") + self.printERROR(_("Failed to receive package list")) else: # получаем список пакетов которые необходимых для работы required_pkgs = [x for x in required_pkgs @@ -1460,18 +1460,21 @@ class Builder(Update): for pkg, reqs in automagic.items(): if reqs: self.printWARNING( - "Auto depends for %s package by %s will be used" % ( - pkg, ",".join(str(x) for x in reqs))) - for pkg, clear_req_pkgs in automagic_clear.items(): + _("Auto depends for {pkg} package by {pkgs} " + "will be used").format( + pkg=pkg, pkgs=",".join(str(x) for x in reqs))) + clear_req_pkgs = automagic_clear.get(pkg, []) if clear_req_pkgs: self.printWARNING( - "Auto depends for %s package by %s will be clear" % ( - pkg, ",".join(str(x) for x in clear_req_pkgs))) - for pkg, waste_pkgs in automagic_waste.items(): + _("Auto depends for {pkg} package by {pkgs} " + "will be clear").format( + pkg=pkg, pkgs=",".join(str(x) for x in clear_req_pkgs))) + waste_pkgs = automagic_waste.get(pkg, []) if waste_pkgs: self.printWARNING( - "Specified depends for %s package by %s obsoleted" % ( - pkg, ",".join(waste_pkgs))) + _("Specified depends for {pkg} package by {pkgs} " + "obsoleted").format( + pkg=pkg, pkgs=",".join(waste_pkgs))) def _rebuild_automagic(self, automagic, automagic_clear, builder_path): """