X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/b74b7ab68b983b3f7d9e561eb991b21764cdb3be..e51169132aaaafb5b90515ad1165e513e8953c91:/IkiWiki/Plugin/prettydate.pm

diff --git a/IkiWiki/Plugin/prettydate.pm b/IkiWiki/Plugin/prettydate.pm
index be7e2c761..82d8a3df3 100644
--- a/IkiWiki/Plugin/prettydate.pm
+++ b/IkiWiki/Plugin/prettydate.pm
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 package IkiWiki::Plugin::prettydate;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 use warnings;
 no warnings 'redefine';
 use strict;
@@ -33,36 +33,40 @@ sub default_timetable {
 		gettext("%A evening"),				# 6
 		"",						# 7
 		gettext("late %A evening"),			# 8
-		"",			# 9			# 9
+		"",						# 9
 		gettext("%A night"),				# 10
 		"",						# 11
 	];
 }
 
-sub import { #{{{
-	hook(type => "getsetup", id => "getsetup", call => \&getsetup);
+sub import {
+	hook(type => "getsetup", id => "prettydate", call => \&getsetup);
 	hook(type => "checkconfig", id => "prettydate", call => \&checkconfig);
-} # }}}
+}
 
-sub getsetup () { #{{{
+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,
 		},
-} #}}}
+}
 
-sub checkconfig () { #{{{
+sub checkconfig () {
 	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];
 		}
 	}
-} #}}}
+}
 
-sub IkiWiki::displaytime ($;$) { #{{{
+sub IkiWiki::formattime ($;$) {
 	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);
-} #}}}
+}
 
 1