]> sipb.mit.edu Git - ikiwiki.git/blobdiff - IkiWiki/Plugin/prettydate.pm
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
[ikiwiki.git] / IkiWiki / Plugin / prettydate.pm
index 48e9db05c60d00e0071da5f8615ae81de7280a08..745e6a1de436e2db15b97ebe897858f891de2a51 100644 (file)
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 package IkiWiki::Plugin::prettydate;
-use IkiWiki;
+use IkiWiki 2.00;
 use warnings;
 no warnings 'redefine';
 use strict;
@@ -22,8 +22,8 @@ sub default_timetable {
                gettext("early %A morning"),                    # 7
                "",                                             # 8
                "",                                             # 9
-               gettext("in mid-morning %A"),                   # 10
-               gettext("in late morning %A"),                  # 11
+               gettext("mid-morning %A"),                      # 10
+               gettext("late %A morning"),                     # 11
                gettext("at lunch time on %A"),                 # 12
                "",                                             # 1
                gettext("%A afternoon"),                        # 2
@@ -40,7 +40,7 @@ sub default_timetable {
 }
 
 sub import { #{{{
-       hook(type => "checkconfig", id => "skeleton", call => \&checkconfig);
+       hook(type => "checkconfig", id => "prettydate", call => \&checkconfig);
 } # }}}
 
 sub checkconfig () { #{{{
@@ -61,8 +61,12 @@ sub checkconfig () { #{{{
        }
 } #}}}
 
-sub IkiWiki::displaytime ($) { #{{{
+sub IkiWiki::displaytime ($;$) { #{{{
        my $time=shift;
+       my $format=shift;
+       if (! defined $format) {
+               $format=$config{prettydateformat};
+       }
        
        eval q{use Date::Format};
        error($@) if $@;
@@ -93,7 +97,6 @@ sub IkiWiki::displaytime ($) { #{{{
 
        $t=~s{\%A-}{my @yest=@t; $yest[6]--; strftime("%A", \@yest)}eg;
 
-       my $format=$config{prettydateformat};
        $format=~s/\%X/$t/g;
        return strftime($format, \@t);
 } #}}}