]> sipb.mit.edu Git - ikiwiki.git/commitdiff
* Honor LC_CTIME when formatting a time for display. Thanks, Faidon
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Sun, 2 Jul 2006 00:32:12 +0000 (00:32 +0000)
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Sun, 2 Jul 2006 00:32:12 +0000 (00:32 +0000)
  Liambotis.

IkiWiki/Render.pm
debian/changelog
doc/bugs/utf8_html_templates.mdwn [new file with mode: 0644]

index d4e498188aad43c37f05fd28a094a951758b0a14..22fba3a2fd1fe935e20b0fc2d5fc724d0219a790 100644 (file)
@@ -230,7 +230,7 @@ sub check_overwrite ($$) { #{{{
 sub displaytime ($) { #{{{
        my $time=shift;
 
-       if ($config{timeformat} eq '%c') {
+       if ($config{timeformat} eq '%c' && ! exists $ENV{LC_CTIME}) {
                return scalar(localtime($time)); # optimisation
        }
        else {
index 974d3c4b689bb543bfb40b0218913e4f7c5ab26b..50f9c1e607933371c80743ec4d454aae0dcacc96 100644 (file)
@@ -4,8 +4,10 @@ ikiwiki (1.8) UNRELEASED; urgency=low
     for a page not being an orphan.
   * Support pinging services such as Technorati using XML-RPC to notify them
     about changes to rss feeds.
+  * Honor LC_CTIME when formatting a time for display. Thanks, Faidon
+    Liambotis.
 
- -- Joey Hess <joeyh@debian.org>  Mon, 26 Jun 2006 20:41:45 -0400
+ -- Joey Hess <joeyh@debian.org>  Sat,  1 Jul 2006 20:28:26 -0400
 
 ikiwiki (1.7) unstable; urgency=low
 
diff --git a/doc/bugs/utf8_html_templates.mdwn b/doc/bugs/utf8_html_templates.mdwn
new file mode 100644 (file)
index 0000000..6a3c566
--- /dev/null
@@ -0,0 +1,16 @@
+HTML::Template does not read files as utf-8, so modifying ikiwiki's
+template files to contain utf-8 won't currently work.
+
+It seems that the best way to fix this would be to make HTML::Template
+support utf-8.
+
+A workaround is to change all the template reading code like this:
+
+       -     my $template=HTML::Template->new(blind_cache => 1,
+       -             filename => "$config{templatedir}/page.tmpl");
+       +     open(TMPL, "<:utf8", "$config{templatedir}/page.tmpl");
+       +     my $template=HTML::Template->new(filehandle => *TMPL);
+       +     close(TMPL);
+
+However, this will make ikiwiki slower when rebuilding a wiki, since it
+won't cache templates.