global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-13 10:23:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

git-gui: Protect against bad translation strings

Browse Source 
If a translation string uses a format character we don't have an
argument for then it may throw an error when we attempt to format
the translation.  In this case switch back to the default format
that comes with the program (aka the English translation).

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Steffen Prohaska <prohaska@zib.de>
This commit is contained in:
Shawn O. Pearce
2007-10-25 00:15:21 +02:00
committed by Steffen Prohaska
parent 4e8904080d
commit 334cf5f96d
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
git-gui/git-gui.sh
View File

@@ -88,13 +88,20 @@ if {![catch {set _verbose $env(GITGUI_VERBOSE)}]} {
package require msgcat
proc mc {fmt args} {
set fmt [::msgcat::mc $fmt]
proc _mc_trim {fmt} {
set cmk [string first @@ $fmt]
if {$cmk > 0} {
set fmt [string range $fmt 0 [expr {$cmk - 1}]]
return [string range $fmt 0 [expr {$cmk - 1}]]
}
return [eval [list format $fmt] $args]
return $fmt
}
proc mc {en_fmt args} {
set fmt [_mc_trim [::msgcat::mc $en_fmt]]
if {[catch {set msg [eval [list format $fmt] $args]} err]} {
set msg [eval [list format [_mc_trim $en_fmt]] $args]
}
return $msg
}
proc strcat {args} {