From 1179eb56dfc42faa4fea47071a89fa52a518174c Mon Sep 17 00:00:00 2001 From: dinamiko Date: Tue, 15 Feb 2022 11:26:45 +0100 Subject: [PATCH 1/2] Fix merge conflict --- modules/ppcp-wc-gateway/services.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ppcp-wc-gateway/services.php b/modules/ppcp-wc-gateway/services.php index 532ada86c..2849f1f39 100644 --- a/modules/ppcp-wc-gateway/services.php +++ b/modules/ppcp-wc-gateway/services.php @@ -1984,7 +1984,7 @@ return array( ), 'class' => array(), 'input_class' => array( 'wc-enhanced-select' ), - 'default' => $container->get( 'api.shop.is-psd2-country' ) ? '3D_SECURE' : 'NO_3D_SECURE', + 'default' => $container->get( 'api.shop.is-psd2-country' ) ? 'SCA_WHEN_REQUIRED' : 'NO_3D_SECURE', 'desc_tip' => true, 'options' => array( 'NO_3D_SECURE' => __( 'No 3D Secure (transaction will be denied if 3D Secure is required)', 'woocommerce-paypal-payments' ), From 1661e40b53016a7995d1eceb51321291746fa6d9 Mon Sep 17 00:00:00 2001 From: dinamiko Date: Tue, 15 Feb 2022 12:33:23 +0100 Subject: [PATCH 2/2] Fix merge conflict --- modules/ppcp-wc-gateway/services.php | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/modules/ppcp-wc-gateway/services.php b/modules/ppcp-wc-gateway/services.php index 2849f1f39..9a553b10d 100644 --- a/modules/ppcp-wc-gateway/services.php +++ b/modules/ppcp-wc-gateway/services.php @@ -746,10 +746,15 @@ return array( 'class' => array(), 'input_class' => array( 'wc-enhanced-select' ), 'default' => array(), - 'desc_tip' => true, - 'description' => __( - 'By default all possible funding sources will be shown. You can disable some sources, if you wish.', - 'woocommerce-paypal-payments' + 'desc_tip' => false, + 'description' => sprintf( + // translators: %1$s and %2$s are the opening and closing of HTML tag. + __( 'By default, all possible funding sources will be shown. This setting can disable funding sources such as Credit Cards, Pay Later, Venmo, or other %1$sAlternative Payment Methods%2$s.', 'woocommerce-paypal-payments' ), + '', + '' ), 'options' => array( 'card' => _x( 'Credit or debit cards', 'Name of payment method', 'woocommerce-paypal-payments' ), @@ -1989,7 +1994,7 @@ return array( 'options' => array( 'NO_3D_SECURE' => __( 'No 3D Secure (transaction will be denied if 3D Secure is required)', 'woocommerce-paypal-payments' ), 'SCA_WHEN_REQUIRED' => __( '3D Secure when required', 'woocommerce-paypal-payments' ), - 'SCA_ALWAYS' => __( 'Always trigger 3D Secure', 'woocommerce-paypal-payments' ), + 'SCA_ALWAYS' => __( 'Always trigger 3D Secure', 'woocommerce-paypal-payments' ), ), 'screens' => array( State::STATE_ONBOARDED,