summaryrefslogtreecommitdiff
path: root/lib/option.tcl
diff options
context:
space:
mode:
authorLibravatar Shawn O. Pearce <spearce@spearce.org>2007-09-14 01:50:09 -0400
committerLibravatar Shawn O. Pearce <spearce@spearce.org>2007-09-14 01:51:18 -0400
commit31bb1d1b2d1e893836b0d2b091fed9e39ee84853 (patch)
tree88f778a7c48f2941c5c89a137c0f162eab68250d /lib/option.tcl
parentgit-gui: Make the tree browser also use lightgray selection (diff)
downloadtgif-31bb1d1b2d1e893836b0d2b091fed9e39ee84853.tar.xz
git-gui: Paper bag fix missing translated strings
The Tcl expression "[append [mc Foo] Bar]" does not return the string "FooBar" after translation; instead it is setting the variable Foo to the value Bar, or if Foo is already defined it is appending Bar onto the end of it. This is *not* what we wanted to have happen here. Tcl's join function is actually the correct function but its default joinStr argument is a single space. Unfortunately all of our call sites do not want an extra space added to their string. So we need a small wrapper function to make the call to join with an empty join string. In C this is (roughly) the job of the strcat function. Since strcat is not yet used at the global level it is a reasonable name to use here. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'lib/option.tcl')
-rw-r--r--lib/option.tcl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/option.tcl b/lib/option.tcl
index 03bc08f128..12e297971a 100644
--- a/lib/option.tcl
+++ b/lib/option.tcl
@@ -308,7 +308,7 @@ proc do_restore_defaults {} {
proc do_save_config {w} {
if {[catch {save_config} err]} {
- error_popup [append [mc "Failed to completely save options:"] "\n\n$err"]
+ error_popup [strcat [mc "Failed to completely save options:"] "\n\n$err"]
}
reshow_diff
destroy $w