Merge branch 'master' into debian-jessie-backports

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

diff --git a/IkiWiki/Plugin/prettydate.pm b/IkiWiki/Plugin/prettydate.pm
index 29330f29fd5666c75a7bead7e4fcbbcf394ea3b0..82d8a3df3eeef1c0b4a45c532774637a2a3e5209 100644 (file)
--- a/IkiWiki/Plugin/prettydate.pm
+++ b/IkiWiki/Plugin/prettydate.pm
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 package IkiWiki::Plugin::prettydate;
 #!/usr/bin/perl
 package IkiWiki::Plugin::prettydate;

-use IkiWiki 2.00;
+use IkiWiki 3.00;

 use warnings;
 no warnings 'redefine';
 use strict;
 use warnings;
 no warnings 'redefine';
 use strict;


@@ -33,36 +33,40 @@ sub default_timetable {
                gettext("%A evening"),                          # 6
                "",                                             # 7
                gettext("late %A evening"),                     # 8
                gettext("%A evening"),                          # 6
                "",                                             # 7
                gettext("late %A evening"),                     # 8

-               "",                     # 9                     # 9
+               "",                                             # 9

                gettext("%A night"),                            # 10
                "",                                             # 11
        ];
 }
 
                gettext("%A night"),                            # 10
                "",                                             # 11
        ];
 }
 

-sub import { #{{{
+sub import {

        hook(type => "getsetup", id => "prettydate", call => \&getsetup);
        hook(type => "checkconfig", id => "prettydate", call => \&checkconfig);
        hook(type => "getsetup", id => "prettydate", call => \&getsetup);
        hook(type => "checkconfig", id => "prettydate", call => \&checkconfig);

-} # }}}
+}

 
 

-sub getsetup () { #{{{
+sub getsetup () {

        return
        return

+               plugin => {
+                       safe => 1,
+                       rebuild => 1,
+               },

                prettydateformat => {
                        type => "string",
                prettydateformat => {
                        type => "string",

-                       default => '%X, %B %o, %Y',
+                       example => '%X, %B %o, %Y',

                        description => "format to use to display date",
                        description => "format to use to display date",

+                       advanced => 1,

                        safe => 1,
                        rebuild => 1,
                },
                timetable => {
                        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,
                },
                        description => "array of time descriptions",
                        safe => 1,
                        rebuild => 1,
                },

-} #}}}
+}

 
 

-sub checkconfig () { #{{{
+sub checkconfig () {

        if (! defined $config{prettydateformat} ||
            $config{prettydateformat} eq '%c') {
                $config{prettydateformat}='%X, %B %o, %Y';
        if (! defined $config{prettydateformat} ||
            $config{prettydateformat} eq '%c') {
                $config{prettydateformat}='%X, %B %o, %Y';


@@ -78,9 +82,9 @@ sub checkconfig () { #{{{
                        $config{timetable}[$h] = $config{timetable}[$h - 1];
                }
        }
                        $config{timetable}[$h] = $config{timetable}[$h - 1];
                }
        }

-} #}}}
+}

 
 

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

        my $time=shift;
        my $format=shift;
        if (! defined $format) {
        my $time=shift;
        my $format=shift;
        if (! defined $format) {


@@ -118,6 +122,6 @@ sub IkiWiki::displaytime ($;$) { #{{{
 
        $format=~s/\%X/$t/g;
        return strftime($format, \@t);
 
        $format=~s/\%X/$t/g;
        return strftime($format, \@t);

-} #}}}
+}

 
 1
 
 1