Merge pull request #36 from PrestaShop/feature/change-wording

Edit wordings

_dev/components/panel/account-list.vue

@@ -6,24 +6,21 @@
       </h3>
       <div class="card-block row">
         <div class="card-text">
+          <div class="row mb-2">
+            <div class="col-12 col-sm-12 col-md-12 col-lg-12 pl-0">
+              <h1 class="text-muted font-weight-light">{{ $t('panel.account-list.activateAllPayment') }}</h1>
+            </div>
+          </div>
           <div class="row">
             <div class="col-12 col-sm-6 col-md-8 col-lg-8 pl-0">
               <h2>{{ $t('panel.account-list.essentialsAccount') }}</h2>
               <p class="text-muted mb-0">
-                <template v-if="$store.state.firebase.account.status === false">
-                  {{ $t('panel.account-list.activateAllPayment') }}
+                <template v-if="$store.state.firebase.account.status === true">
+                  {{ $t('panel.account-list.connectedWitdh') }} <b>{{ $store.state.firebase.account.email }}</b> {{ $t('panel.account-list.account') }}
                 </template>
                 <template v-else>
-                  {{ $t('panel.account-list.connectedWitdh') }}
-                </template>
-              </p>
-              <p class="text-muted mb-0">
-                <template v-if="$store.state.firebase.account.status === false">
                   {{ $t('panel.account-list.createNewAccount') }}
                 </template>
-                <template v-else>
-                  <b>{{ $store.state.firebase.account.email }}</b>
-                </template>
               </p>
             </div>
             <div class="col-12 col-sm-4 col-md-3 col-lg-3 m-auto">

_dev/components/panel/fees.vue

@@ -3,12 +3,12 @@
     <div class="card">
       <div class="card-block row">
         <div class="card-text">
-          <h1>{{ $t('panel.fees.title') }}</h1>
+          <h1 class="text-center">{{ $t('panel.fees.title') }}</h1>
 
           <div class="row pt-4">
             <div class="col-12 col-sm-4 col-md-4 col-lg-4">
               <form class="form form-horizontal">
-                <p>{{ $t('panel.fees.calculateMuch') }}</p>
+                <p>{{ $t('panel.fees.calculateMuch') }}.</p>
                 <div class="form-group">
                   <label class="form-control-label">{{ $t('panel.fees.countryResidence') }}</label>
                   <select class="custom-select" v-model="country">

_dev/components/panel/payment-mode.vue

@@ -19,7 +19,7 @@
             </div>
           </div>
           <PSAlert :alert-type="ALERT_TYPE_INFO">
-            <p>{{ $t('panel.payment-mode.infoAlertText') }}</p>
+            <p>{{ $t('panel.payment-mode.infoAlertText') }}.</p>
           </PSAlert>
           <div class="form-group row">
             <label class="form-control-label">
@@ -33,7 +33,7 @@
                   {{ $t('panel.payment-mode.tipProductionMode') }}
                 </template>
                 <template v-else>
-                  {{ $t('panel.payment-mode.tipSandboxMode') }}
+                  {{ $t('panel.payment-mode.tipSandboxMode') }}.
                 </template>
               </small>
               <a href="#" @click.prevent="updatePaymentMode()">

_dev/pages/Accounts.vue

@@ -10,7 +10,7 @@
         </PSAlert>
         <PSAlert :alert-type="ALERT_TYPE_WARNING">
           <h2>{{ $t('pages.accounts.documentNeeded') }}</h2>
-          <p>{{ $t('pages.accounts.additionalDocumentsNeeded') }}:</p>
+          <p>{{ $t('pages.accounts.additionalDocumentsNeeded') }}</p>
           <ul class="my-1">
             <li><b>{{ $t('pages.accounts.photoIds') }}</b></li>
           </ul>
@@ -20,7 +20,7 @@
           <h2>{{ $t('pages.accounts.undergoingCheck') }}</h2>
           <p>
             {{ $t('pages.accounts.severalDays') }}
-            {{ $t('pages.accounts.youCanProcess') }} <b>{{ $t('pages.accounts.upTo') }}</b> {{ $t('pages.accounts.transactionsUntil') }}
+            {{ $t('pages.accounts.youCanProcess') }} <b>{{ $t('pages.accounts.upTo') }}</b> {{ $t('pages.accounts.transactionsUntil') }}.
           </p>
           <div class="mt-3">
             <a href="#" target="_blank">
@@ -31,7 +31,7 @@
         <PSAlert :alert-type="ALERT_TYPE_DANGER">
           <h2>{{ $t('pages.accounts.accountDeclined') }}</h2>
           <p>
