From 71a74c41c7cdb90e315c8dd18295fc9dc596fe72 Mon Sep 17 00:00:00 2001
From: David Baumgold <david@davidbaumgold.com>
Date: Thu, 11 Dec 2014 13:41:53 -0500
Subject: [PATCH 1/3] Don't break up i18n string

---
 cms/templates/activation_invalid.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/cms/templates/activation_invalid.html b/cms/templates/activation_invalid.html
index 7f3fbed5a9..dc09c12d81 100644
--- a/cms/templates/activation_invalid.html
+++ b/cms/templates/activation_invalid.html
@@ -18,7 +18,9 @@
         <h1 class="title">${_('Your account activation is invalid')}</h1>
         <div class="copy">
           <p>${_("We're sorry. Something went wrong with your activation. Check to make sure the URL you went to was correct &mdash; e-mail programs will sometimes split it into two lines.")}</p>
-          <p>${_("If you still have issues, contact edX Support. In the meatime, you can also return to")} <a href="/">{_('the Studio homepage.')}</a></p>
+          <p>${_("If you still have issues, contact edX Support. In the meantime, you can also return to {link_start}the Studio homepage.{link_end}").format(
+              link_start='<a href="/">', link_end="</a>"
+            )}</p>
         </div>
       </div>
 

From 1fe72d89bf7279babe4f9b399b63d03a14e14565 Mon Sep 17 00:00:00 2001
From: David Baumgold <david@davidbaumgold.com>
Date: Fri, 12 Dec 2014 09:44:21 -0500
Subject: [PATCH 2/3] Double quotes for i18n string

---
 cms/templates/activation_invalid.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cms/templates/activation_invalid.html b/cms/templates/activation_invalid.html
index dc09c12d81..7ee7bc442c 100644
--- a/cms/templates/activation_invalid.html
+++ b/cms/templates/activation_invalid.html
@@ -15,7 +15,7 @@
 
     <div class="notice notice-incontext notice-instruction has-actions">
       <div class="msg">
-        <h1 class="title">${_('Your account activation is invalid')}</h1>
+        <h1 class="title">${_("Your account activation is invalid")}</h1>
         <div class="copy">
           <p>${_("We're sorry. Something went wrong with your activation. Check to make sure the URL you went to was correct &mdash; e-mail programs will sometimes split it into two lines.")}</p>
           <p>${_("If you still have issues, contact edX Support. In the meantime, you can also return to {link_start}the Studio homepage.{link_end}").format(

From e8d62ff6a85958fc659b28205119a7dfa1aabda3 Mon Sep 17 00:00:00 2001
From: David Baumgold <david@davidbaumgold.com>
Date: Fri, 12 Dec 2014 11:09:26 -0500
Subject: [PATCH 3/3] Replace &mdash; with literal emdash

---
 cms/templates/activation_invalid.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cms/templates/activation_invalid.html b/cms/templates/activation_invalid.html
index 7ee7bc442c..d50ed51db4 100644
--- a/cms/templates/activation_invalid.html
+++ b/cms/templates/activation_invalid.html
@@ -17,7 +17,7 @@
       <div class="msg">
         <h1 class="title">${_("Your account activation is invalid")}</h1>
         <div class="copy">
-          <p>${_("We're sorry. Something went wrong with your activation. Check to make sure the URL you went to was correct &mdash; e-mail programs will sometimes split it into two lines.")}</p>
+          <p>${_("We're sorry. Something went wrong with your activation. Check to make sure the URL you went to was correct — e-mail programs will sometimes split it into two lines.")}</p>
           <p>${_("If you still have issues, contact edX Support. In the meantime, you can also return to {link_start}the Studio homepage.{link_end}").format(
               link_start='<a href="/">', link_end="</a>"
             )}</p>