hail UB313!
parent
1e7be2d3dd
commit
9575948b51
|
@ -11,20 +11,22 @@ sub import { #{{{
|
||||||
sub checkconfig () { #{{{
|
sub checkconfig () { #{{{
|
||||||
if (! defined $config{timeformat} ||
|
if (! defined $config{timeformat} ||
|
||||||
$config{timeformat} eq '%c') {
|
$config{timeformat} eq '%c') {
|
||||||
$config{timeformat}='on %{%A, the %e of %B%}, %Y. %N%nCelebrate %H';
|
$config{timeformat}='on %A, the %e of %B, %Y. %N%nCelebrate %H';
|
||||||
}
|
}
|
||||||
} #}}}
|
} #}}}
|
||||||
|
|
||||||
sub IkiWiki::displaytime ($) { #{{{
|
sub IkiWiki::displaytime ($) { #{{{
|
||||||
my $time=shift;
|
my $time=shift;
|
||||||
eval q{use POSIX};
|
eval q{
|
||||||
my $gregorian=POSIX::strftime("%d %m %Y", localtime($time));
|
use DateTime;
|
||||||
my $date=`ddate +'$config{timeformat}' $gregorian`;
|
use DateTime::Calendar::Discordian;
|
||||||
chomp $date;
|
};
|
||||||
if ($? || ! length $date) {
|
if ($@) {
|
||||||
return "some time or other (hail Eris!)";
|
return "some time or other ($@ -- hail Eris!)";
|
||||||
}
|
}
|
||||||
return $date;
|
my $dt = DateTime->from_epoch(epoch => $time);
|
||||||
|
my $dd = DateTime::Calendar::Discordian->from_object(object => $dt);
|
||||||
|
return $dd->strftime($IkiWiki::config{timeformat});
|
||||||
} #}}}
|
} #}}}
|
||||||
|
|
||||||
5
|
5
|
||||||
|
|
|
@ -27,8 +27,9 @@ ikiwiki (1.27) UNRELEASED; urgency=low
|
||||||
utf8 wikinames from there will be used properly.
|
utf8 wikinames from there will be used properly.
|
||||||
* Patch from Recai to kill utf-8 on the wiki name when generating the
|
* Patch from Recai to kill utf-8 on the wiki name when generating the
|
||||||
session cookie.
|
session cookie.
|
||||||
|
* Change ddate plugin to use the DateTime::Calendar::Discordian perl module.
|
||||||
|
|
||||||
-- Joey Hess <joeyh@debian.org> Sun, 10 Sep 2006 14:06:01 -0400
|
-- Joey Hess <joeyh@debian.org> Thu, 14 Sep 2006 18:25:27 -0400
|
||||||
|
|
||||||
ikiwiki (1.26) unstable; urgency=low
|
ikiwiki (1.26) unstable; urgency=low
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
[[template id=plugin name=ddate included=1 author="[[Joey]]"]]
|
[[template id=plugin name=ddate included=1 author="[[Joey]]"]]
|
||||||
[[tag type/fun]]
|
[[tag type/fun]]
|
||||||
[[tag type/slow]]
|
|
||||||
|
|
||||||
Enables use of Discordian dates. `--timeformat` can be used to change
|
Enables use of Discordian dates. `--timeformat` can be used to change
|
||||||
the date format; see `ddate(1)`.
|
the date format; see `ddate(1)`.
|
||||||
|
|
||||||
|
This plugin requires the DateTime and DateTime::Calendar::Discordian
|
||||||
|
perl modules.
|
||||||
|
|
Loading…
Reference in New Issue