[MERGE] foward port of 10.0 up to revision 84a650e33aadb29661121410813e3de37a5ad3e9

2 files changed, 2 insertions, 107 deletions

diff --git a/addons/payment_transfer/i18n/payment_transfer.pot b/addons/payment_transfer/i18n/payment_transfer.pot
deleted file mode 100644
index 8d148467a56..00000000000
--- a/addons/payment_transfer/i18n/payment_transfer.pot
+++ /dev/null
@@ -1,105 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-#	* payment_transfer
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server 9.saas~10c\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-18 14:07+0000\n"
-"PO-Revision-Date: 2016-08-18 14:07+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: payment_transfer
-#: code:addons/payment_transfer/models/payment_acquirer.py:68
-#, python-format
-msgid "; multiple order found"
-msgstr ""
-
-#. module: payment_transfer
-#: code:addons/payment_transfer/models/payment_acquirer.py:66
-#, python-format
-msgid "; no order found"
-msgstr ""
-
-#. module: payment_transfer
-#: model:payment.acquirer,cancel_msg:payment_transfer.payment_acquirer_transfer
-msgid "<span><i>Cancel,</i> Your payment has been cancelled.</span>"
-msgstr ""
-
-#. module: payment_transfer
-#: model:payment.acquirer,done_msg:payment_transfer.payment_acquirer_transfer
-msgid "<span><i>Done,</i> Your online payment has been successfully processed. Thank you for your order.</span>"
-msgstr ""
-
-#. module: payment_transfer
-#: model:payment.acquirer,error_msg:payment_transfer.payment_acquirer_transfer
-msgid "<span><i>Error,</i> Please be aware that an error occurred during the transaction. The order has been confirmed but won't be paid. Don't hesitate to contact us if you have any questions on the status of your order.</span>"
-msgstr ""
-
-#. module: payment_transfer
-#: model:payment.acquirer,pending_msg:payment_transfer.payment_acquirer_transfer
-msgid "<span><i>Pending,</i> Your online payment has been successfully processed. But your order is not validated yet.</span>"
-msgstr ""
-
-#. module: payment_transfer
-#: code:addons/payment_transfer/models/payment_acquirer.py:30
-#: model:payment.acquirer,post_msg:payment_transfer.payment_acquirer_transfer
-#, python-format
-msgid "Bank Account"
-msgstr ""
-
-#. module: payment_transfer
-#: code:addons/payment_transfer/models/payment_acquirer.py:30
-#, python-format
-msgid "Bank Accounts"
-msgstr ""
-
-#. module: payment_transfer
-#: model:payment.acquirer,post_msg:payment_transfer.payment_acquirer_transfer
-msgid "Communication"
-msgstr ""
-
-#. module: payment_transfer
-#: model:ir.model,name:payment_transfer.model_payment_acquirer
-msgid "Payment Acquirer"
-msgstr ""
-
-#. module: payment_transfer
-#: model:ir.model,name:payment_transfer.model_payment_transaction
-msgid "Payment Transaction"
-msgstr ""
-
-#. module: payment_transfer
-#: model:payment.acquirer,post_msg:payment_transfer.payment_acquirer_transfer
-msgid "Please use the following transfer details"
-msgstr ""
-
-#. module: payment_transfer
-#: model:payment.acquirer,post_msg:payment_transfer.payment_acquirer_transfer
-msgid "Please use the order name as communication reference."
-msgstr ""
-
-#. module: payment_transfer
-#: model:payment.acquirer,pre_msg:payment_transfer.payment_acquirer_transfer
-msgid "Transfer information will be provided after choosing the payment mode."
-msgstr ""
-
-#. module: payment_transfer
-#: code:addons/payment_transfer/models/payment_acquirer.py:19
-#: model:payment.acquirer,name:payment_transfer.payment_acquirer_transfer
-#, python-format
-msgid "Wire Transfer"
-msgstr ""
-
-#. module: payment_transfer
-#: code:addons/payment_transfer/models/payment_acquirer.py:64
-#, python-format
-msgid "received data for reference %s"
-msgstr ""
-
diff --git a/addons/payment_transfer/models/payment.py b/addons/payment_transfer/models/payment.py
index c61b12b1ceb..4a19e336f3f 100644
--- a/addons/payment_transfer/models/payment.py
+++ b/addons/payment_transfer/models/payment.py
@@ -25,13 +25,13 @@ class TransferPaymentAcquirer(models.Model):
         accounts = journals.mapped('bank_account_id').name_get()
         bank_title = _('Bank Accounts') if len(accounts) > 1 else _('Bank Account')
         bank_accounts = ''.join(['<ul>'] + ['<li>%s</li>' % name for id, name in accounts] + ['</ul>'])
-        post_msg = '''<div>
+        post_msg = _('''<div>
 <h3>Please use the following transfer details</h3>
 <h4>%(bank_title)s</h4>
 %(bank_accounts)s
 <h4>Communication</h4>
 <p>Please use the order name as communication reference.</p>
-</div>''' % {
+</div>''') % {
             'bank_title': bank_title,
             'bank_accounts': bank_accounts,
         }