From 8b0a3ea7c0d599fdcf560d813ccc4ff20fa1aa82 Mon Sep 17 00:00:00 2001 From: "Sergey V. Udaltsov" Date: Thu, 25 Mar 2010 23:18:48 +0000 Subject: [PATCH] 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 --- .gitignore | 1 + docs/iso3166-3.csv | 246 ++++++++++++++++++++++++++++++++++++ rules/base.xml.in | 28 ++-- tests/testShortDescriptions | 6 + 4 files changed, 267 insertions(+), 14 deletions(-) create mode 100644 docs/iso3166-3.csv create mode 100755 tests/testShortDescriptions diff --git a/.gitignore b/.gitignore index f6cff46..7209b19 100644 --- 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 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 --- a/rules/base.xml.in +++ b/rules/base.xml.in @@ -1566,7 +1566,7 @@ bd - <_shortDescription>Ban + <_shortDescription>Bgd <_description>Bangladesh ben @@ -1963,7 +1963,7 @@ cd - <_shortDescription>DRC + <_shortDescription>COD <_description>Congo, Democratic Republic of the fra @@ -1972,7 +1972,7 @@ cn - <_shortDescription>China + <_shortDescription>Chn <_description>China chi @@ -2070,7 +2070,7 @@ dk - <_shortDescription>Dan + <_shortDescription>Dnk <_description>Denmark dan @@ -2132,7 +2132,7 @@ bt - <_shortDescription>Bhu + <_shortDescription>Btn <_description>Bhutan dzo @@ -2251,7 +2251,7 @@ fo - <_shortDescription>Fao + <_shortDescription>Fro <_description>Faroe Islands fao @@ -2462,7 +2462,7 @@ gn - <_shortDescription>Gui + <_shortDescription>Gin <_description>Guinea fra @@ -2597,7 +2597,7 @@ gr - <_shortDescription>Gre + <_shortDescription>Grc <_description>Greece gre @@ -3030,7 +3030,7 @@ lv - <_shortDescription>Lav + <_shortDescription>Lva <_description>Latvia lav @@ -3832,7 +3832,7 @@ lk - <_shortDescription>SrL + <_shortDescription>Lka <_description>Sri Lanka sin @@ -4215,7 +4215,7 @@ mv - <_shortDescription>Mal + <_shortDescription>Mdv <_description>Maldives div @@ -4224,7 +4224,7 @@ za - <_shortDescription>Zar + <_shortDescription>Zaf <_description>South Africa eng @@ -4248,7 +4248,7 @@ np - <_shortDescription>Nep + <_shortDescription>Npl <_description>Nepal nep @@ -4256,7 +4256,7 @@ ng - <_shortDescription>Nig + <_shortDescription>Nga <_description>Nigeria eng diff --git a/tests/testShortDescriptions b/tests/testShortDescriptions new file mode 100755 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 '+' + -- 2.32.0.93.g670b81a890