In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/b15b9c2a4267eed1abe5a08e57b250f7fab2e9f9?hp=664f237a84176c09b20b62dbfe64dd736a7ce05e>
- Log ----------------------------------------------------------------- commit b15b9c2a4267eed1abe5a08e57b250f7fab2e9f9 Author: Sullivan Beck <[email protected]> Date: Tue Dec 4 21:32:45 2012 +0000 Update Locale-Codes to CPAN version 3.24 Signed-off-by: Chris 'BinGOs' Williams <[email protected]> ----------------------------------------------------------------------- Summary of changes: Porting/Maintainers.pl | 2 +- cpan/Locale-Codes/lib/Locale/Codes.pm | 4 +- cpan/Locale-Codes/lib/Locale/Codes/Changes.pod | 32 + cpan/Locale-Codes/lib/Locale/Codes/Constants.pm | 2 +- cpan/Locale-Codes/lib/Locale/Codes/Country.pm | 2 +- cpan/Locale-Codes/lib/Locale/Codes/Country.pod | 7 +- .../Locale-Codes/lib/Locale/Codes/Country_Codes.pm | 2968 +++++++------------- .../lib/Locale/Codes/Country_Retired.pm | 276 ++- cpan/Locale-Codes/lib/Locale/Codes/Currency.pm | 2 +- .../lib/Locale/Codes/Currency_Codes.pm | 8 +- .../lib/Locale/Codes/Currency_Retired.pm | 6 +- cpan/Locale-Codes/lib/Locale/Codes/LangExt.pm | 2 +- .../Locale-Codes/lib/Locale/Codes/LangExt_Codes.pm | 4 +- .../lib/Locale/Codes/LangExt_Retired.pm | 4 +- cpan/Locale-Codes/lib/Locale/Codes/LangFam.pm | 2 +- .../Locale-Codes/lib/Locale/Codes/LangFam_Codes.pm | 4 +- .../lib/Locale/Codes/LangFam_Retired.pm | 2 +- cpan/Locale-Codes/lib/Locale/Codes/LangVar.pm | 2 +- .../Locale-Codes/lib/Locale/Codes/LangVar_Codes.pm | 4 +- .../lib/Locale/Codes/LangVar_Retired.pm | 4 +- cpan/Locale-Codes/lib/Locale/Codes/Language.pm | 2 +- .../lib/Locale/Codes/Language_Codes.pm | 9 +- .../lib/Locale/Codes/Language_Retired.pm | 5 +- cpan/Locale-Codes/lib/Locale/Codes/Script.pm | 2 +- cpan/Locale-Codes/lib/Locale/Codes/Script_Codes.pm | 2076 +++++++------- .../lib/Locale/Codes/Script_Retired.pm | 5 +- cpan/Locale-Codes/lib/Locale/Country.pm | 2 +- cpan/Locale-Codes/lib/Locale/Country.pod | 7 +- cpan/Locale-Codes/lib/Locale/Currency.pm | 2 +- cpan/Locale-Codes/lib/Locale/Language.pm | 2 +- cpan/Locale-Codes/lib/Locale/Script.pm | 2 +- cpan/Locale-Codes/t/country2code.t | 2 +- cpan/Locale-Codes/t/country2code_old.t | 2 +- 33 files changed, 2514 insertions(+), 2941 deletions(-) diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index f395c94..6949807 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -1101,7 +1101,7 @@ use File::Glob qw(:case); 'Locale-Codes' => { 'MAINTAINER' => 'sbeck', - 'DISTRIBUTION' => 'SBECK/Locale-Codes-3.23.tar.gz', + 'DISTRIBUTION' => 'SBECK/Locale-Codes-3.24.tar.gz', 'FILES' => q[cpan/Locale-Codes], 'EXCLUDED' => [ qw( t/pod_coverage.t diff --git a/cpan/Locale-Codes/lib/Locale/Codes.pm b/cpan/Locale-Codes/lib/Locale/Codes.pm index 41b1081..7a69eea 100644 --- a/cpan/Locale-Codes/lib/Locale/Codes.pm +++ b/cpan/Locale-Codes/lib/Locale/Codes.pm @@ -31,7 +31,7 @@ our($VERSION,%Data,%Retired); # $Retired{ TYPE }{ CODESET }{ code }{ CODE } = NAME # { name }{ NAME } = [CODE,NAME] (the key is lowercase) -$VERSION='3.23'; +$VERSION='3.24'; #======================================================================= # @@ -486,7 +486,7 @@ sub _delete_alias { return 0; } - my $n = $#{ $Data{$type}{'id2names'}{$id} }; + my $n = $#{ $Data{$type}{'id2names'}{$id} } + 1; if ($n == 1) { carp "delete_${type}_alias(): only one name defined (use _delete_${type} instead)\n" unless ($nowarn); diff --git a/cpan/Locale-Codes/lib/Locale/Codes/Changes.pod b/cpan/Locale-Codes/lib/Locale/Codes/Changes.pod index 374942b..4f49d2c 100644 --- a/cpan/Locale-Codes/lib/Locale/Codes/Changes.pod +++ b/cpan/Locale-Codes/lib/Locale/Codes/Changes.pod @@ -24,6 +24,38 @@ codes, I will add them to the module and release a new version. =head1 VERSION 3.24 (planned 2012-12-01; sbeck) +=head1 VERSION 3.24 (2012-12-03; sbeck) + +NEW CODE(s) + +=over 4 + +=item B<FIPS-10 country codes deprecated> + +The FIPS-10 document is being withdrawn. It was deprecated in 2008, +and is being updated now only until all the agencies that use it have +switched to something else. The current version no longer lists the +long names for countries. These long names (such as 'Republic of +Albania' for Albania) only appeared in the old FIPS-10 document which +is no longer available, so they are no longer available in this module. + +I will continue to support the FIPS-10 codeset as long as it is available, +but at that point, it will be withdrawn immediately. If an official +end-of-life date is announced, I will include a notice here. Otherwise, support +for the codeset will be discontinued when the document is withdrawn. + +You are encouraged to no longer use the FIPS-10 codeset. + +=item B<Domain country codes now come from ISO 3166> + +The IANA domain codes have changed slightly. The IANA no longer +publishes a list of countries associated with their codes. Instead, +they use the ISO 3166 codes and country names. However, they support +a few non-standard codes, so I will continue to maintain this codeset. +The domain codes are now lowercase to correspond to the ISO 3166 codes. + +=back + =head1 VERSION 3.23 (2012-09-01; sbeck) NEW CODE(s) diff --git a/cpan/Locale-Codes/lib/Locale/Codes/Constants.pm b/cpan/Locale-Codes/lib/Locale/Codes/Constants.pm index 1b789ae..7a5fba2 100644 --- a/cpan/Locale-Codes/lib/Locale/Codes/Constants.pm +++ b/cpan/Locale-Codes/lib/Locale/Codes/Constants.pm @@ -17,7 +17,7 @@ require Exporter; our($VERSION,@ISA,@EXPORT); our(%ALL_CODESETS); -$VERSION='3.23'; +$VERSION='3.24'; @ISA = qw(Exporter); @EXPORT = qw(LOCALE_CODE_ALPHA_2 LOCALE_CODE_ALPHA_3 diff --git a/cpan/Locale-Codes/lib/Locale/Codes/Country.pm b/cpan/Locale-Codes/lib/Locale/Codes/Country.pm index f76888e..a691bec 100644 --- a/cpan/Locale-Codes/lib/Locale/Codes/Country.pm +++ b/cpan/Locale-Codes/lib/Locale/Codes/Country.pm @@ -22,7 +22,7 @@ use Locale::Codes::Country_Retired; our($VERSION,@ISA,@EXPORT,@EXPORT_OK); -$VERSION='3.23'; +$VERSION='3.24'; @ISA = qw(Exporter); @EXPORT = qw(code2country country2code diff --git a/cpan/Locale-Codes/lib/Locale/Codes/Country.pod b/cpan/Locale-Codes/lib/Locale/Codes/Country.pod index c559c37..a167c90 100644 --- a/cpan/Locale-Codes/lib/Locale/Codes/Country.pod +++ b/cpan/Locale-Codes/lib/Locale/Codes/Country.pod @@ -72,8 +72,9 @@ National Geospatial-Intelligence Agency. =item B<dom, LOCALE_CODE_DOM> -The IANA is responsible for assigning two-letter (uppercase) top-level -domain names to each country. +The IANA is responsible for delegating management of the top level country +domains. The country domains are the two-letter (lowercase) codes from ISO 3166 +with a few other additions. =back @@ -162,6 +163,8 @@ so I cannot check the alpha-3 and numerical codes here. =item B<http://www.iso.org/iso/list-en1-semic-3.txt> +=item B<http://www.iso.org/iso/home/standards/country_codes/iso-3166-1_decoding_table.htm> + The source of ISO 3166-1 two-letter codes used by this module. diff --git a/cpan/Locale-Codes/lib/Locale/Codes/Country_Codes.pm b/cpan/Locale-Codes/lib/Locale/Codes/Country_Codes.pm index 4c7ab71..0e58e6b 100644 --- a/cpan/Locale-Codes/lib/Locale/Codes/Country_Codes.pm +++ b/cpan/Locale-Codes/lib/Locale/Codes/Country_Codes.pm @@ -2,7 +2,7 @@ package Locale::Codes::Country_Codes; # This file was automatically generated. Any changes to this file will # be lost the next time 'get_codes' is run. -# Generated on: Tue Aug 28 13:54:32 EDT 2012 +# Generated on: Tue Dec 4 13:52:57 EST 2012 =pod @@ -38,37 +38,31 @@ use warnings; use utf8; our($VERSION); -$VERSION='3.23'; +$VERSION='3.24'; -$Locale::Codes::Data{'country'}{'id'} = '0282'; +$Locale::Codes::Data{'country'}{'id'} = '0295'; $Locale::Codes::Data{'country'}{'id2names'} = { q(0001) => [ q(Afghanistan), - q(Islamic State of Afghanistan), ], q(0002) => [ q(Aland Islands), ], q(0003) => [ q(Albania), - q(Republic of Albania), ], q(0004) => [ q(Algeria), - q(People's Democratic Republic of Algeria), ], q(0005) => [ q(American Samoa), - q(Territory of American Samoa), ], q(0006) => [ q(Andorra), - q(Principality of Andorra), ], q(0007) => [ q(Angola), - q(Republic of Angola), ], q(0008) => [ q(Anguilla), @@ -81,71 +75,58 @@ $Locale::Codes::Data{'country'}{'id2names'} = { ], q(0011) => [ q(Argentina), - q(Argentine Republic), ], q(0012) => [ q(Armenia), - q(Republic of Armenia), ], q(0013) => [ q(Aruba), ], q(0014) => [ q(Australia), - q(Commonwealth of Australia), ], q(0015) => [ q(Austria), - q(Republic of Austria), ], q(0016) => [ q(Azerbaijan), - q(Republic of Azerbaijan), ], q(0017) => [ q(Bahamas), q(Bahamas, The), - q(Commonwealth of the Bahamas), q(The Bahamas), ], q(0018) => [ q(Bahrain), - q(State of Bahrain), ], q(0019) => [ q(Bangladesh), - q(People's Republic of Bangladesh), ], q(0020) => [ q(Barbados), ], q(0021) => [ q(Belarus), - q(Republic of Belarus), ], q(0022) => [ q(Belgium), - q(Kingdom of Belgium), ], q(0023) => [ q(Belize), ], q(0024) => [ q(Benin), - q(Republic of Benin), ], q(0025) => [ q(Bermuda), ], q(0026) => [ q(Bhutan), - q(Kingdom of Bhutan), ], q(0027) => [ q(Bolivia, Plurinational State of), q(Bolivia (Plurinational State of)), q(Bolivia), - q(Republic of Bolivia), ], q(0028) => [ q(Bonaire, Saint Eustatius and Saba), @@ -155,14 +136,12 @@ $Locale::Codes::Data{'country'}{'id2names'} = { ], q(0030) => [ q(Botswana), - q(Republic of Botswana), ], q(0031) => [ q(Bouvet Island), ], q(0032) => [ q(Brazil), - q(Federative Republic of Brazil), ], q(0033) => [ q(British Indian Ocean Territory), @@ -170,7 +149,6 @@ $Locale::Codes::Data{'country'}{'id2names'} = { q(0034) => [ q(Brunei Darussalam), q(Brunei), - q(Negara Brunei Darussalam), ], q(0035) => [ q(Bulgaria), @@ -180,22 +158,18 @@ $Locale::Codes::Data{'country'}{'id2names'} = { ], q(0037) => [ q(Burundi), - q(Republic of Burundi), ], q(0038) => [ q(Cambodia), - q(Kingdom of Cambodia), ], q(0039) => [ q(Cameroon), - q(Republic of Cameroon), ], q(0040) => [ q(Canada), ], q(0041) => [ q(Cape Verde), - q(Republic of Cape Verde), ], q(0042) => [ q(Cayman Islands), @@ -205,45 +179,36 @@ $Locale::Codes::Data{'country'}{'id2names'} = { ], q(0044) => [ q(Chad), - q(Republic of Chad), ], q(0045) => [ q(Chile), - q(Republic of Chile), ], q(0046) => [ q(China), - q(People's Republic of China), ], q(0047) => [ q(Christmas Island), - q(Territory of Christmas Island), ], q(0048) => [ q(Cocos (Keeling) Islands), - q(Territory of Cocos (Keeling) Islands), q(Keeling Islands), q(Cocos Islands), ], q(0049) => [ q(Colombia), - q(Republic of Colombia), ], q(0050) => [ q(Comoros), - q(Federal Islamic Republic of the Comoros), ], q(0051) => [ q(Congo), q(Congo (Brazzaville)), - q(Republic of the Congo), q(Congo, Republic of the), q(The Republic of the Congo), ], q(0052) => [ q(Congo, The Democratic Republic of the), q(Democratic Republic of the Congo), - q(Congo (Kinshasa)), q(Congo, Democratic Republic of the), q(The Democratic Republic of the Congo), ], @@ -252,72 +217,57 @@ $Locale::Codes::Data{'country'}{'id2names'} = { ], q(0054) => [ q(Costa Rica), - q(Republic of Costa Rica), ], q(0055) => [ q(Cote d'Ivoire), - q(Republic of Cote D'Ivoire), ], q(0056) => [ q(Croatia), - q(Republic of Croatia), ], q(0057) => [ q(Cuba), - q(Republic of Cuba), ], q(0058) => [ q(Curacao), ], q(0059) => [ q(Cyprus), - q(Republic of Cyprus), ], q(0060) => [ q(Czech Republic), ], q(0061) => [ q(Denmark), - q(Kingdom of Denmark), ], q(0062) => [ q(Djibouti), - q(Republic of Djibouti), ], q(0063) => [ q(Dominica), - q(Commonwealth of Dominica), ], q(0064) => [ q(Dominican Republic), ], q(0065) => [ q(Ecuador), - q(Republic of Ecuador), ], q(0066) => [ q(Egypt), - q(Arab Republic of Egypt), ], q(0067) => [ q(El Salvador), - q(Republic of El Salvador), ], q(0068) => [ q(Equatorial Guinea), - q(Republic of Equatorial Guinea), ], q(0069) => [ q(Eritrea), - q(State of Eritrea), ], q(0070) => [ q(Estonia), - q(Republic of Estonia), ], q(0071) => [ q(Ethiopia), - q(Federal Democratic Republic of Ethiopia), ], q(0072) => [ q(Falkland Islands (Malvinas)), @@ -329,55 +279,44 @@ $Locale::Codes::Data{'country'}{'id2names'} = { ], q(0074) => [ q(Fiji), - q(Republic of the Fiji Islands), ], q(0075) => [ q(Finland), - q(Republic of Finland), ], q(0076) => [ q(France), - q(French Republic), ], q(0077) => [ q(French Guiana), - q(Department of Guiana), ], q(0078) => [ q(French Polynesia), - q(Territory of French Polynesia), ], q(0079) => [ q(French Southern Territories), q(French Southern and Antarctic Lands), - q(Territory of the French Southern and Antarctic Lands), ], q(0080) => [ q(Gabon), - q(Gabonese Republic), ], q(0081) => [ q(Gambia), q(Gambia, The), - q(Republic of the Gambia), ], q(0082) => [ q(Georgia), ], q(0083) => [ q(Germany), - q(Federal Republic of Germany), ], q(0084) => [ q(Ghana), - q(Republic of Ghana), ], q(0085) => [ q(Gibraltar), ], q(0086) => [ q(Greece), - q(Hellenic Republic), ], q(0087) => [ q(Greenland), @@ -387,83 +326,65 @@ $Locale::Codes::Data{'country'}{'id2names'} = { ], q(0089) => [ q(Guadeloupe), - q(Department of Guadeloupe), ], q(0090) => [ q(Guam), - q(Territory of Guam), ], q(0091) => [ q(Guatemala), - q(Republic of Guatemala), ], q(0092) => [ q(Guernsey), - q(Bailiwick of Guernsey), ], q(0093) => [ q(Guinea), - q(Republic of Guinea), ], q(0094) => [ q(Guinea-Bissau), - q(Republic of Guinea-Bissau), ], q(0095) => [ q(Guyana), - q(Co-operative Republic of Guyana), ], q(0096) => [ q(Haiti), - q(Republic of Haiti), ], q(0097) => [ q(Heard Island and Mcdonald Islands), - q(Territory of Heard Island and McDonald Islands), ], q(0098) => [ q(Holy See (Vatican City State)), q(Holy See), q(Vatican City), - q(State of the Vatican City), q(Holy See (Vatican City)), ], q(0099) => [ q(Honduras), - q(Republic of Honduras), ], q(0100) => [ q(Hong Kong), q(China, Hong Kong Special Administrative Region), q(Hong Kong S.A.R.), - q(Hong Kong Special Administrative Region), q(Hong Kong Special Administrative Region of China), ], q(0101) => [ q(Hungary), - q(Republic of Hungary), ], q(0102) => [ q(Iceland), - q(Republic of Iceland), ], q(0103) => [ q(India), - q(Republic of India), ], q(0104) => [ q(Indonesia), - q(Republic of Indonesia), ], q(0105) => [ q(Iran, Islamic Republic of), q(Iran (Islamic Republic of)), q(Iran), - q(Islamic Republic of Iran), ], q(0106) => [ q(Iraq), - q(Republic of Iraq), ], q(0107) => [ q(Ireland), @@ -473,11 +394,9 @@ $Locale::Codes::Data{'country'}{'id2names'} = { ], q(0109) => [ q(Israel), - q(State of Israel), ], q(0110) => [ q(Italy), - q(Italian Republic), ], q(0111) => [ q(Jamaica), @@ -487,143 +406,112 @@ $Locale::Codes::Data{'country'}{'id2names'} = { ], q(0113) => [ q(Jersey), - q(Bailiwick of Jersey), ], q(0114) => [ q(Jordan), - q(Hashemite Kingdom of Jordan), ], q(0115) => [ q(Kazakhstan), - q(Republic of Kazakhstan), q(Kazakstan), ], q(0116) => [ q(Kenya), - q(Republic of Kenya), ], q(0117) => [ q(Kiribati), - q(Republic of Kiribati), ], q(0118) => [ q(Korea, Democratic People's Republic of), q(Democratic People's Republic of Korea), - q(Korea, North), q(North Korea), ], q(0119) => [ q(Korea, Republic of), q(Republic of Korea), - q(Korea, South), q(South Korea), ], q(0120) => [ q(Kuwait), - q(State of Kuwait), ], q(0121) => [ q(Kyrgyzstan), - q(Kyrgyz Republic), ], q(0122) => [ q(Lao People's Democratic Republic), - q(Laos), ], q(0123) => [ q(Latvia), - q(Republic of Latvia), ], q(0124) => [ q(Lebanon), - q(Lebanese Republic), ], q(0125) => [ q(Lesotho), - q(Republic of Lesotho), ], q(0126) => [ q(Liberia), - q(Republic of Liberia), ], q(0127) => [ q(Libya), - q(Great Socialist People's Libyan Arab Jamahiriya), ], q(0128) => [ q(Liechtenstein), - q(Principality of Liechtenstein), ], q(0129) => [ q(Lithuania), - q(Republic of Lithuania), ], q(0130) => [ q(Luxembourg), - q(Grand Duchy of Luxembourg), ], q(0131) => [ q(Macao), q(China, Macao Special Administrative Region), + q(Macau), q(Macau S.A.R), - q(Macau Special Administrative Region), q(Macau S.A.R.), - q(Macau), q(Macao Special Administrative Region of China), ], q(0132) => [ q(Macedonia, The Former Yugoslav Republic of), q(The former Yugoslav Republic of Macedonia), q(Macedonia), - q(Republic of Macedonia), q(Macedonia, Former Yugoslav Republic of), ], q(0133) => [ q(Madagascar), - q(Republic of Madagascar), ], q(0134) => [ q(Malawi), - q(Republic of Malawi), ], q(0135) => [ q(Malaysia), ], q(0136) => [ q(Maldives), - q(Republic of Maldives), ], q(0137) => [ q(Mali), - q(Republic of Mali), ], q(0138) => [ q(Malta), - q(Republic of Malta), ], q(0139) => [ q(Marshall Islands), - q(Republic of the Marshall Islands), ], q(0140) => [ q(Martinique), - q(Department of Martinique), ], q(0141) => [ q(Mauritania), - q(Islamic Republic of Mauritania), ], q(0142) => [ q(Mauritius), - q(Republic of Mauritius), ], q(0143) => [ q(Mayotte), - q(Territorial Collectivity of Mayotte), ], q(0144) => [ q(Mexico), - q(United Mexican States), ], q(0145) => [ q(Micronesia, Federated States of), @@ -633,11 +521,9 @@ $Locale::Codes::Data{'country'}{'id2names'} = { q(0146) => [ q(Moldova, Republic of), q(Republic of Moldova), - q(Moldova), ], q(0147) => [ q(Monaco), - q(Principality of Monaco), ], q(0148) => [ q(Mongolia), @@ -650,78 +536,61 @@ $Locale::Codes::Data{'country'}{'id2names'} = { ], q(0151) => [ q(Morocco), - q(Kingdom of Morocco), ], q(0152) => [ q(Mozambique), - q(Republic of Mozambique), ], q(0153) => [ q(Myanmar), q(Burma), - q(Union of Burma), ], q(0154) => [ q(Namibia), - q(Republic of Namibia), ], q(0155) => [ q(Nauru), - q(Republic of Nauru), ], q(0156) => [ q(Nepal), - q(Kingdom of Nepal), ], q(0157) => [ q(Netherlands), - q(Kingdom of the Netherlands), ], q(0158) => [ q(New Caledonia), - q(Territory of New Caledonia and Dependencies), ], q(0159) => [ q(New Zealand), ], q(0160) => [ q(Nicaragua), - q(Republic of Nicaragua), ], q(0161) => [ q(Niger), - q(Republic of Niger), ], q(0162) => [ q(Nigeria), - q(Federal Republic of Nigeria), ], q(0163) => [ q(Niue), ], q(0164) => [ q(Norfolk Island), - q(Territory of Norfolk Island), ], q(0165) => [ q(Northern Mariana Islands), - q(Commonwealth of the Northern Mariana Islands), ], q(0166) => [ q(Norway), - q(Kingdom of Norway), ], q(0167) => [ q(Oman), - q(Sultanate of Oman), ], q(0168) => [ q(Pakistan), - q(Islamic Republic of Pakistan), ], q(0169) => [ q(Palau), - q(Republic of Palau), ], q(0170) => [ q(Palestinian Territory, Occupied), @@ -729,60 +598,47 @@ $Locale::Codes::Data{'country'}{'id2names'} = { ], q(0171) => [ q(Panama), - q(Republic of Panama), ], q(0172) => [ q(Papua New Guinea), - q(Independent State of Papua New Guinea), ], q(0173) => [ q(Paraguay), - q(Republic of Paraguay), ], q(0174) => [ q(Peru), - q(Republic of Peru), ], q(0175) => [ q(Philippines), - q(Republic of the Philippines), ], q(0176) => [ q(Pitcairn), q(Pitcairn Islands), - q(Pitcairn, Henderson, Ducie and Oeno Islands), q(Pitcairn Island), ], q(0177) => [ q(Poland), - q(Republic of Poland), ], q(0178) => [ q(Portugal), - q(Portuguese Republic), ], q(0179) => [ q(Puerto Rico), - q(Commonwealth of Puerto Rico), ], q(0180) => [ q(Qatar), - q(State of Qatar), ], q(0181) => [ q(Reunion), - q(Department of Reunion), ], q(0182) => [ q(Romania), ], q(0183) => [ q(Russian Federation), - q(Russia), ], q(0184) => [ q(Rwanda), - q(Rwandese Republic), ], q(0185) => [ q(Saint Barthelemy), @@ -794,7 +650,6 @@ $Locale::Codes::Data{'country'}{'id2names'} = { ], q(0187) => [ q(Saint Kitts and Nevis), - q(Federation of Saint Kitts and Nevis), ], q(0188) => [ q(Saint Lucia), @@ -802,61 +657,50 @@ $Locale::Codes::Data{'country'}{'id2names'} = { q(0189) => [ q(Saint Martin (French part)), q(Saint-Martin (French part)), - q(Saint-Martin), q(Saint Martin), + q(Saint-Martin), ], q(0190) => [ q(Saint Pierre and Miquelon), - q(Territorial Collectivity of Saint Pierre and Miquelon), ], q(0191) => [ q(Saint Vincent and the Grenadines), ], q(0192) => [ q(Samoa), - q(Independent State of Samoa), ], q(0193) => [ q(San Marino), - q(Republic of San Marino), ], q(0194) => [ q(Sao Tome and Principe), - q(Democratic Republic of Sao Tome and Principe), ], q(0195) => [ q(Saudi Arabia), - q(Kingdom of Saudi Arabia), ], q(0196) => [ q(Senegal), - q(Republic of Senegal), ], q(0197) => [ q(Serbia), ], q(0198) => [ q(Seychelles), - q(Republic of Seychelles), ], q(0199) => [ q(Sierra Leone), - q(Republic of Sierra Leone), ], q(0200) => [ q(Singapore), - q(Republic of Singapore), ], q(0201) => [ q(Sint Maarten (Dutch part)), ], q(0202) => [ q(Slovakia), - q(Slovak Republic), ], q(0203) => [ q(Slovenia), - q(Republic of Slovenia), ], q(0204) => [ q(Solomon Islands), @@ -866,7 +710,6 @@ $Locale::Codes::Data{'country'}{'id2names'} = { ], q(0206) => [ q(South Africa), - q(Republic of South Africa), ], q(0207) => [ q(South Georgia and the South Sandwich Islands), @@ -877,19 +720,15 @@ $Locale::Codes::Data{'country'}{'id2names'} = { ], q(0209) => [ q(Spain), - q(Kingdom of Spain), ], q(0210) => [ q(Sri Lanka), - q(Democratic Socialist Republic of Sri Lanka), ], q(0211) => [ q(Sudan), - q(Republic of the Sudan), ], q(0212) => [ q(Suriname), - q(Republic of Suriname), ], q(0213) => [ q(Svalbard and Jan Mayen), @@ -897,19 +736,15 @@ $Locale::Codes::Data{'country'}{'id2names'} = { ], q(0214) => [ q(Swaziland), - q(Kingdom of Swaziland), ], q(0215) => [ q(Sweden), - q(Kingdom of Sweden), ], q(0216) => [ q(Switzerland), - q(Swiss Confederation), ], q(0217) => [ q(Syrian Arab Republic), - q(Syria), q(Golan Heights (Israeli-occupied)), ], q(0218) => [ @@ -918,16 +753,13 @@ $Locale::Codes::Data{'country'}{'id2names'} = { ], q(0219) => [ q(Tajikistan), - q(Republic of Tajikistan), ], q(0220) => [ q(Tanzania, United Republic of), q(United Republic of Tanzania), - q(Tanzania), ], q(0221) => [ q(Thailand), - q(Kingdom of Thailand), ], q(0222) => [ q(Timor-Leste), @@ -935,26 +767,21 @@ $Locale::Codes::Data{'country'}{'id2names'} = { ], q(0223) => [ q(Togo), - q(Togolese Republic), ], q(0224) => [ q(Tokelau), ], q(0225) => [ q(Tonga), - q(Kingdom of Tonga), ], q(0226) => [ q(Trinidad and Tobago), - q(Republic of Trinidad and Tobago), ], q(0227) => [ q(Tunisia), - q(Republic of Tunisia), ], q(0228) => [ q(Turkey), - q(Republic of Turkey), ], q(0229) => [ q(Turkmenistan), @@ -991,26 +818,21 @@ $Locale::Codes::Data{'country'}{'id2names'} = { ], q(0238) => [ q(Uruguay), - q(Oriental Republic of Uruguay), ], q(0239) => [ q(Uzbekistan), - q(Republic of Uzbekistan), ], q(0240) => [ q(Vanuatu), - q(Republic of Vanuatu), ], q(0241) => [ q(Venezuela, Bolivarian Republic of), q(Venezuela (Bolivarian Republic of)), q(Venezuela), - q(Bolivarian Republic of Venezuela), ], q(0242) => [ q(Viet Nam), q(Vietnam), - q(Socialist Republic of Vietnam), ], q(0243) => [ q(Virgin Islands, British), @@ -1020,29 +842,24 @@ $Locale::Codes::Data{'country'}{'id2names'} = { q(0244) => [ q(Virgin Islands, U.S.), q(United States Virgin Islands), - q(Virgin Islands), - q(Virgin Islands of the United States), q(Virgin Islands (US)), + q(Virgin Islands), ], q(0245) => [ q(Wallis and Futuna), q(Wallis and Futuna Islands), - q(Territory of the Wallis and Futuna Islands), ], q(0246) => [ q(Western Sahara), ], q(0247) => [ q(Yemen), - q(Republic of Yemen), ], q(0248) => [ q(Zambia), - q(Republic of Zambia), ], q(0249) => [ q(Zimbabwe), - q(Republic of Zimbabwe), ], q(0250) => [ q(Channel Islands), @@ -1051,11 +868,10 @@ $Locale::Codes::Data{'country'}{'id2names'} = { q(Sark), ], q(0252) => [ - q(Serbia and Montenegro), + q(Akrotiri), ], q(0253) => [ q(Ashmore and Cartier Islands), - q(Territory of Ashmore and Cartier Islands), ], q(0254) => [ q(Baker Island), @@ -1067,80 +883,118 @@ $Locale::Codes::Data{'country'}{'id2names'} = { q(Clipperton Island), ], q(0257) => [ - q(Coral Sea Islands), - q(Coral Sea Islands Territory), + q(Congo (Kinshasa)), ], q(0258) => [ - q(Europa Island), + q(Coral Sea Islands), ], q(0259) => [ - q(Gaza Strip), + q(Dhekelia), ], q(0260) => [ - q(Glorioso Islands), + q(Etorofu, Habomai, Kunashiri, and Shikotan Islands), ], q(0261) => [ - q(Howland Island), + q(Europa Island), ], q(0262) => [ - q(Jan Mayen), + q(Gaza Strip), ], q(0263) => [ - q(Jarvis Island), + q(Glorioso Islands), ], q(0264) => [ - q(Johnston Atoll), + q(Heard Island and McDonald Islands), ], q(0265) => [ - q(Juan De Nova Island), + q(Howland Island), ], q(0266) => [ - q(Kingman Reef), + q(Jan Mayen), ], q(0267) => [ - q(Midway Islands), + q(Jarvis Island), ], q(0268) => [ - q(Navassa Island), + q(Johnston Atoll), ], q(0269) => [ - q(Netherlands Antilles), + q(Juan de Nova Island), ], q(0270) => [ - q(Palmyra Atoll), + q(Kingman Reef), ], q(0271) => [ - q(Paracel Islands), + q(Korea, North), ], q(0272) => [ - q(Spratly Islands), + q(Korea, South), ], q(0273) => [ - q(Svalbard), + q(Kosovo), ], q(0274) => [ - q(Tromelin Island), + q(Laos), ], q(0275) => [ - q(Wake Atoll), + q(Midway Islands), ], q(0276) => [ - q(West Bank), + q(Moldova), ], q(0277) => [ - q(Ascension Island), + q(Navassa Island), ], q(0278) => [ - q(Bonaire, Sint Eustatius and Saba), + q(Palmyra Atoll), ], q(0279) => [ - q(European Union), + q(Paracel Islands), ], q(0280) => [ - q(Soviet Union), + q(Russia), ], q(0281) => [ - q(Portuguese Timor), + q(Saint Helena, Ascension, and Tristan da Cunha), + ], + q(0282) => [ + q(Sint Maarten), + ], + q(0283) => [ + q(South Georgia and South Sandwich Islands), + ], + q(0284) => [ + q(Spratly Islands), + ], + q(0285) => [ + q(Svalbard), + ], + q(0286) => [ + q(Syria), + ], + q(0287) => [ + q(Tanzania), + ], + q(0288) => [ + q(Tromelin Island), + ], + q(0289) => [ + q(Wake Island), + ], + q(0290) => [ + q(West Bank), + ], + q(0291) => [ + q(Ascension Island), + ], + q(0292) => [ + q(Netherlands Antilles), + ], + q(0293) => [ + q(European Union), + ], + q(0294) => [ + q(USSR), ], }; @@ -1149,6 +1003,10 @@ $Locale::Codes::Data{'country'}{'alias2id'} = { q(0001), q(0), ], + q(akrotiri) => [ + q(0252), + q(0), + ], q(aland islands) => [ q(0002), q(0), @@ -1185,18 +1043,10 @@ $Locale::Codes::Data{'country'}{'alias2id'} = { q(0010), q(0), ], - q(arab republic of egypt) => [ - q(0066), - q(1), - ], q(argentina) => [ q(0011), q(0), ], - q(argentine republic) => [ - q(0011), - q(1), - ], q(armenia) => [ q(0012), q(0), @@ -1206,7 +1056,7 @@ $Locale::Codes::Data{'country'}{'alias2id'} = { q(0), ], q(ascension island) => [ - q(0277), + q(0291), q(0), ], q(ashmore and cartier islands) => [ @@ -1237,14 +1087,6 @@ $Locale::Codes::Data{'country'}{'alias2id'} = { q(0018), q(0), ], - q(bailiwick of guernsey) => [ - q(0092), - q(1), - ], - q(bailiwick of jersey) => [ - q(0113), - q(1), - ], q(baker island) => [ q(0254), q(0), @@ -1285,10 +1127,6 @@ $Locale::Codes::Data{'country'}{'alias2id'} = { q(0026), q(0), ], - q(bolivarian republic of venezuela) => [ - q(0241), - q(3), - ], q(bolivia) => [ q(0027), q(2), @@ -1305,10 +1143,6 @@ $Locale::Codes::Data{'country'}{'alias2id'} = { q(0028), q(0), ], - q(bonaire, sint eustatius and saba) => [ - q(0278), - q(0), - ], q(bosnia and herzegovina) => [ q(0029), q(0), @@ -1413,42 +1247,18 @@ $Locale::Codes::Data{'country'}{'alias2id'} = { q(0256), q(0), ], - q(co-operative republic of guyana) => [ - q(0095), - q(1), - ], q(cocos (keeling) islands) => [ q(0048), q(0), ], q(cocos islands) => [ q(0048), - q(3), + q(2), ], q(colombia) => [ q(0049), q(0), ], - q(commonwealth of australia) => [ - q(0014), - q(1), - ], - q(commonwealth of dominica) => [ - q(0063), - q(1), - ], - q(commonwealth of puerto rico) => [ - q(0179), - q(1), - ], - q(commonwealth of the bahamas) => [ - q(0017), - q(2), - ], - q(commonwealth of the northern mariana islands) => [ - q(0165), - q(1), - ], q(comoros) => [ q(0050), q(0), @@ -1462,16 +1272,16 @@ $Locale::Codes::Data{'country'}{'alias2id'} = { q(1), ], q(congo (kinshasa)) => [ - q(0052), - q(2), + q(0257), + q(0), ], q(congo, democratic republic of the) => [ q(0052), - q(3), + q(2), ], q(congo, republic of the) => [ q(0051), - q(3), + q(2), ], q(congo, the democratic republic of the) => [ q(0052), @@ -1482,11 +1292,7 @@ $Locale::Codes::Data{'country'}{'alias2id'} = { q(0), ], q(coral sea islands) => [ - q(0257), - q(0), - ], - q(coral sea islands territory) => [ - q(0257), + q(0258), q(0), ], q(costa rica) => [ @@ -1521,37 +1327,17 @@ $Locale::Codes::Data{'country'}{'alias2id'} = { q(0118), q(1), ], - q(democratic republic of sao tome and principe) => [ - q(0194), - q(1), - ], q(democratic republic of the congo) => [ q(0052), q(1), ], - q(democratic socialist republic of sri lanka) => [ - q(0210), - q(1), - ], q(denmark) => [ q(0061), q(0), ], - q(department of guadeloupe) => [ - q(0089), - q(1), - ], - q(department of guiana) => [ - q(0077), - q(1), - ], - q(department of martinique) => [ - q(0140), - q(1), - ], - q(department of reunion) => [ - q(0181), - q(1), + q(dhekelia) => [ + q(0259), + q(0), ], q(djibouti) => [ q(0062), @@ -1597,12 +1383,16 @@ $Locale::Codes::Data{'country'}{'alias2id'} = { q(0071), q(0), ], + q(etorofu, habomai, kunashiri, and shikotan islands) => [ + q(0260), + q(0), + ], q(europa island) => [ - q(0258), + q(0261), q(0), ], q(european union) => [ - q(0279), + q(0293), q(0), ], q(faeroe islands) => [ @@ -1621,34 +1411,10 @@ $Locale::Codes::Data{'country'}{'alias2id'} = { q(0073), q(0), ], - q(federal democratic republic of ethiopia) => [ - q(0071), - q(1), - ], - q(federal islamic republic of the comoros) => [ - q(0050), - q(1), - ], - q(federal republic of germany) => [ - q(0083), - q(1), - ], - q(federal republic of nigeria) => [ - q(0162), - q(1), - ], q(federated states of micronesia) => [ q(0145), q(2), ], - q(federation of saint kitts and nevis) => [ - q(0187), - q(1), - ], - q(federative republic of brazil) => [ - q(0032), - q(1), - ], q(fiji) => [ q(0074), q(0), @@ -1669,10 +1435,6 @@ $Locale::Codes::Data{'country'}{'alias2id'} = { q(0078), q(0), ], - q(french republic) => [ - q(0076), - q(1), - ], q(french southern and antarctic lands) => [ q(0079), q(1), @@ -1685,10 +1447,6 @@ $Locale::Codes::Data{'country'}{'alias2id'} = { q(0080), q(0), ], - q(gabonese republic) => [ - q(0080), - q(1), - ], q(gambia) => [ q(0081), q(0), @@ -1698,7 +1456,7 @@ $Locale::Codes::Data{'country'}{'alias2id'} = { q(1), ], q(gaza strip) => [ - q(0259), + q(0262), q(0), ], q(georgia) => [ @@ -1718,25 +1476,17 @@ $Locale::Codes::Data{'country'}{'alias2id'} = { q(0), ], q(glorioso islands) => [ - q(0260), + q(0263), q(0), ], q(golan heights (israeli-occupied)) => [ q(0217), - q(2), - ], - q(grand duchy of luxembourg) => [ - q(0130), q(1), ], q(great britain) => [ q(0235), q(2), ], - q(great socialist people's libyan arab jamahiriya) => [ - q(0127), - q(1), - ], q(greece) => [ q(0086), q(0), @@ -1781,18 +1531,14 @@ $Locale::Codes::Data{'country'}{'alias2id'} = { q(0096), q(0), ], - q(hashemite kingdom of jordan) => [ - q(0114), - q(1), + q(heard island and mcdonald islands) => [ + q(0264), + q(0), ], q(heard island and mcdonald islands) => [ q(0097), q(0), ], - q(hellenic republic) => [ - q(0086), - q(1), - ], q(holy see) => [ q(0098), q(1), @@ -1803,7 +1549,7 @@ $Locale::Codes::Data{'country'}{'alias2id'} = { ], q(holy see (vatican city)) => [ q(0098), - q(4), + q(3), ], q(honduras) => [ q(0099), @@ -1817,16 +1563,12 @@ $Locale::Codes::Data{'country'}{'alias2id'} = { q(0100), q(2), ], - q(hong kong special administrative region) => [ - q(0100), - q(3), - ], q(hong kong special administrative region of china) => [ q(0100), - q(4), + q(3), ], q(howland island) => [ - q(0261), + q(0265), q(0), ], q(hungary) => [ @@ -1837,14 +1579,6 @@ $Locale::Codes::Data{'country'}{'alias2id'} = { q(0102), q(0), ], - q(independent state of papua new guinea) => [ - q(0172), - q(1), - ], - q(independent state of samoa) => [ - q(0192), - q(1), - ], q(india) => [ q(0103), q(0), @@ -1873,22 +1607,6 @@ $Locale::Codes::Data{'country'}{'alias2id'} = { q(0107), q(0), ], - q(islamic republic of iran) => [ - q(0105), - q(3), - ], - q(islamic republic of mauritania) => [ - q(0141), - q(1), - ], - q(islamic republic of pakistan) => [ - q(0168), - q(1), - ], - q(islamic state of afghanistan) => [ - q(0001), - q(1), - ], q(isle of man) => [ q(0108), q(0), @@ -1897,10 +1615,6 @@ $Locale::Codes::Data{'country'}{'alias2id'} = { q(0109), q(0), ], - q(italian republic) => [ - q(0110), - q(1), - ], q(italy) => [ q(0110), q(0), @@ -1910,7 +1624,7 @@ $Locale::Codes::Data{'country'}{'alias2id'} = { q(0), ], q(jan mayen) => [ - q(0262), + q(0266), q(0), ], q(japan) => [ @@ -1918,7 +1632,7 @@ $Locale::Codes::Data{'country'}{'alias2id'} = { q(0), ], q(jarvis island) => [ - q(0263), + q(0267), q(0), ], q(jersey) => [ @@ -1926,7 +1640,7 @@ $Locale::Codes::Data{'country'}{'alias2id'} = { q(0), ], q(johnston atoll) => [ - q(0264), + q(0268), q(0), ], q(jordan) => [ @@ -1934,7 +1648,7 @@ $Locale::Codes::Data{'country'}{'alias2id'} = { q(0), ], q(juan de nova island) => [ - q(0265), + q(0269), q(0), ], q(kazakhstan) => [ @@ -1943,104 +1657,48 @@ $Locale::Codes::Data{'country'}{'alias2id'} = { ], q(kazakstan) => [ q(0115), - q(2), + q(1), ], q(keeling islands) => [ q(0048), - q(2), + q(1), ], q(kenya) => [ q(0116), q(0), ], - q(kingdom of belgium) => [ - q(0022), - q(1), - ], - q(kingdom of bhutan) => [ - q(0026), - q(1), + q(kingman reef) => [ + q(0270), + q(0), ], - q(kingdom of cambodia) => [ - q(0038), - q(1), + q(kiribati) => [ + q(0117), + q(0), ], - q(kingdom of denmark) => [ - q(0061), - q(1), - ], - q(kingdom of morocco) => [ - q(0151), - q(1), - ], - q(kingdom of nepal) => [ - q(0156), - q(1), - ], - q(kingdom of norway) => [ - q(0166), - q(1), - ], - q(kingdom of saudi arabia) => [ - q(0195), - q(1), - ], - q(kingdom of spain) => [ - q(0209), - q(1), - ], - q(kingdom of swaziland) => [ - q(0214), - q(1), - ], - q(kingdom of sweden) => [ - q(0215), - q(1), - ], - q(kingdom of thailand) => [ - q(0221), - q(1), - ], - q(kingdom of the netherlands) => [ - q(0157), - q(1), - ], - q(kingdom of tonga) => [ - q(0225), - q(1), - ], - q(kingman reef) => [ - q(0266), - q(0), - ], - q(kiribati) => [ - q(0117), - q(0), - ], - q(korea, democratic people's republic of) => [ - q(0118), - q(0), + q(korea, democratic people's republic of) => [ + q(0118), + q(0), ], q(korea, north) => [ - q(0118), - q(2), + q(0271), + q(0), ], q(korea, republic of) => [ q(0119), q(0), ], q(korea, south) => [ - q(0119), - q(2), + q(0272), + q(0), + ], + q(kosovo) => [ + q(0273), + q(0), ], q(kuwait) => [ q(0120), q(0), ], - q(kyrgyz republic) => [ - q(0121), - q(1), - ], q(kyrgyzstan) => [ q(0121), q(0), @@ -2050,17 +1708,13 @@ $Locale::Codes::Data{'country'}{'alias2id'} = { q(0), ], q(laos) => [ - q(0122), - q(1), + q(0274), + q(0), ], q(latvia) => [ q(0123), q(0), ], - q(lebanese republic) => [ - q(0124), - q(1), - ], q(lebanon) => [ q(0124), q(0), @@ -2095,31 +1749,27 @@ $Locale::Codes::Data{'country'}{'alias2id'} = { ], q(macao special administrative region of china) => [ q(0131), - q(6), + q(5), ], q(macau) => [ q(0131), - q(5), + q(2), ], q(macau s.a.r) => [ q(0131), - q(2), + q(3), ], q(macau s.a.r.) => [ q(0131), q(4), ], - q(macau special administrative region) => [ - q(0131), - q(3), - ], q(macedonia) => [ q(0132), q(2), ], q(macedonia, former yugoslav republic of) => [ q(0132), - q(4), + q(3), ], q(macedonia, the former yugoslav republic of) => [ q(0132), @@ -2182,12 +1832,12 @@ $Locale::Codes::Data{'country'}{'alias2id'} = { q(0), ], q(midway islands) => [ - q(0267), + q(0275), q(0), ], q(moldova) => [ - q(0146), - q(2), + q(0276), + q(0), ], q(moldova, republic of) => [ q(0146), @@ -2230,13 +1880,9 @@ $Locale::Codes::Data{'country'}{'alias2id'} = { q(0), ], q(navassa island) => [ - q(0268), + q(0277), q(0), ], - q(negara brunei darussalam) => [ - q(0034), - q(2), - ], q(nepal) => [ q(0156), q(0), @@ -2246,7 +1892,7 @@ $Locale::Codes::Data{'country'}{'alias2id'} = { q(0), ], q(netherlands antilles) => [ - q(0269), + q(0292), q(0), ], q(new caledonia) => [ @@ -2279,7 +1925,7 @@ $Locale::Codes::Data{'country'}{'alias2id'} = { ], q(north korea) => [ q(0118), - q(3), + q(2), ], q(northern mariana islands) => [ q(0165), @@ -2297,10 +1943,6 @@ $Locale::Codes::Data{'country'}{'alias2id'} = { q(0167), q(0), ], - q(oriental republic of uruguay) => [ - q(0238), - q(1), - ], q(pakistan) => [ q(0168), q(0), @@ -2314,7 +1956,7 @@ $Locale::Codes::Data{'country'}{'alias2id'} = { q(0), ], q(palmyra atoll) => [ - q(0270), + q(0278), q(0), ], q(panama) => [ @@ -2326,25 +1968,13 @@ $Locale::Codes::Data{'country'}{'alias2id'} = { q(0), ], q(paracel islands) => [ - q(0271), + q(0279), q(0), ], q(paraguay) => [ q(0173), q(0), ], - q(people's democratic republic of algeria) => [ - q(0004), - q(1), - ], - q(people's republic of bangladesh) => [ - q(0019), - q(1), - ], - q(people's republic of china) => [ - q(0046), - q(1), - ], q(peru) => [ q(0174), q(0), @@ -2359,16 +1989,12 @@ $Locale::Codes::Data{'country'}{'alias2id'} = { ], q(pitcairn island) => [ q(0176), - q(3), + q(2), ], q(pitcairn islands) => [ q(0176), q(1), ], - q(pitcairn, henderson, ducie and oeno islands) => [ - q(0176), - q(2), - ], q(poland) => [ q(0177), q(0), @@ -2377,26 +2003,6 @@ $Locale::Codes::Data{'country'}{'alias2id'} = { q(0178), q(0), ], - q(portuguese republic) => [ - q(0178), - q(1), - ], - q(portuguese timor) => [ - q(0281), - q(0), - ], - q(principality of andorra) => [ - q(0006), - q(1), - ], - q(principality of liechtenstein) => [ **** PATCH TRUNCATED AT 2000 LINES -- 8605 NOT SHOWN **** -- Perl5 Master Repository
