X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/970373548fda77223ebbeb6aadbdbe4884b67cef..ea713f002515c3c60c28fc5eb0d70d421093af83:/IkiWiki/Plugin/relativedate.pm

diff --git a/IkiWiki/Plugin/relativedate.pm b/IkiWiki/Plugin/relativedate.pm
index fe8ef0901..4ae0be861 100644
--- a/IkiWiki/Plugin/relativedate.pm
+++ b/IkiWiki/Plugin/relativedate.pm
@@ -27,19 +27,18 @@ sub format (@) {
         my %params=@_;
 
 	if (! ($params{content}=~s!^(<body[^>]*>)!$1.include_javascript($params{page})!em)) {
-		# no </body> tag, probably in preview mode
-		$params{content}=include_javascript($params{page}, 1).$params{content};
+		# no <body> tag, probably in preview mode
+		$params{content}=include_javascript(undef).$params{content};
 	}
 	return $params{content};
 }
 
-sub include_javascript ($;$) {
-	my $page=shift;
-	my $absolute=shift;
+sub include_javascript ($) {
+	my $from=shift;
 	
-	return '<script src="'.urlto("ikiwiki/ikiwiki.js", $page, $absolute).
+	return '<script src="'.urlto("ikiwiki/ikiwiki.js", $from).
 		'" type="text/javascript" charset="utf-8"></script>'."\n".
-		'<script src="'.urlto("ikiwiki/relativedate.js", $page, $absolute).
+		'<script src="'.urlto("ikiwiki/relativedate.js", $from).
 		'" type="text/javascript" charset="utf-8"></script>';
 }
 
@@ -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 '<time datetime="'.IkiWiki::date_3339($time).'"'.
-			($pubdate ? ' pubdate' : '').$mid.'</time>';
+			($pubdate ? ' pubdate="pubdate"' : '').$mid.'</time>';
 	}
 	else {
 		return '<span'.$mid.'</span>';