* Only try postsignin if no other action matched. Fixes a bug where the

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

diff --git a/IkiWiki/Plugin/prettydate.pm b/IkiWiki/Plugin/prettydate.pm
index 48e9db05c60d00e0071da5f8615ae81de7280a08..b6110e427b5ca9c9326f572ce2d3df7b955d226f 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;
+use IkiWiki 2.00;

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


@@ -22,8 +22,8 @@ sub default_timetable {
                gettext("early %A morning"),                    # 7
                "",                                             # 8
                "",                                             # 9
                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
                gettext("at lunch time on %A"),                 # 12
                "",                                             # 1
                gettext("%A afternoon"),                        # 2


@@ -40,7 +40,7 @@ sub default_timetable {
 }
 
 sub import { #{{{
 }
 
 sub import { #{{{

-       hook(type => "checkconfig", id => "skeleton", call => \&checkconfig);
+       hook(type => "checkconfig", id => "prettydate", call => \&checkconfig);

 } # }}}
 
 sub checkconfig () { #{{{
 } # }}}
 
 sub checkconfig () { #{{{


@@ -61,7 +61,7 @@ sub checkconfig () { #{{{
        }
 } #}}}
 
        }
 } #}}}
 

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

        my $time=shift;
        
        eval q{use Date::Format};
        my $time=shift;
        
        eval q{use Date::Format};