gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-22 16:33:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into framework_test

Browse source
This commit is contained in:
Fred Kiefer 2020-03-07 11:35:32 +01:00 committed by GitHub
commit 120e8f5294
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -5,6 +5,12 @@
* Tests/base/NSBundle/resources2.m: Extend test to check for
framework resource loading.
2020-03-06 Richard Frith-Macdonald <rfm@gnu.org>
* 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 <rfm@gnu.org>
* Source/objc-load.m: update GSPrivateSymbolPath() so that, on the

23
Resources/Languages/Locale.canonical
View file

@ -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";
}

2
Resources/Languages/README
View file

@ -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