MAGETWO-58089: [Backport] - Issue with inline translate - for 2.0 (gi…

…thub #2652)
magento · Dec 28, 2016 · 4b4a960 · 4b4a960
1 parent 4f6b1f1
commit 4b4a960
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 25 deletions.
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/payment.js b/app/code/Magento/Checkout/view/frontend/web/js/view/payment.js
@@ -15,7 +15,8 @@ define(
         'Magento_Checkout/js/model/payment-service',
         'Magento_Checkout/js/model/payment/method-converter',
         'Magento_Checkout/js/action/get-payment-information',
-        'Magento_Checkout/js/model/checkout-data-resolver'
+        'Magento_Checkout/js/model/checkout-data-resolver',
+        'mage/translate',
     ],
     function (
         $,
@@ -27,7 +28,8 @@ define(
         paymentService,
         methodConverter,
         getPaymentInformation,
-        checkoutDataResolver
+        checkoutDataResolver,
+        $t
     ) {
         'use strict';
 
@@ -51,7 +53,7 @@ define(
                 stepNavigator.registerStep(
                     'payment',
                     null,
-                    'Review & Payments',
+                    $t('Review & Payments'),
                     this.isVisible,
                     _.bind(this.navigate, this),
                     20

diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js b/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js
@@ -75,7 +75,7 @@ define(
                     stepNavigator.registerStep(
                         'shipping',
                         '',
-                        'Shipping',
+                        $t('Shipping'),
                         this.visible, _.bind(this.navigate, this),
                         10
                     );

diff --git a/app/code/Magento/Checkout/view/frontend/web/template/cart/totals/grand-total.html b/app/code/Magento/Checkout/view/frontend/web/template/cart/totals/grand-total.html
@@ -6,7 +6,7 @@
 -->
 <tr class="grand totals">
     <th class="mark" colspan="1" scope="row">
-        <strong data-bind="text: title"></strong>
+        <strong data-bind="i18n: title"></strong>
     </th>
     <td class="amount" data-th="Order Total">
         <strong><span class="price" data-bind="text: getValue()"></span></strong>

diff --git a/app/code/Magento/Checkout/view/frontend/web/template/cart/totals/subtotal.html b/app/code/Magento/Checkout/view/frontend/web/template/cart/totals/subtotal.html
@@ -5,7 +5,7 @@
  */
 -->
 <tr class="totals sub">
-    <th class="mark" colspan="1" scope="row" data-bind="text: title"></th>
+    <th class="mark" colspan="1" scope="row" data-bind="i18n: title"></th>
     <td class="amount" data-th="Subtotal">
         <span class="price" data-bind="text: getValue()"></span>
     </td>

diff --git a/app/code/Magento/Checkout/view/frontend/web/template/payment.html b/app/code/Magento/Checkout/view/frontend/web/template/payment.html
@@ -5,7 +5,7 @@
  */
 -->
 <li id="payment" role="presentation" class="checkout-payment-method" data-bind="fadeVisible: isVisible">
-    <div class="step-title" data-bind="text: title" data-role="title"></div>
+    <div class="step-title" data-bind="i18n: title" data-role="title"></div>
     <div id="checkout-step-payment"
          class="step-content"
          data-role="content"

diff --git a/app/code/Magento/Checkout/view/frontend/web/template/summary/shipping.html b/app/code/Magento/Checkout/view/frontend/web/template/summary/shipping.html
@@ -7,7 +7,7 @@
 <!-- ko if: quoteIsVirtual == 0 -->
     <tr class="totals shipping excl">
         <th class="mark" scope="row">
-            <span class="label" data-bind="text: title"></span>
+            <span class="label" data-bind="i18n: title"></span>
             <span class="value" data-bind="text: getShippingMethodTitle()"></span>
         </th>
         <td class="amount">

diff --git a/app/code/Magento/Tax/view/frontend/web/template/checkout/cart/totals/grand-total.html b/app/code/Magento/Tax/view/frontend/web/template/checkout/cart/totals/grand-total.html
@@ -7,15 +7,15 @@
 <!-- ko if: isTaxDisplayedInGrandTotal && isDisplayed() -->
 <tr class="grand totals incl">
     <th class="mark" scope="row">
-        <strong data-bind="text: inclTaxLabel"></strong>
+        <strong data-bind="i18n: inclTaxLabel"></strong>
     </th>
     <td data-bind="attr: {'data-th': inclTaxLabel}" class="amount">
         <strong><span class="price" data-bind="text: getValue()"></span></strong>
     </td>
 </tr>
 <tr class="grand totals excl">
     <th class="mark" scope="row">
-        <strong data-bind="text: exclTaxLabel"></strong>
+        <strong data-bind="i18n: exclTaxLabel"></strong>
     </th>
     <td data-bind="attr: {'data-th': exclTaxLabel}" class="amount">
         <strong><span class="price" data-bind="text: getGrandTotalExclTax()"></span></strong>
@@ -25,7 +25,7 @@
 <!-- ko if: !isTaxDisplayedInGrandTotal && isDisplayed() -->
 <tr class="grand totals">
     <th class="mark" scope="row">
-        <strong data-bind="text: title"></strong>
+        <strong data-bind="i18n: title"></strong>
     </th>
     <td data-bind="attr: {'data-th': title}" class="amount">
         <strong><span class="price" data-bind="text: getValue()"></span></strong>

diff --git a/app/code/Magento/Tax/view/frontend/web/template/checkout/cart/totals/shipping.html b/app/code/Magento/Tax/view/frontend/web/template/checkout/cart/totals/shipping.html
@@ -30,7 +30,7 @@
     <!-- ko if: isIncludingDisplayed() -->
     <tr class="totals shipping incl">
         <th class="mark" scope="row">
-            <span class="label" data-bind="text: title"></span>
+            <span class="label" data-bind="i18n: title"></span>
             <span class="value" data-bind="text: getShippingMethodTitle()"></span>
         </th>
         <td class="amount">
@@ -42,7 +42,7 @@
     <!-- ko if: isExcludingDisplayed() -->
     <tr class="totals shipping excl">
         <th class="mark" scope="row">
-            <span class="label" data-bind="text: title"></span>
+            <span class="label" data-bind="i18n: title"></span>
             <span class="value" data-bind="text: getShippingMethodTitle()"></span>
         </th>
         <td class="amount">

diff --git a/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/grand-total.html b/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/grand-total.html
@@ -7,15 +7,15 @@
 <!-- ko if: isTaxDisplayedInGrandTotal && isDisplayed() -->
 <tr class="grand totals incl">
     <th class="mark" scope="row">
-        <strong data-bind="text: inclTaxLabel"></strong>
+        <strong data-bind="i18n: inclTaxLabel"></strong>
     </th>
     <td data-bind="attr: {'data-th': inclTaxLabel}" class="amount">
         <strong><span class="price" data-bind="text: getValue()"></span></strong>
     </td>
 </tr>
 <tr class="grand totals excl">
     <th class="mark" scope="row">
-        <strong data-bind="text: exclTaxLabel"></strong>
+        <strong data-bind="i18n: exclTaxLabel"></strong>
     </th>
     <td data-bind="attr: {'data-th': exclTaxLabel}" class="amount">
         <strong><span class="price" data-bind="text: getGrandTotalExclTax()"></span></strong>
@@ -25,7 +25,7 @@
 <!-- ko if: !isTaxDisplayedInGrandTotal && isDisplayed() -->
 <tr class="grand totals">
     <th class="mark" scope="row">
-        <strong data-bind="text: title"></strong>
+        <strong data-bind="i18n: title"></strong>
     </th>
     <td data-bind="attr: {'data-th': title}" class="amount">
         <strong><span class="price" data-bind="text: getValue()"></span></strong>
@@ -34,7 +34,7 @@
 <!-- /ko -->
 <!-- ko if: isBaseGrandTotalDisplayNeeded() && isDisplayed() -->
 <tr class="totals charge">
-    <th class="mark" data-bind="text: basicCurrencyMessage" scope="row"></th>
+    <th class="mark" data-bind="i18n: basicCurrencyMessage" scope="row"></th>
     <td class="amount">
         <span class="price" data-bind="text: getBaseValue(), attr: {'data-th': basicCurrencyMessage}"></span>
     </td>

diff --git a/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/shipping.html b/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/shipping.html
@@ -42,7 +42,7 @@
     <!-- ko if: isIncludingDisplayed() -->
     <tr class="totals shipping incl">
         <th class="mark" scope="row">
-            <span class="label" data-bind="text: title"></span>
+            <span class="label" data-bind="i18n: title"></span>
             <span class="value" data-bind="text: getShippingMethodTitle()"></span>
         </th>
         <td class="amount">
@@ -60,7 +60,7 @@
     <!-- ko if: isExcludingDisplayed() -->
     <tr class="totals shipping excl">
         <th class="mark" scope="row">
-            <span class="label" data-bind="text: title"></span>
+            <span class="label" data-bind="i18n: title"></span>
             <span class="value" data-bind="text: getShippingMethodTitle()"></span>
         </th>
         <td class="amount">

diff --git a/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/subtotal.html b/app/code/Magento/Tax/view/frontend/web/template/checkout/summary/subtotal.html
@@ -7,17 +7,17 @@
 <!-- ko if: isBothPricesDisplayed() -->
 <tr class="totals sub excl">
     <th class="mark" scope="row">
-        <span data-bind="text: title"></span>
-        <span data-bind="text: excludingTaxMessage"></span>
+        <span data-bind="i18n: title"></span>
+        <span data-bind="i18n: excludingTaxMessage"></span>
     </th>
     <td class="amount">
         <span class="price" data-bind="text: getValue(), attr: {'data-th': excludingTaxMessage}"></span>
     </td>
 </tr>
 <tr class="totals sub incl">
     <th class="mark" scope="row">
-        <span data-bind="text: title"></span>
-        <span data-bind="text: includingTaxMessage"></span>
+        <span data-bind="i18n: title"></span>
+        <span data-bind="i18n: includingTaxMessage"></span>
     </th>
     <td class="amount">
         <span class="price" data-bind="text: getValueInclTax(), attr: {'data-th': includingTaxMessage}"></span>
@@ -26,15 +26,15 @@
 <!-- /ko -->
 <!-- ko if: !isBothPricesDisplayed() && isIncludingTaxDisplayed() -->
 <tr class="totals sub">
-    <th data-bind="text: title" class="mark" scope="row"></th>
+    <th data-bind="i18n: title" class="mark" scope="row"></th>
     <td class="amount">
         <span class="price" data-bind="text: getValueInclTax(), attr: {'data-th': title}"></span>
     </td>
 </tr>
 <!-- /ko -->
 <!-- ko if: !isBothPricesDisplayed() && !isIncludingTaxDisplayed() -->
 <tr class="totals sub">
-    <th data-bind="text: title" class="mark" scope="row"></th>
+    <th data-bind="i18n: title" class="mark" scope="row"></th>
     <td class="amount">
         <span class="price" data-bind="text: getValue(), attr: {'data-th': title}"></span>
     </td>