Merge commit 'upstream/master' into prv/po

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

diff --git a/IkiWiki/Plugin/relativedate.pm b/IkiWiki/Plugin/relativedate.pm
index a918889d24f8d6c2119329bd2fc8bd8ba45aaaf3..dc8f7d538a726f5689b6c9b51ddeb4691cc1750f 100644 (file)
--- a/IkiWiki/Plugin/relativedate.pm
+++ b/IkiWiki/Plugin/relativedate.pm
@@ -12,6 +12,7 @@ sub import { #{{{
        add_underlay("javascript");
        hook(type => "getsetup", id => "relativedate", call => \&getsetup);
        hook(type => "format", id => "relativedate", call => \&format);
        add_underlay("javascript");
        hook(type => "getsetup", id => "relativedate", call => \&getsetup);
        hook(type => "format", id => "relativedate", call => \&format);

+       inject(name => "IkiWiki::displaytime", call => \&mydisplaytime);

 } # }}}
 
 sub getsetup () { #{{{
 } # }}}
 
 sub getsetup () { #{{{


@@ -42,16 +43,17 @@ sub include_javascript ($;$) { #{{{
                '" type="text/javascript" charset="utf-8"></script>';
 } #}}}
 
                '" type="text/javascript" charset="utf-8"></script>';
 } #}}}
 

-sub IkiWiki::displaytime ($;$) { #{{{
+sub mydisplaytime ($;$) { #{{{

        my $time=shift;
        my $format=shift;
 
        # This needs to be in a form that can be parsed by javascript.
        my $time=shift;
        my $format=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.
-       my $gmtime=decode_utf8(POSIX::strftime("%a, %d %b %Y %H:%M:%S %z", gmtime($time)));
+       # Being fairly human readable is also nice, as it will be exposed
+       # as the title if javascript is not available.
+       my $gmtime=decode_utf8(POSIX::strftime("%a, %d %b %Y %H:%M:%S %z",
+                       localtime($time)));

 
 

-       return '<span class="date" title="'.$gmtime.'">'.
+       return '<span class="relativedate" title="'.$gmtime.'">'.

                IkiWiki::formattime($time, $format).'</span>';
 } #}}}
 
                IkiWiki::formattime($time, $format).'</span>';
 } #}}}