Skip to content

Commit 7f9a325

Browse files
author
Viktor Tymchynskyi
committed
Merge remote-tracking branch 'origin/MAGETWO-42824' into MPI-BUGFIXES
2 parents 9f8dc49 + 19684d8 commit 7f9a325

File tree

41 files changed

+538
-371
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+538
-371
lines changed

‎app/code/Magento/Paypal/Block/Express/Review.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ public function renderShippingRateOption($rate, $format = '%s - %s%s', $inclTaxF
174174

175175
$incl = $this->_getShippingPrice($rate->getPrice(), true);
176176
if ($incl != $price && $this->_taxHelper->displayShippingBothPrices()) {
177-
$renderedInclTax = sprintf($inclTaxFormat, __('Incl. Tax'), $incl);
177+
$renderedInclTax = sprintf($inclTaxFormat, $this->escapeHtml(__('Incl. Tax')), $incl);
178178
}
179179
}
180180
return sprintf($format, $this->escapeHtml($rate->getMethodTitle()), $price, $renderedInclTax);

‎app/code/Magento/Paypal/i18n/de_DE.csv

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ Authorization,Bewilligung
7171
"IPN ""%1""","IPN ""%1"""
7272
"Billing Agreements",Rechnungsvereinbarungen
7373
"Reference ID","Reference ID"
74-
"Billing Agreement #%1","Billing Agreement #%1"
74+
"Billing Agreement # ","Billing Agreement # "
7575
"Related Orders","Related Orders"
7676
"Billing Agreement View","Rechnungsvereinbarung Ansicht"
7777
"View Transaction Details","Überweisungsdetails zeigen"
@@ -105,7 +105,6 @@ Help,Hilfe
105105
"We found nothing to fetch because of an empty configuration.","We found nothing to fetch because of an empty configuration."
106106
"We fetched %1 report rows from '%2@%3'.","We fetched %1 report rows from '%2@%3'."
107107
"We couldn't fetch reports from '%1@%2'.","We couldn't fetch reports from '%1@%2'."
108-
"Billing Agreement # %1","Billing Agreement # %1"
109108
"We couldn't start the billing agreement wizard.","We couldn't start the billing agreement wizard."
110109
"The billing agreement ""%1"" has been created.","The billing agreement ""%1"" has been created."
111110
"We couldn't finish the billing agreement wizard.","We couldn't finish the billing agreement wizard."
@@ -372,7 +371,9 @@ Funding,Finanzierung
372371
"Created At","Created At"
373372
"Updated At","Updated At"
374373
"-- Please Select Billing Agreement--","-- Bitte wählen Sie Rechnungsvereinbarung --"
375-
"Not sure what PayPal payment method to use? Click <a href=""%1"" target=""_blank"">here</a> to learn more.","Not sure what PayPal payment method to use? Click <a href=""%1"" target=""_blank"">here</a> to learn more."
374+
"Not sure what PayPal payment method to use? Click ","Not sure what PayPal payment method to use? Click "
375+
"here","here"
376+
" to learn more."," to learn more."
376377
"Important: ","Important: "
377378
"To use PayPal Payments Advanced, you must configure your PayPal Payments Advanced account on the PayPal website.","To use PayPal Payments Advanced, you must configure your PayPal Payments Advanced account on the PayPal website."
378379
"Once you log into your PayPal Advanced account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below","Once you log into your PayPal Advanced account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below"
@@ -390,7 +391,7 @@ Updated:,Updated:
390391
"New Billing Agreement","Neue Abrechnungsvereinbarung"
391392
"You will be redirected to the payment system website.","You will be redirected to the payment system website."
392393
Create...,Create...
393-
"Your billing agreement # is: %1.","Your billing agreement # is: %1."
394+
"Your billing agreement # is: ","Your billing agreement # is: "
394395
"Review Order","Auftrag überprüfen"
395396
"Please select a shipping method...","Bitte wählen Sie eine Versandart aus..."
396397
"Update Shipping Method","Update Shipping Method"

