gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-06-02 01:21:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

Language lookup improvements

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@35275 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2012-07-09 10:47:48 +00:00
parent 6741940916
commit 0e756b2efd
6 changed files with 728 additions and 487 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -3,6 +3,8 @@
* Source/NSBundle.m: Fixes for bug #34815 ... map between old and * Source/NSBundle.m: Fixes for bug #34815 ... map between old and
new style language names and use the best language specific new style language names and use the best language specific
resource available. resource available.
* Resources/Languages/Locale.canonical: Add mappings from three
letter language names to two letter names where they exist.
2012-07-08 Richard Frith-Macdonald <rfm@gnu.org> 2012-07-08 Richard Frith-Macdonald <rfm@gnu.org>

967
Resources/Languages/Locale.canonical
View file

@ -1,391 +1,576 @@
{ {
Abkhazian = ab; Abkhazian = ab;
Achinese = ace; Achinese = ace;
Acoli = ach; Acoli = ach;
Adangme = ada; Adangme = ada;
Adyghe = ady; Adyghe = ady;
Afar = aa; Afar = aa;
Afrikaans = af; Afrikaans = af;
Akan = ak; Akan = ak;
Albanian = sq; Albanian = sq;
AlgeriaArabic = ar_DZ; AlgeriaArabic = ar_DZ;
AmericanEnglish = en_US; AmericanEnglish = en_US;
Amharic = am; Amharic = am;
Angika = anp; Angika = anp;
Arabic = ar; Arabic = ar;
Aragonese = an; Aragonese = an;
ArgentinaSpanish = es_AR; ArgentinaSpanish = es_AR;
Armenian = hy; Armenian = hy;
Aromanian = rup; Aromanian = rup;
Assamese = as; Assamese = as;
Asturian = ast; Asturian = ast;
AustraliaEnglish = en_AU; AustraliaEnglish = en_AU;
AustriaGerman = de_AT; AustriaGerman = de_AT;
Avaric = av; Avaric = av;
Awadhi = awa; Awadhi = awa;
Aymara = ay; Aymara = ay;
Azerbaijani = az; /* -Cyrl, or -Latn ?*/ Azerbaijani = az; /* -Cyrl, or -Latn ?*/
BahrainArabic = ar_BH; BahrainArabic = ar_BH;
Balinese = ban; Balinese = ban;
Baluchi = bal; Baluchi = bal;
Bambara = bm; Bambara = bm;
BangladeshBengali = bn_BD; BangladeshBengali = bn_BD;
Basa = bas; Basa = bas;
Bashkir = ba; Bashkir = ba;
Basque = eu; Basque = eu;
Beja = bej; Beja = bej;
Belarusian = be; Belarusian = be;
BelgiumDutch = nl_BE; BelgiumDutch = nl_BE;
BelgiumFrench = fr_BE; BelgiumFrench = fr_BE;
BelgiumGerman = de_BE; BelgiumGerman = de_BE;
Bemba = bem; Bemba = bem;
Bengali = bn; Bengali = bn;
Bhojpuri = bho; Bhojpuri = bho;
Bhutani = dz; Bhutani = dz;
Bihari = bh; Bihari = bh;
Bikol = bik; Bikol = bik;
Bini = bin; Bini = bin;
Bislama = bi; Bislama = bi;
Blin = byn; Blin = byn;
BoliviaSpanish = es_BO; BoliviaSpanish = es_BO;
Bosnian = bs; Bosnian = bs;
BotswanaEnglish = en_BW; BotswanaEnglish = en_BW;
BrasilPortuguese = pt_BR; BrasilPortuguese = pt_BR;
Breton = br; Breton = br;
BritainEnglish = en_GB; BritainEnglish = en_GB;
Buginese = bug; Buginese = bug;
Bulgarian = bg; Bulgarian = bg;
Buriat = bua; Buriat = bua;
Burmese = my; Burmese = my;
Cambodian = km; Cambodian = km;
CanadaEnglish = en_CA; CanadaEnglish = en_CA;
CanadaFrench = fr_CA; CanadaFrench = fr_CA;
Catalan = ca; Catalan = ca;
Cebuano = ceb; Cebuano = ceb;
Chamorro = ch; Chamorro = ch;
Chechen = ce; Chechen = ce;
Chichewa = ny; Chichewa = ny;
ChileSpanish = es_CL; ChileSpanish = es_CL;
Chinese = zh; Chinese = zh;
ChurchSlavic = cu; ChurchSlavic = cu;
Chuvash = cv; Chuvash = cv;
ColombiaSpanish = es_CO; ColombiaSpanish = es_CO;
Cornish = kw; Cornish = kw;
Corsican = co; Corsican = co;
CostaRicaSpanish = es_CR; CostaRicaSpanish = es_CR;
Cree = cr; Cree = cr;
CrimeanTatar = crh; CrimeanTatar = crh;
Croatian = hr; Croatian = hr;
Czech = cs; Czech = cs;
Danish = da; Danish = da;
Dargwa = dar; Dargwa = dar;
DenmarkEnglish = en_DK; DenmarkEnglish = en_DK;
Dinka = din; Dinka = din;
DjiboutiAfar = aa_DJ; DjiboutiAfar = aa_DJ;
DjiboutiSomali = so_DJ; DjiboutiSomali = so_DJ;
Dogri = doi; Dogri = doi;
DominicanRepublicSpanish = es_DO; DominicanRepublicSpanish = es_DO;
Dutch = nl; Dutch = nl;
Dyula = dyu; Dyula = dyu;
EcuadorSpanish = es_EC; EcuadorSpanish = es_EC;
Efik = efi; Efik = efi;
EgyptArabic = ar_EG; EgyptArabic = ar_EG;
ElSalvadorSpanish = es_SV; ElSalvadorSpanish = es_SV;
English = en; English = en;
EritreaAfar = aa_ER; EritreaAfar = aa_ER;
EritreaGeez = gez_ER; EritreaGeez = gez_ER;
EritreaTigrinya = ti_ER; EritreaTigrinya = ti_ER;
Erzya = myv; Erzya = myv;
Esperanto = eo; Esperanto = eo;
EstoniaEstonian = et_EE; EstoniaEstonian = et_EE;
Estonian = et; Estonian = et;
EthiopiaAfar = aa_ET; EthiopiaAfar = aa_ET;
EthiopiaGeez = gez_ET; EthiopiaGeez = gez_ET;
EthiopiaOromo = om_ET; EthiopiaOromo = om_ET;
EthiopiaSomali = so_ET; EthiopiaSomali = so_ET;
EthiopiaTigrinya = ti_ET; EthiopiaTigrinya = ti_ET;
Ewondo = ewo; Ewondo = ewo;
Fang = fan; Fang = fan;
Faroese = fo; Faroese = fo;
Fijian = fj; Fijian = fj;
Filipino = fil; Filipino = fil;
FinlandSwedish = sv_FI; FinlandSwedish = sv_FI;
Finnish = fi; Finnish = fi;
Fon = fon; Fon = fon;
French = fr; French = fr;
Friulian = fur; Friulian = fur;
Fulah = ff; Fulah = ff;
Ga = gaa; Ga = gaa;
Gaelic = gd; Gaelic = gd;
Gallegan = gl; Gallegan = gl;
Ganda = lg; Ganda = lg;
Gayo = gay; Gayo = gay;
Gbaya = gba; Gbaya = gba;
Geez = gez; Geez = gez;
Georgian = ka; Georgian = ka;
German = de; German = de;
Gondi = gon; Gondi = gon;
Gorontalo = gor; Gorontalo = gor;
Grebo = grb; Grebo = grb;
GreeceGreek = el_GR; GreeceGreek = el_GR;
Greek = el; Greek = el;
Greenlandic = kl; Greenlandic = kl;
Guarani = gn; Guarani = gn;
GuatemalaSpanish = es_GT; GuatemalaSpanish = es_GT;
Gujarati = gu; Gujarati = gu;
Haitian = ht; Haitian = ht;
Hausa = ha-Latn; Hausa = ha-Latn;
Hebrew = he; Hebrew = he;
Hebrew = iw; Hebrew = iw;
Herero = hz; Herero = hz;
Hiligaynon = hil; Hiligaynon = hil;
Hindi = hi; Hindi = hi;
HiriMotu = ho; HiriMotu = ho;
Hmong = hmn; Hmong = hmn;
HondurasSpanish = es_HN; HondurasSpanish = es_HN;
HongKongChinese = zh-Hant_HK; HongKongChinese = zh-Hant_HK;
HongKongEnglish = en_HK; HongKongEnglish = en_HK;
Hungarian = hu; Hungarian = hu;
Iban = iba; Iban = iba;
Icelandic = is; Icelandic = is;
Ido = io; Ido = io;
Igbo = ig; Igbo = ig;
Iloko = ilo; Iloko = ilo;
IndiaArabic = ar_IN; IndiaArabic = ar_IN;
IndiaBengali = bn_IN; IndiaBengali = bn_IN;
IndiaEnglish = en_IN; IndiaEnglish = en_IN;
Indonesian = id; Indonesian = id;
Ingush = inh; Ingush = inh;
Interlingua = ia; Interlingua = ia;
Interlingue = ie; Interlingue = ie;
Inuktitut = iu; Inuktitut = iu;
Inupiak = ik; Inupiak = ik;
IraqArabic = ar_IQ; IraqArabic = ar_IQ;
IrelandEnglish = en_IE; IrelandEnglish = en_IE;
Irish = ga; Irish = ga;
Italian = it; Italian = it;
Japanese = ja; Japanese = ja;
Javanese = jv; Javanese = jv;
JordanArabic = ar_JO; JordanArabic = ar_JO;
Kabardian = kbd; Kabardian = kbd;
Kabyle = kab; Kabyle = kab;
Kachin = kac; Kachin = kac;
Kalmyk = xal; Kalmyk = xal;
Kamba = kam; Kamba = kam;
Kannada = kn; Kannada = kn;
Kanuri = kr; Kanuri = kr;
KarachayBalkar = krc; KarachayBalkar = krc;
KaraKalpak = kaa; KaraKalpak = kaa;
Karelian = krl; Karelian = krl;
Kashmiri = ks; Kashmiri = ks;
Kazakh = kk-Cyrl; Kazakh = kk-Cyrl;
KenyaOromo = om_KE; KenyaOromo = om_KE;
KenyaSomali = so_KE; KenyaSomali = so_KE;
Khasi = kha; Khasi = kha;
Kikuyu = ki; Kikuyu = ki;
Kimbundu = kmb; Kimbundu = kmb;
Kinyarwanda = rw; Kinyarwanda = rw;
Kirghiz = ky; Kirghiz = ky;
Komi = kv; Komi = kv;
Kongo = kg; Kongo = kg;
Korean = ko; Korean = ko;
Kumyk = kum; Kumyk = kum;
Kurdish = ku; Kurdish = ku;
Kurukh = kru; Kurukh = kru;
KuwaitArabic = ar_KW; KuwaitArabic = ar_KW;
Kwanyama = kj; Kwanyama = kj;
Ladino = lad; Ladino = lad;
Lamba = lam; Lamba = lam;
Lao = lo; Lao = lo;
Latin = la; Latin = la;
Latvian = lv; Latvian = lv;
LebanonArabic = ar_LB; LebanonArabic = ar_LB;
Lezghian = lez; Lezghian = lez;
LibyaArabic = ar_LY; LibyaArabic = ar_LY;
Limburgish = li; Limburgish = li;
Lingala = ln; Lingala = ln;
Lithuanian = lt; Lithuanian = lt;
Lozi = loz; Lozi = loz;
LubaKatanga = lu; LubaKatanga = lu;
LubaLulua = lua; LubaLulua = lua;
Luganda = lug; Luganda = lug;
Lunda = lun; Lunda = lun;
Luo = luo; Luo = luo;
Lushai = lus; Lushai = lus;
Luxembourgish = lb; Luxembourgish = lb;
LuxemburgFrench = fr_LU; LuxemburgFrench = fr_LU;
LuxemburgGerman = de_LU; LuxemburgGerman = de_LU;
Macedonian = mk; Macedonian = mk;
Madurese = mad; Madurese = mad;
Magahi = mag; Magahi = mag;
Maithili = mai; Maithili = mai;
Makasar = mak; Makasar = mak;
Malagasy = mg; Malagasy = mg;
Malay = ms; Malay = ms;
Malayalam = ml; Malayalam = ml;
Maldivian = dv; Maldivian = dv;
Maltese = mt; Maltese = mt;
Mandar = mdr; Mandar = mdr;
Mandingo = man; Mandingo = man;
Manipuri = mni; Manipuri = mni;
Manx = gv; Manx = gv;
Maori = mi; Maori = mi;
Mapudungun = arn; Mapudungun = arn;
Marathi = mr; Marathi = mr;
Mari = chm; Mari = chm;
Marshallese = mh; Marshallese = mh;
Masai = mas; Masai = mas;
Mende = men; Mende = men;
MexicoSpanish = es_MX; MexicoSpanish = es_MX;
Minangkabau = min; Minangkabau = min;
Moksha = mdf; Moksha = mdf;
Moldavian = mo; Moldavian = mo;
Mongo = lol; Mongo = lol;
Mongolian = mn; Mongolian = mn;
MoroccoArabic = ar_MA; MoroccoArabic = ar_MA;
Mossi = mos; Mossi = mos;
Nauru = na; Nauru = na;
Navajo = nv; Navajo = nv;
NdebeleNorth = nd; NdebeleNorth = nd;
NdebeleSouth = nr; NdebeleSouth = nr;
Ndonga = ng; Ndonga = ng;
Neapolitan = nap; Neapolitan = nap;
NepalBhasa = new; NepalBhasa = new;
Nepali = ne; Nepali = ne;
NetherlandsDutch = nl_NL; NetherlandsDutch = nl_NL;
NewZealandEnglish = en_NZ; NewZealandEnglish = en_NZ;
Nias = nia; Nias = nia;
NicaraguaSpanish = es_NI; NicaraguaSpanish = es_NI;
NorthernSaami = se; NorthernSaami = se;
Norwegian = no; Norwegian = no;
NorwegianBokmal = nb; NorwegianBokmal = nb;
NorwegianNynorsk = nn; NorwegianNynorsk = nn;
Nyamwezi = nym; Nyamwezi = nym;
Nyankole = nyn; Nyankole = nyn;
Nyoro = nyo; Nyoro = nyo;
Nzima = nzi; Nzima = nzi;
Occitan = oc; Occitan = oc;
Ojibwa = oj; Ojibwa = oj;
OmanArabic = ar_OM; OmanArabic = ar_OM;
Oriya = or; Oriya = or;
Oromo = om; Oromo = om;
Ossetian = os; Ossetian = os;
Pali = pi; Pali = pi;
Pampanga = pam; Pampanga = pam;
PanamaSpanish = es_PA; PanamaSpanish = es_PA;
Pangasinan = pag; Pangasinan = pag;
Papiamento = pap; Papiamento = pap;
ParaguaySpanish = es_PY; ParaguaySpanish = es_PY;
Pashto = ps; Pashto = ps;
Pedi = nso; Pedi = nso;
Persian = fa; Persian = fa;
PeruSpanish = es_PE; PeruSpanish = es_PE;
PhilippinesEnglish = en_PH; PhilippinesEnglish = en_PH;
Polish = pl; Polish = pl;
Portuguese = pt; Portuguese = pt;
PuertoRicoSpanish = es_PR; PuertoRicoSpanish = es_PR;
Punjabi = pa; /* -Arab, or -Guru ?*/ Punjabi = pa; /* -Arab, or -Guru ?*/
QatarArabic = ar_QA; QatarArabic = ar_QA;
Quechua = qu; Quechua = qu;
Rajasthani = raj; Rajasthani = raj;
Romanian = ro; Romanian = ro;
Romansh = rm; Romansh = rm;
Rundi = rn; Rundi = rn;
Russian = ru; Russian = ru;
Samoan = sm; Samoan = sm;
Sango = sg; Sango = sg;
Sanskrit = sa; Sanskrit = sa;
Santali = sat; Santali = sat;
Sardinian = sc; Sardinian = sc;
Sasak = sas; Sasak = sas;
SaudiArabiaArabic = ar_SA; SaudiArabiaArabic = ar_SA;
Scots = sco; Scots = sco;
ScotsGaelic = gd_GB; ScotsGaelic = gd_GB;
Serbian = sr; /* -Cyrl, or -Latn ?*/ Serbian = sr; /* -Cyrl, or -Latn ?*/
Serer = srr; Serer = srr;
Shan = shn; Shan = shn;
Shona = sn; Shona = sn;
SichuanYi = ii; SichuanYi = ii;
Sicilian = scn; Sicilian = scn;
Sidamo = sid; Sidamo = sid;
SimplifiedChinese = zh-Hans; SimplifiedChinese = zh-Hans;
Sindhi = sd; Sindhi = sd;
SingaporeChinese = zh-Hans_SG; SingaporeChinese = zh-Hans_SG;
SingaporeEnglish = en_SG; SingaporeEnglish = en_SG;
Sinhala = si; Sinhala = si;
Slovak = sk; Slovak = sk;
Slovenian = sl; Slovenian = sl;
Somali = so; Somali = so;
SomaliaSomali = so_SO; SomaliaSomali = so_SO;
Soninke = snk; Soninke = snk;
Sotho = st; Sotho = st;
SouthAfricaEnglish = en_ZA; SouthAfricaEnglish = en_ZA;
SpainBasque = eu_ES; SpainBasque = eu_ES;
SpainSpanish = es_ES; SpainSpanish = es_ES;
Spanish = es; Spanish = es;
SudanArabic = ar_SD; SudanArabic = ar_SD;
Sukuma = suk; Sukuma = suk;
Sundanese = su; Sundanese = su;
Susu = sus; Susu = sus;
Swahili = sw; Swahili = sw;
Swati = ss; Swati = ss;
Swedish = sv; Swedish = sv;
SwitzerlandFrench = fr_CH; SwitzerlandFrench = fr_CH;
SwitzerlandGerman = de_CH; SwitzerlandGerman = de_CH;
SwitzerlandItalian = it_CH; SwitzerlandItalian = it_CH;
SyriaArabic = ar_SY; SyriaArabic = ar_SY;
Tagalog = tl; Tagalog = tl;
Tahitian = ty; Tahitian = ty;
Tajik = tg; Tajik = tg;
Tamil = ta; Tamil = ta;
Tatar = tt; Tatar = tt;
Telugu = te; Telugu = te;
Tetum = tet; Tetum = tet;
Thai = th; Thai = th;
Tibetan = bo; Tibetan = bo;
Tigre = tig; Tigre = tig;
Tigrinya = ti; Tigrinya = ti;
Timne = tem; Timne = tem;
Tiv = tiv; Tiv = tiv;
TokPisin = tpi; TokPisin = tpi;
Tonga = to; Tonga = to;
TongaNyasa = tog; TongaNyasa = tog;
TraditionalChinese = zh-Hant; TraditionalChinese = zh-Hant;
Tsonga = ts; Tsonga = ts;
Tswana = tn; Tswana = tn;
Tumbuka = tum; Tumbuka = tum;
TunisiaArabic = ar_TN; TunisiaArabic = ar_TN;
Turkish = tr; Turkish = tr;
Turkmen = tk; Turkmen = tk;
Tuvinian = tyv; Tuvinian = tyv;
Twi = tw; Twi = tw;
Udmurt = udm; Udmurt = udm;
Uighur = ug; Uighur = ug;
UkraineRussian = ru_UA; UkraineRussian = ru_UA;
Ukrainian = uk; Ukrainian = uk;
Umbundu = umb; Umbundu = umb;
UnitedArabEmiratesArabic = ar_AE; UnitedArabEmiratesArabic = ar_AE;
Urdu = ur; Urdu = ur;
UruguaySpanish = es_UY; UruguaySpanish = es_UY;
USASpanish = es_US; USASpanish = es_US;
Uzbek = uz; /* -Arab, -Cyrl, or -Latn ?*/ Uzbek = uz; /* -Arab, -Cyrl, or -Latn ?*/
Vai = vai; Vai = vai;
Venda = ve; Venda = ve;
VenezuelaSpanish = es_VE; VenezuelaSpanish = es_VE;
Vietnamese = vi; Vietnamese = vi;
Walamo = wal; Walamo = wal;
Walloon = wa; Walloon = wa;
Waray = war; Waray = war;
Welsh = cy; Welsh = cy;
WesternFrisian = fy; WesternFrisian = fy;
Wolof = wo; Wolof = wo;
Xhosa = xh; Xhosa = xh;
Yakut = sah; Yakut = sah;
Yao = yao; Yao = yao;
YemenArabic = ar_YE; YemenArabic = ar_YE;
Yiddish = yi; Yiddish = yi;
Yoruba = yo; Yoruba = yo;
Zhuang = za; Zhuang = za;
ZimbabweEnglish = en_ZW; ZimbabweEnglish = en_ZW;
Zulu = zu; Zulu = zu;
} aar = aa;
abk = ab;
afr = af;
alb = sq;
amh = am;
ara = ar;
arm = hy;
asm = as;
ave = ae;
aym = ay;
aze = az;
bak = ba;
baq = eu;
bel = be;
ben = bn;
bih = bh;
bis = bi;
bod = bo;
bos = bs;
bre = br;
bul = bg;
bur = my;
cat = ca;
ces = cs;
cha = ch;
che = ce;
chi = zh;
chu = cu;
chv = cv;
cor = kw;
cos = co;
cym = cy;
cze = cs;
dan = da;
deu = de;
dut = nl;
dzo = dz;
ell = el;
eng = en;
epo = eo;
est = et;
eus = eu;
fao = fo;
fas = fa;
fij = fj;
fin = fi;
fra = fr;
fre = fr;
fry = fy;
geo = ka;
ger = de;
gla = gd;
gle = ga;
glg = gl;
glv = gv;
gre = el;
grn = gn;
guj = gu;
hau = ha;
heb = he;
her = hz;
hin = hi;
hmo = ho;
hrv = hr;
hun = hu;
hye = hy;
ice = is;
iku = iu;
ile = ie;
ina = ia;
ind = id;
ipk = ik;
isl = is;
ita = it;
jav = jw;
jaw = jw;
jpn = ja;
kal = kl;
kan = kn;
kas = ks;
kat = ka;
kaz = kk;
khm = km;
kik = ki;
kin = rw;
kir = ky;
kom = kv;
kor = ko;
kua = kj;
kur = ku;
lao = lo;
lat = la;
lav = lv;
lin = ln;
lit = lt;
ltz = lb;
mac = mk;
mah = mh;
mal = ml;
mao = mi;
mar = mr;
may = ms;
mkd = mk;
mlg = mg;
mlt = mt;
mol = mo;
mon = mn;
mri = mi;
msa = ms;
mya = my;
nau = na;
nav = nv;
nbl = nr;
nde = nd;
ndo = ng;
nep = ne;
nld = nl;
nno = nn;
nob = nb;
nor = no;
nya = ny;
oci = oc;
ori = or;
orm = om;
oss = os;
pan = pa;
per = fa;
pli = pi;
pol = pl;
por = pt;
pus = ps;
que = qu;
roh = rm;
ron = ro;
rum = ro;
run = rn;
rus = ru;
sag = sg;
san = sa;
scc = sr;
scr = hr;
sin = si;
slk = sk;
slo = sk;
slv = sl;
sme = se;
smo = sm;
sna = sn;
snd = sd;
som = so;
sot = st;
spa = es;
sqi = sq;
srd = sc;
srp = sr;
ssw = ss;
sun = su;
swa = sw;
swe = sv;
tah = ty;
tam = ta;
tat = tt;
tel = te;
tgk = tg;
tgl = tl;
tha = th;
tib = bo;
tsn = tn;
tso = ts;
tuk = tk;
tur = tr;
twi = tw;
uig = ug;
ukr = uk;
urd = ur;
uzb = uz;
vie = vi;
vol = vo;
wel = cy;
wol = wo;
xho = xh;
yid = yi;
zha = za;
zho = zh;
zul = zu;
}

