urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

master
joey 2007-08-21 21:19:53 +00:00
parent 7c032d1465
commit 7946c67d1f
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
IkiWiki.pm
View File

@ -1017,7 +1017,9 @@ sub file_pruned ($$) { #{{{
sub gettext { #{{{ sub gettext { #{{{
# Only use gettext in the rare cases it's needed. # 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) { if (! $gettext_obj) {
$gettext_obj=eval q{ $gettext_obj=eval q{
use Locale::gettext q{textdomain}; use Locale::gettext q{textdomain};

2
Makefile.PL
View File

@ -31,7 +31,7 @@ ikiwiki.out: ikiwiki.in
chmod +x ikiwiki.out chmod +x ikiwiki.out
extra_build: 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\ --underlaydir=basewiki --nousedirs\
--wikiname="ikiwiki" --verbose \ --wikiname="ikiwiki" --verbose \
--exclude=/discussion --no-discussion --userdir=users \ --exclude=/discussion --no-discussion --userdir=users \

3
debian/changelog vendored
View File

@ -45,8 +45,9 @@ ikiwiki (2.6) UNRELEASED; urgency=low
* Add color parameter to postsparkline. Closes: #438900 * Add color parameter to postsparkline. Closes: #438900
* Add proper Homepage field to Debian package (needs uber-new dpkg). * Add proper Homepage field to Debian package (needs uber-new dpkg).
* Add monotone support, contributed by William Uther. * 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