‎app/code/Magento/Paypal/i18n/en_US.csv

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ Authorization,Authorization
7171
"IPN ""%1""","IPN ""%1"""
7272
"Billing Agreements","Billing Agreements"
7373
"Reference ID","Reference ID"
74-
"Billing Agreement #%1","Billing Agreement #%1"
74+
"Billing Agreement # ","Billing Agreement # "
7575
"Related Orders","Related Orders"
7676
"Billing Agreement View","Billing Agreement View"
7777
"View Transaction Details","View Transaction Details"
@@ -105,7 +105,6 @@ Help,Help
105105
"We found nothing to fetch because of an empty configuration.","We found nothing to fetch because of an empty configuration."
106106
"We fetched %1 report rows from '%2@%3'.","We fetched %1 report rows from '%2@%3'."
107107
"We couldn't fetch reports from '%1@%2'.","We couldn't fetch reports from '%1@%2'."
108-
"Billing Agreement # %1","Billing Agreement # %1"
109108
"We couldn't start the billing agreement wizard.","We couldn't start the billing agreement wizard."
110109
"The billing agreement ""%1"" has been created.","The billing agreement ""%1"" has been created."
111110
"We couldn't finish the billing agreement wizard.","We couldn't finish the billing agreement wizard."
@@ -372,7 +371,9 @@ Funding,Funding
372371
"Created At","Created At"
373372
"Updated At","Updated At"
374373
"-- Please Select Billing Agreement--","-- Please Select Billing Agreement--"
375-
"Not sure what PayPal payment method to use? Click <a href=""%1"" target=""_blank"">here</a> to learn more.","Not sure what PayPal payment method to use? Click <a href=""%1"" target=""_blank"">here</a> to learn more."
374+
"Not sure what PayPal payment method to use? Click ","Not sure what PayPal payment method to use? Click "
375+
"here","here"
376+
" to learn more."," to learn more."
376377
"Important: ","Important: "
377378
"To use PayPal Payments Advanced, you must configure your PayPal Payments Advanced account on the PayPal website.","To use PayPal Payments Advanced, you must configure your PayPal Payments Advanced account on the PayPal website."
378379
"Once you log into your PayPal Advanced account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below","Once you log into your PayPal Advanced account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below"
@@ -390,7 +391,7 @@ Updated:,Updated:
390391
"New Billing Agreement","New Billing Agreement"
391392
"You will be redirected to the payment system website.","You will be redirected to the payment system website."
392393
Create...,Create...
393-
"Your billing agreement # is: %1.","Your billing agreement # is: %1."
394+
"Your billing agreement # is: ","Your billing agreement # is: "
394395
"Review Order","Review Order"
395396
"Please select a shipping method...","Please select a shipping method..."
396397
"Update Shipping Method","Update Shipping Method"

‎app/code/Magento/Paypal/i18n/es_ES.csv

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ Authorization,Autorización
7171
"IPN ""%1""","IPN ""%1"""
7272
"Billing Agreements","Contratos de facturación"
7373
"Reference ID","Reference ID"
74-
"Billing Agreement #%1","Billing Agreement #%1"
74+
"Billing Agreement # ","Billing Agreement # "
7575
"Related Orders","Related Orders"
7676
"Billing Agreement View","Ver contrato de facturación"
7777
"View Transaction Details","Ver Detalles de la Transacción"
@@ -105,7 +105,6 @@ Help,Ayuda
105105
"We found nothing to fetch because of an empty configuration.","We found nothing to fetch because of an empty configuration."
106106
"We fetched %1 report rows from '%2@%3'.","We fetched %1 report rows from '%2@%3'."
107107
"We couldn't fetch reports from '%1@%2'.","We couldn't fetch reports from '%1@%2'."
108-
"Billing Agreement # %1","Billing Agreement # %1"
109108
"We couldn't start the billing agreement wizard.","We couldn't start the billing agreement wizard."
110109
"The billing agreement ""%1"" has been created.","The billing agreement ""%1"" has been created."
111110
"We couldn't finish the billing agreement wizard.","We couldn't finish the billing agreement wizard."
@@ -372,7 +371,9 @@ Funding,Fondos
372371
"Created At","Created At"
373372
"Updated At","Updated At"
374373
"-- Please Select Billing Agreement--","-- Por favor, Seleccione el Acuerdo de Facturación--"
375-
"Not sure what PayPal payment method to use? Click <a href=""%1"" target=""_blank"">here</a> to learn more.","Not sure what PayPal payment method to use? Click <a href=""%1"" target=""_blank"">here</a> to learn more."
374+
"Not sure what PayPal payment method to use? Click ","Not sure what PayPal payment method to use? Click "
375+
"here","here"
376+
" to learn more."," to learn more."
376377
"Important: ","Important: "
377378
"To use PayPal Payments Advanced, you must configure your PayPal Payments Advanced account on the PayPal website.","To use PayPal Payments Advanced, you must configure your PayPal Payments Advanced account on the PayPal website."
378379
"Once you log into your PayPal Advanced account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below","Once you log into your PayPal Advanced account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below"
@@ -390,7 +391,7 @@ Updated:,Updated:
390391
"New Billing Agreement","Nuevo Acuerdo de Facturación"
391392
"You will be redirected to the payment system website.","You will be redirected to the payment system website."
392393
Create...,Create...
393-
"Your billing agreement # is: %1.","Your billing agreement # is: %1."
394+
"Your billing agreement # is: ","Your billing agreement # is: "
394395
"Review Order","Revise su pedido"
395396
"Please select a shipping method...","Por favor, elija un método de envío..."
396397
"Update Shipping Method","Update Shipping Method"

