Date: Sat, 23 Jul 2016 11:24:05 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r303218 - head/tools/tools/locale/tools Message-ID: <201607231124.u6NBO5aJ003824@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Sat Jul 23 11:24:05 2016 New Revision: 303218 URL: https://svnweb.freebsd.org/changeset/base/303218 Log: Add another hack to add weekday to date format to more locales While here only initialize the iconv converter when needed Modified: head/tools/tools/locale/tools/cldr2def.pl Modified: head/tools/tools/locale/tools/cldr2def.pl ============================================================================== --- head/tools/tools/locale/tools/cldr2def.pl Sat Jul 23 10:19:10 2016 (r303217) +++ head/tools/tools/locale/tools/cldr2def.pl Sat Jul 23 11:24:05 2016 (r303218) @@ -201,12 +201,12 @@ sub callback_ampm { my $s = shift; my $nl = $callback{data}{l} . "_" . $callback{data}{c}; my $enc = $callback{data}{e}; - my $converter = Text::Iconv->new("utf-8", "$enc"); if ($nl eq 'ru_RU') { if ($enc eq 'UTF-8') { $s = 'дп;пп'; } else { + my $converter = Text::Iconv->new("utf-8", "$enc"); $s = $converter->convert("дп;пп"); } } @@ -220,6 +220,7 @@ sub callback_cformat { $s =~ s/\.,/\./; $s =~ s/ %Z//; $s =~ s/ %z//; + $s =~ s/^"%e\./%A %e/; $s =~ s/^"(%B %e, )/"%A, $1/; $s =~ s/^"(%e %B )/"%A $1/; return $s; @@ -241,6 +242,7 @@ sub callback_dtformat { $s =~ s/(> )(%H)/$1%A $2/; } $s =~ s/\.,/\./; + $s =~ s/^"%e\./%A %e/; $s =~ s/^"(%B %e, )/"%A, $1/; $s =~ s/^"(%e %B )/"%A $1/; return $s;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201607231124.u6NBO5aJ003824>