From: Paul Mackerras <paulus@samba.org>
To: Alex Henrie <alexhenrie24@gmail.com>
Cc: bernt@norang.ca, git@vger.kernel.org
Subject: Re: [PATCH] gitk: Remove mc parameter from proc show_error
Date: Sat, 2 May 2015 20:05:13 +1000 [thread overview]
Message-ID: <20150502100513.GA19038@iris.ozlabs.ibm.com> (raw)
In-Reply-To: <1430536400-22008-1-git-send-email-alexhenrie24@gmail.com>
On Fri, May 01, 2015 at 09:13:20PM -0600, Alex Henrie wrote:
> This is a better fix for 8d849957d81fc0480a52570d66cc3c2a688ecb1b.
>
> All that was required to fix the original issue was to remove the extra
> mc call, i.e. change [mc "Sorry, gitk cannot run..."] to simply
> "Sorry, gitk cannot run..." Changing the signature of proc show_error
> was unnecessary and introduced two new bugs: It made "OK" untranslatable
> and "mc" translatable when the opposite should be true.
>
> This new fix makes the string "OK" translatable and the string "mc" not
> translatable, while leaving the string "Sorry, gitk cannot run..." not
> translatable. It will take effect the next time `make update-po` is run.
To test this, I changed {package require Tk 8.4} to {package require
Tk 8.7}, in order to deliberately trigger the error. When I run gitk
with that change (and your patch applied), I get this in the xterm
where I run gitk:
$ ./gitk
Error in startup script: invalid command name "mc"
while executing
"mc OK"
(procedure "show_error" line 7)
invoked from within
"show_error {} . "Sorry, gitk cannot run with this version of Tcl/Tk.\n Gitk requires at least Tcl/Tk 8.4.""
invoked from within
"if {[catch {package require Tk 8.7} err]} {
show_error {} . "Sorry, gitk cannot run with this version of Tcl/Tk.\n\
Gitk requires at least ..."
(file "./gitk" line 12012)
and no pop-up window. So this patch still isn't quite right.
Given that old versions of tcl/tk probably don't have [mc], I think
it's inevitable that "OK" will have to be untranslated for that
particular error path.
Paul.
next prev parent reply other threads:[~2015-05-02 10:35 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-02 3:13 [PATCH] gitk: Remove mc parameter from proc show_error Alex Henrie
2015-05-02 10:05 ` Paul Mackerras [this message]
2015-05-03 4:24 ` Alex Henrie
-- strict thread matches above, loose matches on Subject: below --
2015-04-02 21:05 Alex Henrie
2015-04-06 3:33 ` 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=20150502100513.GA19038@iris.ozlabs.ibm.com \
--to=paulus@samba.org \
--cc=alexhenrie24@gmail.com \
--cc=bernt@norang.ca \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).