sync fork with master

Gruntfile.js

@@ -107,18 +107,6 @@ module.exports = function( grunt ){
 				stdout: true,
 				stderr: true
 			},
-			txpull: {
-				command: [
-					'cd i18n',
-					'tx pull -a -f',
-				].join( '&&' )
-			},
-			generatemos: {
-				command: [
-					'cd i18n/languages',
-					'for i in *.po; do msgfmt $i -o ${i%%.*}.mo; done'
-				].join( '&&' )
-			},
 			generatepot: {
 				command: [
 					'cd i18n/makepot/',
@@ -193,13 +181,11 @@ module.exports = function( grunt ){
 
 	grunt.registerTask( 'dev', [
 		'default',
-		'shell:txpull',
-		'shell:generatemos'
+		'pot'
 	]);
 
 	grunt.registerTask( 'deploy', [ 
 		'clean:deploy', 
 		'copy:deploy'
 	]);
-
-};
+};

assets/css/admin.less

@@ -181,6 +181,15 @@ table.wc_status_table {
 		outline: 0;
 	}
 }
+#log-viewer-select {
+	padding: 10px 0 8px;
+	line-height: 180%;
+}
+#log-viewer {
+	textarea {
+		width: 100%;
+	}
+}
 
 /* Bulk/Quick edit */
 .inline-edit-product.quick-edit-row {

assets/js/admin/editor_plugin.js

@@ -1,52 +0,0 @@
-(
-	function(){
-
-		tinymce.create(
-			"tinymce.plugins.WooCommerceShortcodes",
-			{
-				init: function(d,e) {},
-				createControl:function(d,e)
-				{
-
-					var ed = tinymce.activeEditor;
-
-					if(d=="woocommerce_shortcodes_button"){
-
-						d=e.createMenuButton( "woocommerce_shortcodes_button",{
-							title: ed.getLang('woocommerce.insert'),
-							icons: false
-							});
-
-							var a=this;d.onRenderMenu.add(function(c,b){
-
-								a.addImmediate(b, ed.getLang('woocommerce.order_tracking'), '[' + ed.getLang('woocommerce.order_tracking_shortcode') + ']' );
-								a.addImmediate(b, ed.getLang('woocommerce.price_button'), '[add_to_cart id="" sku=""]');
-								a.addImmediate(b, ed.getLang('woocommerce.product_by_sku'), '[product id="" sku=""]');
-								a.addImmediate(b, ed.getLang('woocommerce.products_by_sku'), '[products ids="" skus=""]');
-								a.addImmediate(b, ed.getLang('woocommerce.product_categories'), '[product_categories number=""]');
-								a.addImmediate(b, ed.getLang('woocommerce.products_by_cat_slug'), '[product_category category="" per_page="12" columns="4" orderby="date" order="desc"]');
-
-								b.addSeparator();
-
-								a.addImmediate(b, ed.getLang('woocommerce.recent_products'), '[recent_products per_page="12" columns="4" orderby="date" order="desc"]');
-								a.addImmediate(b, ed.getLang('woocommerce.featured_products'), '[featured_products per_page="12" columns="4" orderby="date" order="desc"]');
-
-								b.addSeparator();
-
-								a.addImmediate(b, ed.getLang('woocommerce.shop_messages'), '[' + ed.getLang('woocommerce.shop_messages_shortcode') + ']');
-							});
-						return d
-
-					} // End IF Statement
-
-					return null
-				},
-
-				addImmediate:function(d,e,a){d.add({title:e,onclick:function(){tinyMCE.activeEditor.execCommand( "mceInsertContent",false,a)}})}
-
-			}
-		);
-
-		tinymce.PluginManager.add( "WooCommerceShortcodes", tinymce.plugins.WooCommerceShortcodes);
-	}
-)();

assets/js/admin/editor_plugin.min.js

@@ -1 +0,0 @@
-!function(){tinymce.create("tinymce.plugins.WooCommerceShortcodes",{init:function(){},createControl:function(a,b){var c=tinymce.activeEditor;if("woocommerce_shortcodes_button"==a){a=b.createMenuButton("woocommerce_shortcodes_button",{title:c.getLang("woocommerce.insert"),icons:!1});var d=this;return a.onRenderMenu.add(function(a,b){d.addImmediate(b,c.getLang("woocommerce.order_tracking"),"["+c.getLang("woocommerce.order_tracking_shortcode")+"]"),d.addImmediate(b,c.getLang("woocommerce.price_button"),'[add_to_cart id="" sku=""]'),d.addImmediate(b,c.getLang("woocommerce.product_by_sku"),'[product id="" sku=""]'),d.addImmediate(b,c.getLang("woocommerce.products_by_sku"),'[products ids="" skus=""]'),d.addImmediate(b,c.getLang("woocommerce.product_categories"),'[product_categories number=""]'),d.addImmediate(b,c.getLang("woocommerce.products_by_cat_slug"),'[product_category category="" per_page="12" columns="4" orderby="date" order="desc"]'),b.addSeparator(),d.addImmediate(b,c.getLang("woocommerce.recent_products"),'[recent_products per_page="12" columns="4" orderby="date" order="desc"]'),d.addImmediate(b,c.getLang("woocommerce.featured_products"),'[featured_products per_page="12" columns="4" orderby="date" order="desc"]'),b.addSeparator(),d.addImmediate(b,c.getLang("woocommerce.shop_messages"),"["+c.getLang("woocommerce.shop_messages_shortcode")+"]")}),a}return null},addImmediate:function(a,b,c){a.add({title:b,onclick:function(){tinyMCE.activeEditor.execCommand("mceInsertContent",!1,c)}})}}),tinymce.PluginManager.add("WooCommerceShortcodes",tinymce.plugins.WooCommerceShortcodes)}();

assets/js/admin/editor_plugin_lang.php

@@ -1,19 +0,0 @@
-<?php
-
-$strings = 'tinyMCE.addI18n({' . _WP_Editors::$mce_locale . ':{
-    woocommerce:{
-        insert: "' . esc_js( __( 'Insert Shortcode', 'woocommerce' ) ) . '",
-        price_button: "' . esc_js( __( 'Product price/cart button', 'woocommerce' ) ) . '",
-        product_by_sku: "' . esc_js( __( 'Product by SKU/ID', 'woocommerce' ) ) . '",
-        products_by_sku: "' . esc_js( __( 'Products by SKU/ID', 'woocommerce' ) ) . '",
-        product_categories: "' . esc_js( __( 'Product categories', 'woocommerce' ) ) . '",
-        products_by_cat_slug: "' . esc_js( __( 'Products by category slug', 'woocommerce' ) ) . '",
-        recent_products: "' . esc_js( __( 'Recent products', 'woocommerce' ) ) . '",
-        featured_products: "' . esc_js( __( 'Featured products', 'woocommerce' ) ) . '",
-        shop_messages: "' . esc_js( __( 'Shop Messages', 'woocommerce' ) ) . '",
-        order_tracking: "' . esc_js( __( 'Order tracking', 'woocommerce' ) ) . '",
-        my_account: "' . esc_js( __( 'My Account', 'woocommerce' ) ) . '",
-        shop_messages_shortcode: "' . esc_js( apply_filters( "shop_messages_shortcode_tag", 'woocommerce_shop_messages' ) ) . '",
-        order_tracking_shortcode: "' . esc_js( apply_filters( "woocommerce_order_tracking_shortcode_tag", 'woocommerce_order_tracking' ) ) . '"
-    }
-}})';

