diff options
| author | Vasco Almeida <vascomalmeida@sapo.pt> | 2016-05-08 10:52:57 +0000 |
|---|---|---|
| committer | Pat Thoyts <patthoyts@users.sourceforge.net> | 2016-10-03 23:40:10 +0100 |
| commit | a3d97afaa8b4187d62496ccc9cf268e8bd47c5db (patch) | |
| tree | 3ae071e6bc2729422c9ba4c98cfe633199de2453 /lib/error.tcl | |
| parent | 43c65a85c4160fc18469ed0af9a41ee2f78b04f4 (diff) | |
| download | git-a3d97afaa8b4187d62496ccc9cf268e8bd47c5db.tar.gz git-a3d97afaa8b4187d62496ccc9cf268e8bd47c5db.tar.xz | |
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/error.tcl')
| -rw-r--r-- | lib/error.tcl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/error.tcl b/lib/error.tcl index 9b7d2294b..71dc8601d 100644 --- a/lib/error.tcl +++ b/lib/error.tcl @@ -17,7 +17,7 @@ proc error_popup {msg} { set cmd [list tk_messageBox \ -icon error \ -type ok \ - -title [append "$title: " [mc "error"]] \ + -title [mc "%s: error" $title] \ -message $msg] if {[winfo ismapped [_error_parent]]} { lappend cmd -parent [_error_parent] @@ -33,7 +33,7 @@ proc warn_popup {msg} { set cmd [list tk_messageBox \ -icon warning \ -type ok \ - -title [append "$title: " [mc "warning"]] \ + -title [mc "%s: warning" $title] \ -message $msg] if {[winfo ismapped [_error_parent]]} { lappend cmd -parent [_error_parent] |