Merge branch 'master' of git://git.ikiwiki.info

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

diff --git a/IkiWiki/Plugin/prettydate.pm b/IkiWiki/Plugin/prettydate.pm
index e155dd39b88285837007d51cc8da9b219d63be72..b0931cb5533b36bcab5cbb3afa514ef75c51f132 100644 (file)
--- a/IkiWiki/Plugin/prettydate.pm
+++ b/IkiWiki/Plugin/prettydate.pm
@@ -33,7 +33,7 @@ sub default_timetable {
                gettext("%A evening"),                          # 6
                "",                                             # 7
                gettext("late %A evening"),                     # 8
-               "",                     # 9                     # 9
+               "",                                             # 9
                gettext("%A night"),                            # 10
                "",                                             # 11
        ];
@@ -118,10 +118,10 @@ sub IkiWiki::formattime ($;$) {
                }
        }
 
-       $t=~s{\%A-}{my @yest=@t; $yest[6]--; strftime("%A", \@yest)}eg;
+       $t=~s{\%A-}{my @yest=@t; $yest[6]--; strftime_utf8("%A", \@yest)}eg;
 
        $format=~s/\%X/$t/g;
-       return strftime($format, \@t);
+       return strftime_utf8($format, \@t);
 }
 
 1