Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 15 Nov 2015 13:09:08 +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: r290862 - head/share/locale-links
Message-ID:  <201511151309.tAFD98fQ050912@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511151309.tAFD98fQ050912>