summaryrefslogtreecommitdiff
path: root/lib/branch_delete.tcl
diff options
context:
space:
mode:
authorVasco Almeida <vascomalmeida@sapo.pt>2016-05-08 10:52:57 (GMT)
committerPat Thoyts <patthoyts@users.sourceforge.net>2016-10-03 22:40:10 (GMT)
commita3d97afaa8b4187d62496ccc9cf268e8bd47c5db (patch)
tree3ae071e6bc2729422c9ba4c98cfe633199de2453 /lib/branch_delete.tcl
parent43c65a85c4160fc18469ed0af9a41ee2f78b04f4 (diff)
downloadgit-a3d97afaa8b4187d62496ccc9cf268e8bd47c5db.zip
git-a3d97afaa8b4187d62496ccc9cf268e8bd47c5db.tar.gz
git-a3d97afaa8b4187d62496ccc9cf268e8bd47c5db.tar.bz2
git-gui: fix incorrect use of Tcl append command
Fix wrong use of append command in strings marked for translation. According to Tcl/Tk Documentation [1], append varName ?value value value ...? appends all value arguments to the current value of variable varName. This means that append "[appname] ([reponame]): " [mc "File Viewer"] is setting a variable named "[appname] ([reponame]): " to the output of [mc "File Viewer"], rather than returning the concatenation of both expressions as one might expect. The format for some strings enables, for instance, a French translator to translate like "%s (%s) : Create Branch" (space before colon). Conversely, strings already translated will be marked as fuzzy and the translator must update them herself. For some cases, use alternative way for concatenation instead of using strcat procedure defined in git-gui.sh. Reference: 31bb1d1 ("git-gui: Paper bag fix missing translated strings", 2007-09-14) fixes the same issue slightly differently. [1] http://www.tcl.tk/man/tcl/TclCmd/append.htm Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Diffstat (limited to 'lib/branch_delete.tcl')
-rw-r--r--lib/branch_delete.tcl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/branch_delete.tcl b/lib/branch_delete.tcl
index 9aef0c9..a505163 100644
--- a/lib/branch_delete.tcl
+++ b/lib/branch_delete.tcl
@@ -13,7 +13,7 @@ constructor dialog {} {
make_dialog top w
wm withdraw $w
- wm title $top [append "[appname] ([reponame]): " [mc "Delete Branch"]]
+ wm title $top [mc "%s (%s): Delete Branch" [appname] [reponame]]
if {$top ne {.}} {
wm geometry $top "+[winfo rootx .]+[winfo rooty .]"
}