Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

[git.ikiwiki.info.git] / IkiWiki / Plugin / relativedate.pm

diff --git a/IkiWiki/Plugin/relativedate.pm b/IkiWiki/Plugin/relativedate.pm
index fe8ef09013e0d888fcf7ff879715dfe8020e1842..c9280ef14799dbecdba10c0bcc259027a245d2fc 100644 (file)
--- a/IkiWiki/Plugin/relativedate.pm
+++ b/IkiWiki/Plugin/relativedate.pm
@@ -49,17 +49,20 @@ sub mydisplaytime ($;$$) {
        my $pubdate=shift;
 
        # This needs to be in a form that can be parsed by javascript.
        my $pubdate=shift;
 
        # This needs to be in a form that can be parsed by javascript.

-       # Being fairly human readable is also nice, as it will be exposed
-       # as the title if javascript is not available.
+       # (Being fairly human readable is also nice, as it will be exposed
+       # as the title if javascript is not available.)
+       my $lc_time=POSIX::setlocale(&POSIX::LC_TIME);
+       POSIX::setlocale(&POSIX::LC_TIME, "C");

        my $gmtime=decode_utf8(POSIX::strftime("%a, %d %b %Y %H:%M:%S %z",
                        localtime($time)));
        my $gmtime=decode_utf8(POSIX::strftime("%a, %d %b %Y %H:%M:%S %z",
                        localtime($time)));

+       POSIX::setlocale(&POSIX::LC_TIME, $lc_time);

 
        my $mid=' class="relativedate" title="'.$gmtime.'">'.
                IkiWiki::formattime($time, $format);
 
        if ($config{html5}) {
                return '<time datetime="'.IkiWiki::date_3339($time).'"'.
 
        my $mid=' class="relativedate" title="'.$gmtime.'">'.
                IkiWiki::formattime($time, $format);
 
        if ($config{html5}) {
                return '<time datetime="'.IkiWiki::date_3339($time).'"'.

-                       ($pubdate ? ' pubdate' : '').$mid.'</time>';
+                       ($pubdate ? ' pubdate="pubdate"' : '').$mid.'</time>';

        }
        else {
                return '<span'.$mid.'</span>';
        }
        else {
                return '<span'.$mid.'</span>';