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]
(kim)
diff -r1.1 -r1.2 src/share/locale/Makefile.common--- src/share/locale/Makefile.common 2013/08/11 22:09:40 1.1
+++ src/share/locale/Makefile.common 2020/03/23 13:56:12 1.2
| @@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
| 1 | # $NetBSD: Makefile.common,v 1.1 2013/08/11 22:09:40 joerg Exp $ | 1 | # $NetBSD: Makefile.common,v 1.2 2020/03/23 13:56:12 kim Exp $ | |
| 2 | 2 | |||
| 3 | all: ${LOCALES:S/$/.out/g} | 3 | all: ${LOCALES:S/$/.out/g} | |
| 4 | realall: ${LOCALES:S/$/.out/g} | 4 | realall: ${LOCALES:S/$/.out/g} | |
| 5 | 5 | |||
| 6 | FILES= ${LOCALES:S/$/.out/g} | 6 | FILES= ${LOCALES:S/$/.out/g} | |
| 7 | CLEANFILES+= ${LOCALES:S/$/.out/g} | 7 | CLEANFILES+= ${LOCALES:S/$/.out/g} | |
| 8 | 8 | |||
| 9 | .SUFFIXES: .src .out | 9 | .SUFFIXES: .src .out | |
| 10 | .src.out: | 10 | .src.out: | |
| 11 | ${_MKTARGET_CREATE} | 11 | ${_MKTARGET_CREATE} | |
| 12 | ${TOOL_MKLOCALE} -t ${CATEGORY} -o ${.TARGET} < ${.IMPSRC} | 12 | ${TOOL_MKLOCALE} -t ${CATEGORY} -o ${.TARGET} < ${.IMPSRC} | |
| 13 | 13 | |||
| 14 | .PATH: ${.CURDIR}/converted | 14 | .PATH: ${.CURDIR}/converted | |
| @@ -27,26 +27,27 @@ update-converted: | @@ -27,26 +27,27 @@ update-converted: | |||
| 27 | . if ${locale} == "ja_JP.ct" | 27 | . if ${locale} == "ja_JP.ct" | |
| 28 | @echo Generating character set ${charset} of ${locale_name}... | 28 | @echo Generating character set ${charset} of ${locale_name}... | |
| 29 | @rm -f ${.CURDIR}/converted/${locale}.src | 29 | @rm -f ${.CURDIR}/converted/${locale}.src | |
| 30 | @iconv -f UTF-8 -t eucJP < ${.CURDIR}/${locale_name}.UTF-8.src \ | 30 | @iconv -f UTF-8 -t eucJP < ${.CURDIR}/${locale_name}.UTF-8.src \ | |
| 31 | | iconv -f eucJP -t ctext > ${.CURDIR}/converted/${locale}.src.tmp; \ | 31 | | iconv -f eucJP -t ctext > ${.CURDIR}/converted/${locale}.src.tmp; \ | |
| 32 | sed "s,\(Character set:\) UTF-8,\1 COMPOUND_TEXT," \ | 32 | sed "s,\(Character set:\) UTF-8,\1 COMPOUND_TEXT," \ | |
| 33 | < ${.CURDIR}/converted/${locale}.src.tmp \ | 33 | < ${.CURDIR}/converted/${locale}.src.tmp \ | |
| 34 | > ${.CURDIR}/converted/${locale}.src; \ | 34 | > ${.CURDIR}/converted/${locale}.src; \ | |
| 35 | rm ${.CURDIR}/converted/${locale}.src.tmp | 35 | rm ${.CURDIR}/converted/${locale}.src.tmp | |
| 36 | . elif !exists(${.CURDIR}/${locale}.src) | 36 | . elif !exists(${.CURDIR}/${locale}.src) | |
| 37 | @echo Generating character set ${charset} of ${locale_name}... | 37 | @echo Generating character set ${charset} of ${locale_name}... | |
| 38 | @rm -f ${.CURDIR}/converted/${locale}.src | 38 | @rm -f ${.CURDIR}/converted/${locale}.src | |
| 39 | @set -e; cat < ${.CURDIR}/${locale_name}.UTF-8.src \ | 39 | @set -e; cat < ${.CURDIR}/${locale_name}.UTF-8.src \ | |
| 40 | | (case ${locale} in fi_FI.ISO8859-1) sed 's,€,e,g';; *) cat ;; esac) \ | |||
| 40 | | (case ${charset} in ISO8859-[125]) sed 's,€,EUR,g';; *) cat ;; esac) \ | 41 | | (case ${charset} in ISO8859-[125]) sed 's,€,EUR,g';; *) cat ;; esac) \ | |
| 41 | | (case ${charset} in ISO8859-9) sed 's,₺,L,g';; *) cat ;; esac) \ | 42 | | (case ${charset} in ISO8859-9) sed 's,₺,L,g';; *) cat ;; esac) \ | |
| 42 | | (case ${charset} in ISO8859*) sed 's,−,-,g';; *) cat ;; esac) \ | 43 | | (case ${charset} in ISO8859*) sed 's,−,-,g';; *) cat ;; esac) \ | |
| 43 | | (case ${charset} in ISO8859*) sed 's,–,-,g';; *) cat ;; esac) \ | 44 | | (case ${charset} in ISO8859*) sed 's,–,-,g';; *) cat ;; esac) \ | |
| 44 | | (case ${charset} in ISO8859-1) sed 's,’,´,g';; *) cat ;; esac) \ | 45 | | (case ${charset} in ISO8859-1) sed 's,’,´,g';; *) cat ;; esac) \ | |
| 45 | | (case ${charset} in ISO8859-15) sed 's,’,'\'',g';; *) cat ;; esac) \ | 46 | | (case ${charset} in ISO8859-15) sed 's,’,'\'',g';; *) cat ;; esac) \ | |
| 46 | | (case ${charset} in KOI8-U|CP1251|ISO8859-5) sed 's,ʼ,'\'',g';; *) cat ;; esac) \ | 47 | | (case ${charset} in KOI8-U|CP1251|ISO8859-5) sed 's,ʼ,'\'',g';; *) cat ;; esac) \ | |
| 47 | | (case ${charset} in ISO8859-2) sed 's,È›,Å£,g';; *) cat ;; esac) \ | 48 | | (case ${charset} in ISO8859-2) sed 's,È›,Å£,g';; *) cat ;; esac) \ | |
| 48 | | (case ${charset} in ISO8859-5|KOI8-U|CP1251) sed 's,₴,грн.,g';; *) cat ;; esac) \ | 49 | | (case ${charset} in ISO8859-5|KOI8-U|CP1251) sed 's,₴,грн.,g';; *) cat ;; esac) \ | |
| 49 | | iconv -f UTF-8 -t ${charset} \ | 50 | | iconv -f UTF-8 -t ${charset} \ | |
| 50 | > ${.CURDIR}/converted/${locale}.src.tmp; \ | 51 | > ${.CURDIR}/converted/${locale}.src.tmp; \ | |
| 51 | sed "s,\(Character set:\) UTF-8,\1 ${charset}," \ | 52 | sed "s,\(Character set:\) UTF-8,\1 ${charset}," \ | |
| 52 | < ${.CURDIR}/converted/${locale}.src.tmp \ | 53 | < ${.CURDIR}/converted/${locale}.src.tmp \ |
--- src/share/locale/monetary/converted/fi_FI.ISO8859-1.src 2013/08/11 22:09:41 1.1
+++ src/share/locale/monetary/converted/fi_FI.ISO8859-1.src 2020/03/23 13:56:12 1.2
| @@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
| 1 | # $NetBSD: fi_FI.ISO8859-1.src,v 1.1 2013/08/11 22:09:41 joerg Exp $ | 1 | # $NetBSD: fi_FI.ISO8859-1.src,v 1.2 2020/03/23 13:56:12 kim Exp $ | |
| 2 | # | 2 | # | |
| 3 | # Locale: fi_FI | 3 | # Locale: fi_FI | |
| 4 | # Character set: ISO8859-1 | 4 | # Character set: ISO8859-1 | |
| 5 | # | 5 | # | |
| 6 | # Copyright 1991-2011 Unicode, Inc. All rights reserved. Distributed under the Terms of Use in | 6 | # Copyright 1991-2011 Unicode, Inc. All rights reserved. Distributed under the Terms of Use in | |
| 7 | # http://www.unicode.org/copyright.html. | 7 | # http://www.unicode.org/copyright.html. | |
| 8 | # | 8 | # | |
| 9 | # Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode | 9 | # Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode | |
| 10 | # data files and any associated documentation (the "Data Files") or Unicode software and any | 10 | # data files and any associated documentation (the "Data Files") or Unicode software and any | |
| 11 | # associated documentation (the "Software") to deal in the Data Files or Software without | 11 | # associated documentation (the "Software") to deal in the Data Files or Software without | |
| 12 | # restriction, including without limitation the rights to use, copy, modify, merge, publish, | 12 | # restriction, including without limitation the rights to use, copy, modify, merge, publish, | |
| 13 | # distribute, and/or sell copies of the Data Files or Software, and to permit persons to whom | 13 | # distribute, and/or sell copies of the Data Files or Software, and to permit persons to whom | |
| 14 | # the Data Files or Software are furnished to do so, provided that (a) the above copyright | 14 | # the Data Files or Software are furnished to do so, provided that (a) the above copyright | |
| @@ -23,27 +23,27 @@ | @@ -23,27 +23,27 @@ | |||
| 23 | # PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT | 23 | # PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT | |
| 24 | # HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR | 24 | # HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR | |
| 25 | # CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, | 25 | # CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, | |
| 26 | # WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN | 26 | # WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN | |
| 27 | # CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR SOFTWARE. | 27 | # CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR SOFTWARE. | |
| 28 | # | 28 | # | |
| 29 | # International Currency Symbol (int_curr_symbol) | 29 | # International Currency Symbol (int_curr_symbol) | |
| 30 | # NOTE: Last character is always SPACE | 30 | # NOTE: Last character is always SPACE | |
| 31 | # | 31 | # | |
| 32 | EUR | 32 | EUR | |
| 33 | # | 33 | # | |
| 34 | # Currency Symbol (currency_symbol) | 34 | # Currency Symbol (currency_symbol) | |
| 35 | # | 35 | # | |
| 36 | EUR | 36 | e | |
| 37 | # | 37 | # | |
| 38 | # Monetary Decimal Point (mon_decimal_point) | 38 | # Monetary Decimal Point (mon_decimal_point) | |
| 39 | # | 39 | # | |
| 40 | , | 40 | , | |
| 41 | # | 41 | # | |
| 42 | # Monetary Thousands Separator (mon_thousands_sep) | 42 | # Monetary Thousands Separator (mon_thousands_sep) | |
| 43 | # | 43 | # | |
| 44 | 44 | |||
| 45 | # | 45 | # | |
| 46 | # Monetary Grouping Sequence (mon_grouping) | 46 | # Monetary Grouping Sequence (mon_grouping) | |
| 47 | # A sequence of integers separated by semi-colons ';'. | 47 | # A sequence of integers separated by semi-colons ';'. | |
| 48 | # | 48 | # | |
| 49 | 3 | 49 | 3 |