Merge pull request #12 from jellesiderius/master

Multiple changes to emails
mageplaza · Mar 12, 2020 · 9cb1769 · 9cb1769
2 parents 3eea2b5 + 53cf9c4
commit 9cb1769
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Helper/Data.php b/Helper/Data.php
@@ -367,7 +367,7 @@ public function emailApprovalAction($customer, $emailType)
         }
 
         if ($this->getEmailEnable($emailType)) {
-            $template = $this->getEmailTemplate($emailType);
+            $template = $this->getEmailTemplate($emailType, $storeId);
             $this->sendMail($sendTo, $customer, $template, $storeId, $sender);
         }
     }

diff --git a/i18n/en_US.csv b/i18n/en_US.csv
@@ -23,7 +23,7 @@ Password:,Password:
 "The one you set when you registered your account","The one you set when you registered your account"
 "To sign in to our site, use these credentials during checkout or on the <a href=""%customer_url"">My Account</a> page:","To sign in to our site, use these credentials during checkout or on the <a href=""%customer_url"">My Account</a> page:"
 "Thanks,<br>%store_name","Thanks,<br>%store_name"
-"Your cccount on %store_name has not been approved.","Your cccount on %store_name has not been approved."
+"Your account on %store_name has not been approved.","Your account on %store_name has not been approved."
 "Thank you for registering your account at our website. Unfortunately, we <strong>cannot accept</strong> your account.","Thank you for registering your account at our website. Unfortunately, we <strong>cannot accept</strong> your account."
 "Please contact us for more information.","Please contact us for more information."
 "A new account from %store_name has been registered.","A new account from %store_name has been registered."

diff --git a/view/frontend/email/notapprove.html b/view/frontend/email/notapprove.html
@@ -20,7 +20,7 @@
  */
 -->
 
-<!--@subject {{trans "Your cccount on %store_name has not been approved." store_name=$store.getFrontendName()}} @-->
+<!--@subject {{trans "Your account on %store_name has not been approved." store_name=$store.getFrontendName()}} @-->
 <!--@vars {
 "var customer.name":"Customer Name",
 "var customer.email":"Customer Email",
@@ -35,4 +35,4 @@
 <p>{{trans "Please contact us for more information."}}</p>
 <p>{{trans "Thanks,<br>%store_name" store_name=$store.getFrontendName() |raw}}</p>
 
-{{template config_path="design/email/footer_template"}}
+{{template config_path="design/email/footer_template"}}