(bug 38679) Replacing regions NA, LA, SA with AM

Change-Id: Ib484dd9cb0453ec1bd214e0196119b14d96ac128
This commit is contained in:
Amir E. Aharoni
2012-09-01 10:06:57 +03:00
parent acaddfcac4
commit de3abc3315
3 changed files with 71 additions and 74 deletions

View File

@@ -11,7 +11,7 @@ languages:
af: [Latn, [AF], Afrikaans]
ahr: [Deva, [AS], अहिराणी]
ak: [Latn, [AF], Akan]
akz: [Latn, [NA], Albaamo innaaɬiilka]
akz: [Latn, [AM], Albaamo innaaɬiilka]
aln: [Latn, [EU], Gegë]
am: [Ethi, [AF], አማርኛ]
an: [Latn, [EU], aragonés]
@@ -19,17 +19,17 @@ languages:
anp: [Deva, [AS], अङ्गिका]
ar: [Arab, [ME], العربية]
arc: [Syrc, [ME], ܐܪܡܝܐ]
arn: [Latn, [SA], mapudungun]
aro: [Latn, [LA], Araona]
arn: [Latn, [AM], mapudungun]
aro: [Latn, [AM], Araona]
arq: [Latn, [AF], Dziri]
ary: [Latn, [ME], Maġribi]
arz: [Arab, [ME], مصرى]
as: [Beng, [AS], অসমীয়া]
ase: [Sgnw, [NA], American sign language]
ase: [Sgnw, [AM], American sign language]
ast: [Latn, [EU], asturianu]
av: [Cyrl, [EU], авар]
avk: [Latn, [WW], Kotava]
ay: [Latn, [SA], Aymar aru]
ay: [Latn, [AM], Aymar aru]
# also Arab, and in the past - Cyrl
az: [Latn, [EU, ME], azərbaycanca]
ba: [Cyrl, [EU], башҡортса]
@@ -67,17 +67,17 @@ languages:
ce: [Cyrl, [EU], нохчийн]
ceb: [Latn, [AS], Cebuano]
ch: [Latn, [PA], Chamoru]
cho: [Latn, [NA], Choctaw]
chr: [Cher, [NA], ᏣᎳᎩ]
chy: [Latn, [NA], Tsetsêhestâhese]
cho: [Latn, [AM], Choctaw]
chr: [Cher, [AM], ᏣᎳᎩ]
chy: [Latn, [AM], Tsetsêhestâhese]
ckb: [Arab, [ME], کوردی]
co: [Latn, [EU], corsu]
cps: [Latn, [AS], Capiceño]
cr-cans: [Cans, [NA], ᓀᐦᐃᔭᐍᐏᐣ]
cr-latn: [Latn, [NA], Nēhiyawēwin]
cr-cans: [Cans, [AM], ᓀᐦᐃᔭᐍᐏᐣ]
cr-latn: [Latn, [AM], Nēhiyawēwin]
# XXX multiple script
# cr: [[Latn, Cans], [NA], [Nēhiyawēwin, ᓀᐦᐃᔭᐍᐏᐣ]]
cr: [Cans, [NA], Nēhiyawēwin / ᓀᐦᐃᔭᐍᐏᐣ]
# cr: [[Latn, Cans], [AM], [Nēhiyawēwin, ᓀᐦᐃᔭᐍᐏᐣ]]
cr: [Cans, [AM], Nēhiyawēwin / ᓀᐦᐃᔭᐍᐏᐣ]
crh-cyrl: [Cyrl, [EU], къырымтатарджа (Кирилл)]
crh-latn: [Latn, [EU], qırımtatarca (Latin)]
# XXX multiple script
@@ -104,17 +104,17 @@ languages:
egl: [Latn, [EU], Emiliàn]
el: [Grek, [EU], Ελληνικά]
eml: [Latn, [EU], emiliàn e rumagnòl]
en-ca: [Latn, [NA], Canadian English]
en-ca: [Latn, [AM], Canadian English]
en-gb: [Latn, [EU, AS, AU], British English]
# world?
en: [Latn, [EU, NA, AU, AF, ME, AS, PA, WW], English]
en: [Latn, [EU, AM, AU, AF, ME, AS, PA, WW], English]
eo: [Latn, [WW], Esperanto]
es-419: [Latn, [LA], espanol de America Latina]
es-419: [Latn, [AM], espanol de America Latina]
# world?
es-formal: [Latn, [EU, NA, LA, SA, AF, WW], Español (formal)]
es-formal: [Latn, [EU, AM, AF, WW], Español (formal)]
# world?
es: [Latn, [EU, NA, LA, SA, AF, WW], español]
esu: [Latn, [NA], "Yup'ik"]
es: [Latn, [EU, AM, AF, WW], español]
esu: [Latn, [AM], "Yup'ik"]
et: [Latn, [EU], eesti]
eu: [Latn, [EU], euskara]
ext: [Latn, [EU], estremeñu]
@@ -124,7 +124,7 @@ languages:
fit: [Latn, [EU], meänkieli]
fj: [Latn, [PA], Na Vosa Vakaviti]
fo: [Latn, [EU], føroyskt]
fr: [Latn, [EU, NA, SA, WW], français]
fr: [Latn, [EU, AM, WW], français]
frc: [Latn, [EU], français cadien]
frp: [Latn, [EU], arpetan]
frr: [Latn, [EU], Nordfriisk]
@@ -137,11 +137,11 @@ languages:
gan-hant: [Hant, [AS], 贛語(繁體)]
gan: [Hant, [AS], 贛語]
gbz: [Latn, [AS], Dari]
gcf: [Latn, [LA], Guadeloupean Creole French]
gcf: [Latn, [AM], Guadeloupean Creole French]
gd: [Latn, [EU], Gàidhlig]
gl: [Latn, [EU], galego]
glk: [Arab, [ME], گیلکی]
gn: [Latn, [LA], "Avañe'ẽ"]
gn: [Latn, [AM], "Avañe'ẽ"]
gom-deva: [Deva, [AS], कोंकणी]
gom-latn: [Latn, [AS], Konknni]
# XXX multiple script
@@ -152,13 +152,13 @@ languages:
grc: [Grek, [EU], Ἀρχαία ἑλληνικὴ]
gsw: [Latn, [EU], Alemannisch]
gu: [Gujr, [AS], ગુજરાતી]
guc: [Latn, [LA], Wayúu]
guc: [Latn, [AM], Wayúu]
gur: [Latn, [AF], Gurenɛ]
gv: [Latn, [EU], Gaelg]
# The name in Names.php is Arabic, but everything else is Latn
ha: [Latn, [AF], هَوُسَ]
hak: [Latn, [AS], Hak-kâ-fa]
haw: [Latn, [NA, PA], Hawai`i]
haw: [Latn, [AM, PA], Hawai`i]
he: [Hebr, [ME], עברית]
# Or maybe world?
hi: [Deva, [AS], हिन्दी]
@@ -174,7 +174,7 @@ languages:
hsb: [Latn, [EU], hornjoserbsce]
hsn: [Hans, [AS], 湘语]
# Haitian Creole. North America, right?
ht: [Latn, [NA], Kreyòl ayisyen]
ht: [Latn, [AM], Kreyòl ayisyen]
hu-formal: [Latn, [EU], Magyar (magázó)]
hu: [Latn, [EU], magyar]
hy: [Armn, [EU, ME], Հայերեն]
@@ -184,18 +184,18 @@ languages:
ie: [Latn, [WW], Interlingue]
ig: [Latn, [AF], Igbo]
ii: [Yiii, [AS], ꆇꉙ]
ik: [Latn, [NA], Iñupiak]
ike-cans: [Cans, [NA], ᐃᓄᒃᑎᑐᑦ]
ike-latn: [Latn, [NA], inuktitut]
ik: [Latn, [AM], Iñupiak]
ike-cans: [Cans, [AM], ᐃᓄᒃᑎᑐᑦ]
ike-latn: [Latn, [AM], inuktitut]
ilo: [Latn, [AS], Ilokano]
inh: [Cyrl, [EU], ГӀалгӀай]
io: [Latn, [WW], Ido]
is: [Latn, [EU], íslenska]
it: [Latn, [EU], italiano]
# For variants ike-* is used
iu: [Cans, [NA], ᐃᓄᒃᑎᑐᑦ/inuktitut]
iu: [Cans, [AM], ᐃᓄᒃᑎᑐᑦ/inuktitut]
ja: [Jpan, [AS], 日本語]
jam: [Latn, [NA], Patois]
jam: [Latn, [AM], Patois]
jbo: [Latn, [WW], Lojban]
jut: [Latn, [EU], jysk]
# also in the Javanese script (Java), but the Wikipedia is in Latn
@@ -209,7 +209,7 @@ languages:
kbd: [Cyrl, [EU, ME], Адыгэбзэ]
kea: [Latn, [AF], Kabuverdianu]
kg: [Latn, [AF], Kongo]
kgp: [Latn, [LA], Kaingáng]
kgp: [Latn, [AM], Kaingáng]
khw: [Arab, [ME, AS], کھوار]
ki: [Latn, [AF], Gĩkũyũ]
kiu: [Latn, [EU, ME], Kırmancki]
@@ -223,7 +223,7 @@ languages:
# XXX multiple script
# kk: [[Arab, Cyrl, Latn] [EU, AS], [قازاقشا, қазақша, qazaqşa]]
kk: [Cyrl, [EU, AS], қазақша / قازاقشا / qazaqşa]
kl: [Latn, [NA, EU], kalaallisut]
kl: [Latn, [AM, EU], kalaallisut]
km: [Khmr, [AS], ភាសាខ្មែរ]
kn: [Knda, [AS], ಕನ್ನಡ]
# Here Hang may be even more appropriate, because kp has more resistance to Han
@@ -256,7 +256,7 @@ languages:
# Most identified with Turkey, Bulgaria, Greece, Spain and Israel,
# but also spoken in Latin America and elsewhere.
# Wikipedia is mostly in Latn, but also in Hebr. (Comparable to az.)
lad: [Latn, [ME, EU, LA], Ladino]
lad: [Latn, [ME, EU, AM], Ladino]
lb: [Latn, [EU], Lëtzebuergesch]
lbe: [Cyrl, [EU], лакку]
lez: [Cyrl, [EU], лезги]
@@ -280,12 +280,12 @@ languages:
mai: [Deva, [AS], मैथिली]
map-bms: [Latn, [AS], Basa Banyumasan]
mdf: [Cyrl, [EU], мокшень]
mfe: [Latn, [LA], Morisyen]
mfe: [Latn, [AM], Morisyen]
mg: [Latn, [AF], Malagasy]
mh: [Latn, [PA], Ebon]
mhr: [Cyrl, [EU], олык марий]
mi: [Latn, [PA, AU], Māori]
mic: [Latn, [NA], "Mi'kmaq"]
mic: [Latn, [AM], "Mi'kmaq"]
min: [Latn, [AS], Baso Minangkabau]
mk: [Cyrl, [EU], македонски]
ml: [Mlym, [AS, ME], മലയാളം]
@@ -300,14 +300,14 @@ languages:
ms: [Latn, [AS], Bahasa Melayu]
mt: [Latn, [EU], Malti]
mui: [Latn, [AS], Musi]
mus: [Latn, [NA], Mvskoke]
mus: [Latn, [AM], Mvskoke]
mwl: [Latn, [EU], Mirandés]
mwv: [Latn, [AS], Behase Mentawei]
my: [Mymr, [AS], မြန်မာဘာသာ]
myv: [Cyrl, [EU], эрзянь]
mzn: [Arab, [ME, AS], مازِرونی]
na: [Latn, [PA, AU], Dorerin Naoero]
nah: [Latn, [NA, LA], Nāhuatl]
nah: [Latn, [AM], Nāhuatl]
nan: [Latn, [AS], Bân-lâm-gú]
nap: [Latn, [EU], Nnapulitano]
nb: [Latn, [EU], norsk (bokmål)]
@@ -318,15 +318,15 @@ languages:
ng: [Latn, [AF], Oshiwambo]
niu: [Latn, [PA], ko e vagahau Niuē]
njo: [Latn, [AS], Ao]
nl-informal: [Latn, [EU, SA], Nederlands (informeel)]
nl: [Latn, [EU, SA], Nederlands]
nl-informal: [Latn, [EU, AM], Nederlands (informeel)]
nl: [Latn, [EU, AM], Nederlands]
nn: [Latn, [EU], norsk (nynorsk)]
"no": [Latn, [EU]]
nov: [Latn, [WW], Novial]
nqo: [Nkoo, [AF], ߒߞߏ]
nrm: [Latn, [EU], Nouormand]
nso: [Latn, [AF], Sesotho sa Leboa]
nv: [Latn, [NA], Diné bizaad]
nv: [Latn, [AM], Diné bizaad]
ny: [Latn, [AF], Chi-Chewa]
oc: [Latn, [EU], occitan]
om: [Latn, [AF], Oromoo]
@@ -335,10 +335,10 @@ languages:
pa: [Guru, [AS], ਪੰਜਾਬੀ]
pag: [Latn, [AS], Pangasinan]
pam: [Latn, [AS], Kapampangan]
pap: [Latn, [LA], Papiamentu]
pap: [Latn, [AM], Papiamentu]
pcd: [Latn, [EU], Picard]
pdc: [Latn, [EU, NA, SA], Deitsch]
pdt: [Latn, [EU, NA, SA], Plautdietsch]
pdc: [Latn, [EU, AM], Deitsch]
pdt: [Latn, [EU, AM], Plautdietsch]
pfl: [Latn, [EU], Pälzisch]
pi: [Deva, [AS], पाळि]
pih: [Latn, [PA], Norfuk / Pitkern]
@@ -348,16 +348,16 @@ languages:
pms: [Latn, [EU], Piemontèis]
pnb: [Arab, [AS, ME], پنجابی]
pnt: [Grek, [EU], Ποντιακά]
ppl: [Latn, [LA], Nawat]
ppl: [Latn, [AM], Nawat]
prg: [Latn, [EU], Prūsiskan]
pru: [Latn, [EU], Prūsiskan]
ps: [Arab, [AS, ME], پښتو]
pt-br: [Latn, [SA, LA], português do Brasil]
pt-br: [Latn, [AM], português do Brasil]
# world?
pt: [Latn, [EU, LA, AS, PA, AF], português]
qu: [Latn, [SA], Runa Simi]
qug: [Latn, [SA], Runa shimi]
rap: [Latn, [LA], arero rapa nui]
pt: [Latn, [EU, AM, AS, PA, AF], português]
qu: [Latn, [AM], Runa Simi]
qug: [Latn, [AM], Runa shimi]
rap: [Latn, [AM], arero rapa nui]
rgn: [Latn, [EU], Rumagnôl]
rif: [Latn, [AF], Tarifit]
rki: [Mymr, [AS], ရခိုင်]
@@ -391,7 +391,7 @@ languages:
sd: [Arab, [AS], سنڌي]
sdc: [Latn, [EU], Sassaresu]
se: [Latn, [EU], sámegiella]
sei: [Latn, [NA, LA], Cmique Itom]
sei: [Latn, [AM], Cmique Itom]
sg: [Latn, [AF], Sängö]
sgs: [Latn, [EU], žemaitėška]
sh-cyrl: [Cyrl, [EU], српскохрватски]
@@ -425,7 +425,7 @@ languages:
# XXX multiple script
# sr: [[Cyrl, Latn], [EU], [српски, srpski]]
sr: [Cyrl, [EU], српски / srpski]
srn: [Latn, [SA, NA, EU], Sranantongo]
srn: [Latn, [AM, EU], Sranantongo]
ss: [Latn, [AF], SiSwati]
st: [Latn, [AF], Sesotho]
stq: [Latn, [EU], Seeltersk]
@@ -497,11 +497,11 @@ languages:
xh: [Latn, [AF], isiXhosa]
xmf: [Geor, [EU], მარგალური]
ydd: [Hebr, [AS, EU], Eastern Yiddish]
yi: [Hebr, [ME, EU, NA, SA], ייִדיש]
yi: [Hebr, [ME, EU, AM], ייִדיש]
yo: [Latn, [AF], Yorùbá]
yrk: [Cyrl, [AS], Ненэцяʼ вада]
yrl: [Latn, [LA], "ñe'engatú"]
yua: [Latn, [NA, LA], "Maaya T'aan"]
yrl: [Latn, [AM], "ñe'engatú"]
yua: [Latn, [AM], "Maaya T'aan"]
# world?
yue: [Hant, [AS], 粵語]
za: [Latn, [AS], Vahcuengh]
@@ -564,12 +564,8 @@ rtlscripts:
regiongroups:
# Worldwide, international
WW: 1
# North America
NA: 2
# Latin America
LA: 2
# South America
SA: 2
# America
AM: 2
# Europe
EU: 3
# Middle East

File diff suppressed because one or more lines are too long

View File

@@ -61,7 +61,7 @@ test( "-- Initial check", function() {
} );
test( "-- $.uls.data testing", function() {
expect( 24 );
expect( 25 );
strictEqual( $.uls.data.autonyms()['he'], 'עברית', 'Correct autonym is returned for Hebrew using autonyms().' );
@@ -88,17 +88,17 @@ test( "-- $.uls.data testing", function() {
var allLanguagesByRegionAndScript = $.uls.data.allLanguagesByRegionAndScript();
deepEqual( allLanguagesByRegionAndScript['4']['AS']['SouthEastAsian']['Bugi'], ['bug'], 'All languages in the Buginese script in Asia were selected' );
deepEqual( $.uls.data.languagesInRegion( 'AU' ), ["en-gb", "en", "hif-latn", "hif", "mi", "na"], "languages of region AU are selected correctly" );
deepEqual( $.uls.data.languagesInRegions( ['NA', 'WW'] ),
deepEqual( $.uls.data.languagesInRegion( "AU" ), ["en-gb", "en", "hif-latn", "hif", "mi", "na"], "languages of region AU are selected correctly" );
deepEqual( $.uls.data.languagesInRegions( ["AM", "WW"] ),
[
"akz", "ase", "avk", "cho", "chr", "chy", "cr-cans", "cr-latn", "cr",
"en-ca", "en", "eo", "es-formal", "es", "esu", "fr",
"haw", "ht", "ia", "ie", "ik", "ike-cans", "ike-latn", "io",
"iu", "jam", "jbo", "kl", "lfn", "mic", "mus", "nah", "nov", "nv",
"pdc", "pdt", "sei", "simple", "srn", "tokipona",
"vo", "yi", "yua"
"akz", "arn", "aro", "ase", "avk", "ay", "cho", "chr", "chy", "cr-cans", "cr-latn", "cr",
"en-ca", "en", "eo", "es-419", "es-formal", "es", "esu", "fr",
"gcf", "gn", "guc", "haw", "ht", "ia", "ie", "ik", "ike-cans", "ike-latn", "io", "iu",
"jam", "jbo", "kgp", "kl", "lad", "lfn", "mfe", "mic", "mus", "nah", "nl-informal", "nl", "nov", "nv",
"pap", "pdc", "pdt", "ppl", "pt-br", "pt", "qu", "qug", "rap", "sei", "simple", "srn", "tokipona",
"vo", "yi", "yrl", "yua"
],
"languages of regions NA and WW are selected correctly"
"languages of regions AM and WW are selected correctly"
);
deepEqual( $.uls.data.languagesInScript( 'Knda' ), ["kn", "tcy"], "languages in script Knda are selected correctly" );
@@ -107,11 +107,12 @@ test( "-- $.uls.data testing", function() {
"languages in scripts Geor and Armn are selected correctly"
);
deepEqual( $.uls.data.regionsInGroup( 2 ), ["NA", "LA", "SA"], "regions in group 2 are selected correctly" );
deepEqual( $.uls.data.regionsInGroup( 3 ), ["EU", "ME", "AF"], "regions in group 2 are selected correctly" );
deepEqual( $.uls.data.regionsInGroup( 2 ), ["AM"], "regions in group 2 are selected correctly" );
deepEqual( $.uls.data.regionsInGroup( 1 ), ["WW"], "regions in group 1 are selected correctly" );
var languagesByScriptInNA = $.uls.data.languagesByScriptInRegion( 'NA' );
deepEqual( languagesByScriptInNA['Cans'], ["cr-cans", "cr", "ike-cans", "iu"], "correct languages in Cans in NA selected" );
var languagesByScriptInAM = $.uls.data.languagesByScriptInRegion( "AM" );
deepEqual( languagesByScriptInAM['Cans'], ["cr-cans", "cr", "ike-cans", "iu"], "correct languages in Cans in AM selected" );
strictEqual( $.uls.data.autonym( 'pa' ), 'ਪੰਜਾਬੀ', 'Correct autonym of the Punjabi language was selected' );
@@ -121,7 +122,7 @@ test( "-- $.uls.data testing", function() {
var allLanguagesByScriptGroup = $.uls.data.allLanguagesByScriptGroup();
deepEqual( allLanguagesByScriptGroup['Greek'], ['el', 'grc', 'pnt', 'ruq-grek', 'tsd'], 'All languages in the Greek script found' );
deepEqual( $.uls.data.allRegions(), ['WW', 'NA', 'LA', 'SA', 'EU', 'ME', 'AF', 'AS', 'PA', 'AU'], 'All regions found' );
deepEqual( $.uls.data.allRegions(), ["WW", "AM", "EU", "ME", "AF", "AS", "PA", "AU"], "All regions found" );
// autonyms: gn: avañe'ẽ, de: deutsch, hu: magyar, fi: suomi
deepEqual( ['de', 'fi', 'gn', 'hu'].sort( $.uls.data.sortByAutonym ), ['gn', 'de', 'hu', 'fi'], 'Languages are correctly sorted by autonym' );