From 6a9e16374f1549c7e63c7cd1c0e6989b2fb32191 Mon Sep 17 00:00:00 2001 From: joey Date: Sat, 29 Jul 2006 21:04:31 +0000 Subject: * Locale patch from Faidon: - Adds a locale setting to setup files. - Proper local time, if the locale configuration option is used. - Support for UTF-8 (or ISO-8859-X) filenames in SVN. Before this patch, commiting (or even rcs_updating) on repositories with UTF-8 filenames was impossible. --- IkiWiki/Rcs/svn.pm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'IkiWiki/Rcs') diff --git a/IkiWiki/Rcs/svn.pm b/IkiWiki/Rcs/svn.pm index b5f5fb445..f01735afe 100644 --- a/IkiWiki/Rcs/svn.pm +++ b/IkiWiki/Rcs/svn.pm @@ -4,11 +4,33 @@ use warnings; use strict; use IkiWiki; +use POSIX qw(setlocale LC_CTYPE); package IkiWiki; my $svn_webcommit=qr/^web commit (by (\w+)|from (\d+\.\d+\.\d+\.\d+)):?(.*)/; +# svn needs LC_CTYPE set to a UTF-8 locale, so try to find one. Any will do. +sub find_lc_ctype() { + my $current = setlocale(LC_CTYPE()); + return $current if $current =~ m/UTF-?8$/i; + + # Make some obvious attempts to avoid calling `locale -a` + foreach my $locale ("$current.UTF-8", "en_US.UTF-8", "en_GB.UTF-8") { + return $locale if setlocale(LC_CTYPE(), $locale); + } + + # Try to get all available locales and pick the first UTF-8 one found. + if (my @locale = grep(/UTF-?8$/i, `locale -a`)) { + chomp @locale; + return $locale[0] if setlocale(LC_CTYPE(), $locale[0]); + } + + # fallback to the current locale + return $current; +} # }}} +$ENV{LC_CTYPE} = $ENV{LC_CTYPE} || find_lc_ctype(); + sub svn_info ($$) { #{{{ my $field=shift; my $file=shift; -- cgit v1.2.3