Merge commit 'upstream/master' into pub/master

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

diff --git a/IkiWiki/Plugin/relativedate.pm b/IkiWiki/Plugin/relativedate.pm
index 99265676b7cfd3bde4067e469af1b09bbb99dd51..dc8f7d538a726f5689b6c9b51ddeb4691cc1750f 100644 (file)
--- a/IkiWiki/Plugin/relativedate.pm
+++ b/IkiWiki/Plugin/relativedate.pm
@@ -2,12 +2,17 @@
 package IkiWiki::Plugin::relativedate;
 
 use warnings;
+no warnings 'redefine';
 use strict;
 use IkiWiki 2.00;
+use POSIX;
+use Encode;
 
 sub import { #{{{
        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 () { #{{{
@@ -38,4 +43,18 @@ sub include_javascript ($;$) { #{{{
                '" type="text/javascript" charset="utf-8"></script>';
 } #}}}
 
+sub mydisplaytime ($;$) { #{{{
+       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",
+                       localtime($time)));
+
+       return '<span class="relativedate" title="'.$gmtime.'">'.
+               IkiWiki::formattime($time, $format).'</span>';
+} #}}}
+
 1