Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CLDR-17407 generate subdivisions #3625

Closed
wants to merge 2 commits into from
Closed

CLDR-17407 generate subdivisions #3625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
debf7a5
CLDR-17407 Update subdivisions
macchiati Apr 10, 2024
193fad9
CLDR-17407 Fix problems with comments from tool
macchiati Apr 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 74 additions & 0 deletions common/subdivisions/en.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -839,6 +839,9 @@ Generated by tool: SubdivisionNode
<subdivision type="cmou">West</subdivision>
<subdivision type="cmsu">South</subdivision>
<subdivision type="cmsw">Southwest</subdivision>
<subdivision type="cn71">Taiwan</subdivision> <!-- deprecated -->
<subdivision type="cn91">Hong Kong SAR China</subdivision> <!-- deprecated -->
<subdivision type="cn92">Macao SAR China</subdivision> <!-- deprecated -->
Comment on lines +842 to +844
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

surprised these are new, in fact these have been here before but are deprecated, and are now included?

<subdivision type="cnah">Anhui</subdivision>
<subdivision type="cnbj">Beijing</subdivision>
<subdivision type="cncq">Chongqing</subdivision>
Expand Down Expand Up @@ -1219,6 +1222,16 @@ Generated by tool: SubdivisionNode
<subdivision type="dz46">Aïn Témouchent</subdivision>
<subdivision type="dz47">Ghardaïa</subdivision>
<subdivision type="dz48">Relizane</subdivision>
<subdivision type="dz49">Timimoun</subdivision>
<subdivision type="dz50">Bordj Badji Mokhtar</subdivision>
<subdivision type="dz51">Ouled Djellal</subdivision>
<subdivision type="dz52">Béni Abbès</subdivision>
<subdivision type="dz53">In Salah</subdivision>
<subdivision type="dz54">In Guezzam</subdivision>
<subdivision type="dz55">Touggourt</subdivision>
<subdivision type="dz56">Djanet</subdivision>
<subdivision type="dz57">El Meghaier</subdivision>
<subdivision type="dz58">El Meniaa</subdivision>
<!-- EA : Ceuta &amp; Melilla : NO SUBDIVISIONS
EC : Ecuador
-->
Expand Down Expand Up @@ -1463,7 +1476,9 @@ Generated by tool: SubdivisionNode
<subdivision type="etsi">Sidama</subdivision>
<subdivision type="etsn">Southern Nations, Nationalities, and Peoples</subdivision>
<subdivision type="etso">Somali</subdivision>
<subdivision type="etsw">Southwest Ethiopia Peoples</subdivision>
<subdivision type="etti">Tigray</subdivision>
<subdivision type="fi01">Åland Islands</subdivision>
<subdivision type="fi02">South Karelia</subdivision>
<subdivision type="fi03">Southern Ostrobothnia</subdivision>
<subdivision type="fi04">Southern Savonia</subdivision>
Expand Down Expand Up @@ -1618,17 +1633,30 @@ Generated by tool: SubdivisionNode
-->
<subdivision type="frara">Auvergne-Rhône-Alpes</subdivision>
<subdivision type="frbfc">Burgundy-Franche-Comté</subdivision>
<subdivision type="frbl">St. Barthélemy</subdivision>
<subdivision type="frbre">Brittany</subdivision>
<subdivision type="frcor">Corsica</subdivision>
<subdivision type="frcp">Clipperton Island</subdivision>
<subdivision type="frcvl">Centre-Val de Loire</subdivision>
<subdivision type="frges">Grand-Est</subdivision>
<subdivision type="frgf">French Guiana</subdivision> <!-- deprecated -->
<subdivision type="frgp">Guadeloupe</subdivision> <!-- deprecated -->
<subdivision type="frhdf">Hauts-de-France</subdivision>
<subdivision type="fridf">Île-de-France²</subdivision>
<subdivision type="frmf">St. Martin</subdivision>
<subdivision type="frmq">Martinique</subdivision> <!-- deprecated -->
<subdivision type="frnaq">Nouvelle-Aquitaine</subdivision>
<subdivision type="frnc">New Caledonia</subdivision>
<subdivision type="frnor">Normandie</subdivision>
<subdivision type="frocc">Occitanie</subdivision>
<subdivision type="frpac">Provence-Alpes-Côte-d’Azur</subdivision>
<subdivision type="frpdl">Pays-de-la-Loire</subdivision>
<subdivision type="frpf">French Polynesia</subdivision>
<subdivision type="frpm">St. Pierre &amp; Miquelon</subdivision>
<subdivision type="frre">Réunion</subdivision> <!-- deprecated -->
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@macchiati did something change? It's odd that the deprecated items are now being included.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is definitely something wrong. Eg, FR-PF (our frpf) was deprecated some time ago, and should not be showing up. It is not in the source file from ISO, so the tool must be picking up the wrong source file. Will investigate further.

