* Avoid ugly gettext messages if LANG is empty. Closes: #439035

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 848f1dda8079494d639dac1fd7c1748c58e187cd..a89d9c2529190b3c94c265e1f740f0412545db50 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1017,7 +1017,9 @@ sub file_pruned ($$) { #{{{
 
 sub gettext { #{{{
        # Only use gettext in the rare cases it's needed.
 
 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 ((exists $ENV{LANG} && length $ENV{LANG}) ||
+           (exists $ENV{LC_ALL} && length $ENV{LC_ALL}) ||
+           (exists $ENV{LC_MESSAGES} && length $ENV{LC_MESSAGES})) {

                if (! $gettext_obj) {
                        $gettext_obj=eval q{
                                use Locale::gettext q{textdomain};
                if (! $gettext_obj) {
                        $gettext_obj=eval q{
                                use Locale::gettext q{textdomain};

diff --git a/Makefile.PL b/Makefile.PL
index 0e306ac08ce9bb42fe9a873c742b0de238adc819..aba4239d8536313d4274e63a66a89b3798e4ee1c 100755 (executable)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -31,7 +31,7 @@ ikiwiki.out: ikiwiki.in
        chmod +x ikiwiki.out
 
 extra_build: ikiwiki.out
        chmod +x ikiwiki.out
 
 extra_build: ikiwiki.out

-       LANG=C perl -I. $(extramodules) $(tflag) ikiwiki.out doc html --templatedir=templates \
+       LANG= perl -I. $(extramodules) $(tflag) ikiwiki.out doc html --templatedir=templates \

                --underlaydir=basewiki --nousedirs\
                --wikiname="ikiwiki" --verbose \
                --exclude=/discussion --no-discussion --userdir=users \
                --underlaydir=basewiki --nousedirs\
                --wikiname="ikiwiki" --verbose \
                --exclude=/discussion --no-discussion --userdir=users \

diff --git a/debian/changelog b/debian/changelog
index 5bcf097dbceb9c1e84598c350e54ee96ff4ed7fd..11f1c40c82c5810e5e66a58a19f44e3d4dd25bf1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -45,8 +45,9 @@ ikiwiki (2.6) UNRELEASED; urgency=low
   * Add color parameter to postsparkline. Closes: #438900
   * Add proper Homepage field to Debian package (needs uber-new dpkg).
   * Add monotone support, contributed by William Uther.
   * Add color parameter to postsparkline. Closes: #438900
   * Add proper Homepage field to Debian package (needs uber-new dpkg).
   * Add monotone support, contributed by William Uther.

+  * Avoid ugly gettext messages if LANG is empty. Closes: #439035

 
 

- -- Joey Hess <joeyh@debian.org>  Mon, 20 Aug 2007 23:09:11 -0400
+ -- Joey Hess <joeyh@debian.org>  Tue, 21 Aug 2007 17:18:50 -0400

 
 ikiwiki (2.5) unstable; urgency=low
 
 
 ikiwiki (2.5) unstable; urgency=low