From d88425f47eacd5245cd9e0023a38210928922e79 Mon Sep 17 00:00:00 2001 From: Mike Jolley Date: Wed, 28 May 2014 16:48:21 +0100 Subject: [PATCH] Load countries and states when needed rather than in the constructor. Closes #4158 --- i18n/countries.php | 260 ++++++++++++++++++++++++ includes/class-wc-countries.php | 343 +++++--------------------------- 2 files changed, 311 insertions(+), 292 deletions(-) create mode 100644 i18n/countries.php diff --git a/i18n/countries.php b/i18n/countries.php new file mode 100644 index 00000000000..5c572e175a6 --- /dev/null +++ b/i18n/countries.php @@ -0,0 +1,260 @@ + __( 'Afghanistan', 'woocommerce' ), + 'AX' => __( 'Åland Islands', 'woocommerce' ), + 'AL' => __( 'Albania', 'woocommerce' ), + 'DZ' => __( 'Algeria', 'woocommerce' ), + 'AD' => __( 'Andorra', 'woocommerce' ), + 'AO' => __( 'Angola', 'woocommerce' ), + 'AI' => __( 'Anguilla', 'woocommerce' ), + 'AQ' => __( 'Antarctica', 'woocommerce' ), + 'AG' => __( 'Antigua and Barbuda', 'woocommerce' ), + 'AR' => __( 'Argentina', 'woocommerce' ), + 'AM' => __( 'Armenia', 'woocommerce' ), + 'AW' => __( 'Aruba', 'woocommerce' ), + 'AU' => __( 'Australia', 'woocommerce' ), + 'AT' => __( 'Austria', 'woocommerce' ), + 'AZ' => __( 'Azerbaijan', 'woocommerce' ), + 'BS' => __( 'Bahamas', 'woocommerce' ), + 'BH' => __( 'Bahrain', 'woocommerce' ), + 'BD' => __( 'Bangladesh', 'woocommerce' ), + 'BB' => __( 'Barbados', 'woocommerce' ), + 'BY' => __( 'Belarus', 'woocommerce' ), + 'BE' => __( 'Belgium', 'woocommerce' ), + 'PW' => __( 'Belau', 'woocommerce' ), + 'BZ' => __( 'Belize', 'woocommerce' ), + 'BJ' => __( 'Benin', 'woocommerce' ), + 'BM' => __( 'Bermuda', 'woocommerce' ), + 'BT' => __( 'Bhutan', 'woocommerce' ), + 'BO' => __( 'Bolivia', 'woocommerce' ), + 'BQ' => __( 'Bonaire, Saint Eustatius and Saba', 'woocommerce' ), + 'BA' => __( 'Bosnia and Herzegovina', 'woocommerce' ), + 'BW' => __( 'Botswana', 'woocommerce' ), + 'BV' => __( 'Bouvet Island', 'woocommerce' ), + 'BR' => __( 'Brazil', 'woocommerce' ), + 'IO' => __( 'British Indian Ocean Territory', 'woocommerce' ), + 'VG' => __( 'British Virgin Islands', 'woocommerce' ), + 'BN' => __( 'Brunei', 'woocommerce' ), + 'BG' => __( 'Bulgaria', 'woocommerce' ), + 'BF' => __( 'Burkina Faso', 'woocommerce' ), + 'BI' => __( 'Burundi', 'woocommerce' ), + 'KH' => __( 'Cambodia', 'woocommerce' ), + 'CM' => __( 'Cameroon', 'woocommerce' ), + 'CA' => __( 'Canada', 'woocommerce' ), + 'CV' => __( 'Cape Verde', 'woocommerce' ), + 'KY' => __( 'Cayman Islands', 'woocommerce' ), + 'CF' => __( 'Central African Republic', 'woocommerce' ), + 'TD' => __( 'Chad', 'woocommerce' ), + 'CL' => __( 'Chile', 'woocommerce' ), + 'CN' => __( 'China', 'woocommerce' ), + 'CX' => __( 'Christmas Island', 'woocommerce' ), + 'CC' => __( 'Cocos (Keeling) Islands', 'woocommerce' ), + 'CO' => __( 'Colombia', 'woocommerce' ), + 'KM' => __( 'Comoros', 'woocommerce' ), + 'CG' => __( 'Congo (Brazzaville)', 'woocommerce' ), + 'CD' => __( 'Congo (Kinshasa)', 'woocommerce' ), + 'CK' => __( 'Cook Islands', 'woocommerce' ), + 'CR' => __( 'Costa Rica', 'woocommerce' ), + 'HR' => __( 'Croatia', 'woocommerce' ), + 'CU' => __( 'Cuba', 'woocommerce' ), + 'CW' => __( 'CuraÇao', 'woocommerce' ), + 'CY' => __( 'Cyprus', 'woocommerce' ), + 'CZ' => __( 'Czech Republic', 'woocommerce' ), + 'DK' => __( 'Denmark', 'woocommerce' ), + 'DJ' => __( 'Djibouti', 'woocommerce' ), + 'DM' => __( 'Dominica', 'woocommerce' ), + 'DO' => __( 'Dominican Republic', 'woocommerce' ), + 'EC' => __( 'Ecuador', 'woocommerce' ), + 'EG' => __( 'Egypt', 'woocommerce' ), + 'SV' => __( 'El Salvador', 'woocommerce' ), + 'GQ' => __( 'Equatorial Guinea', 'woocommerce' ), + 'ER' => __( 'Eritrea', 'woocommerce' ), + 'EE' => __( 'Estonia', 'woocommerce' ), + 'ET' => __( 'Ethiopia', 'woocommerce' ), + 'FK' => __( 'Falkland Islands', 'woocommerce' ), + 'FO' => __( 'Faroe Islands', 'woocommerce' ), + 'FJ' => __( 'Fiji', 'woocommerce' ), + 'FI' => __( 'Finland', 'woocommerce' ), + 'FR' => __( 'France', 'woocommerce' ), + 'GF' => __( 'French Guiana', 'woocommerce' ), + 'PF' => __( 'French Polynesia', 'woocommerce' ), + 'TF' => __( 'French Southern Territories', 'woocommerce' ), + 'GA' => __( 'Gabon', 'woocommerce' ), + 'GM' => __( 'Gambia', 'woocommerce' ), + 'GE' => __( 'Georgia', 'woocommerce' ), + 'DE' => __( 'Germany', 'woocommerce' ), + 'GH' => __( 'Ghana', 'woocommerce' ), + 'GI' => __( 'Gibraltar', 'woocommerce' ), + 'GR' => __( 'Greece', 'woocommerce' ), + 'GL' => __( 'Greenland', 'woocommerce' ), + 'GD' => __( 'Grenada', 'woocommerce' ), + 'GP' => __( 'Guadeloupe', 'woocommerce' ), + 'GT' => __( 'Guatemala', 'woocommerce' ), + 'GG' => __( 'Guernsey', 'woocommerce' ), + 'GN' => __( 'Guinea', 'woocommerce' ), + 'GW' => __( 'Guinea-Bissau', 'woocommerce' ), + 'GY' => __( 'Guyana', 'woocommerce' ), + 'HT' => __( 'Haiti', 'woocommerce' ), + 'HM' => __( 'Heard Island and McDonald Islands', 'woocommerce' ), + 'HN' => __( 'Honduras', 'woocommerce' ), + 'HK' => __( 'Hong Kong', 'woocommerce' ), + 'HU' => __( 'Hungary', 'woocommerce' ), + 'IS' => __( 'Iceland', 'woocommerce' ), + 'IN' => __( 'India', 'woocommerce' ), + 'ID' => __( 'Indonesia', 'woocommerce' ), + 'IR' => __( 'Iran', 'woocommerce' ), + 'IQ' => __( 'Iraq', 'woocommerce' ), + 'IE' => __( 'Republic of Ireland', 'woocommerce' ), + 'IM' => __( 'Isle of Man', 'woocommerce' ), + 'IL' => __( 'Israel', 'woocommerce' ), + 'IT' => __( 'Italy', 'woocommerce' ), + 'CI' => __( 'Ivory Coast', 'woocommerce' ), + 'JM' => __( 'Jamaica', 'woocommerce' ), + 'JP' => __( 'Japan', 'woocommerce' ), + 'JE' => __( 'Jersey', 'woocommerce' ), + 'JO' => __( 'Jordan', 'woocommerce' ), + 'KZ' => __( 'Kazakhstan', 'woocommerce' ), + 'KE' => __( 'Kenya', 'woocommerce' ), + 'KI' => __( 'Kiribati', 'woocommerce' ), + 'KW' => __( 'Kuwait', 'woocommerce' ), + 'KG' => __( 'Kyrgyzstan', 'woocommerce' ), + 'LA' => __( 'Laos', 'woocommerce' ), + 'LV' => __( 'Latvia', 'woocommerce' ), + 'LB' => __( 'Lebanon', 'woocommerce' ), + 'LS' => __( 'Lesotho', 'woocommerce' ), + 'LR' => __( 'Liberia', 'woocommerce' ), + 'LY' => __( 'Libya', 'woocommerce' ), + 'LI' => __( 'Liechtenstein', 'woocommerce' ), + 'LT' => __( 'Lithuania', 'woocommerce' ), + 'LU' => __( 'Luxembourg', 'woocommerce' ), + 'MO' => __( 'Macao S.A.R., China', 'woocommerce' ), + 'MK' => __( 'Macedonia', 'woocommerce' ), + 'MG' => __( 'Madagascar', 'woocommerce' ), + 'MW' => __( 'Malawi', 'woocommerce' ), + 'MY' => __( 'Malaysia', 'woocommerce' ), + 'MV' => __( 'Maldives', 'woocommerce' ), + 'ML' => __( 'Mali', 'woocommerce' ), + 'MT' => __( 'Malta', 'woocommerce' ), + 'MH' => __( 'Marshall Islands', 'woocommerce' ), + 'MQ' => __( 'Martinique', 'woocommerce' ), + 'MR' => __( 'Mauritania', 'woocommerce' ), + 'MU' => __( 'Mauritius', 'woocommerce' ), + 'YT' => __( 'Mayotte', 'woocommerce' ), + 'MX' => __( 'Mexico', 'woocommerce' ), + 'FM' => __( 'Micronesia', 'woocommerce' ), + 'MD' => __( 'Moldova', 'woocommerce' ), + 'MC' => __( 'Monaco', 'woocommerce' ), + 'MN' => __( 'Mongolia', 'woocommerce' ), + 'ME' => __( 'Montenegro', 'woocommerce' ), + 'MS' => __( 'Montserrat', 'woocommerce' ), + 'MA' => __( 'Morocco', 'woocommerce' ), + 'MZ' => __( 'Mozambique', 'woocommerce' ), + 'MM' => __( 'Myanmar', 'woocommerce' ), + 'NA' => __( 'Namibia', 'woocommerce' ), + 'NR' => __( 'Nauru', 'woocommerce' ), + 'NP' => __( 'Nepal', 'woocommerce' ), + 'NL' => __( 'Netherlands', 'woocommerce' ), + 'AN' => __( 'Netherlands Antilles', 'woocommerce' ), + 'NC' => __( 'New Caledonia', 'woocommerce' ), + 'NZ' => __( 'New Zealand', 'woocommerce' ), + 'NI' => __( 'Nicaragua', 'woocommerce' ), + 'NE' => __( 'Niger', 'woocommerce' ), + 'NG' => __( 'Nigeria', 'woocommerce' ), + 'NU' => __( 'Niue', 'woocommerce' ), + 'NF' => __( 'Norfolk Island', 'woocommerce' ), + 'KP' => __( 'North Korea', 'woocommerce' ), + 'NO' => __( 'Norway', 'woocommerce' ), + 'OM' => __( 'Oman', 'woocommerce' ), + 'PK' => __( 'Pakistan', 'woocommerce' ), + 'PS' => __( 'Palestinian Territory', 'woocommerce' ), + 'PA' => __( 'Panama', 'woocommerce' ), + 'PG' => __( 'Papua New Guinea', 'woocommerce' ), + 'PY' => __( 'Paraguay', 'woocommerce' ), + 'PE' => __( 'Peru', 'woocommerce' ), + 'PH' => __( 'Philippines', 'woocommerce' ), + 'PN' => __( 'Pitcairn', 'woocommerce' ), + 'PL' => __( 'Poland', 'woocommerce' ), + 'PT' => __( 'Portugal', 'woocommerce' ), + 'QA' => __( 'Qatar', 'woocommerce' ), + 'RE' => __( 'Reunion', 'woocommerce' ), + 'RO' => __( 'Romania', 'woocommerce' ), + 'RU' => __( 'Russia', 'woocommerce' ), + 'RW' => __( 'Rwanda', 'woocommerce' ), + 'BL' => __( 'Saint Barthélemy', 'woocommerce' ), + 'SH' => __( 'Saint Helena', 'woocommerce' ), + 'KN' => __( 'Saint Kitts and Nevis', 'woocommerce' ), + 'LC' => __( 'Saint Lucia', 'woocommerce' ), + 'MF' => __( 'Saint Martin (French part)', 'woocommerce' ), + 'SX' => __( 'Saint Martin (Dutch part)', 'woocommerce' ), + 'PM' => __( 'Saint Pierre and Miquelon', 'woocommerce' ), + 'VC' => __( 'Saint Vincent and the Grenadines', 'woocommerce' ), + 'SM' => __( 'San Marino', 'woocommerce' ), + 'ST' => __( 'São Tomé and Príncipe', 'woocommerce' ), + 'SA' => __( 'Saudi Arabia', 'woocommerce' ), + 'SN' => __( 'Senegal', 'woocommerce' ), + 'RS' => __( 'Serbia', 'woocommerce' ), + 'SC' => __( 'Seychelles', 'woocommerce' ), + 'SL' => __( 'Sierra Leone', 'woocommerce' ), + 'SG' => __( 'Singapore', 'woocommerce' ), + 'SK' => __( 'Slovakia', 'woocommerce' ), + 'SI' => __( 'Slovenia', 'woocommerce' ), + 'SB' => __( 'Solomon Islands', 'woocommerce' ), + 'SO' => __( 'Somalia', 'woocommerce' ), + 'ZA' => __( 'South Africa', 'woocommerce' ), + 'GS' => __( 'South Georgia/Sandwich Islands', 'woocommerce' ), + 'KR' => __( 'South Korea', 'woocommerce' ), + 'SS' => __( 'South Sudan', 'woocommerce' ), + 'ES' => __( 'Spain', 'woocommerce' ), + 'LK' => __( 'Sri Lanka', 'woocommerce' ), + 'SD' => __( 'Sudan', 'woocommerce' ), + 'SR' => __( 'Suriname', 'woocommerce' ), + 'SJ' => __( 'Svalbard and Jan Mayen', 'woocommerce' ), + 'SZ' => __( 'Swaziland', 'woocommerce' ), + 'SE' => __( 'Sweden', 'woocommerce' ), + 'CH' => __( 'Switzerland', 'woocommerce' ), + 'SY' => __( 'Syria', 'woocommerce' ), + 'TW' => __( 'Taiwan', 'woocommerce' ), + 'TJ' => __( 'Tajikistan', 'woocommerce' ), + 'TZ' => __( 'Tanzania', 'woocommerce' ), + 'TH' => __( 'Thailand', 'woocommerce' ), + 'TL' => __( 'Timor-Leste', 'woocommerce' ), + 'TG' => __( 'Togo', 'woocommerce' ), + 'TK' => __( 'Tokelau', 'woocommerce' ), + 'TO' => __( 'Tonga', 'woocommerce' ), + 'TT' => __( 'Trinidad and Tobago', 'woocommerce' ), + 'TN' => __( 'Tunisia', 'woocommerce' ), + 'TR' => __( 'Turkey', 'woocommerce' ), + 'TM' => __( 'Turkmenistan', 'woocommerce' ), + 'TC' => __( 'Turks and Caicos Islands', 'woocommerce' ), + 'TV' => __( 'Tuvalu', 'woocommerce' ), + 'UG' => __( 'Uganda', 'woocommerce' ), + 'UA' => __( 'Ukraine', 'woocommerce' ), + 'AE' => __( 'United Arab Emirates', 'woocommerce' ), + 'GB' => __( 'United Kingdom (UK)', 'woocommerce' ), + 'US' => __( 'United States (US)', 'woocommerce' ), + 'UY' => __( 'Uruguay', 'woocommerce' ), + 'UZ' => __( 'Uzbekistan', 'woocommerce' ), + 'VU' => __( 'Vanuatu', 'woocommerce' ), + 'VA' => __( 'Vatican', 'woocommerce' ), + 'VE' => __( 'Venezuela', 'woocommerce' ), + 'VN' => __( 'Vietnam', 'woocommerce' ), + 'WF' => __( 'Wallis and Futuna', 'woocommerce' ), + 'EH' => __( 'Western Sahara', 'woocommerce' ), + 'WS' => __( 'Western Samoa', 'woocommerce' ), + 'YE' => __( 'Yemen', 'woocommerce' ), + 'ZM' => __( 'Zambia', 'woocommerce' ), + 'ZW' => __( 'Zimbabwe', 'woocommerce' ) +); \ No newline at end of file diff --git a/includes/class-wc-countries.php b/includes/class-wc-countries.php index 7c219efd3a4..7aff40386ac 100644 --- a/includes/class-wc-countries.php +++ b/includes/class-wc-countries.php @@ -5,19 +5,13 @@ * The WooCommerce countries class stores country/state data. * * @class WC_Countries - * @version 1.6.4 + * @version 2.2.0 * @package WooCommerce/Classes * @category Class * @author WooThemes */ class WC_Countries { - /** @var array Array of countries */ - public $countries; - - /** @var array Array of states */ - public $states; - /** @var array Array of locales */ public $locale; @@ -25,260 +19,38 @@ class WC_Countries { public $address_formats; /** - * Constructor for the counties class - defines all countries and states. + * Auto-load in-accessible properties on demand. * - * @access public - * @return void + * @param mixed $key + * @return mixed */ - public function __construct() { - global $states; + public function __get( $key ) { + if ( 'countries' == $key ) { + return $this->get_countries(); + } elseif ( 'states' == $key ) { + return $this->get_states(); + } + } - $this->countries = apply_filters( 'woocommerce_countries', array( - 'AF' => __( 'Afghanistan', 'woocommerce' ), - 'AX' => __( 'Åland Islands', 'woocommerce' ), - 'AL' => __( 'Albania', 'woocommerce' ), - 'DZ' => __( 'Algeria', 'woocommerce' ), - 'AD' => __( 'Andorra', 'woocommerce' ), - 'AO' => __( 'Angola', 'woocommerce' ), - 'AI' => __( 'Anguilla', 'woocommerce' ), - 'AQ' => __( 'Antarctica', 'woocommerce' ), - 'AG' => __( 'Antigua and Barbuda', 'woocommerce' ), - 'AR' => __( 'Argentina', 'woocommerce' ), - 'AM' => __( 'Armenia', 'woocommerce' ), - 'AW' => __( 'Aruba', 'woocommerce' ), - 'AU' => __( 'Australia', 'woocommerce' ), - 'AT' => __( 'Austria', 'woocommerce' ), - 'AZ' => __( 'Azerbaijan', 'woocommerce' ), - 'BS' => __( 'Bahamas', 'woocommerce' ), - 'BH' => __( 'Bahrain', 'woocommerce' ), - 'BD' => __( 'Bangladesh', 'woocommerce' ), - 'BB' => __( 'Barbados', 'woocommerce' ), - 'BY' => __( 'Belarus', 'woocommerce' ), - 'BE' => __( 'Belgium', 'woocommerce' ), - 'PW' => __( 'Belau', 'woocommerce' ), - 'BZ' => __( 'Belize', 'woocommerce' ), - 'BJ' => __( 'Benin', 'woocommerce' ), - 'BM' => __( 'Bermuda', 'woocommerce' ), - 'BT' => __( 'Bhutan', 'woocommerce' ), - 'BO' => __( 'Bolivia', 'woocommerce' ), - 'BQ' => __( 'Bonaire, Saint Eustatius and Saba', 'woocommerce' ), - 'BA' => __( 'Bosnia and Herzegovina', 'woocommerce' ), - 'BW' => __( 'Botswana', 'woocommerce' ), - 'BV' => __( 'Bouvet Island', 'woocommerce' ), - 'BR' => __( 'Brazil', 'woocommerce' ), - 'IO' => __( 'British Indian Ocean Territory', 'woocommerce' ), - 'VG' => __( 'British Virgin Islands', 'woocommerce' ), - 'BN' => __( 'Brunei', 'woocommerce' ), - 'BG' => __( 'Bulgaria', 'woocommerce' ), - 'BF' => __( 'Burkina Faso', 'woocommerce' ), - 'BI' => __( 'Burundi', 'woocommerce' ), - 'KH' => __( 'Cambodia', 'woocommerce' ), - 'CM' => __( 'Cameroon', 'woocommerce' ), - 'CA' => __( 'Canada', 'woocommerce' ), - 'CV' => __( 'Cape Verde', 'woocommerce' ), - 'KY' => __( 'Cayman Islands', 'woocommerce' ), - 'CF' => __( 'Central African Republic', 'woocommerce' ), - 'TD' => __( 'Chad', 'woocommerce' ), - 'CL' => __( 'Chile', 'woocommerce' ), - 'CN' => __( 'China', 'woocommerce' ), - 'CX' => __( 'Christmas Island', 'woocommerce' ), - 'CC' => __( 'Cocos (Keeling) Islands', 'woocommerce' ), - 'CO' => __( 'Colombia', 'woocommerce' ), - 'KM' => __( 'Comoros', 'woocommerce' ), - 'CG' => __( 'Congo (Brazzaville)', 'woocommerce' ), - 'CD' => __( 'Congo (Kinshasa)', 'woocommerce' ), - 'CK' => __( 'Cook Islands', 'woocommerce' ), - 'CR' => __( 'Costa Rica', 'woocommerce' ), - 'HR' => __( 'Croatia', 'woocommerce' ), - 'CU' => __( 'Cuba', 'woocommerce' ), - 'CW' => __( 'CuraÇao', 'woocommerce' ), - 'CY' => __( 'Cyprus', 'woocommerce' ), - 'CZ' => __( 'Czech Republic', 'woocommerce' ), - 'DK' => __( 'Denmark', 'woocommerce' ), - 'DJ' => __( 'Djibouti', 'woocommerce' ), - 'DM' => __( 'Dominica', 'woocommerce' ), - 'DO' => __( 'Dominican Republic', 'woocommerce' ), - 'EC' => __( 'Ecuador', 'woocommerce' ), - 'EG' => __( 'Egypt', 'woocommerce' ), - 'SV' => __( 'El Salvador', 'woocommerce' ), - 'GQ' => __( 'Equatorial Guinea', 'woocommerce' ), - 'ER' => __( 'Eritrea', 'woocommerce' ), - 'EE' => __( 'Estonia', 'woocommerce' ), - 'ET' => __( 'Ethiopia', 'woocommerce' ), - 'FK' => __( 'Falkland Islands', 'woocommerce' ), - 'FO' => __( 'Faroe Islands', 'woocommerce' ), - 'FJ' => __( 'Fiji', 'woocommerce' ), - 'FI' => __( 'Finland', 'woocommerce' ), - 'FR' => __( 'France', 'woocommerce' ), - 'GF' => __( 'French Guiana', 'woocommerce' ), - 'PF' => __( 'French Polynesia', 'woocommerce' ), - 'TF' => __( 'French Southern Territories', 'woocommerce' ), - 'GA' => __( 'Gabon', 'woocommerce' ), - 'GM' => __( 'Gambia', 'woocommerce' ), - 'GE' => __( 'Georgia', 'woocommerce' ), - 'DE' => __( 'Germany', 'woocommerce' ), - 'GH' => __( 'Ghana', 'woocommerce' ), - 'GI' => __( 'Gibraltar', 'woocommerce' ), - 'GR' => __( 'Greece', 'woocommerce' ), - 'GL' => __( 'Greenland', 'woocommerce' ), - 'GD' => __( 'Grenada', 'woocommerce' ), - 'GP' => __( 'Guadeloupe', 'woocommerce' ), - 'GT' => __( 'Guatemala', 'woocommerce' ), - 'GG' => __( 'Guernsey', 'woocommerce' ), - 'GN' => __( 'Guinea', 'woocommerce' ), - 'GW' => __( 'Guinea-Bissau', 'woocommerce' ), - 'GY' => __( 'Guyana', 'woocommerce' ), - 'HT' => __( 'Haiti', 'woocommerce' ), - 'HM' => __( 'Heard Island and McDonald Islands', 'woocommerce' ), - 'HN' => __( 'Honduras', 'woocommerce' ), - 'HK' => __( 'Hong Kong', 'woocommerce' ), - 'HU' => __( 'Hungary', 'woocommerce' ), - 'IS' => __( 'Iceland', 'woocommerce' ), - 'IN' => __( 'India', 'woocommerce' ), - 'ID' => __( 'Indonesia', 'woocommerce' ), - 'IR' => __( 'Iran', 'woocommerce' ), - 'IQ' => __( 'Iraq', 'woocommerce' ), - 'IE' => __( 'Republic of Ireland', 'woocommerce' ), - 'IM' => __( 'Isle of Man', 'woocommerce' ), - 'IL' => __( 'Israel', 'woocommerce' ), - 'IT' => __( 'Italy', 'woocommerce' ), - 'CI' => __( 'Ivory Coast', 'woocommerce' ), - 'JM' => __( 'Jamaica', 'woocommerce' ), - 'JP' => __( 'Japan', 'woocommerce' ), - 'JE' => __( 'Jersey', 'woocommerce' ), - 'JO' => __( 'Jordan', 'woocommerce' ), - 'KZ' => __( 'Kazakhstan', 'woocommerce' ), - 'KE' => __( 'Kenya', 'woocommerce' ), - 'KI' => __( 'Kiribati', 'woocommerce' ), - 'KW' => __( 'Kuwait', 'woocommerce' ), - 'KG' => __( 'Kyrgyzstan', 'woocommerce' ), - 'LA' => __( 'Laos', 'woocommerce' ), - 'LV' => __( 'Latvia', 'woocommerce' ), - 'LB' => __( 'Lebanon', 'woocommerce' ), - 'LS' => __( 'Lesotho', 'woocommerce' ), - 'LR' => __( 'Liberia', 'woocommerce' ), - 'LY' => __( 'Libya', 'woocommerce' ), - 'LI' => __( 'Liechtenstein', 'woocommerce' ), - 'LT' => __( 'Lithuania', 'woocommerce' ), - 'LU' => __( 'Luxembourg', 'woocommerce' ), - 'MO' => __( 'Macao S.A.R., China', 'woocommerce' ), - 'MK' => __( 'Macedonia', 'woocommerce' ), - 'MG' => __( 'Madagascar', 'woocommerce' ), - 'MW' => __( 'Malawi', 'woocommerce' ), - 'MY' => __( 'Malaysia', 'woocommerce' ), - 'MV' => __( 'Maldives', 'woocommerce' ), - 'ML' => __( 'Mali', 'woocommerce' ), - 'MT' => __( 'Malta', 'woocommerce' ), - 'MH' => __( 'Marshall Islands', 'woocommerce' ), - 'MQ' => __( 'Martinique', 'woocommerce' ), - 'MR' => __( 'Mauritania', 'woocommerce' ), - 'MU' => __( 'Mauritius', 'woocommerce' ), - 'YT' => __( 'Mayotte', 'woocommerce' ), - 'MX' => __( 'Mexico', 'woocommerce' ), - 'FM' => __( 'Micronesia', 'woocommerce' ), - 'MD' => __( 'Moldova', 'woocommerce' ), - 'MC' => __( 'Monaco', 'woocommerce' ), - 'MN' => __( 'Mongolia', 'woocommerce' ), - 'ME' => __( 'Montenegro', 'woocommerce' ), - 'MS' => __( 'Montserrat', 'woocommerce' ), - 'MA' => __( 'Morocco', 'woocommerce' ), - 'MZ' => __( 'Mozambique', 'woocommerce' ), - 'MM' => __( 'Myanmar', 'woocommerce' ), - 'NA' => __( 'Namibia', 'woocommerce' ), - 'NR' => __( 'Nauru', 'woocommerce' ), - 'NP' => __( 'Nepal', 'woocommerce' ), - 'NL' => __( 'Netherlands', 'woocommerce' ), - 'AN' => __( 'Netherlands Antilles', 'woocommerce' ), - 'NC' => __( 'New Caledonia', 'woocommerce' ), - 'NZ' => __( 'New Zealand', 'woocommerce' ), - 'NI' => __( 'Nicaragua', 'woocommerce' ), - 'NE' => __( 'Niger', 'woocommerce' ), - 'NG' => __( 'Nigeria', 'woocommerce' ), - 'NU' => __( 'Niue', 'woocommerce' ), - 'NF' => __( 'Norfolk Island', 'woocommerce' ), - 'KP' => __( 'North Korea', 'woocommerce' ), - 'NO' => __( 'Norway', 'woocommerce' ), - 'OM' => __( 'Oman', 'woocommerce' ), - 'PK' => __( 'Pakistan', 'woocommerce' ), - 'PS' => __( 'Palestinian Territory', 'woocommerce' ), - 'PA' => __( 'Panama', 'woocommerce' ), - 'PG' => __( 'Papua New Guinea', 'woocommerce' ), - 'PY' => __( 'Paraguay', 'woocommerce' ), - 'PE' => __( 'Peru', 'woocommerce' ), - 'PH' => __( 'Philippines', 'woocommerce' ), - 'PN' => __( 'Pitcairn', 'woocommerce' ), - 'PL' => __( 'Poland', 'woocommerce' ), - 'PT' => __( 'Portugal', 'woocommerce' ), - 'QA' => __( 'Qatar', 'woocommerce' ), - 'RE' => __( 'Reunion', 'woocommerce' ), - 'RO' => __( 'Romania', 'woocommerce' ), - 'RU' => __( 'Russia', 'woocommerce' ), - 'RW' => __( 'Rwanda', 'woocommerce' ), - 'BL' => __( 'Saint Barthélemy', 'woocommerce' ), - 'SH' => __( 'Saint Helena', 'woocommerce' ), - 'KN' => __( 'Saint Kitts and Nevis', 'woocommerce' ), - 'LC' => __( 'Saint Lucia', 'woocommerce' ), - 'MF' => __( 'Saint Martin (French part)', 'woocommerce' ), - 'SX' => __( 'Saint Martin (Dutch part)', 'woocommerce' ), - 'PM' => __( 'Saint Pierre and Miquelon', 'woocommerce' ), - 'VC' => __( 'Saint Vincent and the Grenadines', 'woocommerce' ), - 'SM' => __( 'San Marino', 'woocommerce' ), - 'ST' => __( 'São Tomé and Príncipe', 'woocommerce' ), - 'SA' => __( 'Saudi Arabia', 'woocommerce' ), - 'SN' => __( 'Senegal', 'woocommerce' ), - 'RS' => __( 'Serbia', 'woocommerce' ), - 'SC' => __( 'Seychelles', 'woocommerce' ), - 'SL' => __( 'Sierra Leone', 'woocommerce' ), - 'SG' => __( 'Singapore', 'woocommerce' ), - 'SK' => __( 'Slovakia', 'woocommerce' ), - 'SI' => __( 'Slovenia', 'woocommerce' ), - 'SB' => __( 'Solomon Islands', 'woocommerce' ), - 'SO' => __( 'Somalia', 'woocommerce' ), - 'ZA' => __( 'South Africa', 'woocommerce' ), - 'GS' => __( 'South Georgia/Sandwich Islands', 'woocommerce' ), - 'KR' => __( 'South Korea', 'woocommerce' ), - 'SS' => __( 'South Sudan', 'woocommerce' ), - 'ES' => __( 'Spain', 'woocommerce' ), - 'LK' => __( 'Sri Lanka', 'woocommerce' ), - 'SD' => __( 'Sudan', 'woocommerce' ), - 'SR' => __( 'Suriname', 'woocommerce' ), - 'SJ' => __( 'Svalbard and Jan Mayen', 'woocommerce' ), - 'SZ' => __( 'Swaziland', 'woocommerce' ), - 'SE' => __( 'Sweden', 'woocommerce' ), - 'CH' => __( 'Switzerland', 'woocommerce' ), - 'SY' => __( 'Syria', 'woocommerce' ), - 'TW' => __( 'Taiwan', 'woocommerce' ), - 'TJ' => __( 'Tajikistan', 'woocommerce' ), - 'TZ' => __( 'Tanzania', 'woocommerce' ), - 'TH' => __( 'Thailand', 'woocommerce' ), - 'TL' => __( 'Timor-Leste', 'woocommerce' ), - 'TG' => __( 'Togo', 'woocommerce' ), - 'TK' => __( 'Tokelau', 'woocommerce' ), - 'TO' => __( 'Tonga', 'woocommerce' ), - 'TT' => __( 'Trinidad and Tobago', 'woocommerce' ), - 'TN' => __( 'Tunisia', 'woocommerce' ), - 'TR' => __( 'Turkey', 'woocommerce' ), - 'TM' => __( 'Turkmenistan', 'woocommerce' ), - 'TC' => __( 'Turks and Caicos Islands', 'woocommerce' ), - 'TV' => __( 'Tuvalu', 'woocommerce' ), - 'UG' => __( 'Uganda', 'woocommerce' ), - 'UA' => __( 'Ukraine', 'woocommerce' ), - 'AE' => __( 'United Arab Emirates', 'woocommerce' ), - 'GB' => __( 'United Kingdom (UK)', 'woocommerce' ), - 'US' => __( 'United States (US)', 'woocommerce' ), - 'UY' => __( 'Uruguay', 'woocommerce' ), - 'UZ' => __( 'Uzbekistan', 'woocommerce' ), - 'VU' => __( 'Vanuatu', 'woocommerce' ), - 'VA' => __( 'Vatican', 'woocommerce' ), - 'VE' => __( 'Venezuela', 'woocommerce' ), - 'VN' => __( 'Vietnam', 'woocommerce' ), - 'WF' => __( 'Wallis and Futuna', 'woocommerce' ), - 'EH' => __( 'Western Sahara', 'woocommerce' ), - 'WS' => __( 'Western Samoa', 'woocommerce' ), - 'YE' => __( 'Yemen', 'woocommerce' ), - 'ZM' => __( 'Zambia', 'woocommerce' ), - 'ZW' => __( 'Zimbabwe', 'woocommerce' ) - )); + /** + * Get all countries + * @return array + */ + public function get_countries() { + if ( empty( $this->countries ) ) { + $this->countries = apply_filters( 'woocommerce_countries', include( WC()->plugin_path() . '/i18n/countries.php' ) ); + if ( apply_filters('woocommerce_sort_countries', true ) ) { + asort( $this->countries ); + } + } + return $this->countries; + } + + /** + * Load the states + */ + public function load_country_states() { + global $states; // States set to array() are blank i.e. the country has no use for the state field. $states = array( @@ -321,6 +93,24 @@ class WC_Countries { $this->states = apply_filters( 'woocommerce_states', $states ); } + /** + * Get the states for a country. + * + * @access public + * @param string $cc country code + * @return array of states + */ + public function get_states( $cc = false ) { + if ( empty( $this->states ) ) { + $this->load_country_states(); + } + if ( $cc ) { + return isset( $this->states[ $cc ] ) ? $this->states[ $cc ] : false; + } else { + return $this->states; + } + } + /** * Get the base country for the store. * @@ -374,12 +164,9 @@ class WC_Countries { * @return array */ public function get_allowed_countries() { - - if ( apply_filters('woocommerce_sort_countries', true ) ) - asort( $this->countries ); - - if ( get_option('woocommerce_allowed_countries') !== 'specific' ) + if ( get_option('woocommerce_allowed_countries') !== 'specific' ) { return $this->countries; + } $countries = array(); @@ -398,10 +185,6 @@ class WC_Countries { * @return array */ public function get_shipping_countries() { - - if ( apply_filters( 'woocommerce_sort_countries', true ) ) - asort( $this->countries ); - if ( get_option( 'woocommerce_ship_to_countries' ) == '' ) return $this->get_allowed_countries(); @@ -475,7 +258,6 @@ class WC_Countries { return array( 'AT', 'BE', 'BG', 'CY', 'CZ', 'DE', 'DK', 'EE', 'ES', 'FI', 'FR', 'GB', 'GR', 'HU', 'HR', 'IE', 'IT', 'LT', 'LU', 'LV', 'MT', 'NL', 'PL', 'PT', 'RO', 'SE', 'SI', 'SK' ); } - /** * Gets the correct string for shipping - ether 'to the' or 'to' * @@ -489,7 +271,6 @@ class WC_Countries { return apply_filters('woocommerce_countries_shipping_to_prefix', $return, WC()->customer->get_shipping_country()); } - /** * Prefix certain countries with 'the' * @@ -515,7 +296,6 @@ class WC_Countries { return apply_filters( 'woocommerce_countries_tax_or_vat', $return ); } - /** * Include the Inc Tax label. * @@ -528,7 +308,6 @@ class WC_Countries { return apply_filters( 'woocommerce_countries_inc_tax_or_vat', $return ); } - /** * Include the Ex Tax label. * @@ -541,19 +320,6 @@ class WC_Countries { return apply_filters( 'woocommerce_countries_ex_tax_or_vat', $return ); } - - /** - * Get the states for a country. - * - * @access public - * @param string $cc country code - * @return array of states - */ - public function get_states( $cc ) { - return ( isset( $this->states[ $cc ] ) ) ? $this->states[ $cc ] : false; - } - - /** * Outputs the list of countries and states for use in dropdown boxes. * @@ -564,12 +330,8 @@ class WC_Countries { * @return void */ public function country_dropdown_options( $selected_country = '', $selected_state = '', $escape = false ) { - - if ( apply_filters('woocommerce_sort_countries', true ) ) - asort( $this->countries ); - if ( $this->countries ) foreach ( $this->countries as $key=>$value) : - if ( $states = $this->get_states($key) ) : + if ( $states = $this->get_states( $key ) ) : echo ''; foreach ($states as $state_key=>$state_value) : echo '