diff options
author | Shawn O. Pearce <spearce@spearce.org> | 2007-09-14 01:50:09 -0400 |
---|---|---|
committer | Shawn O. Pearce <spearce@spearce.org> | 2007-09-14 01:51:18 -0400 |
commit | 31bb1d1b2d1e893836b0d2b091fed9e39ee84853 (patch) | |
tree | 88f778a7c48f2941c5c89a137c0f162eab68250d /lib/branch_rename.tcl | |
parent | bba060462c8732a5cb46ea00165198a9579517ae (diff) | |
download | git-31bb1d1b2d1e893836b0d2b091fed9e39ee84853.tar.gz git-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/branch_rename.tcl')
-rw-r--r-- | lib/branch_rename.tcl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/branch_rename.tcl b/lib/branch_rename.tcl index d6f040e7a..166538808 100644 --- a/lib/branch_rename.tcl +++ b/lib/branch_rename.tcl @@ -114,7 +114,7 @@ method _rename {} { -type ok \ -title [wm title $w] \ -parent $w \ - -message [append [mc "Failed to rename '%s'." $oldname] "\n\n$err"] + -message [strcat [mc "Failed to rename '%s'." $oldname] "\n\n$err"] return } |