From: Joey Hess <joey@gnu.kitenet.net>
Date: Wed, 12 Aug 2009 16:26:07 +0000 (-0400)
Subject: po: Detect if nowrapi18n can't be passed to po4a, and warn about the old version... 
X-Git-Tag: 3.1415926~152
X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=commitdiff_plain;h=b4d7dfcbe1e7ea62f1c25e0534feee58720397ac

po: Detect if nowrapi18n can't be passed to po4a, and warn about the old version, but continue. Closes: #541205
---

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index e9dc9dd8c..52677076e 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -10,7 +10,12 @@ use warnings;
 use strict;
 use IkiWiki 3.00;
 use Encode;
-use Locale::Po4a::Common qw(nowrapi18n !/.*/);
+eval q{use Locale::Po4a::Common qw(nowrapi18n !/.*/)};
+if ($@) {
+	print STDERR gettext("warning: Old po4a detected! Recommend upgrade to 0.35.")."\n";
+	eval q{use Locale::Po4a::Common qw(!/.*/)};
+	die $@ if $@;
+}
 use Locale::Po4a::Chooser;
 use Locale::Po4a::Po;
 use File::Basename;
diff --git a/debian/changelog b/debian/changelog
index 2cbf1403e..95e3905a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ikiwiki (3.141593) UNRELEASED; urgency=low
+
+  * po: Detect if nowrapi18n can't be passed to po4a, and warn about
+    the old version, but continue. Closes: #541205 
+
+ -- Joey Hess <joeyh@debian.org>  Wed, 12 Aug 2009 12:25:30 -0400
+
 ikiwiki (3.141592) unstable; urgency=low
 
   * Add new hooks: canremove, canrename, rename. (intrigeri)