From d64dbe37b20afadac527b754e99b4f0e86cfcee7 Mon Sep 17 00:00:00 2001 From: John-Henrique Date: Mon, 20 Aug 2018 09:57:06 -0300 Subject: [PATCH 1/7] Currency for Paraguay --- i18n/locale-info.php | 10 ++++++++++ i18n/states/PY.php | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 i18n/states/PY.php diff --git a/i18n/locale-info.php b/i18n/locale-info.php index 1b16207e604..3aee3c0583d 100644 --- a/i18n/locale-info.php +++ b/i18n/locale-info.php @@ -483,6 +483,16 @@ return array( ), ), ), + 'PY' => array( + 'currency_code' => '₲', // G uppercase striped + 'currency_pos' => 'left', + 'thousand_sep' => '.', + 'decimal_sep' => ',', + 'num_decimals' => 2, + 'weight_unit' => 'kg', + 'dimension_unit' => 'cm', + 'tax_rates' => array(), + ), 'RO' => array( 'currency_code' => 'RON', 'currency_pos' => 'right_space', diff --git a/i18n/states/PY.php b/i18n/states/PY.php new file mode 100644 index 00000000000..fb2a5e7fc08 --- /dev/null +++ b/i18n/states/PY.php @@ -0,0 +1,32 @@ + 'Alto Paraguay', 'woocommerce' ), + 'Alto Paraná' => __( 'Alto Paraná', 'woocommerce' ), + 'Amambay' => __( 'Amambay', 'woocommerce' ), + 'Asuncion' => __( 'Asunción', 'woocommerce' ), + 'Boqueron' => __( ' Boquerón', 'woocommerce' ), + 'Caaguazu' => __( 'Caaguazú', 'woocommerce' ), + 'Caazapa' => __( 'Caazapá', 'woocommerce' ), + 'Canindeyú' => __( 'Canindeyú', 'woocommerce' ), + 'Central' => __( 'Central', 'woocommerce' ), + 'Concepcion' => __( 'Concepción', 'woocommerce' ), + 'Cordillera' => __( 'Cordillera', 'woocommerce' ), + 'Guaira' => __( 'Guairá', 'woocommerce' ), + 'Itapua' => __( 'Itapúa', 'woocommerce' ), + 'Misiones' => __( 'Misiones', 'woocommerce' ), + 'Ñeembucu' => __( 'Ñeembucú', 'woocommerce' ), + 'Paraguari' => __( 'Paraguarí', 'woocommerce' ), + 'Presidente Hayes' => __( 'Presidente Hayes', 'woocommerce' ), + 'San Pedro' => __( 'San Pedro', 'woocommerce' ) +); From 84a99b590ae5a592f313b10344190ef01193eddd Mon Sep 17 00:00:00 2001 From: John-Henrique Date: Mon, 20 Aug 2018 10:08:02 -0300 Subject: [PATCH 2/7] Fix mistake --- i18n/states/PY.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/i18n/states/PY.php b/i18n/states/PY.php index fb2a5e7fc08..c9035eca7d0 100644 --- a/i18n/states/PY.php +++ b/i18n/states/PY.php @@ -11,7 +11,7 @@ global $states; defined( 'ABSPATH' ) || exit; $states['PY'] = array( - 'Alto Paraguay' => 'Alto Paraguay', 'woocommerce' ), + 'Alto Paraguay' => __( 'Alto Paraguay', 'woocommerce' ), 'Alto Paraná' => __( 'Alto Paraná', 'woocommerce' ), 'Amambay' => __( 'Amambay', 'woocommerce' ), 'Asuncion' => __( 'Asunción', 'woocommerce' ), From fd7a0b40cf8bf8dfd8487e08509bab50f5483eeb Mon Sep 17 00:00:00 2001 From: John-Henrique Date: Tue, 21 Aug 2018 16:56:49 -0300 Subject: [PATCH 3/7] Fix ISO Using ISO 4217 and ISO 3166 --- i18n/locale-info.php | 2 +- i18n/states/PY.php | 38 +++++++++++++++++++------------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/i18n/locale-info.php b/i18n/locale-info.php index 3aee3c0583d..d95438e6f49 100644 --- a/i18n/locale-info.php +++ b/i18n/locale-info.php @@ -484,7 +484,7 @@ return array( ), ), 'PY' => array( - 'currency_code' => '₲', // G uppercase striped + 'currency_code' => 'PYG', // G uppercase striped 'currency_pos' => 'left', 'thousand_sep' => '.', 'decimal_sep' => ',', diff --git a/i18n/states/PY.php b/i18n/states/PY.php index c9035eca7d0..4a12a01cdfc 100644 --- a/i18n/states/PY.php +++ b/i18n/states/PY.php @@ -10,23 +10,23 @@ global $states; defined( 'ABSPATH' ) || exit; -$states['PY'] = array( - 'Alto Paraguay' => __( 'Alto Paraguay', 'woocommerce' ), - 'Alto Paraná' => __( 'Alto Paraná', 'woocommerce' ), - 'Amambay' => __( 'Amambay', 'woocommerce' ), - 'Asuncion' => __( 'Asunción', 'woocommerce' ), - 'Boqueron' => __( ' Boquerón', 'woocommerce' ), - 'Caaguazu' => __( 'Caaguazú', 'woocommerce' ), - 'Caazapa' => __( 'Caazapá', 'woocommerce' ), - 'Canindeyú' => __( 'Canindeyú', 'woocommerce' ), - 'Central' => __( 'Central', 'woocommerce' ), - 'Concepcion' => __( 'Concepción', 'woocommerce' ), - 'Cordillera' => __( 'Cordillera', 'woocommerce' ), - 'Guaira' => __( 'Guairá', 'woocommerce' ), - 'Itapua' => __( 'Itapúa', 'woocommerce' ), - 'Misiones' => __( 'Misiones', 'woocommerce' ), - 'Ñeembucu' => __( 'Ñeembucú', 'woocommerce' ), - 'Paraguari' => __( 'Paraguarí', 'woocommerce' ), - 'Presidente Hayes' => __( 'Presidente Hayes', 'woocommerce' ), - 'San Pedro' => __( 'San Pedro', 'woocommerce' ) +$states['PYG'] = array( + 'PY-16' => __( 'Alto Paraguay', 'woocommerce' ), + 'PY-10' => __( 'Alto Paraná', 'woocommerce' ), + 'PY-13' => __( 'Amambay', 'woocommerce' ), + 'PY-ASU' => __( 'Asunción', 'woocommerce' ), + 'PY-19' => __( ' Boquerón', 'woocommerce' ), + 'PY-5' => __( 'Caaguazú', 'woocommerce' ), + 'PY-6' => __( 'Caazapá', 'woocommerce' ), + 'PY-14' => __( 'Canindeyú', 'woocommerce' ), + 'PY-11' => __( 'Central', 'woocommerce' ), + 'PY-1' => __( 'Concepción', 'woocommerce' ), + 'PY-3' => __( 'Cordillera', 'woocommerce' ), + 'PY-4' => __( 'Guairá', 'woocommerce' ), + 'PY-7' => __( 'Itapúa', 'woocommerce' ), + 'PY-8' => __( 'Misiones', 'woocommerce' ), + 'PY-12' => __( 'Ñeembucú', 'woocommerce' ), + 'PY-9' => __( 'Paraguarí', 'woocommerce' ), + 'PY-15' => __( 'Presidente Hayes', 'woocommerce' ), + 'PY-2' => __( 'San Pedro', 'woocommerce' ) ); From 54c7244d9b2e692957306bc782cdba3f10e18a8a Mon Sep 17 00:00:00 2001 From: John-Henrique Date: Wed, 22 Aug 2018 08:58:37 -0300 Subject: [PATCH 4/7] Fix department Reorder and fix department --- i18n/states/PY.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/i18n/states/PY.php b/i18n/states/PY.php index 4a12a01cdfc..b2369121df7 100644 --- a/i18n/states/PY.php +++ b/i18n/states/PY.php @@ -11,22 +11,22 @@ global $states; defined( 'ABSPATH' ) || exit; $states['PYG'] = array( - 'PY-16' => __( 'Alto Paraguay', 'woocommerce' ), - 'PY-10' => __( 'Alto Paraná', 'woocommerce' ), - 'PY-13' => __( 'Amambay', 'woocommerce' ), 'PY-ASU' => __( 'Asunción', 'woocommerce' ), - 'PY-19' => __( ' Boquerón', 'woocommerce' ), - 'PY-5' => __( 'Caaguazú', 'woocommerce' ), - 'PY-6' => __( 'Caazapá', 'woocommerce' ), - 'PY-14' => __( 'Canindeyú', 'woocommerce' ), - 'PY-11' => __( 'Central', 'woocommerce' ), 'PY-1' => __( 'Concepción', 'woocommerce' ), + 'PY-2' => __( 'San Pedro', 'woocommerce' ), 'PY-3' => __( 'Cordillera', 'woocommerce' ), 'PY-4' => __( 'Guairá', 'woocommerce' ), + 'PY-5' => __( 'Caaguazú', 'woocommerce' ), + 'PY-6' => __( 'Caazapá', 'woocommerce' ), 'PY-7' => __( 'Itapúa', 'woocommerce' ), 'PY-8' => __( 'Misiones', 'woocommerce' ), - 'PY-12' => __( 'Ñeembucú', 'woocommerce' ), 'PY-9' => __( 'Paraguarí', 'woocommerce' ), + 'PY-10' => __( 'Alto Paraná', 'woocommerce' ), + 'PY-11' => __( 'Central', 'woocommerce' ), + 'PY-12' => __( 'Ñeembucú', 'woocommerce' ), + 'PY-13' => __( 'Amambay', 'woocommerce' ), + 'PY-14' => __( 'Canindeyú', 'woocommerce' ), 'PY-15' => __( 'Presidente Hayes', 'woocommerce' ), - 'PY-2' => __( 'San Pedro', 'woocommerce' ) + 'PY-16' => __( 'Alto Paraguay', 'woocommerce' ), + 'PY-17' => __( ' Boquerón', 'woocommerce' ), ); From 148d17eca8d862d722c07ec97250cc7e77b1ca27 Mon Sep 17 00:00:00 2001 From: John-Henrique Date: Wed, 22 Aug 2018 09:30:26 -0300 Subject: [PATCH 5/7] WP Coding Standards and tax --- i18n/locale-info.php | 14 ++++++++++++-- i18n/states/PY.php | 36 ++++++++++++++++++------------------ 2 files changed, 30 insertions(+), 20 deletions(-) diff --git a/i18n/locale-info.php b/i18n/locale-info.php index d95438e6f49..6710b10f0b0 100644 --- a/i18n/locale-info.php +++ b/i18n/locale-info.php @@ -484,14 +484,24 @@ return array( ), ), 'PY' => array( - 'currency_code' => 'PYG', // G uppercase striped + 'currency_code' => 'PYG', 'currency_pos' => 'left', 'thousand_sep' => '.', 'decimal_sep' => ',', 'num_decimals' => 2, 'weight_unit' => 'kg', 'dimension_unit' => 'cm', - 'tax_rates' => array(), + 'tax_rates' => array( + '' => array( + array( + 'country' => 'PY', + 'state' => '', + 'rate' => '10.0000', + 'name' => 'VAT', + 'shipping' => true, + ), + ), + ), ), 'RO' => array( 'currency_code' => 'RON', diff --git a/i18n/states/PY.php b/i18n/states/PY.php index b2369121df7..29f287563c1 100644 --- a/i18n/states/PY.php +++ b/i18n/states/PY.php @@ -11,22 +11,22 @@ global $states; defined( 'ABSPATH' ) || exit; $states['PYG'] = array( - 'PY-ASU' => __( 'Asunción', 'woocommerce' ), - 'PY-1' => __( 'Concepción', 'woocommerce' ), - 'PY-2' => __( 'San Pedro', 'woocommerce' ), - 'PY-3' => __( 'Cordillera', 'woocommerce' ), - 'PY-4' => __( 'Guairá', 'woocommerce' ), - 'PY-5' => __( 'Caaguazú', 'woocommerce' ), - 'PY-6' => __( 'Caazapá', 'woocommerce' ), - 'PY-7' => __( 'Itapúa', 'woocommerce' ), - 'PY-8' => __( 'Misiones', 'woocommerce' ), - 'PY-9' => __( 'Paraguarí', 'woocommerce' ), - 'PY-10' => __( 'Alto Paraná', 'woocommerce' ), - 'PY-11' => __( 'Central', 'woocommerce' ), - 'PY-12' => __( 'Ñeembucú', 'woocommerce' ), - 'PY-13' => __( 'Amambay', 'woocommerce' ), - 'PY-14' => __( 'Canindeyú', 'woocommerce' ), - 'PY-15' => __( 'Presidente Hayes', 'woocommerce' ), - 'PY-16' => __( 'Alto Paraguay', 'woocommerce' ), - 'PY-17' => __( ' Boquerón', 'woocommerce' ), + 'PY-ASU' => __( 'Asunción', 'woocommerce' ), + 'PY-1' => __( 'Concepción', 'woocommerce' ), + 'PY-2' => __( 'San Pedro', 'woocommerce' ), + 'PY-3' => __( 'Cordillera', 'woocommerce' ), + 'PY-4' => __( 'Guairá', 'woocommerce' ), + 'PY-5' => __( 'Caaguazú', 'woocommerce' ), + 'PY-6' => __( 'Caazapá', 'woocommerce' ), + 'PY-7' => __( 'Itapúa', 'woocommerce' ), + 'PY-8' => __( 'Misiones', 'woocommerce' ), + 'PY-9' => __( 'Paraguarí', 'woocommerce' ), + 'PY-10' => __( 'Alto Paraná', 'woocommerce' ), + 'PY-11' => __( 'Central', 'woocommerce' ), + 'PY-12' => __( 'Ñeembucú', 'woocommerce' ), + 'PY-13' => __( 'Amambay', 'woocommerce' ), + 'PY-14' => __( 'Canindeyú', 'woocommerce' ), + 'PY-15' => __( 'Presidente Hayes', 'woocommerce' ), + 'PY-16' => __( 'Alto Paraguay', 'woocommerce' ), + 'PY-17' => __( 'Boquerón', 'woocommerce' ), ); From f65311ee3803dfa7459aad5870e12cd0d604874f Mon Sep 17 00:00:00 2001 From: John-Henrique Date: Wed, 22 Aug 2018 16:24:19 -0300 Subject: [PATCH 6/7] Update version --- i18n/locale-info.php | 2 +- i18n/states/PY.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/i18n/locale-info.php b/i18n/locale-info.php index 6710b10f0b0..f1dba04fbf5 100644 --- a/i18n/locale-info.php +++ b/i18n/locale-info.php @@ -3,7 +3,7 @@ * Locales information * * @package WooCommerce/i18n - * @version 3.4.0 + * @version 3.4.4 */ defined( 'ABSPATH' ) || exit; diff --git a/i18n/states/PY.php b/i18n/states/PY.php index 29f287563c1..733b19bfe1b 100644 --- a/i18n/states/PY.php +++ b/i18n/states/PY.php @@ -3,7 +3,7 @@ * Paraguay states * * @package WooCommerce/i18n - * @version 2.0.0 + * @version 3.4.4 */ global $states; From fdd2f63ae4b46028be580a145e4eecceee844491 Mon Sep 17 00:00:00 2001 From: John-Henrique Date: Fri, 24 Aug 2018 03:01:13 -0300 Subject: [PATCH 7/7] Fixed version and white space --- i18n/locale-info.php | 2 +- i18n/states/PY.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/i18n/locale-info.php b/i18n/locale-info.php index f1dba04fbf5..3dd3a654640 100644 --- a/i18n/locale-info.php +++ b/i18n/locale-info.php @@ -3,7 +3,7 @@ * Locales information * * @package WooCommerce/i18n - * @version 3.4.4 + * @version 3.5.0 */ defined( 'ABSPATH' ) || exit; diff --git a/i18n/states/PY.php b/i18n/states/PY.php index 733b19bfe1b..6bcebd8630d 100644 --- a/i18n/states/PY.php +++ b/i18n/states/PY.php @@ -3,7 +3,7 @@ * Paraguay states * * @package WooCommerce/i18n - * @version 3.4.4 + * @version 3.5.0 */ global $states; @@ -23,7 +23,7 @@ $states['PYG'] = array( 'PY-9' => __( 'Paraguarí', 'woocommerce' ), 'PY-10' => __( 'Alto Paraná', 'woocommerce' ), 'PY-11' => __( 'Central', 'woocommerce' ), - 'PY-12' => __( 'Ñeembucú', 'woocommerce' ), + 'PY-12' => __( 'Ñeembucú', 'woocommerce' ), 'PY-13' => __( 'Amambay', 'woocommerce' ), 'PY-14' => __( 'Canindeyú', 'woocommerce' ), 'PY-15' => __( 'Presidente Hayes', 'woocommerce' ),