From: Bernt Hansen <bernt@norang.ca>
To: git@vger.kernel.org
Cc: Paul Mackerras <paulus@samba.org>, Bernt Hansen <bernt@norang.ca>
Subject: [PATCH 2/2] gitk: Provide a default mc function if msgcat is not available
Date: Sat, 24 Oct 2009 16:20:40 -0400 [thread overview]
Message-ID: <1256415640-10328-3-git-send-email-bernt@norang.ca> (raw)
In-Reply-To: <1256415640-10328-1-git-send-email-bernt@norang.ca>
Msgcat is available since Tcl 8.1. For really old versions of Tcl
provide a default mc that just returns the text untranslated. This
allows the Tcl version check to return the error in a window instead
of making Tcl abort when attempting to load the msgcat package.
Signed-off-by: Bernt Hansen <bernt@norang.ca>
---
I'm not sure if we care about Tcl versions older than 8.1 but this at
least shows the error in the window with the [OK] button.
gitk | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/gitk b/gitk
index d4cd566..bff891d 100755
--- a/gitk
+++ b/gitk
@@ -11019,10 +11019,15 @@ if { [info exists ::env(GITK_MSGSDIR)] } {
## Internationalization (i18n) through msgcat and gettext. See
## http://www.gnu.org/software/gettext/manual/html_node/Tcl.html
-package require msgcat
-namespace import ::msgcat::mc
-## And eventually load the actual message catalog
-::msgcat::mcload $gitk_msgsdir
+if {[catch {package require msgcat}]} {
+ proc mc {arg} {
+ return $arg
+ }
+} else {
+ namespace import ::msgcat::mc
+ ## And eventually load the actual message catalog
+ ::msgcat::mcload $gitk_msgsdir
+}
# Check that Tcl/Tk is recent enough
if {[catch {package require Tk 8.4} err]} {
--
1.6.5.1.69.g36942
next prev parent reply other threads:[~2009-10-24 20:21 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-24 20:20 [PATCH 0/2] gitk: Fix error display when Tcl is too old Bernt Hansen
2009-10-24 20:20 ` [PATCH 1/2] gitk: Initialize msgcat before first use Bernt Hansen
2009-10-31 21:34 ` Pat Thoyts
2009-11-01 13:09 ` Bernt Hansen
2009-11-02 12:41 ` [PATCH] Skip translation of wrong Tcl version text Bernt Hansen
2009-11-03 11:31 ` Paul Mackerras
2009-10-24 20:20 ` Bernt Hansen [this message]
2009-10-24 22:08 ` [PATCH 2/2] gitk: Provide a default mc function if msgcat is not available Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1256415640-10328-3-git-send-email-bernt@norang.ca \
--to=bernt@norang.ca \
--cc=git@vger.kernel.org \
--cc=paulus@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).