From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Thu, 11 Jan 2007 23:29:22 +0000 (+0000)
Subject: * Fix encoding issue with use of Locale::Gettext. Seems that the OO
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/92e26031ee6209a3b7905f7f7b1822993a327fd7?hp=bd94e24566158e63e320513f0b77fe26d6dd453f

* Fix encoding issue with use of Locale::Gettext. Seems that the OO
  interface returns proper utf-8 decoded strings, unlike the traditional
  interface, so use the OO interface.
---

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 41276e118..43ef67e8c 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -816,13 +816,15 @@ sub file_pruned ($$) { #{{{
 	$file =~ m/$regexp/;
 } #}}}
 
+my $gettext_obj;
 sub gettext { #{{{
 	# Only use gettext in the rare cases it's needed.
-	# This overrides future calls of this function.
 	if (exists $ENV{LANG} || exists $ENV{LC_ALL} || exists $ENV{LC_MESSAGES}) {
-		eval q{use Locale::gettext};
-		textdomain('ikiwiki');
-		return Locale::gettext::gettext(shift);
+		if (! $gettext_obj) {
+			eval q{use Locale::gettext ''};
+			$gettext_obj=Locale::gettext->domain('ikiwiki');
+		}
+		return $gettext_obj->get(shift);
 	}
 	else {
 		return shift;
diff --git a/debian/changelog b/debian/changelog
index 03a352239..91d9f623e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,11 @@ ikiwiki (1.39) UNRELEASED; urgency=low
   * Include the pot file in the source tarball. Closes: #405890
   * Add a Swedish translation by Daniel Nylander. Closes: #406410
   * Add a Czech translation by Miroslav Kure.
+  * Fix encoding issue with use of Locale::Gettext. Seems that the OO
+    interface returns proper utf-8 decoded strings, unlike the traditional
+    interface, so use the OO interface.
 
- -- Joey Hess <joeyh@debian.org>  Wed, 10 Jan 2007 22:24:25 -0500
+ -- Joey Hess <joeyh@debian.org>  Thu, 11 Jan 2007 18:28:05 -0500
 
 ikiwiki (1.38) unstable; urgency=low