X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/d9e4a3718ec84a2855aa3b585cd2d8ec0bea182e..4ed0a630cb8a10d583c5e88cc7a87a5cecdedc8d:/IkiWiki/Plugin/prettydate.pm?ds=inline

diff --git a/IkiWiki/Plugin/prettydate.pm b/IkiWiki/Plugin/prettydate.pm
index 48e9db05c..745e6a1de 100644
--- a/IkiWiki/Plugin/prettydate.pm
+++ b/IkiWiki/Plugin/prettydate.pm
@@ -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);
 } #}}}