po: Detect if nowrapi18n can't be passed to po4a, and warn about the old version...

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index e9dc9dd8cfc2ba7dd0ed5291434c48a795bde50a..52677076ec02cde9a9465485200c1e2ec98c3e84 100644 (file)
--- 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 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;
 use Locale::Po4a::Chooser;
 use Locale::Po4a::Po;
 use File::Basename;

diff --git a/debian/changelog b/debian/changelog
index 2cbf1403e7f24a54e663cf226ef3f6ca10c40c00..95e3905a389267a3f7cecbf2b0dd8eed9e69fa69 100644 (file)
--- 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)
 ikiwiki (3.141592) unstable; urgency=low
 
   * Add new hooks: canremove, canrename, rename. (intrigeri)