Merge commit 'origin/master' into pub/master

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

diff --git a/IkiWiki/Plugin/prettydate.pm b/IkiWiki/Plugin/prettydate.pm
index be7e2c761d122019e9e1d4b5562e3c1e6c2b39a0..0f02142b06812cb7bb11bc0b5a98cde3e13f8526 100644 (file)
--- a/IkiWiki/Plugin/prettydate.pm
+++ b/IkiWiki/Plugin/prettydate.pm
@@ -40,22 +40,26 @@ sub default_timetable {
 }
 
 sub import { #{{{
-       hook(type => "getsetup", id => "getsetup", call => \&getsetup);
+       hook(type => "getsetup", id => "prettydate", call => \&getsetup);
        hook(type => "checkconfig", id => "prettydate", call => \&checkconfig);
 } # }}}
 
 sub getsetup () { #{{{
        return
+               plugin => {
+                       safe => 1,
+                       rebuild => 1,
+               },
                prettydateformat => {
                        type => "string",
-                       default => '%X, %B %o, %Y',
+                       example => '%X, %B %o, %Y',
                        description => "format to use to display date",
+                       advanced => 1,
                        safe => 1,
                        rebuild => 1,
                },
                timetable => {
-                       type => undef, # don't try to show in interface
-                       default => '%X, %B %o, %Y',
+                       type => "internal",
                        description => "array of time descriptions",
                        safe => 1,
                        rebuild => 1,
@@ -80,7 +84,7 @@ sub checkconfig () { #{{{
        }
 } #}}}
 
-sub IkiWiki::displaytime ($;$) { #{{{
+sub IkiWiki::formattime ($;$) { #{{{
        my $time=shift;
        my $format=shift;
        if (! defined $format) {