{"thread":{"id":"39011","subject":"[PATCH v2] gitk: Remove mc parameter from proc show_error","startedAt":"2015-04-06T05:06:04Z","lastAt":"2015-04-06T05:06:04Z","messageCount":1,"participants":["Alex Henrie"],"isPatch":true,"patchVersion":2,"patchTotal":null},"messages":[{"id":"259052","messageId":"1428296764-29970-1-git-send-email-alexhenrie24@gmail.com","threadId":"39011","inReplyTo":null,"subject":"[PATCH v2] gitk: Remove mc parameter from proc show_error","fromName":"Alex Henrie","fromEmail":"alexhenrie24@gmail.com","sentAt":"2015-04-06T05:06:04Z","receivedAt":"2015-04-06T05:06:04Z","isPatch":true,"sender":{"key":"alexhenrie24@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5951993?v=4"},"body":"This is a better fix for 8d849957d81fc0480a52570d66cc3c2a688ecb1b.\n\nAll that was required to fix the original issue was to remove the extra\nmc call, i.e. change [mc \"Sorry, gitk cannot run...\"] to simply\n\"Sorry, gitk cannot run...\" Changing the signature of proc show_error\nwas unnecessary and introduced two new bugs: It made \"OK\" untranslatable\nand \"mc\" translatable when the opposite should be true.\n\nThis new fix makes the string \"OK\" translatable and the string \"mc\" not\ntranslatable, while leaving the string \"Sorry, gitk cannot run...\" not\ntranslatable. It will take effect the next time `make update-po` is run.\n\nSigned-off-by: Alex Henrie <alexhenrie24@gmail.com>\n---\n gitk | 6 +++---\n 1 file changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/gitk b/gitk\nindex 30fcd30..096389f 100755\n--- a/gitk\n+++ b/gitk\n@@ -1894,13 +1894,13 @@ proc make_transient {window origin} {\n     }\n }\n \n-proc show_error {w top msg {mc mc}} {\n+proc show_error {w top msg} {\n     global NS\n     if {![info exists NS]} {set NS \"\"}\n     if {[wm state $top] eq \"withdrawn\"} { wm deiconify $top }\n     message $w.m -text $msg -justify center -aspect 400\n     pack $w.m -side top -fill x -padx 20 -pady 20\n-    ${NS}::button $w.ok -default active -text [$mc OK] -command \"destroy $top\"\n+    ${NS}::button $w.ok -default active -text [mc OK] -command \"destroy $top\"\n     pack $w.ok -side bottom -fill x\n     bind $top <Visibility> \"grab $top; focus $top\"\n     bind $top <Key-Return> \"destroy $top\"\n@@ -12011,7 +12011,7 @@ proc get_path_encoding {path} {\n # First check that Tcl/Tk is recent enough\n if {[catch {package require Tk 8.4} err]} {\n     show_error {} . \"Sorry, gitk cannot run with this version of Tcl/Tk.\\n\\\n-\t\t     Gitk requires at least Tcl/Tk 8.4.\" list\n+\t\t     Gitk requires at least Tcl/Tk 8.4.\"\n     exit 1\n }\n \n-- \n2.3.5\n"}]}