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.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html