hail UB313!

diff --git a/IkiWiki/Plugin/ddate.pm b/IkiWiki/Plugin/ddate.pm
index b677026558f457f8da0e48c605006771361eb905..862d4da5b180146356757dff5600977a2df41966 100644 (file)
--- a/IkiWiki/Plugin/ddate.pm
+++ b/IkiWiki/Plugin/ddate.pm
@@ -11,20 +11,22 @@ sub import { #{{{
 sub checkconfig () { #{{{
        if (! defined $config{timeformat} ||
            $config{timeformat} eq '%c') {
 sub checkconfig () { #{{{
        if (! defined $config{timeformat} ||
            $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 ($) { #{{{
        my $time=shift;
        }
 } #}}}
 
 sub IkiWiki::displaytime ($) { #{{{
        my $time=shift;

-        eval q{use POSIX};
-        my $gregorian=POSIX::strftime("%d %m %Y", localtime($time));
-       my $date=`ddate +'$config{timeformat}' $gregorian`;
-       chomp $date;
-       if ($? || ! length $date) {
-               return "some time or other (hail Eris!)";
+       eval q{
+               use DateTime;
+               use DateTime::Calendar::Discordian;
+       };
+       if ($@) {
+                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

diff --git a/debian/changelog b/debian/changelog
index 5b77574a9e2b883e75111e2b72bf782b48d86f62..a18dd76d146952c7ceba915195a9d61c419776ef 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,8 +27,9 @@ ikiwiki (1.27) UNRELEASED; urgency=low
     utf8 wikinames from there will be used properly.
   * Patch from Recai to kill utf-8 on the wiki name when generating the
     session cookie.
     utf8 wikinames from there will be used properly.
   * Patch from Recai to kill utf-8 on the wiki name when generating the
     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
 

diff --git a/doc/plugins/ddate.mdwn b/doc/plugins/ddate.mdwn
index 26465d58133255a37ef189f95fdf71879725cfda..c35afe4cacaaee45b839b2403d12b7a4eafc8a9f 100644 (file)
--- a/doc/plugins/ddate.mdwn
+++ b/doc/plugins/ddate.mdwn
@@ -1,6 +1,8 @@
 [[template id=plugin name=ddate included=1 author="[[Joey]]"]]
 [[tag type/fun]]
 [[template id=plugin name=ddate included=1 author="[[Joey]]"]]
 [[tag type/fun]]

-[[tag type/slow]]

 
 Enables use of Discordian dates. `--timeformat` can be used to change
 the date format; see `ddate(1)`.
 
 Enables use of Discordian dates. `--timeformat` can be used to change
 the date format; see `ddate(1)`.

+
+This plugin requires the DateTime and DateTime::Calendar::Discordian
+perl modules.