From 5248b6ee363f1da256297182aff7579fb614c535 Mon Sep 17 00:00:00 2001 From: Richard Frith-Macdonald Date: Fri, 6 Mar 2020 09:19:54 +0000 Subject: [PATCH] Backward compatibility fix for ICU 65 by Fred Kiefer --- ChangeLog | 6 ++++++ Resources/Languages/Locale.canonical | 23 +++++++++++++++++++++++ Resources/Languages/README | 2 +- 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 8658c8b1b..2be1696c7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2020-03-06 Richard Frith-Macdonald + + * Resources/Languages/Locale.canonical: + Backward compatibility fix for ICU 65 by Fred Kiefer + * Resources/Languages/README: Fix trivial typo + 2020-02-24 Richard Frith-Macdonald * Source/objc-load.m: update GSPrivateSymbolPath() so that, on the diff --git a/Resources/Languages/Locale.canonical b/Resources/Languages/Locale.canonical index f976d5163..98a9bc289 100644 --- a/Resources/Languages/Locale.canonical +++ b/Resources/Languages/Locale.canonical @@ -573,4 +573,27 @@ zha = za; zho = zh; zul = zu; + ca_ES_PREEURO = "ca_ES@currency=ESP"; + de_AT_PREEURO = "de_AT@currency=ATS"; + de_DE_PREEURO = "de_DE@currency=DEM"; + de_LU_PREEURO = "de_LU@currency=LUF"; + el_GR_PREEURO = "el_GR@currency=GRD"; + en_BE_PREEURO = "en_BE@currency=BEF"; + en_IE_PREEURO = "en_IE@currency=IEP"; + es_ES_PREEURO = "es_ES@currency=ESP"; + eu_ES_PREEURO = "eu_ES@currency=ESP"; + fi_FI_PREEURO = "fi_FI@currency=FIM"; + fr_BE_PREEURO = "fr_BE@currency=BEF"; + fr_FR_PREEURO = "fr_FR@currency=FRF"; + fr_LU_PREEURO = "fr_LU@currency=LUF"; + ga_IE_PREEURO = "ga_IE@currency=IEP"; + gl_ES_PREEURO = "gl_ES@currency=ESP"; + it_IT_PREEURO = "it_IT@currency=ITL"; + nl_BE_PREEURO = "nl_BE@currency=BEF"; + nl_NL_PREEURO = "nl_NL@currency=NLG"; + pt_PT_PREEURO = "pt_PT@currency=PTE"; + de__PHONEBOOK = "de@collation=phonebook"; + es__TRADITIONAL = "es@collation=traditional"; + hi__DIRECT = "hi@collation=direct"; + ja_JP_TRADITIONAL = "ja_JP@calendar=japanese"; } diff --git a/Resources/Languages/README b/Resources/Languages/README index 0579004e4..fd6bf3631 100644 --- a/Resources/Languages/README +++ b/Resources/Languages/README @@ -2,7 +2,7 @@ The file Locale.aliases is used to map common language specifications to old-style long names. The file Locale.canonical is used to map old style names and three letter -ISO-639-2 names to the preferred tewo letter ISO-639-1 names. +ISO-639-2 names to the preferred two letter ISO-639-1 names. Language files which contain non-ascii characters should either be properly marked unicode files (UTF-8 with a leading Byte Order Mark or UTF-16 with a