-            {{ $t('pages.accounts.cannotProcessCreditCard') }}
+            {{ $t('pages.accounts.cannotProcessCreditCard') }}.
           </p>
           <div class="mt-3">
             <a href="#" target="_blank">

classes/HostedFieldsErrors.php

@@ -45,9 +45,9 @@ public function getHostedFieldsErrors()
     {
         //TODO: Complete with all error code possible - waiting response from paypal
         $errors = array(
-            'INVALID_STRING_LENGTH' => $this->module->l('The value of a field is either too short or too long'),
-            'INVALID_EXPIRATION_YEAR' => $this->module->l('Expiration Year must be between current year and 2099'),
-            'INVALID_PARAMETER_SYNTAX' => $this->module->l('The value of a field does not conform to the expected format'),
+            'INVALID_STRING_LENGTH' => $this->module->l('Invalid format, check your bank details and try again'),
+            'INVALID_EXPIRATION_YEAR' => $this->module->l('Expiration year must be between now and 2099'),
+            'INVALID_PARAMETER_SYNTAX' => $this->module->l('Invalid format, check your bank details and try again'),
         );
 
         return json_encode($errors);

classes/translations/Translations.php

@@ -58,49 +58,50 @@ public function getTranslations()
             ),
             'general' => array(
                 'save' => $this->module->l('Save'),
-                'testModeOn' => $this->module->l('Test mode is turned ON'),
+                'testModeOn' => $this->module->l('Test mode is turned on'),
             ),
             'pages' => array(
                 'accounts' => array(
                     'approvalPending' => $this->module->l('Approval pending'),
-                    'waitingEmail' => $this->module->l('We are waiting for email confirmation… Check your inbox to finalize creation.'),
-                    'didntReceiveEmail' => $this->module->l('Didn’t receive any confirmation email?'),
-                    'sendEmailAgain' => $this->module->l('Send email again'),
-                    'documentNeeded' => $this->module->l('Documents needed'),
-                    'additionalDocumentsNeeded' => $this->module->l('We need additional documents to complete our background check. Please prepare the following documents'),
+                    'waitingEmail' => $this->module->l('A confirmation email has been sent. Check your inbox and click on the link to activate your account.'),
+                    'didntReceiveEmail' => $this->module->l('No confirmation email?'),
+                    'sendEmailAgain' => $this->module->l('Send it again'),
+                    'documentNeeded' => $this->module->l('Information needed'),
+                    'additionalDocumentsNeeded' => $this->module->l('Additional information is required to complete background check. Please upload the following document(s):'),
                     'photoIds' => $this->module->l('Photo IDs, such as driving licence, for all beneficial owners'),
-                    'uploadFile' => $this->module->l('Upload file'),
-                    'undergoingCheck' => $this->module->l('Your case is currently undergoing necessary background check'),
-                    'severalDays' => $this->module->l('This can take several days. If further information is needed, you will be notified.'),
+                    'uploadFile' => $this->module->l('Upload file(s)'),
+                    'undergoingCheck' => $this->module->l('Background check is currently undergoing'),
+                    'severalDays' => $this->module->l('It can take several days. If further information is needed, you will be notified.'),
                     'youCanProcess' => $this->module->l('You can process'),
                     'upTo' => $this->module->l('up to $500'),
-                    'transactionsUntil' => $this->module->l('in card transactions until your account is fully approved to accept card payment.'),
+                    'transactionsUntil' => $this->module->l('in card transactions until your account is fully approved'),
                     'approvalPendingLink' => $this->module->l('Approval pending FAQs'),
                     'accountDeclined' => $this->module->l('Account declined'),
-                    'cannotProcessCreditCard' => $this->module->l('We cannot process credit card payments for you at the moment. You can reapply after 90 days, in the meantine you can accept orders via PayPal.'),
+                    'cannotProcessCreditCard' => $this->module->l('Unfortunately, credit card payments cannot be processed for you at the moment. You will be able to reapply after 90 days. In the meantime, you can still receive payments via PayPal'),
                     'accountDeclinedLink' => $this->module->l('Account declined FAQs'),
                 ),
             ),
             'panel' => array(
                 'account-list' => array(
                     'accountSettings' => $this->module->l('Account settings'),
-                    'essentialsAccount' => $this->module->l('PrestaShop Essentials account'),
-                    'activateAllPayment' => $this->module->l('Activate all payment methods with your PrestaShop Essentials account.'),
-                    'connectedWitdh' => $this->module->l('You are connected with'),
-                    'createNewAccount' => $this->module->l('Create a new account or login with your current account.'),
-                    'createAccount' => $this->module->l('Create account'),
+                    'essentialsAccount' => $this->module->l('PrestaShop Checkout account'),
+                    'activateAllPayment' => $this->module->l('You need to connect to both PrestaShop Checkout and PayPal accounts to activate all payment methods'),
+                    'connectedWitdh' => $this->module->l('You are now logged in with your'),
+                    'account' => $this->module->l('account'),
+                    'createNewAccount' => $this->module->l('Sign in or login to provide every payment method to your customer.'),
+                    'createAccount' => $this->module->l('Sign up'),
                     'or' => $this->module->l('or'),
                     'logIn' => $this->module->l('Log in'),
                     'logOut' => $this->module->l('Log out'),
                     'paypalAccount' => $this->module->l('PayPal account'),
-                    'activatePayment' => $this->module->l('To activate payment methods link your existing PayPal account or create a new one.'),
-                    'accountIsLinked' => $this->module->l('Your PrestaShop Essentials account is linked with this PayPal account.'),
+                    'activatePayment' => $this->module->l('Log in or sign up to PayPal'),
+                    'accountIsLinked' => $this->module->l('Your PrestaShop Checkout account is linked to your PayPal account'),
                     'linkToPaypal' => $this->module->l('Link to PayPal account'),
                     'loading' => $this->module->l('Loading'),
                     'useAnotherAccount' => $this->module->l('Use another account'),
                 ),
                 'active-payment' => array(
-                    'activePaymentMethods' => $this->module->l('Active payment methods'),
+                    'activePaymentMethods' => $this->module->l('Activate payment methods'),
                     'paymentMethods' => $this->module->l('Payment methods'),
                     'changeOrder' => $this->module->l('Change order'),
                     'enabled' => $this->module->l('Enabled'),
@@ -111,22 +112,24 @@ public function getTranslations()
                 ),
                 'payment-mode' => array(
                     'title' => $this->module->l('Payment methods activation'),
-                    'paymentAction' => $this->module->l('Payment action'),
-                    'capture' => $this->module->l('CAPTURE'),
-                    'authorize' => $this->module->l('AUTHORIZE'),
+                    'paymentAction' => $this->module->l('Transaction type'),
+                    'capture' => $this->module->l('Direct Sale'),
+                    'authorize' => $this->module->l('Capture at shipping'),
                     'helpBoxPaymentMode' => $this->module->l('Authorize process holds all payments on customers’ account. Mark the order as « Shipped » or « Payment accepted » to capture payments. Local Payment Methods are not compatible with Authorize process.'),
-                    'infoAlertText' => $this->module->l('We recommend Authorize process only for lean manufacturers and craft products sellers.'),
+                    'infoAlertText' => $this->module->l('We recommend « Capture at shipping » if you are a lean manufacturer or a craft products seller'),
                     'environment' => $this->module->l('Environment'),
-                    'sandboxMode' => $this->module->l('Sandbox mode'),
-                    'useSandboxMode' => $this->module->l('Use test mode'),
-                    'tipSandboxMode' => $this->module->l('Test mode doesn’t allow you to collect payments.'),
+                    'sandboxMode' => $this->module->l('Test mode'),
+                    'useSandboxMode' => $this->module->l('Switch to test mode?'),
+                    'tipSandboxMode' => $this->module->l('Note that you cannot collect payments with test mode'),
                     'productionMode' => $this->module->l('Production mode'),
                     'useProductionMode' => $this->module->l('Use production mode'),
                     'tipProductionMode' => $this->module->l('Production mode enables you to collect your payments.'),
                 ),
                 'fees' => array(
-                    'title' => $this->module->l('How much fees will be taken on my sales from the processing service provider?'),
-                    'calculateMuch' => $this->module->l('Calculate how much fees you will be paying when invoicing your clients.'),
+                    'title' => $this->module->l('How fees are calculated for each sale?'),
+                    'calculateMuch' => $this->module->l('The processing service provider will keep a comission on every sale you accept'),
+                    'additionalFees' => $this->module->l('Additional fees are applied to cross border transactions made outside your country of residence. See details below'),
+                    'eurozone' => $this->module->l('Eurozone includes...'),
                     'countryResidence' => $this->module->l('Your country of residence'),
                     'estimatedSales' => $this->module->l('Your estimated monthly sales'),
                     'paymentMethod' => $this->module->l('Payment method'),
@@ -142,7 +145,7 @@ public function getTranslations()
             ),
             'block' => array(
                 'reassurance' => array(
-                    'title' => $this->module->l('PrestaShop Payments, all-in-one module for your payment options'),
+                    'title' => $this->module->l('PrestaShop Checkout, all-in-one module for your payment options'),
                     'firstTip1' => $this->module->l('All payment methods'),
                     'firstTip2' => $this->module->l('accept cards, PayPal and much more.'),
                     'secondTip1' => $this->module->l('Benefit from all'),
@@ -155,18 +158,17 @@ public function getTranslations()
                 ),
                 'fraud-tool' => array(
                     'title' => $this->module->l('Fraud tool'),
-                    'text' => $this->module->l('PayPal algorithms limits your fraud rate automatically.
-                    If you want to go further in Fraud management, there is a complete
-                    tool on PayPal platform to set specific rules and drive your performance
-                    concerning fraud and chargeback costs.'),
-                    'discoverFraudTool' => $this->module->l('Discover fraud tool'),
+                    'text' => $this->module->l('PayPal algorithms automatically limit your fraud rate.
+                    If you want to go further in Fraud Management, there is a complete tool on the PayPal platform
+                    to set specific rules and drive your performance concerning fraud and chargeback costs.'),
+                    'discoverFraudTool' => $this->module->l('Go further'),
                 ),
                 'feature-incoming' => array(
-                    'text' => $this->module->l('Cash on delivery, recurring payments, point of sales terminal, … and more to come!'),
+                    'text' => $this->module->l('Checkout customization, transactions list, dispute management ... and more to come!'),
                 ),
                 'dispute' => array(
-                    'pendingDispute' => $this->module->l('pending disputes'),
-                    'goToDispute' => $this->module->l('Go to Disputes Management Plateform'),
+                    'pendingDispute' => $this->module->l('pending dispute(s)'),
+                    'goToDispute' => $this->module->l('Go to the dispute management platform'),
                 ),
             ),
         );

ps_checkout.php

@@ -259,7 +259,7 @@ public function getPaypalPaymentOption()
     {
         $paypalPaymentOption = new PaymentOption();
         $paypalPaymentOption->setModuleName($this->name . '_paypal')
-                            ->setCallToActionText($this->l('and other payment methods'))
+                            ->setCallToActionText($this->l('Pay by PayPal or other payment methods'))
                             ->setAction($this->context->link->getModuleLink($this->name, 'CreateOrder', array(), true))
                             ->setAdditionalInformation($this->generatePaypalForm())
                             ->setLogo(Media::getMediaPath(_PS_MODULE_DIR_ . $this->name . '/views/img/paypal.png'));
@@ -286,7 +286,7 @@ public function getHostedFieldsPaymentOption()
     {
         $hostedFieldsPaymentOption = new PaymentOption();
         $hostedFieldsPaymentOption->setModuleName($this->name . '_hostedFields')
-                    ->setCallToActionText($this->l('100% secure payments'))
+                    ->setCallToActionText($this->l('Pay by Card'))
                     ->setAction($this->context->link->getModuleLink($this->name, 'ValidateOrder', array(), true))
                     ->setForm($this->generateHostedFieldsForm())
                     ->setLogo(Media::getMediaPath(_PS_MODULE_DIR_ . $this->name . '/views/img/payement-cards.png'));

views/templates/front/paypal.tpl

@@ -35,21 +35,21 @@
         </div>
         <div class="condition-label">
             <label class="js-terms paypal-label" for="conditions_to_approve-paypal">
-            I agree to the <a href="" id="cta-terms-and-conditions-0">terms of service</a> and will adhere to them unconditionally.
+            {l s='I agree to the' mod='ps_checkout'} <a href="" id="cta-terms-and-conditions-checkout">{l s='terms of service' mod='ps_checkout'}</a> {l s='and will adhere to them unconditionally' mod='ps_checkout'}.
             </label>
         </div>
         </li>
     </ul>
 </form>
 
-<div class="paypal-tips">You will be temporarily redirected to the related payment service.</div>
+<div class="paypal-tips">{l s='You will be redirected to the related gateway to complete payment' mod='ps_checkout'}</div>
 
 <div id="paypal-button-container"></div>
 
 <div id="paypal-approve-error" class="hide-paypal-error">
     <article class="alert alert-danger" role="alert" data-alert="danger">
         <ul>
-            <li>Impossible de mettre à jour vos informations, veuillez vérifier vos données.</li>
+            <li>{l s='Please indicate that you have read Terms & Conditions and accept all terms' mod='ps_checkout'}</li>.
         </ul>
     </article>
 </div>