From 04cde27a0e070af714826cf89071d27286d1d7fe Mon Sep 17 00:00:00 2001
From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Tue, 16 Jan 2007 03:37:39 +0000
Subject: * Gettext 1.04 or up is needed for the OO interface that ikiwiki
 needs,   if an older version is installed, just don't gettext strings,
 instead of   crashing.

---
 IkiWiki.pm | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'IkiWiki.pm')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 8a3c81755..42d607b0d 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -838,8 +838,15 @@ sub gettext { #{{{
 	# Only use gettext in the rare cases it's needed.
 	if (exists $ENV{LANG} || exists $ENV{LC_ALL} || exists $ENV{LC_MESSAGES}) {
 		if (! $gettext_obj) {
-			eval q{use Locale::gettext ''};
-			$gettext_obj=Locale::gettext->domain('ikiwiki');
+			$gettext_obj=eval q{
+				use Locale::gettext q{textdomain};
+				Locale::gettext->domain('ikiwiki')
+			};
+			if ($@) {
+				print STDERR "$@";
+				$gettext_obj=undef;
+				return shift;
+			}
 		}
 		return $gettext_obj->get(shift);
 	}
-- 
cgit v1.2.3