‎app/code/Magento/Paypal/i18n/fr_FR.csv

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ Authorization,Autorisation
7171
"IPN ""%1""","IPN ""%1"""
7272
"Billing Agreements","Accords de facturation"
7373
"Reference ID","Reference ID"
74-
"Billing Agreement #%1","Billing Agreement #%1"
74+
"Billing Agreement # ","Billing Agreement # "
7575
"Related Orders","Related Orders"
7676
"Billing Agreement View","Voir l'accord de facturation"
7777
"View Transaction Details","Voir les détails de la transction"
@@ -105,7 +105,6 @@ Help,Aide
105105
"We found nothing to fetch because of an empty configuration.","We found nothing to fetch because of an empty configuration."
106106
"We fetched %1 report rows from '%2@%3'.","We fetched %1 report rows from '%2@%3'."
107107
"We couldn't fetch reports from '%1@%2'.","We couldn't fetch reports from '%1@%2'."
108-
"Billing Agreement # %1","Billing Agreement # %1"
109108
"We couldn't start the billing agreement wizard.","We couldn't start the billing agreement wizard."
110109
"The billing agreement ""%1"" has been created.","The billing agreement ""%1"" has been created."
111110
"We couldn't finish the billing agreement wizard.","We couldn't finish the billing agreement wizard."
@@ -372,7 +371,9 @@ Funding,Fonds
372371
"Created At","Created At"
373372
"Updated At","Updated At"
374373
"-- Please Select Billing Agreement--","-- Veuillez sélectionner un accord de facturation--"
375-
"Not sure what PayPal payment method to use? Click <a href=""%1"" target=""_blank"">here</a> to learn more.","Not sure what PayPal payment method to use? Click <a href=""%1"" target=""_blank"">here</a> to learn more."
374+
"Not sure what PayPal payment method to use? Click ","Not sure what PayPal payment method to use? Click "
375+
"here","here"
376+
" to learn more."," to learn more."
376377
"Important: ","Important: "
377378
"To use PayPal Payments Advanced, you must configure your PayPal Payments Advanced account on the PayPal website.","To use PayPal Payments Advanced, you must configure your PayPal Payments Advanced account on the PayPal website."
378379
"Once you log into your PayPal Advanced account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below","Once you log into your PayPal Advanced account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below"
@@ -390,7 +391,7 @@ Updated:,Updated:
390391
"New Billing Agreement","Nouvel Accord de Facturation"
391392
"You will be redirected to the payment system website.","You will be redirected to the payment system website."
392393
Create...,Create...
393-
"Your billing agreement # is: %1.","Your billing agreement # is: %1."
394+
"Your billing agreement # is: ","Your billing agreement # is: "
394395
"Review Order","Vérification de la commande"
395396
"Please select a shipping method...","Veuillez sélectionner un mode d'expédition..."
396397
"Update Shipping Method","Update Shipping Method"