assets/js/admin/meta-boxes-variations.js

@@ -324,7 +324,7 @@ jQuery( function ( $ ) {
 		if ( $button.is( '.remove' ) ) {
 
 			setting_variation_image.find( '.upload_image_id' ).val( '' );
-			setting_variation_image.find( 'img' ).attr( 'src', woocommerce_admin_meta_boxes_variations.woocommerce_placeholder_img_src );
+			setting_variation_image.find( 'img' ).eq( 0 ).attr( 'src', woocommerce_admin_meta_boxes_variations.woocommerce_placeholder_img_src );
 			setting_variation_image.find( '.upload_image_button' ).removeClass( 'remove' );
 
 		} else {
@@ -356,11 +356,12 @@ jQuery( function ( $ ) {
 			// When an image is selected, run a callback.
 			variable_image_frame.on( 'select', function () {
 
-				var attachment = variable_image_frame.state().get( 'selection' ).first().toJSON();
+				var attachment = variable_image_frame.state().get( 'selection' ).first().toJSON(),
+					url = attachment.sizes.thumbnail ? attachment.sizes.thumbnail.url : attachment.url;
 
 				setting_variation_image.find( '.upload_image_id' ).val( attachment.id );
 				setting_variation_image.find( '.upload_image_button' ).addClass( 'remove' );
-				setting_variation_image.find( 'img' ).attr( 'src', attachment.url );
+				setting_variation_image.find( 'img' ).eq( 0 ).attr( 'src', url );
 
 				wp.media.model.settings.post.id = wp_media_post_id;
 			});

assets/js/admin/meta-boxes.js

@@ -451,7 +451,6 @@ jQuery( function($){
 			};
 
 			$.post( woocommerce_admin_meta_boxes.ajax_url, data, function( response ) {
-
 				if ( response ) {
 					$items.each( function() {
 						var $row = $(this);

assets/js/admin/woocommerce_admin.js

@@ -1,13 +1,15 @@
+/* global woocommerce_admin */
+
 /**
  * WooCommerce Admin JS
  */
 jQuery(function(){
 
 	// Price input validation
-	jQuery('body').on( 'blur', '.wc_input_decimal[type=text], .wc_input_price[type=text]', function() {
-			jQuery('.wc_error_tip').fadeOut('100', function(){ jQuery(this).remove(); } );
-			return this;
-		});
+	jQuery('body').on( 'blur', '.wc_input_decimal[type=text], .wc_input_price[type=text], .wc_input_country_iso[type=text]', function() {
+		jQuery('.wc_error_tip').fadeOut('100', function(){ jQuery(this).remove(); } );
+		return this;
+	});
 
 	jQuery('body').on('keyup change', '.wc_input_price[type=text]', function(){
 		var value		= jQuery(this).val();
@@ -47,6 +49,24 @@ jQuery(function(){
 		return this;
 	});
 
+	jQuery('body').on('keyup change', '.wc_input_country_iso[type=text]', function(){
+		var value = jQuery(this).val();
+		var regex = new RegExp( '^([A-Z])?([A-Z])$' );
+
+		if ( ! regex.test( value ) ) {
+			jQuery(this).val( '' );
+			if ( jQuery(this).parent().find('.wc_error_tip').size() === 0 ) {
+				var offset = jQuery(this).position();
+				jQuery(this).after( '<div class="wc_error_tip">' + woocommerce_admin.i18n_country_iso_error + '</div>' );
+				jQuery('.wc_error_tip')
+					.css('left', offset.left + jQuery(this).width() - ( jQuery(this).width() / 2 ) - ( jQuery('.wc_error_tip').width() / 2 ) )
+					.css('top', offset.top + jQuery(this).height() )
+					.fadeIn('100');
+			}
+		}
+		return this;
+	});
+
 	jQuery("body").click(function(){
 		jQuery('.wc_error_tip').fadeOut('100', function(){ jQuery(this).remove(); } );
 	});
@@ -195,4 +215,4 @@ jQuery(function(){
 	// Attribute term table
 	jQuery( 'table.attributes-table tbody tr:nth-child(odd)' ).addClass( 'alternate' );
 
-});
+});

assets/js/chosen/chosen-rtl.js

@@ -1,6 +1,6 @@
 jQuery(function($) {
 
 	// Fix Chosen for RTL
-	$('.chosen_select, .chosen_select_nostd, .product_attributes select.multiselect, select.country_select, select.state_select, select#dropdown_shop_coupon_type, select[name=m], select#dropdown_shop_order_status').addClass('chosen-rtl');
+	$('.chosen_select, .chosen_select_nostd, .product_attributes select.multiselect, select.country_select, select.state_select, select#dropdown_shop_coupon_type, select[name=m]').addClass('chosen-rtl');
 
 });

assets/js/chosen/chosen-rtl.min.js

@@ -1 +1 @@
-jQuery(function(e){e(".chosen_select, .chosen_select_nostd, .product_attributes select.multiselect, select.country_select, select.state_select, select#dropdown_shop_coupon_type, select[name=m], select#dropdown_shop_order_status").addClass("chosen-rtl")});
+jQuery(function(e){e(".chosen_select, .chosen_select_nostd, .product_attributes select.multiselect, select.country_select, select.state_select, select#dropdown_shop_coupon_type, select[name=m]").addClass("chosen-rtl")});

assets/js/frontend/address-i18n.js

@@ -1,5 +1,10 @@
 jQuery( function( $ ) {
 
+	// wc_address_i18n_params is required to continue, ensure the object exists
+	if (typeof wc_address_i18n_params === "undefined") {
+    	return false;
+	}
+
 	var locale_json = wc_address_i18n_params.locale.replace( /"/g, '"' ),
 		locale = $.parseJSON( locale_json ),
 		required = ' <abbr class="required" title="' + wc_address_i18n_params.i18n_required_text + '">*</abbr>';

assets/js/frontend/address-i18n.min.js

@@ -1 +1 @@
-jQuery(function(a){var b=wc_address_i18n_params.locale.replace(/&quot;/g,'"'),c=a.parseJSON(b),d=' <abbr class="required" title="'+wc_address_i18n_params.i18n_required_text+'">*</abbr>';a("body").bind("country_to_state_changing",function(b,e,f){var g,h=f;g="undefined"!=typeof c[e]?c[e]:c["default"];var i=a.parseJSON(wc_address_i18n_params.locale_fields);a.each(i,function(a,b){var e=h.find(b);g[a]?(g[a].label&&e.find("label").html(g[a].label),g[a].placeholder&&e.find("input").attr("placeholder",g[a].placeholder),e.find("label abbr").remove(),"undefined"==typeof g[a].required&&c["default"][a].required===!0?e.find("label").append(d):g[a].required===!0&&e.find("label").append(d),"state"!==a&&(g[a].hidden===!0?e.hide().find("input").val(""):e.show())):c["default"][a]&&(c["default"][a].required===!0&&0===e.find("label abbr").size()&&e.find("label").append(d),"state"!==a&&("undefined"==typeof c["default"][a].hidden||c["default"][a].hidden===!1?e.show():c["default"][a].hidden===!0&&e.hide().find("input").val("")))});var j=h.find("#billing_postcode_field, #shipping_postcode_field"),k=h.find("#billing_city_field, #shipping_city_field"),l=h.find("#billing_state_field, #shipping_state_field");j.attr("data-o_class")||(j.attr("data-o_class",j.attr("class")),k.attr("data-o_class",k.attr("class")),l.attr("data-o_class",l.attr("class"))),g.postcode_before_city?(j.add(k).add(l).removeClass("form-row-first form-row-last").addClass("form-row-wide"),j.insertBefore(k)):(j.attr("class",j.attr("data-o_class")),k.attr("class",k.attr("data-o_class")),l.attr("class",l.attr("data-o_class")),j.insertAfter(l))})});
+jQuery(function(a){if("undefined"==typeof wc_address_i18n_params)return!1;var b=wc_address_i18n_params.locale.replace(/&quot;/g,'"'),c=a.parseJSON(b),d=' <abbr class="required" title="'+wc_address_i18n_params.i18n_required_text+'">*</abbr>';a("body").bind("country_to_state_changing",function(b,e,f){var g,h=f;g="undefined"!=typeof c[e]?c[e]:c["default"];var i=a.parseJSON(wc_address_i18n_params.locale_fields);a.each(i,function(a,b){var e=h.find(b);g[a]?(g[a].label&&e.find("label").html(g[a].label),g[a].placeholder&&e.find("input").attr("placeholder",g[a].placeholder),e.find("label abbr").remove(),"undefined"==typeof g[a].required&&c["default"][a].required===!0?e.find("label").append(d):g[a].required===!0&&e.find("label").append(d),"state"!==a&&(g[a].hidden===!0?e.hide().find("input").val(""):e.show())):c["default"][a]&&(c["default"][a].required===!0&&0===e.find("label abbr").size()&&e.find("label").append(d),"state"!==a&&("undefined"==typeof c["default"][a].hidden||c["default"][a].hidden===!1?e.show():c["default"][a].hidden===!0&&e.hide().find("input").val("")))});var j=h.find("#billing_postcode_field, #shipping_postcode_field"),k=h.find("#billing_city_field, #shipping_city_field"),l=h.find("#billing_state_field, #shipping_state_field");j.attr("data-o_class")||(j.attr("data-o_class",j.attr("class")),k.attr("data-o_class",k.attr("class")),l.attr("data-o_class",l.attr("class"))),g.postcode_before_city?(j.add(k).add(l).removeClass("form-row-first form-row-last").addClass("form-row-wide"),j.insertBefore(k)):(j.attr("class",j.attr("data-o_class")),k.attr("class",k.attr("data-o_class")),l.attr("class",l.attr("data-o_class")),j.insertAfter(l))})});

assets/js/frontend/checkout.js

@@ -1,7 +1,7 @@
 jQuery( function( $ ) {
 
-	$.blockUI.defaults.overlayCSS.cursor = 'default'; 
-	
+	$.blockUI.defaults.overlayCSS.cursor = 'default';
+
 	// wc_checkout_params is required to continue, ensure the object exists
 	if ( typeof wc_checkout_params === 'undefined' )
 		return false;
@@ -187,7 +187,7 @@ jQuery( function( $ ) {
 
 	/* Update totals/taxes/shipping */
 	// Inputs/selects which update totals instantly
-	.on( 'input change', 'select.shipping_method, input[name^=shipping_method], #ship-to-different-address input, .update_totals_on_change select', function() {
+	.on( 'input change', 'select.shipping_method, input[name^=shipping_method], #ship-to-different-address input, .update_totals_on_change select, .update_totals_on_change input[type=radio]', function() {
 		clearTimeout( updateTimer );
 		dirtyInput = false;
 		$( 'body' ).trigger( 'update_checkout' );

dummy-data/dummy-data.xml

@@ -37,16 +37,9 @@
 
 	<wp:term><wp:term_id>17</wp:term_id><wp:term_taxonomy>pa_color</wp:term_taxonomy><wp:term_slug>black</wp:term_slug><wp:term_parent></wp:term_parent><wp:term_name><![CDATA[Black]]></wp:term_name></wp:term>
 	<wp:term><wp:term_id>19</wp:term_id><wp:term_taxonomy>pa_color</wp:term_taxonomy><wp:term_slug>blue</wp:term_slug><wp:term_parent></wp:term_parent><wp:term_name><![CDATA[Blue]]></wp:term_name></wp:term>
-	<wp:term><wp:term_id>12</wp:term_id><wp:term_taxonomy>shop_order_status</wp:term_taxonomy><wp:term_slug>cancelled</wp:term_slug><wp:term_parent></wp:term_parent><wp:term_name><![CDATA[cancelled]]></wp:term_name></wp:term>
-	<wp:term><wp:term_id>10</wp:term_id><wp:term_taxonomy>shop_order_status</wp:term_taxonomy><wp:term_slug>completed</wp:term_slug><wp:term_parent></wp:term_parent><wp:term_name><![CDATA[completed]]></wp:term_name></wp:term>
 	<wp:term><wp:term_id>5</wp:term_id><wp:term_taxonomy>product_type</wp:term_taxonomy><wp:term_slug>external</wp:term_slug><wp:term_parent></wp:term_parent><wp:term_name><![CDATA[external]]></wp:term_name></wp:term>
-	<wp:term><wp:term_id>7</wp:term_id><wp:term_taxonomy>shop_order_status</wp:term_taxonomy><wp:term_slug>failed</wp:term_slug><wp:term_parent></wp:term_parent><wp:term_name><![CDATA[failed]]></wp:term_name></wp:term>
 	<wp:term><wp:term_id>16</wp:term_id><wp:term_taxonomy>pa_color</wp:term_taxonomy><wp:term_slug>green</wp:term_slug><wp:term_parent></wp:term_parent><wp:term_name><![CDATA[Green]]></wp:term_name></wp:term>
 	<wp:term><wp:term_id>3</wp:term_id><wp:term_taxonomy>product_type</wp:term_taxonomy><wp:term_slug>grouped</wp:term_slug><wp:term_parent></wp:term_parent><wp:term_name><![CDATA[grouped]]></wp:term_name></wp:term>
-	<wp:term><wp:term_id>8</wp:term_id><wp:term_taxonomy>shop_order_status</wp:term_taxonomy><wp:term_slug>on-hold</wp:term_slug><wp:term_parent></wp:term_parent><wp:term_name><![CDATA[on-hold]]></wp:term_name></wp:term>
-	<wp:term><wp:term_id>6</wp:term_id><wp:term_taxonomy>shop_order_status</wp:term_taxonomy><wp:term_slug>pending</wp:term_slug><wp:term_parent></wp:term_parent><wp:term_name><![CDATA[pending]]></wp:term_name></wp:term>
-	<wp:term><wp:term_id>9</wp:term_id><wp:term_taxonomy>shop_order_status</wp:term_taxonomy><wp:term_slug>processing</wp:term_slug><wp:term_parent></wp:term_parent><wp:term_name><![CDATA[processing]]></wp:term_name></wp:term>
-	<wp:term><wp:term_id>11</wp:term_id><wp:term_taxonomy>shop_order_status</wp:term_taxonomy><wp:term_slug>refunded</wp:term_slug><wp:term_parent></wp:term_parent><wp:term_name><![CDATA[refunded]]></wp:term_name></wp:term>
 	<wp:term><wp:term_id>2</wp:term_id><wp:term_taxonomy>product_type</wp:term_taxonomy><wp:term_slug>simple</wp:term_slug><wp:term_parent></wp:term_parent><wp:term_name><![CDATA[simple]]></wp:term_name></wp:term>
 	<wp:term><wp:term_id>4</wp:term_id><wp:term_taxonomy>product_type</wp:term_taxonomy><wp:term_slug>variable</wp:term_slug><wp:term_parent></wp:term_parent><wp:term_name><![CDATA[variable]]></wp:term_name></wp:term>
 	<wp:term><wp:term_id>14</wp:term_id><wp:term_taxonomy>product_cat</wp:term_taxonomy><wp:term_slug>clothing</wp:term_slug><wp:term_parent></wp:term_parent><wp:term_name><![CDATA[Clothing]]></wp:term_name></wp:term>

i18n/.tx/config

@@ -1,14 +0,0 @@
-[main]
-host = https://www.transifex.com
-
-[woocommerce.woocommerce-admin-pot]
-file_filter = languages/woocommerce-admin-<lang>.po
-source_file = languages/woocommerce-admin.pot
-source_lang = en
-type = PO
-
-[woocommerce.woocommerce-pot]
-file_filter = languages/woocommerce-<lang>.po
-source_file = languages/woocommerce.pot
-source_lang = en
-type = PO

i18n/countries.php

@@ -0,0 +1,260 @@
+<?php
+/**
+ * Countries
+ *
+ * Returns an array of countries and codes.
+ *
+ * @author 		WooThemes
+ * @category 	i18n
+ * @package 	WooCommerce/i18n
+ * @version     2.2.0
+ */
+
+if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+
+return array(
+	'AF' => __( 'Afghanistan', 'woocommerce' ),
+	'AX' => __( '&#197;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&Ccedil;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&eacute;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&atilde;o Tom&eacute; and Pr&iacute;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' )
+);