From owner-svn-src-head@freebsd.org  Sat Jul 23 11:24:07 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1155DBA263D;
 Sat, 23 Jul 2016 11:24:07 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id CAC9C135D;
 Sat, 23 Jul 2016 11:24:06 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6NBO5mb003825;
 Sat, 23 Jul 2016 11:24:05 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6NBO5aJ003824;
 Sat, 23 Jul 2016 11:24:05 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201607231124.u6NBO5aJ003824@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bapt set sender to
 bapt@FreeBSD.org using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sat, 23 Jul 2016 11:24:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r303218 - head/tools/tools/locale/tools
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 23 Jul 2016 11:24:07 -0000

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;