‎app/code/Magento/Paypal/i18n/nl_NL.csv

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ Authorization,Autorisatie
7171
"IPN ""%1""","IPN ""%1"""
7272
"Billing Agreements","Facturering Overeenkomsten"
7373
"Reference ID","Reference ID"
74-
"Billing Agreement #%1","Billing Agreement #%1"
74+
"Billing Agreement # ","Billing Agreement # "
7575
"Related Orders","Related Orders"
7676
"Billing Agreement View","Factureringsovereenkomst Beeld"
7777
"View Transaction Details","Bekijk Transactie Details"
@@ -105,7 +105,6 @@ Help,Help
105105
"We found nothing to fetch because of an empty configuration.","We found nothing to fetch because of an empty configuration."
106106
"We fetched %1 report rows from '%2@%3'.","We fetched %1 report rows from '%2@%3'."
107107
"We couldn't fetch reports from '%1@%2'.","We couldn't fetch reports from '%1@%2'."
108-
"Billing Agreement # %1","Billing Agreement # %1"
109108
"We couldn't start the billing agreement wizard.","We couldn't start the billing agreement wizard."
110109
"The billing agreement ""%1"" has been created.","The billing agreement ""%1"" has been created."
111110
"We couldn't finish the billing agreement wizard.","We couldn't finish the billing agreement wizard."
@@ -372,7 +371,9 @@ Funding,Financiering
372371
"Created At","Created At"
373372
"Updated At","Updated At"
374373
"-- Please Select Billing Agreement--","-- Selecteer a.u.b. rekeningovereenkomst --"
375-
"Not sure what PayPal payment method to use? Click <a href=""%1"" target=""_blank"">here</a> to learn more.","Not sure what PayPal payment method to use? Click <a href=""%1"" target=""_blank"">here</a> to learn more."
374+
"Not sure what PayPal payment method to use? Click ","Not sure what PayPal payment method to use? Click "
375+
"here","here"
376+
" to learn more."," to learn more."
376377
"Important: ","Important: "
377378
"To use PayPal Payments Advanced, you must configure your PayPal Payments Advanced account on the PayPal website.","To use PayPal Payments Advanced, you must configure your PayPal Payments Advanced account on the PayPal website."
378379
"Once you log into your PayPal Advanced account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below","Once you log into your PayPal Advanced account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below"
@@ -390,7 +391,7 @@ Updated:,Updated:
390391
"New Billing Agreement","Nieuwe factuurovereenkomst"
391392
"You will be redirected to the payment system website.","You will be redirected to the payment system website."
392393
Create...,Create...
393-
"Your billing agreement # is: %1.","Your billing agreement # is: %1."
394+
"Your billing agreement # is: ","Your billing agreement # is: "
394395
"Review Order","Overzicht van de bestelling"
395396
"Please select a shipping method...","Selecteer een methode van verzending..."
396397
"Update Shipping Method","Update Shipping Method"

‎app/code/Magento/Paypal/i18n/pt_BR.csv

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ Authorization,Autorização
7171
"IPN ""%1""","IPN ""%1"""
7272
"Billing Agreements","Contratos de faturamento"
7373
"Reference ID","Reference ID"
74-
"Billing Agreement #%1","Billing Agreement #%1"
74+
"Billing Agreement # ","Billing Agreement # "
7575
"Related Orders","Related Orders"
7676
"Billing Agreement View","Visualização de Contrato de Faturamento"
7777
"View Transaction Details","Visualizar Detalhes da Transação."
@@ -105,7 +105,6 @@ Help,Ajuda
105105
"We found nothing to fetch because of an empty configuration.","We found nothing to fetch because of an empty configuration."
106106
"We fetched %1 report rows from '%2@%3'.","We fetched %1 report rows from '%2@%3'."
107107
"We couldn't fetch reports from '%1@%2'.","We couldn't fetch reports from '%1@%2'."
108-
"Billing Agreement # %1","Billing Agreement # %1"
109108
"We couldn't start the billing agreement wizard.","We couldn't start the billing agreement wizard."
110109
"The billing agreement ""%1"" has been created.","The billing agreement ""%1"" has been created."
111110
"We couldn't finish the billing agreement wizard.","We couldn't finish the billing agreement wizard."
@@ -372,7 +371,9 @@ Funding,Financiamento
372371
"Created At","Created At"
373372
"Updated At","Updated At"
374373
"-- Please Select Billing Agreement--","-- Por Favor, Escolha o Acordo de Cobrança--"
375-
"Not sure what PayPal payment method to use? Click <a href=""%1"" target=""_blank"">here</a> to learn more.","Not sure what PayPal payment method to use? Click <a href=""%1"" target=""_blank"">here</a> to learn more."
374+
"Not sure what PayPal payment method to use? Click ","Not sure what PayPal payment method to use? Click "
375+
"here","here"
376+
" to learn more."," to learn more."
376377
"Important: ","Important: "
377378
"To use PayPal Payments Advanced, you must configure your PayPal Payments Advanced account on the PayPal website.","To use PayPal Payments Advanced, you must configure your PayPal Payments Advanced account on the PayPal website."
378379
"Once you log into your PayPal Advanced account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below","Once you log into your PayPal Advanced account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below"
@@ -390,7 +391,7 @@ Updated:,Updated:
390391
"New Billing Agreement","Novo Contrato de Faturamento"
391392
"You will be redirected to the payment system website.","You will be redirected to the payment system website."
392393
Create...,Create...
393-
"Your billing agreement # is: %1.","Your billing agreement # is: %1."
394+
"Your billing agreement # is: ","Your billing agreement # is: "
394395
"Review Order","Analisar o pedido"
395396
"Please select a shipping method...","Por favor selecione um método de envio..."
396397
"Update Shipping Method","Update Shipping Method"

