Merge Pull Request #4227 from Imaginaerum/magento2.git patch-1

Author: Oleksii Korshenko

app/code/Magento/Customer/view/frontend/email/account_new_confirmation.html

@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Please confirm your {{var store.getFrontendName()}} account @-->
+<!--@subject {{trans "Please confirm your %store_name account" store_name=$store.getFrontendName()}} @-->
 <!--@vars {
 "var this.getUrl($store, 'customer/account/confirm/', [_query:[id:$customer.id, key:$customer.confirmation, back_url:$back_url]])":"Account Confirmation URL",
 "var this.getUrl($store, 'customer/account/')":"Customer Account URL",

app/code/Magento/Customer/view/frontend/email/account_new_confirmed.html

@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Welcome to {{var store.getFrontendName()}} @-->
+<!--@subject {{trans "Welcome to %store_name account" store_name=$store.getFrontendName()}} @-->
 <!--@vars {
 "var this.getUrl($store, 'customer/account/')":"Customer Account URL",
 "var customer.email":"Customer Email",

app/code/Magento/Customer/view/frontend/email/account_new_no_password.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", 

app/code/Magento/Customer/view/frontend/email/change_email.html

@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Your {{var store.getFrontendName()}} email has been changed @-->
+<!--@subject {{trans "Your %store_name email has been changed" store_name=$store.getFrontendName()}} @-->
 <!--@vars {} @-->
 {{template config_path="design/email/header_template"}}
 

app/code/Magento/Customer/view/frontend/email/change_email_and_password.html

@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Your {{var store.getFrontendName()}} email and password has been changed @-->
+<!--@subject {{trans "Your %store_name email and password has been changed" store_name=$store.getFrontendName()}} @-->
 <!--@vars {} @-->
 {{template config_path="design/email/header_template"}}
 

app/code/Magento/Customer/view/frontend/email/password_new.html

@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Reset your {{var store.getFrontendName()}} password @-->
+<!--@subject {{trans "Reset your %store_name password" store_name=$store.getFrontendName()}} @-->
 <!--@vars {
 "var this.getUrl(store, 'customer/account/')":"Customer Account URL",
 "var customer.name":"Customer Name"

app/code/Magento/Customer/view/frontend/email/password_reset.html

@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Your {{var store.getFrontendName()}} password has been changed @-->
+<!--@subject {{trans "Your %store_name password has been changed" store_name=$store.getFrontendName()}} @-->
 <!--@vars {
 "var customer.name":"Customer Name"
 } @-->

app/code/Magento/Customer/view/frontend/email/password_reset_confirmation.html

@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Reset your {{var store.getFrontendName()}} password @-->
+<!--@subject {{trans "Reset your %store_name password" store_name=$store.getFrontendName()}} @-->
 <!--@vars {
 "var customer.name":"Customer Name",
 "var this.getUrl($store, 'customer/account/createPassword/', [_query:[id:$customer.id, token:$customer.rp_token]])":"Reset Password URL"

app/code/Magento/Newsletter/view/frontend/email/subscr_confirm.html

@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Newsletter subscription confirmation @-->
+<!--@subject {{trans "Newsletter subscription confirmation"}} @-->
 <!--@vars {
 "var customer.name":"Customer Name",
 "var subscriber.getConfirmationLink()":"Subscriber Confirmation URL"

app/code/Magento/Newsletter/view/frontend/email/subscr_success.html

@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Newsletter subscription success @-->
+<!--@subject {{trans "Newsletter subscription success"}} @-->
 <!--@vars {
 "template config_path=\"design\/email\/footer_template\"":"Email Footer Template",
 "template config_path=\"design\/email\/header_template\"":"Email Header Template"

app/code/Magento/Newsletter/view/frontend/email/unsub_success.html

@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<!--@subject Newsletter unsubscription success @-->
+<!--@subject {{trans "Newsletter unsubscription success"}} @-->
 <!--@vars {
 "template config_path=\"design\/email\/footer_template\"":"Email Footer Template",
 "template config_path=\"design\/email\/header_template\"":"Email Header Template"

app/code/Magento/Sales/view/frontend/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",

app/code/Magento/Sales/view/frontend/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",

app/code/Magento/Sales/view/frontend/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",

app/code/Magento/Sales/view/frontend/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",

app/code/Magento/Sales/view/frontend/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",

app/code/Magento/Sales/view/frontend/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",

app/code/Magento/Sales/view/frontend/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",

app/code/Magento/Sales/view/frontend/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",

app/code/Magento/Sales/view/frontend/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",

app/code/Magento/Sales/view/frontend/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",

app/code/Magento/Sales/view/frontend/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",

app/code/Magento/Sales/view/frontend/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",

app/code/Magento/Sales/view/frontend/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",

app/code/Magento/Sales/view/frontend/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",

app/code/Magento/Sales/view/frontend/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",

app/code/Magento/Sales/view/frontend/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",

app/design/frontend/Magento/luma/Magento_Customer/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",