From: Shawn O. Pearce <spearce@spearce.org>
Date: Wed, 12 Sep 2007 20:47:06 +0000 (-0400)
Subject: git-gui: Support context-sensitive i18n
X-Git-Tag: gitgui-0.9.0~76
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=146d73a365c3a1c2e61e646a929a5168ffb2810c;p=git.git

git-gui: Support context-sensitive i18n

Ocassionally, one would want to translate the same string used in
different contexts in diffrent ways. This patch provides a wrapper
for msgcat::mc that trims "@@" and anything coming after it, whether
or not the string actually got translated.

Proposed-by: Harri Ilari Tapio Liusvaara <hliusvaa@cc.hut.fi>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---

diff --git a/git-gui.sh b/git-gui.sh
index afee777f1..d00758e95 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -86,7 +86,16 @@ if {![catch {set _verbose $env(GITGUI_VERBOSE)}]} {
 ## http://www.gnu.org/software/gettext/manual/html_node/Tcl.html
 
 package require msgcat
-namespace import ::msgcat::mc
+
+proc mc {fmt args} {
+	set fmt [::msgcat::mc $fmt]
+	set cmk [string first @@ $fmt]
+	if {$cmk > 0} {
+		set fmt [string range $fmt 0 [expr {$cmk - 1}]]
+	}
+	return [eval [list format $fmt] $args]
+}
+
 ::msgcat::mcload $oguimsg
 unset oguimsg