From 222d89f10416c18a157434b4d5dda569dfd2200d Mon Sep 17 00:00:00 2001 From: martin Date: Mon, 30 Mar 2020 18:29:39 +0000 Subject: [PATCH] Pull up following revision(s) (requested by kim in ticket #804): share/locale/monetary/converted/fi_FI.ISO8859-1.src: revision 1.2 share/locale/Makefile.common: revision 1.2 Fix the currency symbol for fi_FI.ISO8859-1 In the Finnish language, the recommended symbol for euro is the euro sign where it is available, and the lowercase letter e otherwise. The use of the ISO currency code EUR is not an abbreviation of the word euro in the Finnish language, just like FIM is not an abbreviation of the word markka. Reference: https://www.kielikello.fi/-/euro- Euro Kielikello 3/1998 Kotimaisten kielten keskus Institute for the Languages of Finland [Last retrieved 2020-03-23] --- share/locale/Makefile.common | 3 ++- share/locale/monetary/converted/fi_FI.ISO8859-1.src | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/share/locale/Makefile.common b/share/locale/Makefile.common index 4f581c300b5d..f5d90c38133b 100644 --- a/share/locale/Makefile.common +++ b/share/locale/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.1 2013/08/11 22:09:40 joerg Exp $ +# $NetBSD: Makefile.common,v 1.1.32.1 2020/03/30 18:29:39 martin Exp $ all: ${LOCALES:S/$/.out/g} realall: ${LOCALES:S/$/.out/g} @@ -37,6 +37,7 @@ update-converted: @echo Generating character set ${charset} of ${locale_name}... @rm -f ${.CURDIR}/converted/${locale}.src @set -e; cat < ${.CURDIR}/${locale_name}.UTF-8.src \ + | (case ${locale} in fi_FI.ISO8859-1) sed 's,€,e,g';; *) cat ;; esac) \ | (case ${charset} in ISO8859-[125]) sed 's,€,EUR,g';; *) cat ;; esac) \ | (case ${charset} in ISO8859-9) sed 's,₺,L,g';; *) cat ;; esac) \ | (case ${charset} in ISO8859*) sed 's,−,-,g';; *) cat ;; esac) \ diff --git a/share/locale/monetary/converted/fi_FI.ISO8859-1.src b/share/locale/monetary/converted/fi_FI.ISO8859-1.src index 11444df20f36..cc5a7c4b30af 100644 --- a/share/locale/monetary/converted/fi_FI.ISO8859-1.src +++ b/share/locale/monetary/converted/fi_FI.ISO8859-1.src @@ -1,4 +1,4 @@ -# $NetBSD: fi_FI.ISO8859-1.src,v 1.1 2013/08/11 22:09:41 joerg Exp $ +# $NetBSD: fi_FI.ISO8859-1.src,v 1.1.32.1 2020/03/30 18:29:39 martin Exp $ # # Locale: fi_FI # Character set: ISO8859-1 @@ -33,7 +33,7 @@ EUR # # Currency Symbol (currency_symbol) # -EUR +e # # Monetary Decimal Point (mon_decimal_point) #