public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox•com>
To: Paul Mackerras <paulus@samba•org>
Cc: Git mailing list <git@vger•kernel.org>,
	patthoyts@users•sourceforge.net,
	Alex Henrie <alexhenrie24@gmail•com>
Subject: Re: [PATCH] gitk: Remove tcl-format flag from a message that shouldn't have it
Date: Mon, 09 Feb 2015 13:55:23 -0800	[thread overview]
Message-ID: <xmqqlhk6agxg.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <CAMMLpeTvtzPuiQJVxAx-Ja4JsoUxih5azMaN7_RcLvajny6A6g@mail.gmail.com> (Alex Henrie's message of "Mon, 9 Feb 2015 14:36:51 -0700")

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

  reply	other threads:[~2015-02-09 21:55 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-22  8:19 [PATCH] gitk: Remove tcl-format flag from a message that shouldn't have it Alex Henrie
2015-02-09 21:36 ` Alex Henrie
2015-02-09 21:55   ` Junio C Hamano [this message]
2015-02-16 23:27     ` Alex Henrie
2015-02-23 22:30       ` Alex Henrie
2015-03-10 18:53         ` Alex Henrie
2015-03-22  3:40     ` Paul Mackerras

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqlhk6agxg.fsf@gitster.dls.corp.google.com \
    --to=gitster@pobox$(echo .)com \
    --cc=alexhenrie24@gmail$(echo .)com \
    --cc=git@vger$(echo .)kernel.org \
    --cc=patthoyts@users$(echo .)sourceforge.net \
    --cc=paulus@samba$(echo .)org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox