From 3da09f240f6e19df568a43c7849b1ca61e78aa69 Mon Sep 17 00:00:00 2001 From: Amir Aharoni Date: Mon, 20 May 2019 14:09:03 +0300 Subject: [PATCH] Revert "Add proper BCP 47 names for various languages" This reverts commit 03205a8955f961a0b6a7077a27ee60637eea1373. Unfortunately, this introduces a lot of changes that may break other features. I generalaly support this change, but this needs a more thorough testing plan. Until this happens, other features and big fixes shouldn't be blocked. --- data/langdb.yaml | 48 +++++---------- language-data.json | 142 +++++++++++++++------------------------------ 2 files changed, 63 insertions(+), 127 deletions(-) diff --git a/data/langdb.yaml b/data/langdb.yaml index ead2994..9d6e37f 100644 --- a/data/langdb.yaml +++ b/data/langdb.yaml @@ -90,8 +90,7 @@ languages: byn: [Ethi, [AF], ብሊን] ca: [Latn, [EU], català] cak: [Latn, [AM], Kaqchikel] - cbk: [Latn, [AS], Chavacano de Zamboanga] - cbk-zam: [cbk] + cbk-zam: [Latn, [AS], Chavacano de Zamboanga] cdo: [Latn, [AS], Mìng-dĕ̤ng-ngṳ̄] ce: [Cyrl, [EU], нохчийн] ceb: [Latn, [AS], Cebuano] @@ -135,8 +134,7 @@ languages: dag: [Latn, [AF], dagbanli] de-at: [Latn, [EU], Österreichisches Deutsch] de-ch: [Latn, [EU], Schweizer Hochdeutsch] - de-formal: [de-x-formal] - de-x-formal: [Latn, [EU], Deutsch (Sie-Form)] + de-formal: [Latn, [EU], Deutsch (Sie-Form)] de: [Latn, [EU], Deutsch] din: [Latn, [AF], Thuɔŋjäŋ] diq: [Latn, [EU, AS], Zazaki] @@ -152,13 +150,11 @@ languages: eml: [Latn, [EU], emiliàn e rumagnòl] en-ca: [Latn, [AM], Canadian English] en-gb: [Latn, [EU, AS, PA], British English] - en-simple: [Latn, [WW], Simple English] en: [Latn, [EU, AM, AF, ME, AS, PA, WW], English] eo: [Latn, [WW], Esperanto] es-419: [Latn, [AM], español de América Latina] # world? - es-formal: [es-x-formal] - es-x-formal: [Latn, [EU, AM, AF, WW], español (formal)] + es-formal: [Latn, [EU, AM, AF, WW], español (formal)] # world? es: [Latn, [EU, AM, AF, WW, PA], español] es-ni: [Latn, [AM], español nicaragüense] @@ -237,8 +233,7 @@ languages: hsb: [Latn, [EU], hornjoserbsce] hsn: [Hans, [AS], 湘语] ht: [Latn, [AM], Kreyòl ayisyen] - hu-formal: [hu-x-formal] - hu-x-formal: [Latn, [EU], Magyar (magázó)] + hu-formal: [Latn, [EU], Magyar (magázó)] hu: [Latn, [EU], magyar] hy: [Armn, [EU, ME], հայերեն] hyw: [Armn, [EU, ME], Արեւմտահայերէն] @@ -266,7 +261,6 @@ languages: jv: [Latn, [AS, PA], Jawa] # For support in webfonts. jv-java: [Java, [AS, PA], ꦗꦮ] - jv-x-bms: [Latn, [AS], Basa Banyumasan] ka: [Geor, [EU], ქართული] kaa: [Latn, [AS], Qaraqalpaqsha] # Can also be Tfng, but the Wikipedia is mostly Latn @@ -353,7 +347,7 @@ languages: # Also Geor, but the incubator is in Latn lzz: [Latn, [EU, ME], Lazuri] mai: [Deva, [AS], मैथिली] - map-bms: [jv-x-bms] + map-bms: [Latn, [AS], Basa Banyumasan] mdf: [Cyrl, [EU], мокшень] mfe: [Latn, [AM], Morisyen] mg: [Latn, [AF], Malagasy] @@ -370,7 +364,7 @@ languages: mnc: [Mong, [AS], ᠮᠠᠨᠵᡠ ᡤᡳᠰᡠᠨ] mni: [Beng, [AS], মেইতেই লোন্] mnw: [Mymr, [AS], ဘာသာ မန်] - mo: [ro-cyrl-md] + mo: [Cyrl, [EU], молдовеняскэ] moe: [Latn, [AM], Innu-aimun] mr: [Deva, [AS, ME], मराठी] mrj: [Cyrl, [EU], кырык мары] @@ -390,7 +384,6 @@ languages: nah: [Latn, [AM], Nāhuatl] nan: [Latn, [AS], Bân-lâm-gú] nap: [Latn, [EU], Napulitano] - nap-x-tara: [Latn, [EU], tarandíne] nb: [Latn, [EU], norsk (bokmål)] nd: [Latn, [AF], siNdebele saseNyakatho] nds-nl: [Latn, [EU], Nedersaksisch] @@ -400,8 +393,7 @@ languages: ng: [Latn, [AF], Oshiwambo] niu: [Latn, [PA], ko e vagahau Niuē] njo: [Latn, [AS], Ao] - nl-informal: [nl-x-informal] - nl-x-informal: [Latn, [EU, AM], Nederlands (informeel)] + nl-informal: [Latn, [EU, AM], Nederlands (informeel)] nl: [Latn, [EU, AM], Nederlands] nn: [Latn, [EU], norsk (nynorsk)] # There's also nb for Bokmål and nn for Nynorsk @@ -410,8 +402,7 @@ languages: nov: [Latn, [WW], Novial] nqo: [Nkoo, [AF], ߒߞߏ] nr: [Latn, [AF], isiNdebele seSewula] - nrf: [Latn, [EU], Nouormand] - nrm: [nrf] + nrm: [Latn, [EU], Nouormand] nso: [Latn, [AF], Sesotho sa Leboa] nv: [Latn, [AM], Diné bizaad] ny: [Latn, [AF], Chi-Chewa] @@ -468,9 +459,8 @@ languages: rmy: [Latn, [EU], Romani] rn: [Latn, [AF], Kirundi] ro: [Latn, [EU], română] - ro-cyrl-md: [Cyrl, [EU], молдовеняскэ] roa-rup: [rup] - roa-tara: [nap-x-tara] + roa-tara: [Latn, [EU], tarandíne] rtm: [Latn, [PA], Faeag Rotuma] # world? ru: [Cyrl, [EU, AS, ME], русский] @@ -507,7 +497,7 @@ languages: shi: [shi-latn] shn: [Mymr, [AS], လိၵ်ႈတႆး] si: [Sinh, [AS], සිංහල] - simple: [en-simple] + simple: [Latn, [WW], Simple English] sjd: [Cyrl, [EU], Кӣллт са̄мь кӣлл] sje: [Latn, [EU], bidumsámegiella] sjo: [Mong, [AS], ᠰᡞᠪᡝ ᡤᡞᠰᡠᠨ] @@ -626,21 +616,15 @@ languages: # world? (may apply to many varieties of Chinese) zh: [Hans, [AS], 中文] zh-classical: [lzh] - zh-cn: [zh-hans-cn] - zh-hans-cn: [Hans, [AS], 中文（中国大陆）] - zh-hans-my: [Hans, [AS], 中文（马来西亚）] - zh-hans-sg: [Hans, [AS], 中文（新加坡）] + zh-cn: [Hans, [AS], 中文（中国大陆）] zh-hans: [Hans, [AS], 中文（简体）] - zh-hant-hk: [Hant, [AS], 中文（香港）] - zh-hant-mo: [Hant, [AS], 中文（澳門）] - zh-hant-tw: [Hant, [AS], 中文（台灣）] zh-hant: [Hant, [AS], 中文（繁體）] - zh-hk: [zh-hant-hk] + zh-hk: [Hant, [AS], 中文（香港）] zh-min-nan: [nan] - zh-mo: [zh-hant-mo] - zh-my: [zh-hans-my] - zh-sg: [zh-hans-sg] - zh-tw: [zh-hant-tw] + zh-mo: [Hant, [AS], 中文（澳門）] + zh-my: [Hans, [AS], 中文（马来西亚）] + zh-sg: [Hans, [AS], 中文（新加坡）] + zh-tw: [Hant, [AS], 中文（台灣）] zh-yue: [yue] zu: [Latn, [AF], isiZulu] zun: [Latn, [AM], "Shiwi'ma"] diff --git a/language-data.json b/language-data.json index a692659..9344371 100644 --- a/language-data.json +++ b/language-data.json @@ -557,16 +557,13 @@ ], "Kaqchikel" ], - "cbk": [ + "cbk-zam": [ "Latn", [ "AS" ], "Chavacano de Zamboanga" ], - "cbk-zam": [ - "cbk" - ], "cdo": [ "Latn", [ @@ -801,9 +798,6 @@ "Schweizer Hochdeutsch" ], "de-formal": [ - "de-x-formal" - ], - "de-x-formal": [ "Latn", [ "EU" @@ -918,13 +912,6 @@ ], "British English" ], - "en-simple": [ - "Latn", - [ - "WW" - ], - "Simple English" - ], "en": [ "Latn", [ @@ -953,9 +940,6 @@ "español de América Latina" ], "es-formal": [ - "es-x-formal" - ], - "es-x-formal": [ "Latn", [ "EU", @@ -1484,9 +1468,6 @@ "Kreyòl ayisyen" ], "hu-formal": [ - "hu-x-formal" - ], - "hu-x-formal": [ "Latn", [ "EU" @@ -1672,13 +1653,6 @@ ], "ꦗꦮ" ], - "jv-x-bms": [ - "Latn", - [ - "AS" - ], - "Basa Banyumasan" - ], "ka": [ "Geor", [ @@ -2234,7 +2208,11 @@ "मैथिली" ], "map-bms": [ - "jv-x-bms" + "Latn", + [ + "AS" + ], + "Basa Banyumasan" ], "mdf": [ "Cyrl", @@ -2343,7 +2321,11 @@ "ဘာသာ မန်" ], "mo": [ - "ro-cyrl-md" + "Cyrl", + [ + "EU" + ], + "молдовеняскэ" ], "moe": [ "Latn", @@ -2476,13 +2458,6 @@ ], "Napulitano" ], - "nap-x-tara": [ - "Latn", - [ - "EU" - ], - "tarandíne" - ], "nb": [ "Latn", [ @@ -2547,9 +2522,6 @@ "Ao" ], "nl-informal": [ - "nl-x-informal" - ], - "nl-x-informal": [ "Latn", [ "EU", @@ -2607,16 +2579,13 @@ ], "isiNdebele seSewula" ], - "nrf": [ + "nrm": [ "Latn", [ "EU" ], "Nouormand" ], - "nrm": [ - "nrf" - ], "nso": [ "Latn", [ @@ -3004,18 +2973,15 @@ ], "română" ], - "ro-cyrl-md": [ - "Cyrl", - [ - "EU" - ], - "молдовеняскэ" - ], "roa-rup": [ "rup" ], "roa-tara": [ - "nap-x-tara" + "Latn", + [ + "EU" + ], + "tarandíne" ], "rtm": [ "Latn", @@ -3244,7 +3210,11 @@ "සිංහල" ], "simple": [ - "en-simple" + "Latn", + [ + "WW" + ], + "Simple English" ], "sjd": [ "Cyrl", @@ -4026,29 +3996,12 @@ "lzh" ], "zh-cn": [ - "zh-hans-cn" - ], - "zh-hans-cn": [ "Hans", [ "AS" ], "中文（中国大陆）" ], - "zh-hans-my": [ - "Hans", - [ - "AS" - ], - "中文（马来西亚）" - ], - "zh-hans-sg": [ - "Hans", - [ - "AS" - ], - "中文（新加坡）" - ], "zh-hans": [ "Hans", [ @@ -4056,27 +4009,6 @@ ], "中文（简体）" ], - "zh-hant-hk": [ - "Hant", - [ - "AS" - ], - "中文（香港）" - ], - "zh-hant-mo": [ - "Hant", - [ - "AS" - ], - "中文（澳門）" - ], - "zh-hant-tw": [ - "Hant", - [ - "AS" - ], - "中文（台灣）" - ], "zh-hant": [ "Hant", [ @@ -4085,22 +4017,42 @@ "中文（繁體）" ], "zh-hk": [ - "zh-hant-hk" + "Hant", + [ + "AS" + ], + "中文（香港）" ], "zh-min-nan": [ "nan" ], "zh-mo": [ - "zh-hant-mo" + "Hant", + [ + "AS" + ], + "中文（澳門）" ], "zh-my": [ - "zh-hans-my" + "Hans", + [ + "AS" + ], + "中文（马来西亚）" ], "zh-sg": [ - "zh-hans-sg" + "Hans", + [ + "AS" + ], + "中文（新加坡）" ], "zh-tw": [ - "zh-hant-tw" + "Hant", + [ + "AS" + ], + "中文（台灣）" ], "zh-yue": [ "yue"