‎app/code/Magento/Paypal/i18n/zh_Hans_CN.csv

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ Authorization,授权
7171
"IPN ""%1""","IPN ""%1"""
7272
"Billing Agreements",记账协议
7373
"Reference ID","Reference ID"
74-
"Billing Agreement #%1","Billing Agreement #%1"
74+
"Billing Agreement # ","Billing Agreement # "
7575
"Related Orders","Related Orders"
7676
"Billing Agreement View",记账协议视图
7777
"View Transaction Details",查看交易详情
@@ -105,7 +105,6 @@ Help,帮助
105105
"We found nothing to fetch because of an empty configuration.","We found nothing to fetch because of an empty configuration."
106106
"We fetched %1 report rows from '%2@%3'.","We fetched %1 report rows from '%2@%3'."
107107
"We couldn't fetch reports from '%1@%2'.","We couldn't fetch reports from '%1@%2'."
108-
"Billing Agreement # %1","Billing Agreement # %1"
109108
"We couldn't start the billing agreement wizard.","We couldn't start the billing agreement wizard."
110109
"The billing agreement ""%1"" has been created.","The billing agreement ""%1"" has been created."
111110
"We couldn't finish the billing agreement wizard.","We couldn't finish the billing agreement wizard."
@@ -372,7 +371,9 @@ Funding,退款
372371
"Created At","Created At"
373372
"Updated At","Updated At"
374373
"-- Please Select Billing Agreement--","-- 请选择记账协议 --"
375-
"Not sure what PayPal payment method to use? Click <a href=""%1"" target=""_blank"">here</a> to learn more.","Not sure what PayPal payment method to use? Click <a href=""%1"" target=""_blank"">here</a> to learn more."
374+
"Not sure what PayPal payment method to use? Click ","Not sure what PayPal payment method to use? Click "
375+
"here","here"
376+
" to learn more."," to learn more."
376377
"Important: ","Important: "
377378
"To use PayPal Payments Advanced, you must configure your PayPal Payments Advanced account on the PayPal website.","To use PayPal Payments Advanced, you must configure your PayPal Payments Advanced account on the PayPal website."
378379
"Once you log into your PayPal Advanced account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below","Once you log into your PayPal Advanced account, navigate to the Service Settings - Hosted Checkout Pages - Set Up menu and set the options described below"
@@ -390,7 +391,7 @@ Updated:,Updated:
390391
"New Billing Agreement",新建记账协议
391392
"You will be redirected to the payment system website.","You will be redirected to the payment system website."
392393
Create...,Create...
393-
"Your billing agreement # is: %1.","Your billing agreement # is: %1."
394+
"Your billing agreement # is: ","Your billing agreement # is: "
394395
"Review Order",查看订单
395396
"Please select a shipping method...",请选择送货方法...
396397
"Update Shipping Method","Update Shipping Method"

0 commit comments

Comments
 (0)