From 291f47791d2c0d8521922c8d3090e2aa6f099d5b Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 9 Jan 2013 06:33:56 +0100 Subject: * apt-pkg/contrib/progress.cc: - Make "..." translatable to fix inconsistencies in the output of e.g. apt-get update. While this adds new translatable strings, not having translations for them will not break anything. Thanks to Guillem Jover. Closes: #696225 --- apt-pkg/contrib/progress.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'apt-pkg/contrib/progress.cc') diff --git a/apt-pkg/contrib/progress.cc b/apt-pkg/contrib/progress.cc index 317048845..17a6b70e9 100644 --- a/apt-pkg/contrib/progress.cc +++ b/apt-pkg/contrib/progress.cc @@ -176,7 +176,7 @@ void OpTextProgress::Update() if (OldOp.empty() == false) cout << endl; OldOp = "a"; - cout << Op << "..." << flush; + cout << Op << _("...") << flush; } return; @@ -192,7 +192,7 @@ void OpTextProgress::Update() } // Print the spinner - snprintf(S,sizeof(S),"\r%s... %u%%",Op.c_str(),(unsigned int)Percent); + snprintf(S,sizeof(S),_("\r%s... %u%%"),Op.c_str(),(unsigned int)Percent); Write(S); OldOp = Op; -- cgit v1.2.3 From 32fa71a57dcf625c94207dce612175af49c93ce4 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 1 Mar 2013 18:50:59 +0100 Subject: include two missing patches to really fix bug #696225, thanks to Guillem Jover --- apt-pkg/contrib/progress.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'apt-pkg/contrib/progress.cc') diff --git a/apt-pkg/contrib/progress.cc b/apt-pkg/contrib/progress.cc index 17a6b70e9..916e1d730 100644 --- a/apt-pkg/contrib/progress.cc +++ b/apt-pkg/contrib/progress.cc @@ -192,7 +192,7 @@ void OpTextProgress::Update() } // Print the spinner - snprintf(S,sizeof(S),_("\r%s... %u%%"),Op.c_str(),(unsigned int)Percent); + snprintf(S,sizeof(S),_("%c%s... %u%%"),'\r',Op.c_str(),(unsigned int)Percent); Write(S); OldOp = Op; -- cgit v1.2.3