From nobody Tue Nov 28 08:05:49 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SfZlL1CrMz531PW; Tue, 28 Nov 2023 08:05:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SfZlL0nMpz4c1j; Tue, 28 Nov 2023 08:05:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701158750; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YXuE4nyysWrAXCaYyNiW6R7l4jJdH8n3cfyrRSDMY0o=; b=IG9l7f7WF60Iehq8gOvwz0N6br+fAiqTCpGptjZ5qQZFtZQocoM4UgSOOps8xYTF0vQ5zQ ScrL/6UaL3LkdZcBD8+vsli0rOAfnLSu0D/rL/VU2fU/i2LWM3O4xzkyUpAfBGnT/NvGWz qsGmXqq2dGAm9vQy3VSDUTOC2gfLCmpCjCkXgvYY+TP53h+P4DtViByWvXfeW23nm6iUFw z1bxfjqW7v5tENQue8/6mqYgFo/mFrp8Fno0mb32ELJbYPrEgZJIjNuZh5UqnXJ1l7fDbS pr5a3RlYoezYLBNp6frie3FF/51GjpwyhbNkaZ33M0KbjjW5Eum9NHqn18h6JA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701158750; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YXuE4nyysWrAXCaYyNiW6R7l4jJdH8n3cfyrRSDMY0o=; b=oV3dKPR+SPOpz2gaTEOGanBaE+IhXw8FC2jDt8JGE1j2fQ1BufsTEytSuNH5y6OT2VBeSK /hufeoSyOWHIi0XhjO5VV/Ynf4R2ZWecJ4spEQBiaMqPtSPbl1J9W+Y8ygV8ftwHroEtri TcO6k0EVR9qy/qmR8cHmQ8Qrj1w5zWu8pEV+jhRQ7dCUjQluWfqeXUWZFy4JGEQnRW++Vv 40kXHRon6SHEl1M8sp6X2IXAWCDmMsVpiUDIz1ndPkZ6werpTfZvB4AkJQmE77bio2/y5o hXwbgE3bL01JPjwaIuRqvuBG67qWnR1QmfvNzObCro/PMB5wNSAsW8aR6cMKuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701158750; a=rsa-sha256; cv=none; b=kRt0OKBGhrSBiZuXcT1pdgmOJLVnXoU6V5eXNDhkBdlgMIqUcEZa6mzSMMqTfX4a6OD2Il mhAYq909dffmrqzJzBhx5bLFw8gmiN8drMR5ylK0N+UTtpLt3MeD4hcH3Vzvq8uaFu9D4P qRgIS8P7Rr5dQuXhuffsyA0wfzMlSX+ZqPOngqS3GdA4u0m/uOF2j2+bwE+I63f1Yk9+xo cVxMY7VZmGyhJucdnfJ5a9D+qB/aToaRlGWIGrDkllON4dvx/DJZAqiJP1lev7IC/YlyPB WuZ2s2InmjMM06ihMAlbD/vWRZdlkK05TTRsYnINjJD16bb/55IE4hZKsWqASA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SfZlK6Xm6z1Cg6; Tue, 28 Nov 2023 08:05:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AS85n7B070601; Tue, 28 Nov 2023 08:05:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AS85naB070598; Tue, 28 Nov 2023 08:05:49 GMT (envelope-from git) Date: Tue, 28 Nov 2023 08:05:49 GMT Message-Id: <202311280805.3AS85naB070598@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Yuri Pankov Subject: git: 5b4b93e6074c - stable/14 - msgdef: fix NO and SI locales List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuripv X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5b4b93e6074c4a928c6a452790ed8a43e1c4a039 Auto-Submitted: auto-generated The branch stable/14 has been updated by yuripv: URL: https://cgit.FreeBSD.org/src/commit/?id=5b4b93e6074c4a928c6a452790ed8a43e1c4a039 commit 5b4b93e6074c4a928c6a452790ed8a43e1c4a039 Author: Yuri Pankov AuthorDate: 2023-09-21 10:45:54 +0000 Commit: Yuri Pankov CommitDate: 2023-11-28 07:12:11 +0000 msgdef: fix NO and SI locales Fix circular symlinks by providing separate source for nn_NO.ISO8859-1, nn_NO.ISO8859-15, and sl_SI.ISO8859-2 (re)generated from CLDR. PR: 260841 Reviewed by: imp (previous version) Fixes: 0a36787e4c1f ("locales: separate unicode from other locales") Differential Revision: https://reviews.freebsd.org/D41899 (cherry picked from commit 159599c4a2bbd8fcc4bb7f845afe3e0ea232ab9e) --- share/msgdef/Makefile | 5 ++--- share/msgdef/nn_NO.ISO8859-15.src | 8 ++++++++ share/msgdef/sl_SI.ISO8859-2.src | 8 ++++++++ 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/share/msgdef/Makefile b/share/msgdef/Makefile index cf268c72d783..e52e02e4adf9 100644 --- a/share/msgdef/Makefile +++ b/share/msgdef/Makefile @@ -1,4 +1,3 @@ - PACKAGE= locales LOCALEDIR= ${SHAREDIR}/locale FILESNAME= LC_MESSAGES @@ -28,6 +27,7 @@ LOCALES+= ru_RU.CP866 LOCALES+= ru_RU.ISO8859-5 LOCALES+= ru_RU.KOI8-R LOCALES+= sk_SK.ISO8859-2 +LOCALES+= sl_SI.ISO8859-2 LOCALES+= sr_RS.ISO8859-5 LOCALES+= tr_TR.ISO8859-9 LOCALES+= uk_UA.CP1251 @@ -47,6 +47,7 @@ LOCALES+= fr_FR.ISO8859-15 LOCALES+= hu_HU.ISO8859-2 LOCALES+= ro_RO.ISO8859-2 LOCALES+= nb_NO.ISO8859-15 +LOCALES+= nn_NO.ISO8859-15 LOCALES+= lt_LT.ISO8859-13 LOCALES+= pl_PL.ISO8859-2 @@ -105,13 +106,11 @@ SAME+= fr_FR.ISO8859-15 fr_CA.ISO8859-15 SAME+= fr_FR.ISO8859-15 fr_CA.ISO8859-1 SAME+= fr_FR.ISO8859-15 fr_BE.ISO8859-15 SAME+= fr_FR.ISO8859-15 fr_BE.ISO8859-1 -SAME+= sr_RS.ISO8859-2 sl_SI.ISO8859-2 SAME+= is_IS.ISO8859-15 is_IS.ISO8859-1 SAME+= it_IT.ISO8859-15 it_IT.ISO8859-1 SAME+= it_IT.ISO8859-15 it_CH.ISO8859-15 SAME+= it_IT.ISO8859-15 it_CH.ISO8859-1 SAME+= nb_NO.ISO8859-15 nb_NO.ISO8859-1 -SAME+= nn_NO.ISO8859-15 nn_NO.ISO8859-15 SAME+= nn_NO.ISO8859-15 nn_NO.ISO8859-1 SAME+= pt_PT.ISO8859-15 pt_PT.ISO8859-1 SAME+= pt_PT.ISO8859-15 pt_BR.ISO8859-1 diff --git a/share/msgdef/nn_NO.ISO8859-15.src b/share/msgdef/nn_NO.ISO8859-15.src new file mode 100644 index 000000000000..4dd2bca424d6 --- /dev/null +++ b/share/msgdef/nn_NO.ISO8859-15.src @@ -0,0 +1,8 @@ +# yesexpr +^(([jJ]([aA])?)|([jJ])|([yY]([eE][sS])?)|([yY])) +# noexpr +^(([nN]([eE][iI])?)|([nN])|([nN]([oO])?)|([nN])) +# yesstr +ja:j:JA:J:yes:y:YES:Y +# nostr +nei:n:NEI:N:no:n:NO:N diff --git a/share/msgdef/sl_SI.ISO8859-2.src b/share/msgdef/sl_SI.ISO8859-2.src new file mode 100644 index 000000000000..a52851e8b8e4 --- /dev/null +++ b/share/msgdef/sl_SI.ISO8859-2.src @@ -0,0 +1,8 @@ +# yesexpr +^(([dD]([aA])?)|([dD])|([yY]([eE][sS])?)|([yY])) +# noexpr +^(([nN]([eE])?)|([nN])|([nN]([oO])?)|([nN])) +# yesstr +da:d:DA:D:yes:y:YES:Y +# nostr +ne:n:NE:N:no:n:NO:N