MAGETWO-51792: [Github]  is not translated #4072 #4116

Oleksii Korshenko · Oleksii Korshenko · commit 1430015ba80f · 2016-05-05T14:51:24.000-05:00
diff --git a/app/code/Magento/Checkout/view/adminhtml/email/failed_payment.html b/app/code/Magento/Checkout/view/adminhtml/email/failed_payment.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Payment Transaction Failed Reminder @-->
+<!--@subject {{trans "Payment Transaction Failed Reminder"}} @-->
 <!--@vars {
 "var billingAddress.format('html')|raw":"Billing Address",
 "var checkoutType":"Checkout Type",
diff --git a/app/code/Magento/Contact/view/adminhtml/email/submitted_form.html b/app/code/Magento/Contact/view/adminhtml/email/submitted_form.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Contact Form@-->
+<!--@subject {{trans "Contact Form"}} @-->
 <!--@vars {
 "var data.comment":"Comment",
 "var data.email":"Sender Email",
diff --git a/app/code/Magento/Customer/view/frontend/email/account_new.html b/app/code/Magento/Customer/view/frontend/email/account_new.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Welcome to {{var store.getFrontendName()}} @-->
+<!--@subject {{trans "Welcome to %store_name" store_name=$store.getFrontendName()}} @-->
 <!--@vars {
 "var this.getUrl($store, 'customer/account/')":"Customer Account URL",
 "var customer.email":"Customer Email",
diff --git a/app/code/Magento/Customer/view/frontend/email/account_new_confirmed.html b/app/code/Magento/Customer/view/frontend/email/account_new_confirmed.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject {{trans "Welcome to %store_name account" store_name=$store.getFrontendName()}} @-->
+<!--@subject {{trans "Welcome to %store_name" store_name=$store.getFrontendName()}} @-->
 <!--@vars {
 "var this.getUrl($store, 'customer/account/')":"Customer Account URL",
 "var customer.email":"Customer Email",
diff --git a/app/code/Magento/Directory/view/adminhtml/email/currency_update_notification.html b/app/code/Magento/Directory/view/adminhtml/email/currency_update_notification.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Currency Update Warnings @-->
+<!--@subject {{trans "Currency Update Warnings"}} @-->
 <!--@vars {
 "var warnings":"Currency Update Warnings"
 } @-->
diff --git a/app/code/Magento/Email/view/frontend/email/footer.html b/app/code/Magento/Email/view/frontend/email/footer.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Footer @-->
+<!--@subject {{trans "Footer"}} @-->
 <!--@vars {
 "var store.getFrontendName()":"Store Name"
 } @-->
diff --git a/app/code/Magento/Email/view/frontend/email/header.html b/app/code/Magento/Email/view/frontend/email/header.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Header @-->
+<!--@subject {{trans "Header"}} @-->
 <!--@vars {
 "var logo_height":"Email Logo Image Height",
 "var logo_width":"Email Logo Image Width",
diff --git a/app/code/Magento/ProductAlert/view/adminhtml/email/cron_error.html b/app/code/Magento/ProductAlert/view/adminhtml/email/cron_error.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Product alerts Cron error @-->
+<!--@subject {{trans "Product alerts Cron error"}} @-->
 <!--@vars {
 "var warnings":"Warnings"
 } @-->
diff --git a/app/code/Magento/ProductAlert/view/frontend/email/price_alert.html b/app/code/Magento/ProductAlert/view/frontend/email/price_alert.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Products price changed alert @-->
+<!--@subject {{trans "Products price changed alert"}} @-->
 <!--@vars {
 "var alertGrid|raw":"Alert Data Grid",
 "var customerName":"Customer Name",
diff --git a/app/code/Magento/ProductAlert/view/frontend/email/stock_alert.html b/app/code/Magento/ProductAlert/view/frontend/email/stock_alert.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Products back in stock alert @-->
+<!--@subject {{trans "Products back in stock alert"}} @-->
 <!--@vars {
 "var alertGrid|raw":"Alert Data Grid",
 "var customerName":"Customer Name",
diff --git a/app/code/Magento/SendFriend/view/frontend/email/product_share.html b/app/code/Magento/SendFriend/view/frontend/email/product_share.html
@@ -4,8 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-
-<!--@subject Welcome, {{var name}} @-->
+<!--@subject {{trans "Welcome, %name" name=$name}} @-->
 <!--@vars {
 "var product_name":"Product name",
 "var email":"Recipient Email address",
diff --git a/app/code/Magento/Sitemap/view/adminhtml/email/generate_warnings.html b/app/code/Magento/Sitemap/view/adminhtml/email/generate_warnings.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Sitemap generate Warnings @-->
+<!--@subject {{trans "Sitemap generate Warnings"}} @-->
 <!--@vars {
 "var warnings":"Sitemap Generation Warnings"
 } @-->
diff --git a/app/code/Magento/User/view/adminhtml/email/password_reset_confirmation.html b/app/code/Magento/User/view/adminhtml/email/password_reset_confirmation.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Password Reset Confirmation for {{var user.name}} @-->
+<!--@subject {{trans "Password Reset Confirmation for %name" name=$user.name}} @-->
 <!--@vars {
 "var user.name":"Account Holder Name",
 "store url=\"admin\/auth\/resetpassword\/\" _query_id=$user.id _query_token=$user.rp_token":"Reset Password URL"
diff --git a/app/code/Magento/User/view/adminhtml/email/user_notification.html b/app/code/Magento/User/view/adminhtml/email/user_notification.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject New {{var changes}} for {{var user.name}} @-->
+<!--@subject {{trans "New %changes for %user_name" changes=$changes user_name=$user.name}} @-->
 <!--@vars {
 "var store.getFrontendName()|escape":"Store Name"
 } @-->
diff --git a/app/code/Magento/Wishlist/view/frontend/email/share_notification.html b/app/code/Magento/Wishlist/view/frontend/email/share_notification.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Take a look at {{var customerName}}'s Wish List @-->
+<!--@subject {{trans "Take a look at %customer_name's Wish List" customer_name=$customerName}} @-->
 <!--@vars {
 "var customerName":"Customer Name",
 "var viewOnSiteLink":"View Wish List URL",
diff --git a/app/design/frontend/Magento/luma/Magento_Email/email/footer.html b/app/design/frontend/Magento/luma/Magento_Email/email/footer.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Footer @-->
+<!--@subject {{trans "Footer"}} @-->
 <!--@vars {
 "var store.getFrontendName()":"Store Name"
 } @-->
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_new.html b/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_new.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Credit memo for your {{var store.getFrontendName()}} order @-->
+<!--@subject {{trans "Credit memo for your %store_name order" store_name=$store.getFrontendName()}} @-->
 <!--@vars {
 "var formattedBillingAddress|raw":"Billing Address",
 "var comment":"Credit Memo Comment",
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_new_guest.html b/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_new_guest.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Credit memo for your {{var store.getFrontendName()}} order @-->
+<!--@subject {{trans "Credit memo for your %store_name order" store_name=$store.getFrontendName()}} @-->
 <!--@vars {
 "var formattedBillingAddress|raw":"Billing Address",
 "var comment":"Credit Memo Comment",
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_update.html b/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_update.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Update to your {{var store.getFrontendName()}} credit memo @-->
+<!--@subject {{trans "Update to your %store_name credit memo" store_name=$store.getFrontendName()}} @-->
 <!--@vars {
 "var comment":"Credit Memo Comment",
 "var creditmemo.increment_id":"Credit Memo Id",
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_update_guest.html b/app/design/frontend/Magento/luma/Magento_Sales/email/creditmemo_update_guest.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Update to your {{var store.getFrontendName()}} credit memo @-->
+<!--@subject {{trans "Update to your %store_name credit memo" store_name=$store.getFrontendName()}} @-->
 <!--@vars {
 "var comment":"Credit Memo Comment",
 "var creditmemo.increment_id":"Credit Memo Id",
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_new.html b/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_new.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Invoice for your {{var store.getFrontendName()}} order @-->
+<!--@subject {{trans "Invoice for your %store_name order" store_name=$store.getFrontendName()}} @-->
 <!--@vars {
 "var formattedBillingAddress|raw":"Billing Address",
 "var this.getUrl($store, 'customer/account/')":"Customer Account URL",
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_new_guest.html b/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_new_guest.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Invoice for your {{var store.getFrontendName()}} order @-->
+<!--@subject {{trans "Invoice for your %store_name order" store_name=$store.getFrontendName()}} @-->
 <!--@vars {
 "var formattedBillingAddress|raw":"Billing Address",
 "var billing.getName()":"Guest Customer Name",
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_update.html b/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_update.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Update to your {{var store.getFrontendName()}} invoice @-->
+<!--@subject {{trans "Update to your %store_name invoice" store_name=$store.getFrontendName()}} @-->
 <!--@vars {
 "var this.getUrl($store, 'customer/account/')":"Customer Account URL",
 "var order.getCustomerName()":"Customer Name",
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_update_guest.html b/app/design/frontend/Magento/luma/Magento_Sales/email/invoice_update_guest.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Update to your {{var store.getFrontendName()}} invoice @-->
+<!--@subject {{trans "Update to your %store_name invoice" store_name=$store.getFrontendName()}} @-->
 <!--@vars {
 "var billing.getName()":"Guest Customer Name",
 "var comment":"Invoice Comment",
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/order_new.html b/app/design/frontend/Magento/luma/Magento_Sales/email/order_new.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Your {{var store.getFrontendName()}} order confirmation @-->
+<!--@subject {{trans "Your %store_name order confirmation" store_name=$store.getFrontendName()}} @-->
 <!--@vars {
 "var formattedBillingAddress|raw":"Billing Address",
 "var order.getEmailCustomerNote()":"Email Order Note",
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/order_new_guest.html b/app/design/frontend/Magento/luma/Magento_Sales/email/order_new_guest.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Your {{var store.getFrontendName()}} order confirmation @-->
+<!--@subject {{trans "Your %store_name order confirmation" store_name=$store.getFrontendName()}} @-->
 <!--@vars {
 "var formattedBillingAddress|raw":"Billing Address",
 "var order.getEmailCustomerNote()":"Email Order Note",
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/order_update.html b/app/design/frontend/Magento/luma/Magento_Sales/email/order_update.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Update to your {{var store.getFrontendName()}} order @-->
+<!--@subject {{trans "Update to your %store_name order" store_name=$store.getFrontendName()}} @-->
 <!--@vars {
 "var this.getUrl($store, 'customer/account/')":"Customer Account URL",
 "var order.getCustomerName()":"Customer Name",
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/order_update_guest.html b/app/design/frontend/Magento/luma/Magento_Sales/email/order_update_guest.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Update to your {{var store.getFrontendName()}} order @-->
+<!--@subject {{trans "Update to your %store_name order" store_name=$store.getFrontendName()}} @-->
 <!--@vars {
 "var billing.getName()":"Guest Customer Name",
 "var comment":"Order Comment",
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new.html b/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Your {{var store.getFrontendName()}} order has shipped @-->
+<!--@subject {{trans "Your %store_name order has shipped" store_name=$store.getFrontendName()}} @-->
 <!--@vars {
 "var formattedBillingAddress|raw":"Billing Address",
 "var this.getUrl($store, 'customer/account/')":"Customer Account URL",
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new_guest.html b/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_new_guest.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Your {{var store.getFrontendName()}} order has shipped @-->
+<!--@subject {{trans "Your %store_name order has shipped" store_name=$store.getFrontendName()}} @-->
 <!--@vars {
 "var formattedBillingAddress|raw":"Billing Address",
 "var billing.getName()":"Guest Customer Name",
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_update.html b/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_update.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Update to your {{var store.getFrontendName()}} shipment @-->
+<!--@subject {{trans "Update to your %store_name shipment" store_name=$store.getFrontendName()}} @-->
 <!--@vars {
 "var this.getUrl($store, 'customer/account/')":"Customer Account URL",
 "var order.getCustomerName()":"Customer Name",
diff --git a/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_update_guest.html b/app/design/frontend/Magento/luma/Magento_Sales/email/shipment_update_guest.html
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Update to your {{var store.getFrontendName()}} shipment @-->
+<!--@subject {{trans "Update to your %store_name shipment" store_name=$store.getFrontendName()}} @-->
 <!--@vars {
 "var billing.getName()":"Guest Customer Name",
 "var comment":"Order Comment",
diff --git a/dev/tests/integration/testsuite/Magento/Email/Controller/Adminhtml/Email/TemplateTest.php b/dev/tests/integration/testsuite/Magento/Email/Controller/Adminhtml/Email/TemplateTest.php
@@ -21,7 +21,7 @@ public function testDefaultTemplateAction()
         $this->getRequest()->setPostValue($post);
         $this->dispatch('backend/admin/email_template/defaultTemplate/?isAjax=true');
         $this->assertContains(
-            '"template_type":2,"template_subject":"Reset your',
+            '"template_type":2,"template_subject":"{{trans \"Reset your',
             $this->getResponse()->getBody()
         );
     }
diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/_files/code/Magento/Email/view/email/footer.html b/dev/tests/integration/testsuite/Magento/Email/Model/_files/code/Magento/Email/view/email/footer.html
@@ -4,5 +4,5 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Footer @-->
+<!--@subject {{trans "Footer"}} @-->
 Footer from module directory
diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/_files/code/Magento/Email/view/email/header.html b/dev/tests/integration/testsuite/Magento/Email/Model/_files/code/Magento/Email/view/email/header.html
@@ -4,5 +4,5 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Header @-->
+<!--@subject {{trans "Header"}} @-->
 <!--@styles p { color: #111; } @--> {{var template_styles}}