<subdivision type="frtf">French Southern Territories</subdivision>
<subdivision type="frwf">Wallis &amp; Futuna</subdivision>
<subdivision type="fryt">Mayotte</subdivision> <!-- deprecated -->
<!-- GA : Gabon -->
<subdivision type="ga1">Estuaire</subdivision>
<subdivision type="ga2">Haut-Ogooué</subdivision>
Expand Down Expand Up @@ -1799,6 +1827,7 @@ Generated by tool: SubdivisionNode
<subdivision type="gbnlk">North Lanarkshire</subdivision> <!-- in gbsct : Scotland -->
<subdivision type="gbnln">North Lincolnshire</subdivision> <!-- in gbeng : England -->
<subdivision type="gbnmd">Newry, Mourne and Down</subdivision> <!-- in gbnir : Northern Ireland -->
<subdivision type="gbnnh">North Northamptonshire</subdivision>
<subdivision type="gbnsm">North Somerset</subdivision> <!-- in gbeng : England -->
<subdivision type="gbnta">Newtownabbey</subdivision> <!-- deprecated -->
<subdivision type="gbnth">Northamptonshire</subdivision> <!-- in gbeng : England -->
Expand Down Expand Up @@ -1880,6 +1909,7 @@ Generated by tool: SubdivisionNode
<subdivision type="gbwls">Wales</subdivision> <!-- deprecated -->
<subdivision type="gbwlv">Wolverhampton</subdivision> <!-- in gbeng : England -->
<subdivision type="gbwnd">Wandsworth</subdivision> <!-- in gbeng : England -->
<subdivision type="gbwnh">West Northamptonshire</subdivision>
<subdivision type="gbwnm">Windsor and Maidenhead</subdivision> <!-- in gbeng : England -->
<subdivision type="gbwok">Wokingham</subdivision> <!-- in gbeng : England -->
<subdivision type="gbwor">Worcestershire</subdivision> <!-- in gbeng : England -->
Expand Down Expand Up @@ -2252,7 +2282,11 @@ Generated by tool: SubdivisionNode
<subdivision type="idnu">Lesser Sunda Islands</subdivision>
<subdivision type="idpa">Papua</subdivision> <!-- in idpp : Papua Islands -->
<subdivision type="idpb">West Papua</subdivision> <!-- in idpp : Papua Islands -->
<subdivision type="idpd">Papua Barat Daya</subdivision>
<subdivision type="idpe">Papua Pengunungan</subdivision>
<subdivision type="idpp">Papua Islands</subdivision>
<subdivision type="idps">Papua Selatan</subdivision>
<subdivision type="idpt">Papua Tengah</subdivision>
<subdivision type="idri">Riau</subdivision> <!-- in idsm : Sumatra -->
<subdivision type="idsa">North Sulawesi</subdivision> <!-- in idsl : Sulawesi -->
<subdivision type="idsb">West Sumatra</subdivision> <!-- in idsm : Sumatra -->
Expand Down Expand Up @@ -2311,6 +2345,7 @@ Generated by tool: SubdivisionNode
<subdivision type="inar">Arunachal Pradesh</subdivision>
<subdivision type="inas">Assam</subdivision>
<subdivision type="inbr">Bihar</subdivision>
<subdivision type="incg">Chhattīsgarh</subdivision>
<subdivision type="inch">Chandigarh</subdivision>
<subdivision type="inct">Chhattisgarh</subdivision>
<subdivision type="indd">Daman and Diu</subdivision>
Expand All @@ -2333,6 +2368,7 @@ Generated by tool: SubdivisionNode
<subdivision type="inmp">Madhya Pradesh</subdivision>
<subdivision type="inmz">Mizoram</subdivision>
<subdivision type="innl">Nagaland</subdivision>
<subdivision type="inod">Odisha</subdivision>
<subdivision type="inor">Odisha</subdivision>
<subdivision type="inpb">Punjab</subdivision>
<subdivision type="inpy">Puducherry</subdivision>
Expand All @@ -2341,6 +2377,8 @@ Generated by tool: SubdivisionNode
<subdivision type="intg">Telangana</subdivision>
<subdivision type="intn">Tamil Nadu</subdivision>
<subdivision type="intr">Tripura</subdivision>
<subdivision type="ints">Telangāna</subdivision>
<subdivision type="inuk">Uttarākhand</subdivision>
<subdivision type="inup">Uttar Pradesh</subdivision>
<subdivision type="inut">Uttarakhand</subdivision>
<subdivision type="inwb">West Bengal</subdivision>
Expand Down Expand Up @@ -2439,6 +2477,7 @@ Generated by tool: SubdivisionNode
<subdivision type="ishel">Helgafellssveit</subdivision>
<subdivision type="ishrg">Hörgársveit</subdivision>
<subdivision type="ishru">Hrunamannahreppur</subdivision>
<subdivision type="ishug">Húnabyggð</subdivision>
<subdivision type="ishut">Húnavatnshreppur</subdivision>
<subdivision type="ishuv">Húnaþing vestra</subdivision>
<subdivision type="ishva">Hvalfjarðarsveit</subdivision>
Expand Down Expand Up @@ -2468,6 +2507,7 @@ Generated by tool: SubdivisionNode
<subdivision type="isskf">Skaftárhreppur</subdivision>
<subdivision type="isskg">Skagabyggð</subdivision>
<subdivision type="issko">Skorradalshreppur</subdivision>
<subdivision type="isskr">Skagafjörður</subdivision>
<subdivision type="issku">Skútustaðahreppur</subdivision>
<subdivision type="issnf">Snæfellsbær</subdivision>
<subdivision type="issog">Skeiða- og Gnúpverjahreppur</subdivision>
Expand Down Expand Up @@ -2815,6 +2855,7 @@ Generated by tool: SubdivisionNode
<subdivision type="kp10">Ryanggang</subdivision>
<subdivision type="kp13">Rason</subdivision>
<subdivision type="kp14">Nampho</subdivision>
<subdivision type="kp15">Kaeseong</subdivision>
<!-- KR : South Korea -->
<subdivision type="kr11">Seoul</subdivision>
<subdivision type="kr26">Busan</subdivision>
Expand All @@ -2840,6 +2881,26 @@ Generated by tool: SubdivisionNode
<subdivision type="kwja">Al Jahra</subdivision>
<subdivision type="kwku">Al Asimah</subdivision>
<subdivision type="kwmu">Mubarak Al-Kabeer</subdivision>
<subdivision type="kz10">Abay oblysy</subdivision>
<subdivision type="kz11">Aqmola oblysy</subdivision>
<subdivision type="kz15">Aqtöbe oblysy</subdivision>
<subdivision type="kz19">Almaty oblysy</subdivision>
<subdivision type="kz23">Atyraū oblysy</subdivision>
<subdivision type="kz27">Batys Qazaqstan oblysy</subdivision>
<subdivision type="kz31">Zhambyl oblysy</subdivision>
<subdivision type="kz33">Zhetisū oblysy</subdivision>
<subdivision type="kz35">Qaraghandy oblysy</subdivision>
<subdivision type="kz39">Qostanay oblysy</subdivision>
<subdivision type="kz43">Qyzylorda oblysy</subdivision>
<subdivision type="kz47">Mangghystaū oblysy</subdivision>
<subdivision type="kz55">Pavlodar oblysy</subdivision>
<subdivision type="kz59">Soltüstik Qazaqstan oblysy</subdivision>
<subdivision type="kz61">Türkistan oblysy</subdivision>
<subdivision type="kz62">Ulytaū oblysy</subdivision>
<subdivision type="kz63">Shyghys Qazaqstan oblysy</subdivision>
<subdivision type="kz71">Astana</subdivision>
<subdivision type="kz75">Almaty</subdivision>
<subdivision type="kz79">Shymkent</subdivision>
<!-- KY : Cayman Islands : NO SUBDIVISIONS
KZ : Kazakhstan
-->
Expand Down Expand Up @@ -3380,6 +3441,7 @@ Generated by tool: SubdivisionNode
<subdivision type="me22">Gusinje</subdivision>
<subdivision type="me23">Petnjica</subdivision>
<subdivision type="me24">Tuzi</subdivision>
<subdivision type="me25">Zeta</subdivision>
<subdivision type="MF">St. Martin</subdivision>
<!-- MF : St. Martin : NO SUBDIVISIONS
MG : Madagascar
Expand Down Expand Up @@ -3886,9 +3948,11 @@ Generated by tool: SubdivisionNode
<subdivision type="nins">Nueva Segovia</subdivision>
<subdivision type="niri">Rivas</subdivision>
<subdivision type="nisj">Río San Juan</subdivision>
<subdivision type="nlaw">Aruba</subdivision>
<subdivision type="nlbq1">Bonaire</subdivision>
<subdivision type="nlbq2">Saba</subdivision>
<subdivision type="nlbq3">Sint Eustatius</subdivision>
<subdivision type="nlcw">Curaçao</subdivision>
<subdivision type="nldr">Drenthe</subdivision>
<subdivision type="nlfl">Flevoland</subdivision>
<subdivision type="nlfr">Friesland</subdivision>
Expand All @@ -3898,6 +3962,7 @@ Generated by tool: SubdivisionNode
<subdivision type="nlnb">North Brabant</subdivision>
<subdivision type="nlnh">North Holland</subdivision>
<subdivision type="nlov">Overijssel</subdivision>
<subdivision type="nlsx">Sint Maarten</subdivision>
<subdivision type="nlut">Utrecht</subdivision>
<subdivision type="nlze">Zeeland</subdivision>
<subdivision type="nlzh">South Holland</subdivision>
Expand Down Expand Up @@ -4139,6 +4204,8 @@ Generated by tool: SubdivisionNode
<subdivision type="phmas">Masbate</subdivision> <!-- in ph05 : Bicol -->
<subdivision type="phmdc">Occidental Mindoro</subdivision> <!-- in ph41 : Mimaropa -->
<subdivision type="phmdr">Oriental Mindoro</subdivision> <!-- in ph41 : Mimaropa -->
<subdivision type="phmgn">Maguindanao del Norte</subdivision>
<subdivision type="phmgs">Maguindanao del Sur</subdivision>
<subdivision type="phmou">Mountain</subdivision> <!-- in ph15 : Cordillera Administrative -->
<subdivision type="phmsc">Misamis Occidental</subdivision> <!-- in ph10 : Northern Mindanao -->
<subdivision type="phmsr">Misamis Oriental</subdivision> <!-- in ph10 : Northern Mindanao -->
Expand Down Expand Up @@ -4558,6 +4625,7 @@ Generated by tool: SubdivisionNode
<!-- SH : St. Helena -->
<subdivision type="shac">Ascension Island</subdivision>
<subdivision type="shhl">Saint Helena</subdivision>
<subdivision type="shta">Tristan da Cunha</subdivision>
<!-- SI : Slovenia -->
<subdivision type="si001">Ajdovščina</subdivision>
<subdivision type="si002">Beltinci</subdivision>
Expand Down Expand Up @@ -5423,6 +5491,7 @@ Generated by tool: SubdivisionNode
<subdivision type="usak">Alaska</subdivision>
<subdivision type="usal">Alabama</subdivision>
<subdivision type="usar">Arkansas</subdivision>
<subdivision type="usas">American Samoa</subdivision>
<subdivision type="usaz">Arizona</subdivision>
<subdivision type="usca">California</subdivision>
<subdivision type="usco">Colorado</subdivision>
Expand All @@ -5431,6 +5500,7 @@ Generated by tool: SubdivisionNode
<subdivision type="usde">Delaware</subdivision>
<subdivision type="usfl">Florida</subdivision>
<subdivision type="usga">Georgia</subdivision>
<subdivision type="usgu">Guam</subdivision>
<subdivision type="ushi">Hawaii</subdivision>
<subdivision type="usia">Iowa</subdivision>
<subdivision type="usid">Idaho</subdivision>
Expand All @@ -5445,6 +5515,7 @@ Generated by tool: SubdivisionNode
<subdivision type="usmi">Michigan</subdivision>
<subdivision type="usmn">Minnesota</subdivision>
<subdivision type="usmo">Missouri</subdivision>
<subdivision type="usmp">Northern Mariana Islands</subdivision>
<subdivision type="usms">Mississippi</subdivision>
<subdivision type="usmt">Montana</subdivision>
<subdivision type="usnc">North Carolina</subdivision>
Expand All @@ -5459,13 +5530,16 @@ Generated by tool: SubdivisionNode
<subdivision type="usok">Oklahoma</subdivision>
<subdivision type="usor">Oregon</subdivision>
<subdivision type="uspa">Pennsylvania</subdivision>
<subdivision type="uspr">Puerto Rico</subdivision>
<subdivision type="usri">Rhode Island</subdivision>
<subdivision type="ussc">South Carolina</subdivision>
<subdivision type="ussd">South Dakota</subdivision>
<subdivision type="ustn">Tennessee</subdivision>
<subdivision type="ustx">Texas</subdivision>
<subdivision type="usum">U.S. Outlying Islands</subdivision>
<subdivision type="usut">Utah</subdivision>
<subdivision type="usva">Virginia</subdivision>
<subdivision type="usvi">U.S. Virgin Islands</subdivision>
<subdivision type="usvt">Vermont</subdivision>
<subdivision type="uswa">Washington</subdivision>
<subdivision type="uswi">Wisconsin</subdivision>
Expand Down
Loading
Loading