[PATCH] gitk: Remove mc parameter from proc show_error

From: Alex Henrie <hidden>
Date: 2016-06-15 23:04:21

This partially reverts commit 8d849957d81fc0480a52570d66cc3c2a688ecb1b.

This change makes the string "OK" translatable and the string "mc" not
translatable. It will take effect the next time `make update-po` is run.

Signed-off-by: Alex Henrie <redacted>
---
 gitk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gitk b/gitk
index 30fcd30..7193f6f 100755
--- a/gitk
+++ b/gitk

@@ -1894,13 +1894,13 @@ proc make_transient {window origin} {
     }
 }
 
-proc show_error {w top msg {mc mc}} {
+proc show_error {w top msg} {
     global NS
     if {![info exists NS]} {set NS ""}
     if {[wm state $top] eq "withdrawn"} { wm deiconify $top }
     message $w.m -text $msg -justify center -aspect 400
     pack $w.m -side top -fill x -padx 20 -pady 20
-    ${NS}::button $w.ok -default active -text [$mc OK] -command "destroy $top"
+    ${NS}::button $w.ok -default active -text [mc OK] -command "destroy $top"
     pack $w.ok -side bottom -fill x
     bind $top <Visibility> "grab $top; focus $top"
     bind $top <Key-Return> "destroy $top"

-- 
2.3.5

Re: [PATCH] gitk: Remove mc parameter from proc show_error

From: Paul Mackerras <hidden>
Date: 2016-06-15 23:04:22

On Thu, Apr 02, 2015 at 03:05:35PM -0600, Alex Henrie wrote:

This partially reverts commit 8d849957d81fc0480a52570d66cc3c2a688ecb1b.

... and brings back the bug that 8d849957d81f solves, as far as I can
see.  If that's not the case then you need to explain that in the
patch description.

Paul.

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help