From owner-svn-src-projects@freebsd.org Sat Aug 8 18:29:46 2015 Return-Path: Delivered-To: svn-src-projects@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 941749B5DC0 for ; Sat, 8 Aug 2015 18:29:46 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 8468CC4D; Sat, 8 Aug 2015 18:29:46 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t78ITkI1085589; Sat, 8 Aug 2015 18:29:46 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t78ITkCW085587; Sat, 8 Aug 2015 18:29:46 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201508081829.t78ITkCW085587@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sat, 8 Aug 2015 18:29:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r286460 - in projects/collation/share: . locale-links X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Aug 2015 18:29:46 -0000 Author: bapt Date: Sat Aug 8 18:29:45 2015 New Revision: 286460 URL: https://svnweb.freebsd.org/changeset/base/286460 Log: Add symlinks for locales alternative names Added: projects/collation/share/locale-links/ projects/collation/share/locale-links/Makefile (contents, props changed) Modified: projects/collation/share/Makefile Modified: projects/collation/share/Makefile ============================================================================== --- projects/collation/share/Makefile Sat Aug 8 18:22:14 2015 (r286459) +++ projects/collation/share/Makefile Sat Aug 8 18:29:45 2015 (r286460) @@ -13,6 +13,7 @@ SUBDIR= ${_colldef} \ ${_examples} \ ${_i18n} \ keys \ + ${_locale-links} \ ${_man} \ ${_me} \ misc \ @@ -59,13 +60,14 @@ _i18n= i18n .endif .if ${MK_LOCALES} != "no" -_colldef = colldef -_ctypedef = ctypedef -_mklocale = mklocale -_monetdef = monetdef -_msgdef = msgdef -_numericdef = numericdef -_timedef = timedef +_colldef= colldef +_ctypedef= ctypedef +_locale-links= locale-links +_mklocale= mklocale +_monetdef= monetdef +_msgdef= msgdef +_numericdef= numericdef +_timedef= timedef .endif .if ${MK_MAKE} != "no" Added: projects/collation/share/locale-links/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/collation/share/locale-links/Makefile Sat Aug 8 18:29:45 2015 (r286460) @@ -0,0 +1,67 @@ +# This creates short versions of locales as symlinks to full versions +# e.g. zh_Hant_TW is a symlink to zh_Hant_TW.UTF-8. + +UTF8= af_ZA am_ET be_BY bg_BG ca_AD ca_ES ca_FR ca_IT \ + cs_CZ da_DK de_AT de_CH de_DE el_GR en_AU en_CA \ + en_GB en_HK en_IE en_NZ en_PH en_SG en_US es_AR \ + es_CR es_ES es_MX et_EE eu_ES fi_FI fr_BE fr_CA \ + fr_CH fr_FR he_IL hi_IN hr_HR hu_HU hy_AM is_IS \ + it_CH it_IT ja_JP kk_KZ ko_KR lt_LT lv_LV nb_NO \ + nl_BE nl_NL nn_NO pl_PL pt_BR pt_PT ro_RO ru_RU \ + se_FI se_NO sk_SK sl_SI sv_FI sv_SE tr_TR uk_UA \ + mn_Cyrl_MN \ + sr_Cyrl_RS \ + sr_Latn_RS \ + zh_Hans_CN \ + zh_Hant_HK \ + zh_Hant_TW + +EURO= af_ZA ca_AD ca_ES ca_FR ca_IT da_DK de_AT de_CH \ + de_DE en_AU en_CA en_GB en_NZ en_US en_ZA es_ES \ + et_EE eu_ES fi_FI fr_BE fr_CA fr_CH fr_FR is_IS \ + it_CH it_IT nb_NO nl_BE nl_NL nn_NO pt_BR pt_PT \ + sv_FI sv_SE + +STD1= ${EURO:Net_EE} en_HK en_PH en_SG es_AR es_CR es_MX +STD2= cs_CZ hr_HR hu_HU pl_PL ro_RO sk_SK sl_SI sr_Latn_RS +STD5= be_BY ru_RU uk_UA sr_Cyrl_RS +MANUAL= lt_LT el_GR tr_TR lv_LV + +LOCALEDIR= /usr/share/locale + +SYMLINKS= lt_LT.ISO8859-4 ${LOCALEDIR}/lt_LT \ + el_GR.ISO8859-7 ${LOCALEDIR}/el_GR \ + tr_TR.ISO8859-9 ${LOCALEDIR}/tr_TR \ + lv_LV.ISO8859-13 ${LOCALEDIR}/lv_LV \ + en_US.ISO8859-1 ${LOCALEDIR}/en_US.ISO-8859-1 \ + en_US.ISO8859-15 ${LOCALEDIR}/en_US.ISO-8859-15 \ + ja_JP.eucJP ${LOCALEDIR}/ja_JP.eucjp +.for symdir in ${STD1} +SYMLINKS+= ${symdir}.ISO8859-1 ${LOCALEDIR}/${symdir} +.endfor +.for symdir in ${STD2} +SYMLINKS+= ${symdir}.ISO8859-2 ${LOCALEDIR}/${symdir} +.endfor +.for symdir in ${STD5} +SYMLINKS+= ${symdir}.ISO8859-5 ${LOCALEDIR}/${symdir} +.endfor +.for symdir in ${UTF8} +. if ! (${STD1:M${symdir}} || ${STD2:M${symdir}} || \ + ${STD5:M${symdir}} || ${MANUAL:M${symdir}}) +SYMLINKS+= ${symdir}.UTF-8 ${LOCALEDIR}/${symdir} +. endif +SYMLINKS+= ${symdir}.UTF-8 ${LOCALEDIR}/${symdir}.UTF8 +.endfor +.for symdir in ${EURO} +SYMLINKS+= ${symdir}.ISO8859-15 ${LOCALEDIR}/${symdir}@euro +SYMLINKS+= ${symdir}.ISO8859-15 ${LOCALEDIR}/${symdir}.ISO-8859-15@euro +.endfor + +# 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 +SYMLINKS+= zh_Hans_CN.${CN} ${LOCALEDIR}/zh_CN.${CN} +.endfor + +.include