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

* 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.
master
joey 2007-01-11 23:29:22 +00:00
parent bd94e24566
commit 92e26031ee
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
IkiWiki.pm
View File

@ -816,13 +816,15 @@ sub file_pruned ($$) { #{{{
$file =~ m/$regexp/; $file =~ m/$regexp/;
} #}}} } #}}}
my $gettext_obj;
sub gettext { #{{{ sub gettext { #{{{
# Only use gettext in the rare cases it's needed. # 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}) { if (exists $ENV{LANG} || exists $ENV{LC_ALL} || exists $ENV{LC_MESSAGES}) {
eval q{use Locale::gettext}; if (! $gettext_obj) {
textdomain('ikiwiki'); eval q{use Locale::gettext ''};
return Locale::gettext::gettext(shift); $gettext_obj=Locale::gettext->domain('ikiwiki');
}
return $gettext_obj->get(shift);
} }
else { else {
return shift; return shift;

5
debian/changelog vendored
View File

@ -5,8 +5,11 @@ ikiwiki (1.39) UNRELEASED; urgency=low
* Include the pot file in the source tarball. Closes: #405890 * Include the pot file in the source tarball. Closes: #405890
* Add a Swedish translation by Daniel Nylander. Closes: #406410 * Add a Swedish translation by Daniel Nylander. Closes: #406410
* Add a Czech translation by Miroslav Kure. * 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 ikiwiki (1.38) unstable; urgency=low