diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-01-10 20:25:00 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-01-10 20:25:00 +0000 |
| commit | b31dc8d994d1cfd179c330a729dcb8bce0b293c2 (patch) | |
| tree | b95ae9cbd8c577f4fa7456035275a1f190fe736a | |
| parent | a1519df7dd7b3619485171230d1a9f167b8e1fae (diff) | |
| download | ikiwiki-b31dc8d994d1cfd179c330a729dcb8bce0b293c2.tar ikiwiki-b31dc8d994d1cfd179c330a729dcb8bce0b293c2.tar.gz | |
* Fix --locale to control LC_ALL now.
| -rw-r--r-- | IkiWiki.pm | 2 | ||||
| -rw-r--r-- | IkiWiki/Plugin/inline.pm | 4 | ||||
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | doc/bugs/Discussion_link_not_translated_after_page_update.mdwn | 1 |
4 files changed, 6 insertions, 4 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm index 5b78014d1..41276e118 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -82,7 +82,7 @@ sub checkconfig () { #{{{ eval q{use POSIX}; error($@) if $@; $ENV{LANG} = $config{locale} - if POSIX::setlocale(&POSIX::LC_TIME, $config{locale}); + if POSIX::setlocale(&POSIX::LC_ALL, $config{locale}); } if ($config{w3mmode}) { diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index ecae47f1a..5857636de 100644 --- a/IkiWiki/Plugin/inline.pm +++ b/IkiWiki/Plugin/inline.pm @@ -238,7 +238,7 @@ sub date_822 ($) { #{{{ eval q{use POSIX}; error($@) if $@; - my $lc_time= POSIX::setlocale(&POSIX::LC_TIME); + my $lc_time=POSIX::setlocale(&POSIX::LC_TIME); POSIX::setlocale(&POSIX::LC_TIME, "C"); my $ret=POSIX::strftime("%a, %d %b %Y %H:%M:%S %z", localtime($time)); POSIX::setlocale(&POSIX::LC_TIME, $lc_time); @@ -250,7 +250,7 @@ sub date_3339 ($) { #{{{ eval q{use POSIX}; error($@) if $@; - my $lc_time= POSIX::setlocale(&POSIX::LC_TIME); + my $lc_time=POSIX::setlocale(&POSIX::LC_TIME); POSIX::setlocale(&POSIX::LC_TIME, "C"); my $ret=POSIX::strftime("%Y-%m-%dT%H:%M:%SZ", localtime($time)); POSIX::setlocale(&POSIX::LC_TIME, $lc_time); diff --git a/debian/changelog b/debian/changelog index 5e75dcbbe..74bd84225 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ ikiwiki (1.39) UNRELEASED; urgency=low * Add a rawhtml plugin that allows copying raw html files from the srcdir. + * Fix --locale to control LC_ALL now. - -- Joey Hess <joeyh@debian.org> Mon, 8 Jan 2007 15:53:25 -0500 + -- Joey Hess <joeyh@debian.org> Wed, 10 Jan 2007 15:24:36 -0500 ikiwiki (1.38) unstable; urgency=low diff --git a/doc/bugs/Discussion_link_not_translated_after_page_update.mdwn b/doc/bugs/Discussion_link_not_translated_after_page_update.mdwn index 698dd9f69..a59eb9ab5 100644 --- a/doc/bugs/Discussion_link_not_translated_after_page_update.mdwn +++ b/doc/bugs/Discussion_link_not_translated_after_page_update.mdwn @@ -22,3 +22,4 @@ with him Spanish translation. >> "Discussion" link instead of "Dyskusja" link after any page update >> via WWW. --Pawel +>>> A setlocale issue. Now [[bugs/done]] --[[Joey]] |