11
Resources/Languages/README
View file

@ -1,3 +1,8 @@
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.
Language files which contain non-ascii characters should either be properly 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 marked unicode files (UTF-8 with a leading Byte Order Mark or UTF-16 with a
@ -13,14 +18,14 @@ in the default encoding used by your system.
For example, to edit the French language file so that it contains an ascii For example, to edit the French language file so that it contains an ascii
propertly list with \u escape sequeneces, you could do - propertly list with \u escape sequeneces, you could do -
cvtenc -EscapeIn yes French > tmpfile cvtenc -EscapeIn yes fr > tmpfile
vi tmpfile vi tmpfile
cvtenc -EscapeOut yes tmpfile > French cvtenc -EscapeOut yes tmpfile > fr
rm tmpfile rm tmpfile
A common case is where you have a file in UTF-8, but the Byte Order Mark is A common case is where you have a file in UTF-8, but the Byte Order Mark is
missing, so you need to fix it up ... missing, so you need to fix it up ...
cvtenc -Encoding 'UNICODE UTF-8' FileWithMissingBOM >tmpFile cvtenc -Encoding 'UNICODE UTF-8' FileWithMissingBOM >tmpFile
cvtenc -EscapeOut yes tmpFile > French cvtenc -EscapeOut yes tmpFile > fr

229
Source/NSBundle.m
View file

@ -75,10 +75,11 @@ manager()
return mgr; return mgr;
} }
static NSDictionary *alternativeLanguageMap = nil; static NSDictionary *langAliases = nil;
static NSDictionary *langCanonical = nil;
/* Map a language name to any alternative versions. This function should /* Map a language name to any alternative versions. This function should
* return an array of alternative language/localisation directry names in * return an array of alternative language/localisation directory names in
* the preferred order of precedence (ie resources in the directories named * the preferred order of precedence (ie resources in the directories named
* earlier in the array are to be preferred to those in directories named * earlier in the array are to be preferred to those in directories named
* later). * later).
@ -88,91 +89,85 @@ static NSDictionary *alternativeLanguageMap = nil;
* in the United States region). * in the United States region).
*/ */
static NSArray * static NSArray *
altLang(NSString *lang) altLang(NSString *full)
{ {
if (lang) NSMutableArray *a = nil;
if (nil != full)
{ {
NSArray *a; NSString *alias = nil;
NSString *canon = nil;
NSString *lang = nil;
NSString *dialect = nil;
NSString *region = nil;
NSRange r; NSRange r;
r = [lang rangeOfString: @"-"]; alias = [langAliases objectForKey: full];
if (r.length > 0) if (nil == alias)
{ {
NSString *full = lang; canon = [langCanonical objectForKey: full];
if (nil != canon)
lang = [full substringToIndex: r.location];
r = [lang rangeOfString: @"_"];
if (r.length > 0)
{ {
NSString *national = [full substringToIndex: r.location]; alias = [langAliases objectForKey: canon];
// language-dialect_region
a = [alternativeLanguageMap objectForKey: lang];
if (nil == a)
{
return [NSArray arrayWithObjects: full, national, lang, nil];
}
else
{
NSMutableArray *m = [a mutableCopy];
[m insertObject: full atIndex: 0];
[m insertObject: national atIndex: 0];
return [m autorelease];
}
} }
else if (nil == alias)
{ {
// language-dialect alias = full;
a = [alternativeLanguageMap objectForKey: lang];
if (nil == a)
{
return [NSArray arrayWithObjects: full, lang, nil];
}
else
{
NSMutableArray *m = [a mutableCopy];
[m insertObject: full atIndex: 0];
return [m autorelease];
}
} }
} }
canon = [langCanonical objectForKey: alias];
if (nil == canon)
{
canon = [langCanonical objectForKey: full];
if (nil == canon)
{
canon = full;
}
}
if ([canon rangeOfString: @"-"].length > 1)
{
dialect = [canon substringFromIndex: NSMaxRange(r)];
lang = [canon substringToIndex: r.location];
if ([dialect rangeOfString: @"_"].length > 1)
{
region = [dialect substringFromIndex: NSMaxRange(r)];
dialect = [dialect substringToIndex: r.location];
}
}
else if ([canon rangeOfString: @"_"].length > 1)
{
region = [canon substringFromIndex: NSMaxRange(r)];
lang = [canon substringToIndex: r.location];
}
else else
{ {
NSString *full = lang; lang = canon;
}
r = [lang rangeOfString: @"_"]; a = [NSMutableArray arrayWithCapacity: 5];
if (r.length > 0) if (nil != dialect && nil != region)
{ {
// language_region [a addObject: [NSString stringWithFormat: @"%@-%@_%@",
lang = [full substringToIndex: r.location]; lang, dialect, region]];
a = [alternativeLanguageMap objectForKey: lang]; }
if (nil == a) if (nil != dialect)
{ {
return [NSArray arrayWithObjects: full, lang, nil]; [a addObject: [NSString stringWithFormat: @"%@-%@",
} lang, dialect]];
else }
{ if (nil != region)
NSMutableArray *m = [a mutableCopy]; {
[a addObject: [NSString stringWithFormat: @"%@_%@",
[m insertObject: full atIndex: 0]; lang, region]];
return [m autorelease]; }
} [a addObject: lang];
} if (NO == [a containsObject: alias])
else {
{ [a addObject: alias];
// language
a = [alternativeLanguageMap objectForKey: lang];
if (nil == a)
{
return [NSArray arrayWithObject: lang];
}
return a;
}
} }
} }
return nil; return a;
} }
static NSLock *pathCacheLock = nil; static NSLock *pathCacheLock = nil;
@ -1066,6 +1061,7 @@ _bundle_load_callback(Class theClass, struct objc_category *theCategory)
if (self == [NSBundle class]) if (self == [NSBundle class])
{ {
extern const char *GSPathHandling(const char *); extern const char *GSPathHandling(const char *);
NSString *file;
const char *mode; const char *mode;
NSDictionary *env; NSDictionary *env;
NSString *str; NSString *str;
@ -1075,25 +1071,41 @@ _bundle_load_callback(Class theClass, struct objc_category *theCategory)
mode = GSPathHandling("right"); mode = GSPathHandling("right");
_emptyTable = RETAIN([NSDictionary dictionary]); _emptyTable = RETAIN([NSDictionary dictionary]);
/* Check ... I think this is all the languages we traditionally /* Create basic mapping dictionaries for bootstrapping and
* support ... but maybe we need others. * for use if the full ductionaries can't be loaded from the
* gnustep-base library resource bundle.
*/ */
alternativeLanguageMap = [[NSDictionary alloc] initWithObjectsAndKeys: langAliases = [[NSDictionary alloc] initWithObjectsAndKeys:
[NSArray arrayWithObjects: @"zh", @"Chinese", nil], @"Chinese", @"German", @"de",
[NSArray arrayWithObjects: @"en", @"English", nil], @"English", @"English", @"en",
[NSArray arrayWithObjects: @"eo", @"Esperanto", nil], @"Esperanto", @"Esperanto", @"eo",
[NSArray arrayWithObjects: @"fr", @"French", nil], @"French", @"Spanish", @"es",
[NSArray arrayWithObjects: @"de", @"German", nil], @"German", @"French", @"fr",
[NSArray arrayWithObjects: @"it", @"Italian", nil], @"Italian", @"Italian", @"it",
[NSArray arrayWithObjects: @"ko", @"Korean", nil], @"Korean", @"Korean", @"ko",
[NSArray arrayWithObjects: @"zh", @"Chinese", nil], @"zh", @"TraditionalChinese", @"zh",
[NSArray arrayWithObjects: @"en", @"English", nil], @"en", nil];
[NSArray arrayWithObjects: @"eo", @"Esperanto", nil], @"eo", langCanonical = [[NSDictionary alloc] initWithObjectsAndKeys:
[NSArray arrayWithObjects: @"fr", @"French", nil], @"fr", @"en", @"English",
[NSArray arrayWithObjects: @"de", @"German", nil], @"de", @"en", @"eng",
[NSArray arrayWithObjects: @"it", @"Italian", nil], @"it", @"ep", @"Esperanto",
[NSArray arrayWithObjects: @"ko", @"Korean", nil], @"ko", @"ep", @"epo",
[NSArray arrayWithObjects: @"es", @"Spanish", nil], @"es", @"ep", @"epo",
@"fr", @"French",
@"fr", @"fra",
@"fr", @"fre",
@"de", @"German",
@"de", @"ger",
@"de", @"deu",
@"it", @"Italian",
@"it", @"ita",
@"ko", @"Korean",
@"ko", @"kir",
@"sp", @"Spanish",
@"sp", @"spa",
@"zh", @"TraditionalChinese",
@"zh", @"chi",
@"zh", @"zho",
nil]; nil];
/* Initialise manager here so it's thread-safe. /* Initialise manager here so it's thread-safe.
@ -1138,6 +1150,43 @@ _bundle_load_callback(Class theClass, struct objc_category *theCategory)
_gnustep_bundle = RETAIN([self bundleForLibrary: @"gnustep-base" _gnustep_bundle = RETAIN([self bundleForLibrary: @"gnustep-base"
version: _base_version]); version: _base_version]);
/* The Locale aliases map converts canonical names to old-style names
*/
file = [_gnustep_bundle pathForResource: @"Locale"
ofType: @"aliases"
inDirectory: @"Languages"];
if (file != nil)
{
NSDictionary *d;
d = [[NSDictionary alloc] initWithContentsOfFile: file];
if ([d count] > 0)
{
ASSIGN(langAliases, d);
}
[d release];
}
/* The Locale canonical map converts old-style names to ISO 639 names
* and converts ISO 639-2 names to the preferred ISO 639-1 names where
* an ISO 639-1 name exists.
*/
file = [_gnustep_bundle pathForResource: @"Locale"
ofType: @"canonical"
inDirectory: @"Languages"];
if (file != nil)
{
NSDictionary *d;
d = [[NSDictionary alloc] initWithContentsOfFile: file];
if ([d count] > 0)
{
ASSIGN(langCanonical, d);
}
[d release];
}
#if 0 #if 0
_loadingBundle = [self mainBundle]; _loadingBundle = [self mainBundle];
handle = objc_open_main_module(stderr); handle = objc_open_main_module(stderr);

1
Tools/GNUmakefile
View file

@ -116,6 +116,7 @@ AUTOGSDOC=./$(GNUSTEP_OBJ_DIR_NAME)/autogsdoc
include Makefile.preamble include Makefile.preamble
include $(GNUSTEP_MAKEFILES)/tool.make include $(GNUSTEP_MAKEFILES)/tool.make
#include $(GNUSTEP_MAKEFILES)/test-tool.make
include $(GNUSTEP_MAKEFILES)/ctool.make include $(GNUSTEP_MAKEFILES)/ctool.make
include $(GNUSTEP_MAKEFILES)/aggregate.make include $(GNUSTEP_MAKEFILES)/aggregate.make

5
Tools/locale_alias.m
View file

@ -59,9 +59,8 @@ loc_read_file(const char *dir, const char *file)
language[0] = '\0'; language[0] = '\0';
country[0] = '\0'; country[0] = '\0';
while (1) while (NULL != fgets(buf, MAXSTRING, fp))
{ {
fgets(buf, MAXSTRING, fp);
if (strstr(buf, "anguage") != NULL) if (strstr(buf, "anguage") != NULL)
{ {
sscanf(&buf[2], "%s", language); sscanf(&buf[2], "%s", language);
@ -131,7 +130,7 @@ main(int argc, char *argv[])
/* Write out a skeleton file from the current locale */ /* Write out a skeleton file from the current locale */
dict = GSDomainFromDefaultLocale(); dict = GSDomainFromDefaultLocale();
lang = GSLanguageFromLocale(GSSetLocale(NULL)); lang = GSLanguageFromLocale(GSSetLocale(0,NULL));
if (lang == nil) if (lang == nil)
lang = @"Locale"; lang = @"Locale";
if (dict) if (dict)