The branch main has been updated by yuripv:
URL:
https://cgit.FreeBSD.org/src/commit/?id=159599c4a2bbd8fcc4bb7f845afe3e0ea232ab9e
commit 159599c4a2bbd8fcc4bb7f845afe3e0ea232ab9e
Author: Yuri Pankov <yur...@freebsd.org>
AuthorDate: 2023-09-21 10:45:54 +0000
Commit: Yuri Pankov <yur...@freebsd.org>
CommitDate: 2023-09-21 10:54:21 +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
---
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
