From 550cec06a4af608d627d2c3e5072fd30b18ec153 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 14 Sep 2020 14:41:11 +0200 Subject: [PATCH] Look and feel v12 --- htdocs/langs/en_US/main.lang | 1 + htdocs/langs/en_US/paybox.lang | 1 - htdocs/langs/en_US/stripe.lang | 1 - htdocs/paybox/admin/paybox.php | 22 +++++++++++----------- htdocs/stripe/admin/stripe.php | 2 +- 5 files changed, 13 insertions(+), 14 deletions(-) diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index a2c314bc7cc..e184368c618 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -1088,3 +1088,4 @@ DELETEInDolibarr=Record %s deleted VALIDATEInDolibarr=Record %s validated APPROVEDInDolibarr=Record %s approved DefaultMailModel=Default Mail Model +PublicVendorName=Public name of vendor diff --git a/htdocs/langs/en_US/paybox.lang b/htdocs/langs/en_US/paybox.lang index 1bbbef4017b..6f320c03181 100644 --- a/htdocs/langs/en_US/paybox.lang +++ b/htdocs/langs/en_US/paybox.lang @@ -20,7 +20,6 @@ AccountParameter=Account parameters UsageParameter=Usage parameters InformationToFindParameters=Help to find your %s account information PAYBOX_CGI_URL_V2=Url of Paybox CGI module for payment -VendorName=Name of vendor CSSUrlForPaymentForm=CSS style sheet url for payment form NewPayboxPaymentReceived=New Paybox payment received NewPayboxPaymentFailed=New Paybox payment tried but failed diff --git a/htdocs/langs/en_US/stripe.lang b/htdocs/langs/en_US/stripe.lang index 0eac6842199..0eba2f5c286 100644 --- a/htdocs/langs/en_US/stripe.lang +++ b/htdocs/langs/en_US/stripe.lang @@ -28,7 +28,6 @@ AccountParameter=Account parameters UsageParameter=Usage parameters InformationToFindParameters=Help to find your %s account information STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment -VendorName=Name of vendor CSSUrlForPaymentForm=CSS style sheet url for payment form NewStripePaymentReceived=New Stripe payment received NewStripePaymentFailed=New Stripe payment tried but failed diff --git a/htdocs/paybox/admin/paybox.php b/htdocs/paybox/admin/paybox.php index cb1ad560158..5323fd8d7df 100644 --- a/htdocs/paybox/admin/paybox.php +++ b/htdocs/paybox/admin/paybox.php @@ -129,27 +129,27 @@ print "\n"; print ''; print ''.$langs->trans("PAYBOX_PBX_SITE").''; print ''; -print '
'.$langs->trans("Example").': 1999888 ('.$langs->trans("Test").')'; +print '
'.$langs->trans("Example").': 1999888 ('.$langs->trans("Test").')
'; print ''; print ''; print ''.$langs->trans("PAYBOX_PBX_RANG").''; print ''; -print '
'.$langs->trans("Example").': 99 ('.$langs->trans("Test").')'; +print '
'.$langs->trans("Example").': 99 ('.$langs->trans("Test").')
'; print ''; print ''; print ''.$langs->trans("PAYBOX_PBX_IDENTIFIANT").''; print ''; -print '
'.$langs->trans("Example").': 2 ('.$langs->trans("Test").')'; +print '
'.$langs->trans("Example").': 2 ('.$langs->trans("Test").')
'; print ''; print ''; print ''.$langs->trans("PAYBOX_HMAC_KEY").''; print ''; -print '
'.$langs->trans("Example").': 1A2B3C4D5E6F'; +print '
'.$langs->trans("Example").': 1A2B3C4D5E6F
'; print ''; print ''; @@ -179,15 +179,15 @@ print ''; print ''; print ''.$langs->trans("PAYBOX_CGI_URL_V2").''; print ''; -print '
'.$langs->trans("Example").' (preprod): https://preprod-tpeweb.paybox.com/php/'; -print '
'.$langs->trans("Example").' (prod): https://tpeweb.paybox.com/php/'; +print '
'.$langs->trans("Example").' (preprod): https://preprod-tpeweb.paybox.com/php/'; +print '
'.$langs->trans("Example").' (prod): https://tpeweb.paybox.com/php/
'; print ''; print ''; -print $langs->trans("VendorName").''; -print ''; -print '
'.$langs->trans("Example").': '.$mysoc->name; +print $langs->trans("PublicVendorName").''; +print ''; +print '
'.$langs->trans("Example").': '.$mysoc->name.''; print ''; @@ -203,7 +203,7 @@ if (!empty($conf->banque->enabled)) print ''; print $langs->trans("CSSUrlForPaymentForm").''; print ''; -print '
'.$langs->trans("Example").': http://mysite/mycss.css'; +print '
'.$langs->trans("Example").': http://mysite/mycss.css
'; print ''; @@ -230,7 +230,7 @@ print ''; print ''; print $langs->trans("ONLINE_PAYMENT_SENDEMAIL").''; print ''; -print '   '.$langs->trans("Example").': myemail@myserver.com, Payment service <myemail2@myserver2.com>'; +print '   '.$langs->trans("Example").': myemail@myserver.com, Payment service <myemail2@myserver2.com>'; print ''; // Payment token for URL diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php index efc6391bc58..9b781557a1d 100644 --- a/htdocs/stripe/admin/stripe.php +++ b/htdocs/stripe/admin/stripe.php @@ -332,7 +332,7 @@ print ''.$langs->trans("Value").''; print "\n"; print ''; -print $langs->trans("VendorName").''; +print $langs->trans("PublicVendorName").''; print ''; print '   '.$langs->trans("Example").': '.$mysoc->name; print '';