[IMP] payment: uniform translatable messages

Avoid trailing space:
In translation content, these tends to be skipped during translation,
making the message inconsistent. There is already a translation for
the term without the space so can reuse it.

Merge "setup"
Use the same writing to avoid having two similar messages

Remove unnecessary comma

Merge PayPal and Paypal

Courtesy of Primesh on Transifex

closes odoo/odoo#38348

X-original-commit: c1fb136cc684eba0cdeec302f27268ccda7fa5d2
Signed-off-by: Martin Trigaux (mat) <mat@odoo.com>

4 files changed, 6 insertions, 24 deletions

diff --git a/addons/payment/data/payment_acquirer_data.xml b/addons/payment/data/payment_acquirer_data.xml
index f956de72633..6175435b0c2 100644
--- a/addons/payment/data/payment_acquirer_data.xml
+++ b/addons/payment/data/payment_acquirer_data.xml
@@ -159,7 +159,7 @@
     </record>
 
     <record id="payment_acquirer_paypal" model="payment.acquirer">
-        <field name="name">Paypal</field>
+        <field name="name">PayPal</field>
         <field name="sequence">1</field>
         <field name="view_template_id" ref="default_acquirer_button"/>
         <field name="image_128" type="base64" file="payment_paypal/static/src/img/paypal_icon.png"/>
diff --git a/addons/payment/i18n/payment.pot b/addons/payment/i18n/payment.pot
index 1edbc646fc5..439173a9970 100644
--- a/addons/payment/i18n/payment.pot
+++ b/addons/payment/i18n/payment.pot
@@ -416,13 +416,6 @@ msgid "Cancelled payments"
 msgstr ""
 
 #. module: payment
-#. openerp-web
-#: code:addons/payment/static/src/js/payment_form.js:0
-#, python-format
-msgid "Cannot set-up the payment"
-msgstr ""
-
-#. module: payment
 #: code:addons/payment/controllers/portal.py:0
 #, python-format
 msgid "Cannot setup the payment."
@@ -870,7 +863,7 @@ msgstr ""
 #. openerp-web
 #: code:addons/payment/static/src/xml/payment_processing.xml:0
 #, python-format
-msgid "If, the payment hasn't been confirmed you can contact us."
+msgid "If the payment hasn't been confirmed you can contact us."
 msgstr ""
 
 #. module: payment
@@ -1251,6 +1244,7 @@ msgstr ""
 #. module: payment
 #: model:ir.model.fields.selection,name:payment.selection__payment_acquirer_onboarding_wizard__payment_method__paypal
 #: model:ir.model.fields.selection,name:payment.selection__res_company__payment_onboarding_payment_method__paypal
+#: model:payment.acquirer,name:payment.payment_acquirer_paypal
 msgid "PayPal"
 msgstr ""
 
@@ -1409,11 +1403,6 @@ msgid "Payments received"
 msgstr ""
 
 #. module: payment
-#: model:payment.acquirer,name:payment.payment_acquirer_paypal
-msgid "Paypal"
-msgstr ""
-
-#. module: payment
 #: model:ir.model.fields,field_description:payment.field_payment_acquirer_onboarding_wizard__paypal_user_type
 msgid "Paypal User Type"
 msgstr ""
@@ -1936,13 +1925,6 @@ msgstr ""
 
 #. module: payment
 #. openerp-web
-#: code:addons/payment/static/src/js/payment_form.js:0
-#, python-format
-msgid "We are not able to redirect you to the payment form. "
-msgstr ""
-
-#. module: payment
-#. openerp-web
 #: code:addons/payment/static/src/js/payment_processing.js:0
 #, python-format
 msgid "We are processing your payment, please wait ..."
diff --git a/addons/payment/static/src/js/payment_form.js b/addons/payment/static/src/js/payment_form.js
index 72a4b17fa29..345b678d5bf 100644
--- a/addons/payment/static/src/js/payment_form.js
+++ b/addons/payment/static/src/js/payment_form.js
@@ -301,7 +301,7 @@ publicWidget.registry.PaymentForm = publicWidget.Widget.extend({
                     }).guardedCatch(function (error) {
                         self.displayError(
                             _t('Server Error'),
-                            _t("We are not able to redirect you to the payment form. ") +
+                            _t("We are not able to redirect you to the payment form.") + " " +
                                 self._parseError(error)
                         );
                     });
@@ -309,7 +309,7 @@ publicWidget.registry.PaymentForm = publicWidget.Widget.extend({
                 else {
                     // we append the form to the body and send it.
                     this.displayError(
-                        _t("Cannot set-up the payment"),
+                        _t("Cannot setup the payment"),
                         _t("We're unable to process your payment.")
                     );
                 }
diff --git a/addons/payment/static/src/xml/payment_processing.xml b/addons/payment/static/src/xml/payment_processing.xml
index 386a03bb117..866230475c1 100644
--- a/addons/payment/static/src/xml/payment_processing.xml
+++ b/addons/payment/static/src/xml/payment_processing.xml
@@ -129,7 +129,7 @@
         <div class="text-center">
             <p>We are not able to find your payment, but don't worry.</p>
             <p>You should receive an email confirming your payment in a few minutes.</p>
-            <p>If, the payment hasn't been confirmed you can contact us.</p>
+            <p>If the payment hasn't been confirmed you can contact us.</p>
         </div>
     </t>