Index: modules/contact_dir/fields.inc =================================================================== RCS file: /cvs/drupal/contributions/modules/contact_dir/fields.inc,v retrieving revision 1.4 diff -u -r1.4 fields.inc --- modules/contact_dir/fields.inc 1 Mar 2005 20:58:26 -0000 1.4 +++ modules/contact_dir/fields.inc 16 Mar 2005 16:59:22 -0000 @@ -1,6 +1,6 @@ country-name pairs (as in ISO 3166-1 alpha-2) as an array */ function _get_contact_country_list() { - $countries = array(); - - $countries['0'] = '[Select]'; - $countries['UNITED STATES'] = 'UNITED STATES'; - $countries['CANADA'] = 'CANADA'; - - return $countries; + return array('0' => '[Select]', + 'ad' => 'Andorra', + 'ae' => 'United Arab Emirates', + 'af' => 'Afghanistan', + 'ag' => 'Antigua and Barbuda', + 'ai' => 'Anguilla', + 'al' => 'Albania', + 'am' => 'Armenia', + 'an' => 'Netherlands Antilles', + 'ao' => 'Angola', + 'aq' => 'Antarctica', + 'ar' => 'Argentina', + 'as' => 'American Samoa', + 'at' => 'Austria', + 'au' => 'Australia', + 'aw' => 'Aruba', + 'ax' => 'Aland Islands', + 'az' => 'Azerbaijan', + 'ba' => 'Bosnia and Herzegovina', + 'bb' => 'Barbados', + 'bd' => 'Bangladesh', + 'be' => 'Belgium', + 'bf' => 'Burkina Faso', + 'bg' => 'Bulgaria', + 'bh' => 'Bahrain', + 'bi' => 'Burundi', + 'bj' => 'Benin', + 'bm' => 'Bermuda', + 'bn' => 'Brunei Darussalam', + 'bo' => 'Bolivia', + 'br' => 'Brazil', + 'bs' => 'Bahamas', + 'bt' => 'Bhutan', + 'bv' => 'Bouvet Island', + 'bw' => 'Botswana', + 'by' => 'Belarus', + 'bz' => 'Belize', + 'ca' => 'Canada', + 'cc' => 'Cocos (Keeling) Islands', + 'cd' => 'Democratic Republic of the Congo (formerly Zaire)', + 'cf' => 'Central African Republic', + 'cg' => 'Congo (Republic of the Congo)', + 'ch' => 'Switzerland (Confoederatio Helvetica)', + 'ci' => 'Cote d\'Ivoire (Ivory Coast)', + 'ck' => 'Cook Islands', + 'cl' => 'Chile', + 'cm' => 'Cameroon', + 'cn' => 'China', + 'co' => 'Colombia', + 'cr' => 'Costa Rica', + 'cs' => 'Serbia and Montenegro', + 'cu' => 'Cuba', + 'cv' => 'Cape Verde', + 'cx' => 'Christmas Island', + 'cy' => 'Cyprus', + 'cz' => 'Czech Republic', + 'de' => 'Germany (Deutschland)', + 'dj' => 'Djibouti', + 'dk' => 'Denmark', + 'dm' => 'Dominica', + 'do' => 'Dominican Republic', + 'dz' => 'Algeria', + 'ec' => 'Ecuador', + 'ee' => 'Estonia', + 'eg' => 'Egypt', + 'eh' => 'Western Sahara (formerly Spanish Sahara)', + 'er' => 'Eritrea', + 'es' => 'Spain (Espana)', + 'et' => 'Ethiopia', + 'fi' => 'Finland', + 'fj' => 'Fiji', + 'fk' => 'Falkland Islands', + 'fm' => 'Federated States of Micronesia', + 'fo' => 'Faroe Islands', + 'fr' => 'France', + 'ga' => 'Gabon', + 'gb' => 'United Kingdom', + 'gd' => 'Grenada', + 'ge' => 'Georgia', + 'gf' => 'French Guiana', + 'gd' => 'Ghana', + 'gi' => 'Gibraltar', + 'gl' => 'Greenland', + 'gm' => 'Gambia', + 'gn' => 'Guinea', + 'gp' => 'Guadeloupe', + 'gq' => 'Equatorial Guinea', + 'gr' => 'Greece', + 'gs' => 'South Georgia and the South Sandwich Islands', + 'gt' => 'Guatemala', + 'gu' => 'Guam', + 'gw' => 'Guinea-Bissau', + 'gy' => 'Guyana', + 'hk' => 'Hong Kong', + 'hm' => 'Heard Island and McDonald Islands', + 'hn' => 'Honduras', + 'hr' => 'Croatia (Hrvatska)', + 'ht' => 'Haiti', + 'hu' => 'Hungary', + 'id' => 'Indonesia', + 'ie' => 'Ireland', + 'il' => 'Israel', + 'in' => 'India', + 'io' => 'British Indian Ocean Territory (including Diego Garcia)', + 'iq' => 'Iraq', + 'ir' => 'Iran', + 'is' => 'Iceland', + 'it' => 'Italy', + 'jm' => 'Jamaica', + 'jo' => 'Jordan', + 'jp' => 'Japan', + 'ke' => 'Kenya', + 'kg' => 'Kyrgyzstan', + 'kh' => 'Cambodia', + 'ki' => 'Kiribati', + 'km' => 'Comoros', + 'kn' => 'Saint Kitts and Nevis', + 'kp' => 'North Korea', + 'kr' => 'South Korea', + 'kw' => 'Kuwait', + 'ky' => 'Cayman Islands', + 'kz' => 'Kazakhstan', + 'la' => 'Laos', + 'lb' => 'Lebanon', + 'lc' => 'Saint Lucia', + 'li' => 'Liechtenstein', + 'lk' => 'Sri Lanka', + 'lr' => 'Liberia', + 'ls' => 'Lesotho', + 'lt' => 'Lithuania', + 'lu' => 'Luxembourg', + 'lv' => 'Latvia', + 'ly' => 'Libya', + 'ma' => 'Morocco', + 'mc' => 'Monaco', + 'md' => 'Moldova', + 'mg' => 'Madagascar', + 'mh' => 'Marshall Islands', + 'mk' => 'Former Yugoslav Republic of Macedonia', + 'ml' => 'Mali', + 'mm' => 'Myanmar (Burma)', + 'mn' => 'Mongolia', + 'mo' => 'Macao (Macau)', + 'mp' => 'Northern Mariana Islands', + 'mq' => 'Martinique', + 'mr' => 'Mauritania', + 'ms' => 'Montserrat', + 'mt' => 'Malta', + 'mu' => 'Mauritius', + 'mv' => 'Maldives', + 'mw' => 'Malawi', + 'mx' => 'Mexico', + 'my' => 'Malaysia', + 'mz' => 'Mozambique', + 'na' => 'Namibia', + 'nc' => 'New Caledonia', + 'ne' => 'Niger', + 'nf' => 'Norfolk Island', + 'ng' => 'Nigeria', + 'ni' => 'Nicaragua', + 'nl' => 'Netherlands', + 'no' => 'Norway', + 'np' => 'Nepal', + 'nr' => 'Nauru', + 'nu' => 'Niue', + 'nz' => 'New Zealand', + 'om' => 'Oman', + 'pa' => 'Panama', + 'pe' => 'Peru', + 'pf' => 'French Polynesia', + 'pg' => 'Papua New Guinea', + 'ph' => 'Philippines', + 'pk' => 'Pakistan', + 'pl' => 'Poland', + 'pm' => 'Saint-Pierre and Miquelon', + 'pn' => 'Pitcairn Islands', + 'pr' => 'Puerto Rico', + 'ps' => 'Palestinian Territories (West Bank and Gaza Strip)', + 'pt' => 'Portugal', + 'pw' => 'Palau', + 'py' => 'Paraguay', + 'qa' => 'Qatar', + 're' => 'Reunion', + 'ro' => 'Romania', + 'ru' => 'Russia', + 'rw' => 'Rwanda', + 'sa' => 'Saudi Arabia', + 'sb' => 'Solomon Islands', + 'sc' => 'Seychelles', + 'sd' => 'Sudan', + 'se' => 'Sweden', + 'sg' => 'Singapore', + 'sh' => 'Saint Helena', + 'si' => 'Slovenia', + 'sj' => 'Svalbard and Jan Mayen Islands', + 'sk' => 'Slovakia', + 'sl' => 'Sierra Leone', + 'sm' => 'San Marino', + 'sn' => 'Senegal', + 'so' => 'Somalia', + 'sr' => 'Suriname', + 'st' => 'Sao Tome and Principe', + 'sv' => 'El Salvador', + 'sy' => 'Syria', + 'sz' => 'Swaziland', + 'tc' => 'Turks and Caicos Islands', + 'td' => 'Chad (Tchad)', + 'tf' => 'French Southern Territories', + 'tg' => 'Togo', + 'th' => 'Thailand', + 'tj' => 'Tajikistan', + 'tk' => 'Tokelau', + 'tl' => 'Timor-Leste (East Timor)', + 'tm' => 'Turkmenistan', + 'tn' => 'Tunisia', + 'to' => 'Tonga', + 'tr' => 'Turkey', + 'tt' => 'Trinidad and Tobago', + 'tv' => 'Tuvalu', + 'tw' => 'Taiwan', + 'tz' => 'Tanzania', + 'ua' => 'Ukraine', + 'ug' => 'Uganda', + 'um' => 'United States Minor Outlying Islands', + 'us' => 'United States', + 'uy' => 'Uruguay', + 'uz' => 'Uzbekistan', + 'va' => 'Vatican City', + 'vc' => 'Saint Vincent and the Grenadines', + 've' => 'Venezuela', + 'vg' => 'British Virgin Islands', + 'vi' => 'U.S. Virgin Islands', + 'vn' => 'Vietnam', + 'vu' => 'Vanuatu', + 'wf' => 'Wallis and Futuna', + 'ws' => 'Samoa', + 'ye' => 'Yemen', + 'yt' => 'Mayotte', + 'za' => 'South Africa', + 'zm' => 'Zambia', + 'zw' => 'Zimbabwe' + ); } /** @@ -257,6 +492,7 @@ $states = array(); $states['0'] = '[Select]'; + $states['xx'] = 'Outside USA'; $states['AK'] = 'AK'; $states['AS'] = 'AS'; $states['AZ'] = 'AZ'; @@ -315,7 +551,6 @@ $states['WV'] = 'WV'; $states['WI'] = 'WI'; $states['WY'] = 'WY'; - $states['OUTSIDE USA'] = 'OUTSIDE USA'; return $states; }