From owner-svn-src-head@freebsd.org  Sun Nov 15 13:09:09 2015
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 E6E0CA27D0A;
 Sun, 15 Nov 2015 13:09:09 +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 B12D012A3;
 Sun, 15 Nov 2015 13:09:09 +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 tAFD98RR050913;
 Sun, 15 Nov 2015 13:09:08 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAFD98fQ050912;
 Sun, 15 Nov 2015 13:09:08 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201511151309.tAFD98fQ050912@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: Sun, 15 Nov 2015 13:09:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r290862 - head/share/locale-links
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.20
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: Sun, 15 Nov 2015 13:09:10 -0000

Author: bapt
Date: Sun Nov 15 13:09:08 2015
New Revision: 290862
URL: https://svnweb.freebsd.org/changeset/base/290862

Log:
  Simplify a bit the aliases generation

Modified:
  head/share/locale-links/Makefile

Modified: head/share/locale-links/Makefile
==============================================================================
--- head/share/locale-links/Makefile	Sun Nov 15 12:50:14 2015	(r290861)
+++ head/share/locale-links/Makefile	Sun Nov 15 13:09:08 2015	(r290862)
@@ -4,24 +4,18 @@ LOCALEDIR=	${SHAREDIR}/locale
 LC_FILES=	LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC \
 		LC_TIME
 
-# We need to keep zh_CN.* around as aliases to zh_Hans_CN.* because some
-# of the lang catalogs use zh_CN still (e.g. vi), plus people may expect it
-# We won't alias zh_Hans_CN or zh_Hans_UTF8 though
-.for CN in GB18030 GB2312 GBK UTF-8 eucCN
-.for f in ${LC_FILES}
-SYMLINKS+=	zh_Hans_CN.${CN}/${f} ${LOCALEDIR}/zh_CN.${CN}/${f}
-.endfor
-.endfor
-
-.for HK in Big5HKSCS UTF-8
-.for f in ${LC_FILES}
-SYMLINKS+=	zh_Hant_HK.${HK}/${f} ${LOCALEDIR}/zh_HK.${HK}/${f}
-.endfor
-.endfor
+ALIASES=	zh_Hans_CN.GB18030 zh_CN.GB18030 \
+		zh_Hans_CN.GB2312 zh_CN.GB2312 \
+		zh_Hans_CN.GBK zh_CN.GBK \
+		zh_Hans_CN.eucCN zh_CN.eucCN \
+		zh_Hant_HK.Big5HKSCS zh_HK.Big5HKSCS \
+		zh_Hant_HK.UTF-8 zh_HK.UTF-8 \
+		zh_Hant_TW.Big5 zh_TW.Big5 \
+		zh_Hant_TW.UTF-8 zh_TW.UTF-8
 
-.for TW in Big5 UTF-8
+.for from to in ${ALIASES}
 .for f in ${LC_FILES}
-SYMLINKS+=	zh_Hant_TW.${TW}/${f} ${LOCALEDIR}/zh_TW.${TW}/${f}
+SYMLINKS+=	${from}/${f} ${LOCALEDIR}/${to}/${f}
 .endfor
 .endfor