Changeset 6606


Ignore:
Timestamp:
09/28/15 09:27:53 (9 years ago)
Author:
Twan Goosen
Message:

merged updated language name variants map from trunk to 3.3 branch

Location:
vlo/branches/vlo-3.3
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • vlo/branches/vlo-3.3

  • vlo/branches/vlo-3.3/vlo-commons/src/main/resources/LanguageNameVariantsMap.xml

    r6141 r6606  
     1<?xml version="1.0"?>
    12<LanguageNames>
     3    <Language name="Abkhazian; Abkhaz">
     4        <Variation>Abkhazian</Variation>
     5        <Variation>Abkhaz</Variation>
     6    </Language>
     7    <Language name="Adyghe; Adygei">
     8        <Variation>Adyghe</Variation>
     9        <Variation>Adygei</Variation>
     10    </Language>
     11    <Language name="Official Aramaic; Imperial Aramaic">
     12        <Variation>Official Aramaic</Variation>
     13        <Variation>Imperial Aramaic</Variation>
     14    </Language>
     15    <Language name="Mapudungun; Mapuche">
     16        <Variation>Mapudungun</Variation>
     17        <Variation>Mapuche</Variation>
     18    </Language>
     19    <Language name="Asturian; Bable; Leonese; Asturleonese">
     20        <Variation>Asturian</Variation>
     21        <Variation>Bable</Variation>
     22        <Variation>Leonese</Variation>
     23        <Variation>Asturleonese</Variation>
     24    </Language>
     25    <Language name="Avar; Avarish; Avaric">
     26        <Variation>Avar</Variation>
     27        <Variation>Avarish</Variation>
     28        <Variation>Avaric</Variation>
     29    </Language>
     30    <Language name="Beja; Bedawiyet">
     31        <Variation>Beja</Variation>
     32        <Variation>Bedawiyet</Variation>
     33    </Language>
     34    <Language name="Bengali; Bangla">
     35        <Variation>Bengali</Variation>
     36        <Variation>Bangla</Variation>
     37    </Language>
     38    <Language name="Bini; Edo">
     39        <Variation>Bini</Variation>
     40        <Variation>Edo</Variation>
     41    </Language>
     42    <Language name="Blin; Bilin">
     43        <Variation>Blin</Variation>
     44        <Variation>Bilin</Variation>
     45    </Language>
     46    <Language name="Catalan; Valencian">
     47        <Variation>Catalan</Variation>
     48        <Variation>Valencian</Variation>
     49    </Language>
     50    <Language name="Chipewyan; Dene Suline">
     51        <Variation>Chipewyan</Variation>
     52        <Variation>Dene Suline</Variation>
     53    </Language>
     54    <Language name="Church Slavic; Old Slavonic; Old Church Slavonic; Church Slavonic; Old Bulgarian">
     55        <Variation>Church Slavic</Variation>
     56        <Variation>Old Slavonic</Variation>
     57        <Variation>Old Church Slavonic</Variation>
     58        <Variation>Church Slavonic</Variation>
     59        <Variation>Old Bulgarian</Variation>
     60    </Language>
     61    <Language name="Crimean Tatar; Crimean Turkish">
     62        <Variation>Crimean Tatar</Variation>
     63        <Variation>Crimean Turkish</Variation>
     64    </Language>
     65    <Language name="Divehi; Dhivehi; Maldivian">
     66        <Variation>Divehi</Variation>
     67        <Variation>Dhivehi</Variation>
     68        <Variation>Maldivian</Variation>
     69    </Language>
     70    <Language name="Dzongkha; Bhutani; Butanese">
     71        <Variation>Dzongkha</Variation>
     72        <Variation>Bhutani</Variation>
     73        <Variation>Butanese</Variation>
     74    </Language>
     75    <Language name="Faroese; Faeroese">
     76        <Variation>Faroese</Variation>
     77        <Variation>Faeroese</Variation>
     78    </Language>
     79    <Language name="Farsi; Persian">
     80        <Variation>Farsi</Variation>
     81        <Variation>Persian</Variation>
     82    </Language>
     83    <Language name="Filipino; Pilipino">
     84        <Variation>Filipino</Variation>
     85        <Variation>Pilipino</Variation>
     86    </Language>
     87    <Language name="Fulah; Fula; Fulani; Fulfulde; Peul">
     88        <Variation>Fulah</Variation>
     89        <Variation>Fula</Variation>
     90        <Variation>Fulani</Variation>
     91        <Variation>Fulfulde</Variation>
     92        <Variation>Peul</Variation>
     93    </Language>
     94    <Language name="Gaelic; Scottish Gaelic">
     95        <Variation>Gaelic</Variation>
     96        <Variation>Scottish Gaelic</Variation>
     97    </Language>
     98    <Language name="Swiss German; Alemannic; Alsatian">
     99        <Variation>Swiss German</Variation>
     100        <Variation>Alemannic</Variation>
     101        <Variation>Alsatian</Variation>
     102    </Language>
     103    <Language name="Haitian; Haitian Creole">
     104        <Variation>Haitian</Variation>
     105        <Variation>Haitian Creole</Variation>
     106    </Language>
     107    <Language name="Sichuan Yi; Nuosu">
     108        <Variation>Sichuan Yi</Variation>
     109        <Variation>Nuosu</Variation>
     110    </Language>
     111    <Language name="Kachin; Jingpho">
     112        <Variation>Kachin</Variation>
     113        <Variation>Jingpho</Variation>
     114    </Language>
     115    <Language name="Greenlandic; Kalaallisut">
     116        <Variation>Greenlandic</Variation>
     117        <Variation>Kalaallisut</Variation>
     118    </Language>
     119    <Language name="Khotanese; Sakan">
     120        <Variation>Khotanese</Variation>
     121        <Variation>Sakan</Variation>
     122    </Language>
     123    <Language name="Kikuyu; Gikuyu">
     124        <Variation>Kikuyu</Variation>
     125        <Variation>Gikuyu</Variation>
     126    </Language>
     127    <Language name="Kinyarwanda; Rwanda">
     128        <Variation>Kinyarwanda</Variation>
     129        <Variation>Rwanda</Variation>
     130    </Language>
     131    <Language name="Kyrgyz; Kirghiz">
     132        <Variation>Kyrgyz</Variation>
     133        <Variation>Kirghiz</Variation>
     134    </Language>
     135    <Language name="Kuanyama; Kwanyama">
     136        <Variation>Kuanyama</Variation>
     137        <Variation>Kwanyama</Variation>
     138    </Language>
     139    <Language name="Laotian; Lao">
     140        <Variation>Laotian</Variation>
     141        <Variation>Lao</Variation>
     142    </Language>
     143    <Language name="Limburgish; Limburger; Limburgian">
     144        <Variation>Limburgish</Variation>
     145        <Variation>Limburger</Variation>
     146        <Variation>Limburgian</Variation>
     147    </Language>
     148    <Language name="Letzeburgesch; Luxembourgish">
     149        <Variation>Letzeburgesch</Variation>
     150        <Variation>Luxembourgish</Variation>
     151    </Language>
     152    <Language name="Luganda; Ganda">
     153        <Variation>Luganda</Variation>
     154        <Variation>Ganda</Variation>
     155    </Language>
     156    <Language name="Mi'kmaq; Micmac">
     157        <Variation>Mi'kmaq</Variation>
     158        <Variation>Micmac</Variation>
     159    </Language>
     160    <Language name="Myanmar; Burmese">
     161        <Variation>Myanmar</Variation>
     162        <Variation>Burmese</Variation>
     163    </Language>
     164    <Language name="Navajo; Navaho">
     165        <Variation>Navajo</Variation>
     166        <Variation>Navaho</Variation>
     167    </Language>
     168    <Language name="Low German; Low Saxon">
     169        <Variation>Low German</Variation>
     170        <Variation>Low Saxon</Variation>
     171    </Language>
     172    <Language name="Nepal Bhasa; Newari">
     173        <Variation>Nepal Bhasa</Variation>
     174        <Variation>Newari</Variation>
     175    </Language>
     176    <Language name="Pedi; Sepedi; Northern Sotho">
     177        <Variation>Pedi</Variation>
     178        <Variation>Sepedi</Variation>
     179        <Variation>Northern Sotho</Variation>
     180    </Language>
     181    <Language name="Classical Newari; Old Newari; Classical Nepal Bhasa">
     182        <Variation>Classical Newari</Variation>
     183        <Variation>Old Newari</Variation>
     184        <Variation>Classical Nepal Bhasa</Variation>
     185    </Language>
     186    <Language name="Chichewa; Chewa; Nyanja">
     187        <Variation>Chichewa</Variation>
     188        <Variation>Chewa</Variation>
     189        <Variation>Nyanja</Variation>
     190    </Language>
     191    <Language name="Occitan; Provençal">
     192        <Variation>Occitan</Variation>
     193        <Variation>Provençal</Variation>
     194    </Language>
     195    <Language name="Oromo; Afan Oromo; Galla">
     196        <Variation>Oromo</Variation>
     197        <Variation>Afan Oromo</Variation>
     198        <Variation>Galla</Variation>
     199    </Language>
     200    <Language name="Ossetian; Ossetic">
     201        <Variation>Ossetian</Variation>
     202        <Variation>Ossetic</Variation>
     203    </Language>
     204    <Language name="Pampanga; Kapampangan">
     205        <Variation>Pampanga</Variation>
     206        <Variation>Kapampangan</Variation>
     207    </Language>
     208    <Language name="Punjabi; Panjabi">
     209        <Variation>Punjabi</Variation>
     210        <Variation>Panjabi</Variation>
     211    </Language>
     212    <Language name="Pashto; Pushto">
     213        <Variation>Pashto</Variation>
     214        <Variation>Pushto</Variation>
     215    </Language>
     216    <Language name="Rarotongan; Cook Islands Maori">
     217        <Variation>Rarotongan</Variation>
     218        <Variation>Cook Islands Maori</Variation>
     219    </Language>
     220    <Language name="Romany; Romani">
     221        <Variation>Romany</Variation>
     222        <Variation>Romani</Variation>
     223    </Language>
     224    <Language name="Romanian; Moldavian; Moldovan">
     225        <Variation>Romanian</Variation>
     226        <Variation>Moldavian</Variation>
     227        <Variation>Moldovan</Variation>
     228    </Language>
     229    <Language name="Kirundi; Rundi">
     230        <Variation>Kirundi</Variation>
     231        <Variation>Rundi</Variation>
     232    </Language>
     233    <Language name="Aromanian; Arumanian; Macedo-Romanian">
     234        <Variation>Aromanian</Variation>
     235        <Variation>Arumanian</Variation>
     236        <Variation>Macedo-Romanian</Variation>
     237    </Language>
     238    <Language name="Sango; Sangho">
     239        <Variation>Sango</Variation>
     240        <Variation>Sangho</Variation>
     241    </Language>
     242    <Language name="Lowlands Scots; Scots; Lallans">
     243        <Variation>Lowlands Scots</Variation>
     244        <Variation>Scots</Variation>
     245        <Variation>Lallans</Variation>
     246    </Language>
     247    <Language name="Sinhala; Sinhalese; Singhalese">
     248        <Variation>Sinhala</Variation>
     249        <Variation>Sinhalese</Variation>
     250        <Variation>Singhalese</Variation>
     251    </Language>
     252    <Language name="Sesotho; Southern Sotho">
     253        <Variation>Sesotho</Variation>
     254        <Variation>Southern Sotho</Variation>
     255    </Language>
    2256    <Language name="Spanish; Castilian">
     257        <Variation>Spanish</Variation>
     258        <Variation>Castilian</Variation>
    3259        <Variation>Spanish, Castilian</Variation>
    4260    </Language>
     261    <Language name="Swazi; Swati; Siswati">
     262        <Variation>Swazi</Variation>
     263        <Variation>Swati</Variation>
     264        <Variation>Siswati</Variation>
     265    </Language>
     266    <Language name="Swahili; Kiswahili">
     267        <Variation>Swahili</Variation>
     268        <Variation>Kiswahili</Variation>
     269    </Language>
     270    <Language name="Tembo; Kitembo">
     271        <Variation>Tembo</Variation>
     272        <Variation>Kitembo</Variation>
     273    </Language>
     274    <Language name="Klingon; tlhIngan Hol">
     275        <Variation>Klingon</Variation>
     276        <Variation>tlhIngan Hol</Variation>
     277    </Language>
     278    <Language name="Tembo; Motembo">
     279        <Variation>Tembo</Variation>
     280        <Variation>Motembo</Variation>
     281    </Language>
     282    <Language name="Setswana; Tswana">
     283        <Variation>Setswana</Variation>
     284        <Variation>Tswana</Variation>
     285    </Language>
     286    <Language name="Uighur; Uyghur">
     287        <Variation>Uighur</Variation>
     288        <Variation>Uyghur</Variation>
     289    </Language>
     290    <Language name="Wolaytta; Walamo">
     291        <Variation>Wolaytta</Variation>
     292        <Variation>Walamo</Variation>
     293    </Language>
     294    <Language name="Kalmyk; Oirat">
     295        <Variation>Kalmyk</Variation>
     296        <Variation>Oirat</Variation>
     297    </Language>
     298    <Language name="Blissymbols; Blissymbolics; Bliss">
     299        <Variation>Blissymbols</Variation>
     300        <Variation>Blissymbolics</Variation>
     301        <Variation>Bliss</Variation>
     302    </Language>
     303    <Language name="Zhuang; Chuang">
     304        <Variation>Zhuang</Variation>
     305        <Variation>Chuang</Variation>
     306    </Language>
     307    <Language name="Zaza; Dimili; Dimli; Kirdki; Kirmanjki; Zazaki">
     308        <Variation>Zaza</Variation>
     309        <Variation>Dimili</Variation>
     310        <Variation>Dimli</Variation>
     311        <Variation>Kirdki</Variation>
     312        <Variation>Kirmanjki</Variation>
     313        <Variation>Zazaki</Variation>
     314    </Language>
    5315</LanguageNames>

  • vlo/branches/vlo-3.3/vlo-importer/src/test/java/eu/clarin/cmdi/vlo/importer/LanguageCodePostProcessorTest.java

    r6142 r6606  
    2222        assertEquals("code:nld", processor.process("NL").get(0));
    2323        assertEquals("code:eng", processor.process("en").get(0));
    24         assertEquals("code:nld", processor.process("nl").get(0));
    2524        assertEquals("code:fry", processor.process("fry").get(0));
    2625        assertEquals("name:test", processor.process("test").get(0));
    … …  
    3332        assertEquals("code:eng", processor.process("eng").get(0));
    3433        assertEquals("code:eng", processor.process("English").get(0));
    35         assertEquals("code:deu", processor.process("German").get(0));
    3634        assertEquals("code:esn", processor.process("Salvadoran Sign Language").get(0));
    3735        assertEquals("code:eng", processor.process("en_US").get(0));
    … …  
    3937        assertEquals("code:eng", processor.process("ISO639-2:eng").get(0));
    4038        assertEquals("code:spa", processor.process("Spanish, Castilian").get(0));
     39        assertEquals("code:ron", processor.process("Romanian").get(0));
    4140    }
    4241}
Note: See TracChangeset for help on using the changeset viewer.