]> sipb.mit.edu Git - ikiwiki.git/blobdiff - IkiWiki/Plugin/relativedate.pm
sipb-www / ikiwiki.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Provide a UUID in edittemplate templates.
[ikiwiki.git] / IkiWiki / Plugin / relativedate.pm
diff --git a/IkiWiki/Plugin/relativedate.pm b/IkiWiki/Plugin/relativedate.pm
index 179f9238c97efa990836049e3c6543ceb2d3bc70..4ae0be8615852db38222ebd892fd5c216bd5b4bf 100644 (file)
--- 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,10 +48,13 @@ 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);
wiki compiler