Re: [PATCH] gitk: Remove tcl-format flag from a message that shouldn't have it

From: Junio C Hamano <gitster@pobox.com>
Date: Feb 9, 2015, 21:55 UTC
Message-ID: <xmqqlhk6agxg.fsf@gitster.dls.corp.google.com>
In-Reply-To: <CAMMLpeTvtzPuiQJVxAx-Ja4JsoUxih5azMaN7_RcLvajny6A6g@mail.gmail.com>

Alex Henrie <alexhenrie24@gmail.com> writes:

> This is just a friendly reminder that this patch has been sitting in
> the mailing list archives for a couple of weeks, and it has not yet
> been accepted or commented on.

I think that is because the message was not sent to the right people, and also because the patch was made against a wrong project ;-).

I'll forward it to the gitk maintainer after digging it out of the archive and tweaking it. Thanks.

Paul, comments?

-- >8 --
From: Alex Henrie <alexhenrie24@gmail.com>
Date: Thu, 22 Jan 2015 01:19:39 -0700
Subject: gitk: Remove tcl-format flag from a message that shouldn't have it

xgettext sees "% o" and interprets it as a placeholder for an octal number preceded by a space. However, in this case it's not actually a placeholder, and most translations will replace the "% o" sequence with something else. Removing the tcl-format flag from this string prevents tools like Poedit from freaking out when "% o" doesn't appear in the translated string.

The corrected flag will appear in each translation's po file the next time the translation is updated with `make update-po`.

Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
---
 gitk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gitk b/gitk
index 78358a7..dfd458d 100755
--- a/gitk
+++ b/gitk
@@ -11237,6 +11237,7 @@ proc prefspage_general {notebook} {
     ${NS}::label $page.maxwidthl -text [mc "Maximum graph width (lines)"]
     spinbox $page.maxwidth -from 0 -to 100 -width 4 -textvariable maxwidth
     grid $page.spacer $page.maxwidthl $page.maxwidth -sticky w
+                                         #xgettext:no-tcl-format
     ${NS}::label $page.maxpctl -text [mc "Maximum graph width (% of pane)"]
     spinbox $page.maxpct -from 1 -to 100 -width 4 -textvariable maxgraphpct
     grid x $page.maxpctl $page.maxpct -sticky w

-- 
2.2.2