Bug#696225: apt: Progress output format problems on some locales

[Guillem Jover <guillem@debian.org>]

On Wed, 2013-01-09 at 06:36:30 +0100, Michael Vogt wrote:
> I merged this into my branch now and it will be part of the next
> upload. I think its fine for wheezy. While it does add two new
> translatable strings its just like it is now if they are not
> translated so nothing regresses.

While I wholeheartedly agree, I've to note some translators give the
100% mark a great meaning, even if in reality the goal post did not
move, we were just not using the correct lenses. ;)

I'm including a second patch, as I've just noticed now that the gettext
tools do not really like non \n and \t escape sequences in marked
strings. As a penance I think I'll try to translate as much of these
two strings as possible, or as long as it makes sense.

Thanks,
Guillem

From 920f57cf31d04f202dd5683e355d96c6f705c29c Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Fri, 11 Jan 2013 00:55:11 +0100
Subject: [PATCH] Do not include \r in strings marked for translation

The gettext tools do not like that.
---
 apt-pkg/contrib/progress.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apt-pkg/contrib/progress.cc b/apt-pkg/contrib/progress.cc
index 17a6b70..916e1d7 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;
-- 
1.8.1