X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/970373548fda77223ebbeb6aadbdbe4884b67cef..d16e34c736676256b7cd3ea12797313dc1332fc3:/IkiWiki/Plugin/relativedate.pm diff --git a/IkiWiki/Plugin/relativedate.pm b/IkiWiki/Plugin/relativedate.pm index fe8ef0901..083966ad2 100644 --- a/IkiWiki/Plugin/relativedate.pm +++ b/IkiWiki/Plugin/relativedate.pm @@ -26,20 +26,19 @@ sub getsetup () { sub format (@) { my %params=@_; - if (! ($params{content}=~s!^(]*>)!$1.include_javascript($params{page})!em)) { - # no tag, probably in preview mode - $params{content}=include_javascript($params{page}, 1).$params{content}; + if (! ($params{content}=~s!^(\s*]*>)!include_javascript($params{page}).$1!em)) { + # no tag, probably in preview mode + $params{content}=$params{content}.include_javascript(undef); } return $params{content}; } -sub include_javascript ($;$) { - my $page=shift; - my $absolute=shift; +sub include_javascript ($) { + my $from=shift; - return ''."\n". - ''; } @@ -49,17 +48,20 @@ sub mydisplaytime ($;$$) { 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))); + POSIX::setlocale(&POSIX::LC_TIME, $lc_time); my $mid=' class="relativedate" title="'.$gmtime.'">'. IkiWiki::formattime($time, $format); if ($config{html5}) { return ''; } else { return '';