Skip to content

Commit

Permalink
Merge pull request #10829 from IQSS/10826-fix-controlledvocab-after-m…
Browse files Browse the repository at this point in the history
…erging-10762

reworked controlled vocab language keys
  • Loading branch information
landreev authored Sep 24, 2024
2 parents de88c00 + a877831 commit 212c64a
Show file tree
Hide file tree
Showing 3 changed files with 86 additions and 43 deletions.
23 changes: 9 additions & 14 deletions scripts/api/data/metadatablocks/citation.tsv
Original file line number Diff line number Diff line change
Expand Up @@ -173,14 +173,13 @@
language Acatepec Me'phaa tpx 30 tpx
language Achagua aca 31 aca
language Achang acn 32 acn
language Ache yif 33 yif
language Ache yif 33 yif guq Aché
language Acheron acz 34 acz
language Achi acr 35 acr
language Achinese ace 36 ace
language Achterhoeks act 37 act
language Achuar-Shiwiar acu 38 acu
language Achumawi acv 39 acv
language Aché guq 40 guq
language Acoli ach 41 ach
language Acroá acs 42 acs
language Adai xad 43 xad
Expand Down Expand Up @@ -296,7 +295,7 @@
language Akwa akw 153 akw
language Akyaung Ari Naga nqy 154 nqy
language Al-Sayyid Bedouin Sign Language syy 155 syy
language Alaba-Kabeena alw 156 alw
language Alaba-K'abeena alw 156 alw
language Alabama akz 157 akz
language Alabat Island Agta dul 158 dul
language Alacatlatzala Mixtec mim 159 mim
Expand Down Expand Up @@ -797,7 +796,7 @@
language Bardi bcj 654 bcj
language Barein bva 655 bva
language Bargam mlp 656 mlp
language Bari bfa 657 bfa
language Bari bfa 657 bfa mot Barí
language Bariai bch 658 bch
language Bariji bjc 659 bjc
language Barikanchi bxo 660 bxo
Expand All @@ -811,7 +810,6 @@
language Barwe bwg 668 bwg
language Barzani Jewish Neo-Aramaic bjf 669 bjf
language Baré bae 670 bae
language Barí mot 671 mot
language Basa (Cameroon) bas 672 bas
language Basa (Nigeria) bzw 673 bzw
language Basa-Gumna bsl 674 bsl
Expand Down Expand Up @@ -2411,7 +2409,7 @@
language Gweda grw 2268 grw
language Gweno gwe 2269 gwe
language Gwere gwr 2270 gwr
language Gwichʼin gwi 2271 gwi
language Gwich'in gwi 2271 gwi
language Gyalsumdo gyo 2272 gyo
language Gyele gyi 2273 gyi
language Gyem gye 2274 gye
Expand Down Expand Up @@ -2888,7 +2886,7 @@
language Jutish jut 2745 jut
language Juwal mwb 2746 mwb
language Juxtlahuaca Mixtec vmc 2747 vmc
language Juǀʼhoan ktz 2748 ktz
language Juǀ'hoan ktz 2748 ktz
language Jwira-Pepesa jwi 2749 jwi
language Jèrriais nrf 2750 nrf
language Júma jua 2751 jua
Expand Down Expand Up @@ -5402,7 +5400,7 @@
language Old Burmese obr 5259 obr
language Old Cham ocm 5260 ocm
language Old Chinese och 5261 och
language Old Church Slavonic, Church Slavonic, Old Bulgarian chu 5262 chu cu Church Slavonic Church Slavic Old Church Slavonic Old Bulgarian
language Old Church Slavonic chu 5262 chu cu Church Slavonic Church Slavic Old Church Slavonic Old Bulgarian
language Old Cornish oco 5263 oco
language Old Dutch odt 5264 odt
language Old English (ca. 450-1100) ang 5265 ang
Expand Down Expand Up @@ -6069,7 +6067,7 @@
language Salasaca Highland Quichua qxl 5926 qxl
language Salawati xmx 5927 xmx
language Saleman sau 5928 sau
language Saliba sbe 5929 sbe
language Saliba sbe 5929 sbe slc Sáliba
language Salinan sln 5930 sln
language Sallands sdz 5931 sdz
language Salt-Yui sll 5932 sll
Expand Down Expand Up @@ -6693,7 +6691,6 @@
language Syenara Senoufo shz 6550 shz
language Sylheti syl 6551 syl
language Syriac syr 6552 syr
language Sáliba slc 6553 slc
language São Paulo Kaingáng zkp 6554 zkp
language Sãotomense cri 6555 cri
language Sìcìté Sénoufo sep 6556 sep
Expand Down Expand Up @@ -7440,15 +7437,14 @@
language Volapük vol 7297 vol vo
language Volscian xvo 7298 xvo
language Vono kch 7299 kch
language Voro vor 7300 vor
language Voro vor 7300 vor vro Võro
language Votic vot 7301 vot
language Vumbu vum 7302 vum
language Vunapu vnp 7303 vnp
language Vunjo vun 7304 vun
language Vurës msn 7305 msn
language Vute vut 7306 vut
language Vwanji wbi 7307 wbi
language Võro vro 7308 vro
language Wa wbm 7309 wbm
language Wa'ema wag 7310 wag
language Waama wwa 7311 wwa
Expand Down Expand Up @@ -7545,7 +7541,7 @@
language Wapishana wap 7402 wap
language Wappo wao 7403 wao
language War-Jaintia aml 7404 aml
language Wara wbf 7405 wbf
language Wara wbf 7405 wbf tci Wára
language Warao wba 7406 wba
language Waray (Australia) wrz 7407 wrz
language Waray (Philippines) war 7408 war
Expand Down Expand Up @@ -7748,7 +7744,6 @@
language Wuzlam udl 7605 udl
language Wyandot wyn 7606 wyn
language Wymysorys wym 7607 wym
language Wára tci 7608 tci
language Wãpha juw 7609 juw
language Wè Northern wob 7610 wob
language Wè Southern gxx 7611 gxx
Expand Down
57 changes: 29 additions & 28 deletions src/main/java/propertyFiles/citation.properties
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ controlledvocabulary.language.abidji=Abidji
controlledvocabulary.language.abinomn=Abinomn
controlledvocabulary.language.abipon=Abipon
controlledvocabulary.language.abishira=Abishira
controlledvocabulary.language.abkhaz,_abkhazian=Abkhaz, Abkhazian
controlledvocabulary.language.abkhaz=Abkhaz, Abkhazian
controlledvocabulary.language.abom=Abom
controlledvocabulary.language.abon=Abon
controlledvocabulary.language.abron=Abron
Expand Down Expand Up @@ -460,7 +460,7 @@ controlledvocabulary.language.akurio=Akurio
controlledvocabulary.language.akwa=Akwa
controlledvocabulary.language.akyaung_ari_naga=Akyaung Ari Naga
controlledvocabulary.language.al-sayyid_bedouin_sign_language=Al-Sayyid Bedouin Sign Language
controlledvocabulary.language.alaba-kabeena=Alaba-K’abeena
controlledvocabulary.language.alaba-k'abeena=Alaba-K’abeena
controlledvocabulary.language.alabama=Alabama
controlledvocabulary.language.alabat_island_agta=Alabat Island Agta
controlledvocabulary.language.alacatlatzala_mixtec=Alacatlatzala Mixtec
Expand Down Expand Up @@ -1469,7 +1469,7 @@ controlledvocabulary.language.carrier=Carrier
controlledvocabulary.language.cashibo-cacataibo=Cashibo-Cacataibo
controlledvocabulary.language.cashinahua=Cashinahua
controlledvocabulary.language.casiguran_dumagat_agta=Casiguran Dumagat Agta
controlledvocabulary.language.castilian,_spanish=Castilian, Spanish
controlledvocabulary.language.spanish,_castilian=Castilian, Spanish
controlledvocabulary.language.casuarina_coast_asmat=Casuarina Coast Asmat
controlledvocabulary.language.catalan_sign_language=Catalan Sign Language
controlledvocabulary.language.catalan,_valencian=Catalan, Valencian
Expand Down Expand Up @@ -1648,7 +1648,7 @@ controlledvocabulary.language.chulym=Chulym
controlledvocabulary.language.chumburung=Chumburung
controlledvocabulary.language.chung=Chung
controlledvocabulary.language.churahi=Churahi
controlledvocabulary.language.church_slavonic,_church_slavic,_old_church_slavonic,_old_bulgarian=Church Slavonic, Church Slavic, Old Church Slavonic, Old Bulgarian
controlledvocabulary.language.old_church_slavonic=Church Slavonic, Church Slavic, Old Church Slavonic, Old Bulgarian
controlledvocabulary.language.chut=Chut
controlledvocabulary.language.chuukese=Chuukese
controlledvocabulary.language.chuvantsy=Chuvantsy
Expand Down Expand Up @@ -2493,7 +2493,7 @@ controlledvocabulary.language.guana_(paraguay)=Guana (Paraguay)
controlledvocabulary.language.guanano=Guanano
controlledvocabulary.language.guanche=Guanche
controlledvocabulary.language.guanyinqiao=Guanyinqiao
controlledvocabulary.language.guarani,_guarani=Guarani, Guaraní
controlledvocabulary.language.guarani=Guarani, Guaraní
controlledvocabulary.language.guarayu=Guarayu
controlledvocabulary.language.guarequena=Guarequena
controlledvocabulary.language.guatemalan_sign_language=Guatemalan Sign Language
Expand Down Expand Up @@ -2574,7 +2574,7 @@ controlledvocabulary.language.gwandara=Gwandara
controlledvocabulary.language.gweda=Gweda
controlledvocabulary.language.gweno=Gweno
controlledvocabulary.language.gwere=Gwere
controlledvocabulary.language.gwichʼin=Gwichʼin
controlledvocabulary.language.gwich'in=Gwichʼin
controlledvocabulary.language.gyalsumdo=Gyalsumdo
controlledvocabulary.language.gyele=Gyele
controlledvocabulary.language.gyem=Gyem
Expand Down Expand Up @@ -2643,7 +2643,7 @@ controlledvocabulary.language.hawaiian=Hawaiian
controlledvocabulary.language.haya=Haya
controlledvocabulary.language.hazaragi=Hazaragi
controlledvocabulary.language.hdi=Hdi
controlledvocabulary.language.hebrew_(modern),_hebrew=Hebrew (modern), Hebrew
controlledvocabulary.language.hebrew_(modern)=Hebrew (modern), Hebrew
controlledvocabulary.language.hehe=Hehe
controlledvocabulary.language.heiban=Heiban
controlledvocabulary.language.heiltsuk=Heiltsuk
Expand Down Expand Up @@ -2861,7 +2861,7 @@ controlledvocabulary.language.inonhan=Inonhan
controlledvocabulary.language.inor=Inor
controlledvocabulary.language.inpui_naga=Inpui Naga
controlledvocabulary.language.interglossa=Interglossa
controlledvocabulary.language.interlingua,_interlingua_(international_auxiliary_language_association)=Interlingua, Interlingua (International Auxiliary Language Association)
controlledvocabulary.language.interlingua=Interlingua, Interlingua (International Auxiliary Language Association)
controlledvocabulary.language.interlingue=Interlingue
controlledvocabulary.language.international_sign=International Sign
controlledvocabulary.language.interslavic=Interslavic
Expand Down Expand Up @@ -3051,7 +3051,7 @@ controlledvocabulary.language.juruna=Jurúna
controlledvocabulary.language.jutish=Jutish
controlledvocabulary.language.juwal=Juwal
controlledvocabulary.language.juxtlahuaca_mixtec=Juxtlahuaca Mixtec
controlledvocabulary.language.juǀʼhoan=Juǀʼhoan
controlledvocabulary.language.juǀ'hoan=Juǀʼhoan
controlledvocabulary.language.jwira-pepesa=Jwira-Pepesa
controlledvocabulary.language.jerriais=Jèrriais
controlledvocabulary.language.juma=Júma
Expand Down Expand Up @@ -3471,7 +3471,7 @@ controlledvocabulary.language.kipsigis=Kipsigis
controlledvocabulary.language.kiput=Kiput
controlledvocabulary.language.kir-balar=Kir-Balar
controlledvocabulary.language.kire=Kire
controlledvocabulary.language.kirghiz,_kyrgyz=Kirghiz, Kyrgyz
controlledvocabulary.language.kirghiz=Kirghiz, Kyrgyz
controlledvocabulary.language.kirike=Kirike
controlledvocabulary.language.kirikiri=Kirikiri
controlledvocabulary.language.kirmanjki_(individual_language)=Kirmanjki (individual language)
Expand Down Expand Up @@ -4088,7 +4088,7 @@ controlledvocabulary.language.logo=Logo
controlledvocabulary.language.logol=Logol
controlledvocabulary.language.logooli=Logooli
controlledvocabulary.language.logorik=Logorik
controlledvocabulary.language.logudorese_sardinian,_croatian=Logudorese Sardinian, Croatian
controlledvocabulary.language.croatian=Logudorese Sardinian, Croatian
controlledvocabulary.language.lohorung=Lohorung
controlledvocabulary.language.loja_highland_quichua=Loja Highland Quichua
controlledvocabulary.language.lojban=Lojban
Expand Down Expand Up @@ -4320,7 +4320,7 @@ controlledvocabulary.language.malawi_lomwe=Malawi Lomwe
controlledvocabulary.language.malawi_sena=Malawi Sena
controlledvocabulary.language.malawian_sign_language=Malawian Sign Language
controlledvocabulary.language.malay_(individual_language)=Malay (individual language)
controlledvocabulary.language.malay,_malay_(macrolanguage)=Malay, Malay (macrolanguage)
controlledvocabulary.language.malay=Malay, Malay (macrolanguage)
controlledvocabulary.language.malayalam=Malayalam
controlledvocabulary.language.malayic_dayak=Malayic Dayak
controlledvocabulary.language.malaynon=Malaynon
Expand Down Expand Up @@ -4451,7 +4451,7 @@ controlledvocabulary.language.marama=Marama
controlledvocabulary.language.maranao=Maranao
controlledvocabulary.language.maranunggu=Maranunggu
controlledvocabulary.language.mararit=Mararit
controlledvocabulary.language.marathi,_marathi_(marathi)=Marathi, Marathi (Marāṭhī)
controlledvocabulary.language.marathi_(marathi)=Marathi, Marathi (Marāṭhī)
controlledvocabulary.language.marau=Marau
controlledvocabulary.language.marba=Marba
controlledvocabulary.language.mardin_sign_language=Mardin Sign Language
Expand Down Expand Up @@ -4773,7 +4773,7 @@ controlledvocabulary.language.mochica=Mochica
controlledvocabulary.language.mocho=Mocho
controlledvocabulary.language.mocovi=Mocoví
controlledvocabulary.language.modang=Modang
controlledvocabulary.language.modern_greek_(1453-),_greek_(modern)=Modern Greek (1453-), Greek (modern)
controlledvocabulary.language.greek_(modern)=Modern Greek (1453-), Greek (modern)
controlledvocabulary.language.modole=Modole
controlledvocabulary.language.moere=Moere
controlledvocabulary.language.mofu-gudur=Mofu-Gudur
Expand Down Expand Up @@ -4980,7 +4980,7 @@ controlledvocabulary.language.mocheno=Mócheno
controlledvocabulary.language.mun_chin=Mün Chin
controlledvocabulary.language.mundu=Mündü
controlledvocabulary.language.maharastri_prakrit=Māhārāṣṭri Prākrit
controlledvocabulary.language.maori,_maori=Māori, Maori
controlledvocabulary.language.maori=Māori, Maori
controlledvocabulary.language.n'ko=N'Ko
controlledvocabulary.language.na=Na
controlledvocabulary.language.na-kara=Na-kara
Expand Down Expand Up @@ -5135,7 +5135,7 @@ controlledvocabulary.language.neo=Neo
controlledvocabulary.language.neo-hittite=Neo-Hittite
controlledvocabulary.language.nepalese_sign_language=Nepalese Sign Language
controlledvocabulary.language.nepali_(individual_language)=Nepali (individual language)
controlledvocabulary.language.nepali_(macrolanguage),_nepali=Nepali (macrolanguage), Nepali
controlledvocabulary.language.nepali=Nepali (macrolanguage), Nepali
controlledvocabulary.language.nete=Nete
controlledvocabulary.language.new_caledonian_javanese=New Caledonian Javanese
controlledvocabulary.language.new_zealand_sign_language=New Zealand Sign Language
Expand Down Expand Up @@ -5368,7 +5368,7 @@ controlledvocabulary.language.northern_luri=Northern Luri
controlledvocabulary.language.northern_mashan_hmong=Northern Mashan Hmong
controlledvocabulary.language.northern_muji=Northern Muji
controlledvocabulary.language.northern_nago=Northern Nago
controlledvocabulary.language.northern_ndebele,_north_ndebele=Northern Ndebele, North Ndebele
controlledvocabulary.language.northern_ndebele=Northern Ndebele, North Ndebele
controlledvocabulary.language.northern_ngbandi=Northern Ngbandi
controlledvocabulary.language.northern_nisu=Northern Nisu
controlledvocabulary.language.northern_nuni=Northern Nuni
Expand Down Expand Up @@ -5525,7 +5525,7 @@ controlledvocabulary.language.obokuitai=Obokuitai
controlledvocabulary.language.obolo=Obolo
controlledvocabulary.language.obulom=Obulom
controlledvocabulary.language.ocaina=Ocaina
controlledvocabulary.language.occitan_(post_1500),_occitan=Occitan (post 1500), Occitan
controlledvocabulary.language.occitan=Occitan (post 1500), Occitan
controlledvocabulary.language.ocotepec_mixtec=Ocotepec Mixtec
controlledvocabulary.language.ocotlan_zapotec=Ocotlán Zapotec
controlledvocabulary.language.od=Od
Expand Down Expand Up @@ -5635,7 +5635,7 @@ controlledvocabulary.language.orang_seletar=Orang Seletar
controlledvocabulary.language.oraon_sadri=Oraon Sadri
controlledvocabulary.language.orejon=Orejón
controlledvocabulary.language.oring=Oring
controlledvocabulary.language.oriya,_oriya_(macrolanguage)=Oriya, Oriya (macrolanguage)
controlledvocabulary.language.oriya=Oriya, Oriya (macrolanguage)
controlledvocabulary.language.orizaba_nahuatl=Orizaba Nahuatl
controlledvocabulary.language.orma=Orma
controlledvocabulary.language.ormu=Ormu
Expand Down Expand Up @@ -5837,7 +5837,7 @@ controlledvocabulary.language.peranakan_indonesian=Peranakan Indonesian
controlledvocabulary.language.pere=Pere
controlledvocabulary.language.peripheral_mongolian=Peripheral Mongolian
controlledvocabulary.language.pero=Pero
controlledvocabulary.language.persian,_persian_(farsi)=Persian, Persian (Farsi)
controlledvocabulary.language.persian_(farsi)=Persian, Persian (Farsi)
controlledvocabulary.language.peruvian_sign_language=Peruvian Sign Language
controlledvocabulary.language.pesse=Pesse
controlledvocabulary.language.petapa_zapotec=Petapa Zapotec
Expand Down Expand Up @@ -6023,7 +6023,7 @@ controlledvocabulary.language.pari=Päri
controlledvocabulary.language.pemono=Pémono
controlledvocabulary.language.peve=Pévé
controlledvocabulary.language.pokoot=Pökoot
controlledvocabulary.language.pali,_pali=Pāli, Pali
controlledvocabulary.language.pali=Pāli, Pali
controlledvocabulary.language.q'anjob'al=Q'anjob'al
controlledvocabulary.language.qabiao=Qabiao
controlledvocabulary.language.qaqet=Qaqet
Expand Down Expand Up @@ -6166,7 +6166,7 @@ controlledvocabulary.language.rukai=Rukai
controlledvocabulary.language.ruma=Ruma
controlledvocabulary.language.rumai_palaung=Rumai Palaung
controlledvocabulary.language.rumu=Rumu
controlledvocabulary.language.rundi,_kirundi=Rundi, Kirundi
controlledvocabulary.language.kirundi=Rundi, Kirundi
controlledvocabulary.language.runga=Runga
controlledvocabulary.language.rungtu_chin=Rungtu Chin
controlledvocabulary.language.rungus=Rungus
Expand Down Expand Up @@ -6305,7 +6305,7 @@ controlledvocabulary.language.sanie=Sanie
controlledvocabulary.language.saniyo-hiyewe=Saniyo-Hiyewe
controlledvocabulary.language.sankaran_maninka=Sankaran Maninka
controlledvocabulary.language.sansi=Sansi
controlledvocabulary.language.sanskrit_(samskrta),_sanskrit=Sanskrit (Saṁskṛta), Sanskrit
controlledvocabulary.language.sanskrit_(samskrta)=Sanskrit (Saṁskṛta), Sanskrit
controlledvocabulary.language.santa_ana_de_tusi_pasco_quechua=Santa Ana de Tusi Pasco Quechua
controlledvocabulary.language.santa_catarina_albarradas_zapotec=Santa Catarina Albarradas Zapotec
controlledvocabulary.language.santa_ines_ahuatempan_popoloca=Santa Inés Ahuatempan Popoloca
Expand Down Expand Up @@ -6522,7 +6522,7 @@ controlledvocabulary.language.siberian_tatar=Siberian Tatar
controlledvocabulary.language.sibu_melanau=Sibu Melanau
controlledvocabulary.language.sicanian=Sicanian
controlledvocabulary.language.sicel=Sicel
controlledvocabulary.language.sichuan_yi,_nuosu=Sichuan Yi, Nuosu
controlledvocabulary.language.nuosu=Sichuan Yi, Nuosu
controlledvocabulary.language.sicilian=Sicilian
controlledvocabulary.language.siculo_arabic=Siculo Arabic
controlledvocabulary.language.sidamo=Sidamo
Expand Down Expand Up @@ -6601,7 +6601,7 @@ controlledvocabulary.language.slave_(athapascan)=Slave (Athapascan)
controlledvocabulary.language.slavomolisano=Slavomolisano
controlledvocabulary.language.slovak=Slovak
controlledvocabulary.language.slovakian_sign_language=Slovakian Sign Language
controlledvocabulary.language.slovenian,_slovene=Slovenian, Slovene
controlledvocabulary.language.slovenian=Slovenian, Slovene
controlledvocabulary.language.small_flowery_miao=Small Flowery Miao
controlledvocabulary.language.smarky_kanum=Smärky Kanum
controlledvocabulary.language.snohomish=Snohomish
Expand Down Expand Up @@ -6660,7 +6660,7 @@ controlledvocabulary.language.south_giziga=South Giziga
controlledvocabulary.language.south_lembata=South Lembata
controlledvocabulary.language.south_marquesan=South Marquesan
controlledvocabulary.language.south_muyu=South Muyu
controlledvocabulary.language.south_ndebele,_southern_ndebele=South Ndebele, Southern Ndebele
controlledvocabulary.language.southern_ndebele=South Ndebele, Southern Ndebele
controlledvocabulary.language.south_nuaulu=South Nuaulu
controlledvocabulary.language.south_picene=South Picene
controlledvocabulary.language.south_slavey=South Slavey
Expand Down Expand Up @@ -6843,7 +6843,7 @@ controlledvocabulary.language.suya=Suyá
controlledvocabulary.language.svan=Svan
controlledvocabulary.language.swabian=Swabian
controlledvocabulary.language.swahili_(individual_language)=Swahili (individual language)
controlledvocabulary.language.swahili,_swahili_(macrolanguage)=Swahili, Swahili (macrolanguage)
controlledvocabulary.language.swahili=Swahili, Swahili (macrolanguage)
controlledvocabulary.language.swampy_cree=Swampy Cree
controlledvocabulary.language.swati=Swati
controlledvocabulary.language.swedish=Swedish
Expand Down Expand Up @@ -7706,7 +7706,7 @@ controlledvocabulary.language.wapan=Wapan
controlledvocabulary.language.wapishana=Wapishana
controlledvocabulary.language.wappo=Wappo
controlledvocabulary.language.war-jaintia=War-Jaintia
controlledvocabulary.language.wara=Wara
controlledvocabulary.language.wara=Wara Wára
controlledvocabulary.language.warao=Warao
controlledvocabulary.language.waray_(australia)=Waray (Australia)
controlledvocabulary.language.waray_(philippines)=Waray (Philippines)
Expand Down Expand Up @@ -8220,3 +8220,4 @@ controlledvocabulary.language.ǁxegwi=ǁXegwi
controlledvocabulary.language.ǂhua=ǂHua
controlledvocabulary.language.ǂungkue=ǂUngkue
controlledvocabulary.language.ǃxoo=ǃXóõ
controlledvocabulary.language.not_applicable=Not Applicable
Loading

0 comments on commit 212c64a

Please sign in to comment.