Fix short descriptions to match ISO3166-alpha3 codes

Most of short descriptions are fixed to be valid ISO codes. Some of them
cannot be bound to ISO codes. Added test script to validate codes.
Closing https://bugs.freedesktop.org/show_bug.cgi?id=27306

diff --git a/.gitignore b/.gitignore
index f6cff46..7209b19 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -64,6 +64,7 @@ rules/sun.xml
 semantics/semantics.dir
 symbols/symbols.dir
 tests/*.lst
+tests/*.sd
 types/types.dir
 rules/extras/base.l1v1_s.part
 rules/extras/base.l2_s.part

diff --git a/docs/iso3166-3.csv b/docs/iso3166-3.csv
new file mode 100644 (file)
index 0000000..0e5a44e
--- /dev/null
+++ b/docs/iso3166-3.csv
@@ -0,0 +1,246 @@
+ABW    Aruba
+AFG    Afghanistan
+AGO    Angola
+AIA    Anguilla
+ALA    Åland Islands
+ALB    Albania
+AND    Andorra
+ANT    Netherlands Antilles
+ARE    United Arab Emirates
+ARG    Argentina
+ARM    Armenia
+ASM    American Samoa
+ATA    Antarctica
+ATF    French Southern Territories
+ATG    Antigua and Barbuda
+AUS    Australia
+AUT    Austria
+AZE    Azerbaijan
+BDI    Burundi
+BEL    Belgium
+BEN    Benin
+BFA    Burkina Faso
+BGD    Bangladesh
+BGR    Bulgaria
+BHR    Bahrain
+BHS    Bahamas
+BIH    Bosnia and Herzegovina
+BLM    Saint Barthélemy
+BLR    Belarus
+BLZ    Belize
+BMU    Bermuda
+BOL    Bolivia, Plurinational State of
+BRA    Brazil
+BRB    Barbados
+BRN    Brunei Darussalam
+BTN    Bhutan
+BVT    Bouvet Island
+BWA    Botswana
+CAF    Central African Republic
+CAN    Canada
+CCK    Cocos (Keeling) Islands
+CHE    Switzerland
+CHL    Chile
+CHN    China
+CIV    Côte d'Ivoire
+CMR    Cameroon
+COD    Congo, the Democratic Republic of the
+COG    Congo
+COK    Cook Islands
+COL    Colombia
+COM    Comoros
+CPV    Cape Verde
+CRI    Costa Rica
+CUB    Cuba
+CXR    Christmas Island
+CYM    Cayman Islands
+CYP    Cyprus
+CZE    Czech Republic
+DEU    Germany
+DJI    Djibouti
+DMA    Dominica
+DNK    Denmark
+DOM    Dominican Republic
+DZA    Algeria
+ECU    Ecuador
+EGY    Egypt
+ERI    Eritrea
+ESH    Western Sahara
+ESP    Spain
+EST    Estonia
+ETH    Ethiopia
+FIN    Finland
+FJI    Fiji
+FLK    Falkland Islands (Malvinas)
+FRA    France
+FRO    Faroe Islands
+FSM    Micronesia, Federated States of
+GAB    Gabon
+GBR    United Kingdom
+GEO    Georgia
+GGY    Guernsey
+GHA    Ghana
+GIB    Gibraltar
+GIN    Guinea
+GLP    Guadeloupe
+GMB    Gambia
+GNB    Guinea-Bissau
+GNQ    Equatorial Guinea
+GRC    Greece
+GRD    Grenada
+GRL    Greenland
+GTM    Guatemala
+GUF    French Guiana
+GUM    Guam
+GUY    Guyana
+HKG    Hong Kong
+HMD    Heard Island and McDonald Islands
+HND    Honduras
+HRV    Croatia
+HTI    Haiti
+HUN    Hungary
+IDN    Indonesia
+IMN    Isle of Man
+IND    India
+IOT    British Indian Ocean Territory
+IRL    Ireland
+IRN    Iran, Islamic Republic of
+IRQ    Iraq
+ISL    Iceland
+ISR    Israel
+ITA    Italy
+JAM    Jamaica
+JEY    Jersey
+JOR    Jordan
+JPN    Japan
+KAZ    Kazakhstan
+KEN    Kenya
+KGZ    Kyrgyzstan
+KHM    Cambodia
+KIR    Kiribati
+KNA    Saint Kitts and Nevis
+KOR    Korea, Republic of
+KWT    Kuwait
+LAO    Lao People's Democratic Republic
+LBN    Lebanon
+LBR    Liberia
+LBY    Libyan Arab Jamahiriya
+LCA    Saint Lucia
+LIE    Liechtenstein
+LKA    Sri Lanka
+LSO    Lesotho
+LTU    Lithuania
+LUX    Luxembourg
+LVA    Latvia
+MAC    Macao
+MAF    Saint Martin (French part)
+MAR    Morocco
+MCO    Monaco
+MDA    Moldova, Republic of
+MDG    Madagascar
+MDV    Maldives
+MEX    Mexico
+MHL    Marshall Islands
+MKD    Macedonia, the former Yugoslav Republic of
+MLI    Mali
+MLT    Malta
+MMR    Myanmar
+MNE    Montenegro
+MNG    Mongolia
+MNP    Northern Mariana Islands
+MOZ    Mozambique
+MRT    Mauritania
+MSR    Montserrat
+MTQ    Martinique
+MUS    Mauritius
+MWI    Malawi
+MYS    Malaysia
+MYT    Mayotte
+NAM    Namibia
+NCL    New Caledonia
+NER    Niger
+NFK    Norfolk Island
+NGA    Nigeria
+NIC    Nicaragua
+NIU    Niue
+NLD    Netherlands
+NOR    Norway
+NPL    Nepal
+NRU    Nauru
+NZL    New Zealand
+OMN    Oman
+PAK    Pakistan
+PAN    Panama
+PCN    Pitcairn
+PER    Peru
+PHL    Philippines
+PLW    Palau
+PNG    Papua New Guinea
+POL    Poland
+PRI    Puerto Rico
+PRK    Korea, Democratic People's Republic of
+PRT    Portugal
+PRY    Paraguay
+PSE    Palestinian Territory, Occupied
+PYF    French Polynesia
+QAT    Qatar
+REU    Réunion
+ROU    Romania
+RUS    Russian Federation
+RWA    Rwanda
+SAU    Saudi Arabia
+SDN    Sudan
+SEN    Senegal
+SGP    Singapore
+SGS    South Georgia and the South Sandwich Islands
+SHN    Saint Helena, Ascension and Tristan da Cunha
+SJM    Svalbard and Jan Mayen
+SLB    Solomon Islands
+SLE    Sierra Leone
+SLV    El Salvador
+SMR    San Marino
+SOM    Somalia
+SPM    Saint Pierre and Miquelon
+SRB    Serbia
+STP    Sao Tome and Principe
+SUR    Suriname
+SVK    Slovakia
+SVN    Slovenia
+SWE    Sweden
+SWZ    Swaziland
+SYC    Seychelles
+SYR    Syrian Arab Republic
+TCA    Turks and Caicos Islands
+TCD    Chad
+TGO    Togo
+THA    Thailand
+TJK    Tajikistan
+TKL    Tokelau
+TKM    Turkmenistan
+TLS    Timor-Leste
+TON    Tonga
+TTO    Trinidad and Tobago
+TUN    Tunisia
+TUR    Turkey
+TUV    Tuvalu
+TWN    Taiwan, Province of China
+TZA    Tanzania, United Republic of
+UGA    Uganda
+UKR    Ukraine
+UMI    United States Minor Outlying Islands
+URY    Uruguay
+USA    United States
+UZB    Uzbekistan
+VAT    Holy See (Vatican City State)
+VCT    Saint Vincent and the Grenadines
+VEN    Venezuela, Bolivarian Republic of
+VGB    Virgin Islands, British
+VIR    Virgin Islands, U.S.
+VNM    Viet Nam
+VUT    Vanuatu
+WLF    Wallis and Futuna
+WSM    Samoa
+YEM    Yemen
+ZAF    South Africa
+ZMB    Zambia
+ZWE    Zimbabwe

diff --git a/rules/base.xml.in b/rules/base.xml.in
index 6d8ea26..f0bb83a 100644 (file)
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -1566,7 +1566,7 @@
     <layout>
       <configItem>
         <name>bd</name>
-        <_shortDescription>Ban</_shortDescription>
+        <_shortDescription>Bgd</_shortDescription>
         <_description>Bangladesh</_description>
         <languageList><iso639Id>ben</iso639Id></languageList>
       </configItem>
@@ -1963,7 +1963,7 @@
     <layout>
       <configItem>
         <name>cd</name>
-        <_shortDescription>DRC</_shortDescription>
+        <_shortDescription>COD</_shortDescription>
         <_description>Congo, Democratic Republic of the</_description>
         <languageList><iso639Id>fra</iso639Id></languageList>
       </configItem>
@@ -1972,7 +1972,7 @@
     <layout>
       <configItem>
         <name>cn</name>
-        <_shortDescription>China</_shortDescription>
+        <_shortDescription>Chn</_shortDescription>
         <_description>China</_description>
         <languageList><iso639Id>chi</iso639Id></languageList>
       </configItem>
@@ -2070,7 +2070,7 @@
     <layout>
       <configItem>
         <name>dk</name>
-        <_shortDescription>Dan</_shortDescription>
+        <_shortDescription>Dnk</_shortDescription>
         <_description>Denmark</_description>
         <languageList><iso639Id>dan</iso639Id></languageList>
       </configItem>
@@ -2132,7 +2132,7 @@
     <layout>
       <configItem>
         <name>bt</name>
-        <_shortDescription>Bhu</_shortDescription>
+        <_shortDescription>Btn</_shortDescription>
         <_description>Bhutan</_description>
         <languageList><iso639Id>dzo</iso639Id></languageList>
       </configItem>
@@ -2251,7 +2251,7 @@
     <layout>
       <configItem>
         <name>fo</name>
-        <_shortDescription>Fao</_shortDescription>
+        <_shortDescription>Fro</_shortDescription>
         <_description>Faroe Islands</_description>
         <languageList><iso639Id>fao</iso639Id></languageList>
       </configItem>
@@ -2462,7 +2462,7 @@
     <layout>
       <configItem>
         <name>gn</name>
-        <_shortDescription>Gui</_shortDescription>
+        <_shortDescription>Gin</_shortDescription>
         <_description>Guinea</_description>
         <languageList><iso639Id>fra</iso639Id></languageList>
       </configItem>
@@ -2597,7 +2597,7 @@
     <layout>
       <configItem>
         <name>gr</name>
-        <_shortDescription>Gre</_shortDescription>
+        <_shortDescription>Grc</_shortDescription>
         <_description>Greece</_description>
         <languageList><iso639Id>gre</iso639Id></languageList>
       </configItem>
@@ -3030,7 +3030,7 @@
     <layout>
       <configItem>
         <name>lv</name>
-        <_shortDescription>Lav</_shortDescription>
+        <_shortDescription>Lva</_shortDescription>
         <_description>Latvia</_description>
         <languageList><iso639Id>lav</iso639Id></languageList>
       </configItem>
@@ -3832,7 +3832,7 @@
     <layout>
       <configItem>
         <name>lk</name>
-        <_shortDescription>SrL</_shortDescription>
+        <_shortDescription>Lka</_shortDescription>
         <_description>Sri Lanka</_description>
         <languageList><iso639Id>sin</iso639Id></languageList>
       </configItem>
@@ -4215,7 +4215,7 @@
     <layout>
       <configItem>
         <name>mv</name>
-        <_shortDescription>Mal</_shortDescription>
+        <_shortDescription>Mdv</_shortDescription>
         <_description>Maldives</_description>
         <languageList><iso639Id>div</iso639Id></languageList>
       </configItem>
@@ -4224,7 +4224,7 @@
     <layout>
        <configItem>
         <name>za</name>
-        <_shortDescription>Zar</_shortDescription>
+        <_shortDescription>Zaf</_shortDescription>
         <_description>South Africa</_description>
         <languageList><iso639Id>eng</iso639Id></languageList>
       </configItem>
@@ -4248,7 +4248,7 @@
     <layout>
       <configItem>
         <name>np</name>
-        <_shortDescription>Nep</_shortDescription>
+        <_shortDescription>Npl</_shortDescription>
        <_description>Nepal</_description>
         <languageList><iso639Id>nep</iso639Id></languageList>
       </configItem>
@@ -4256,7 +4256,7 @@
     <layout>
       <configItem>
         <name>ng</name>
-        <_shortDescription>Nig</_shortDescription>
+        <_shortDescription>Nga</_shortDescription>
        <_description>Nigeria</_description>
         <languageList><iso639Id>eng</iso639Id></languageList>
       </configItem>

diff --git a/tests/testShortDescriptions b/tests/testShortDescriptions
new file mode 100755 (executable)
index 0000000..886b5ab
--- /dev/null
+++ b/tests/testShortDescriptions
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+awk '/shortDescr/{print toupper($0)}' ../rules/base.xml.in | sed 's/<[^>]*>//g;s/ //g' | sort | uniq > xml.sd
+awk '{print $1}' ../docs/iso3166-3.csv | sort > iso.sd
+diff -u iso.sd xml.sd | grep '+'
+