From 0a80c7d4ab366e4147d273970c6d4c94418ca2e7 Mon Sep 17 00:00:00 2001
From: Mike Cooper <mythmon@gmail.com>
Date: Wed, 2 Sep 2015 10:44:49 -0700
Subject: [PATCH] [Bug 1201151] Mark html strings in templates as safe.

---
 Gruntfile.js                           | 2 +-
 app/views/main/question.html           | 4 ++--
 app/views/main/unsupported_locale.html | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 7b95a99..b617138 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -21,7 +21,7 @@ module.exports = function(grunt) {
         },
         watch: {
             scripts: {
-                files: ['js/app.js', 'app/views/*'],
+                files: ['js/app.js', 'app/views/**'],
                 tasks: ['nunjucks']
             }
         },
diff --git a/app/views/main/question.html b/app/views/main/question.html
index 5a7495a..5cc59f0 100644
--- a/app/views/main/question.html
+++ b/app/views/main/question.html
@@ -12,7 +12,7 @@
   </header>
   <main id="thread-scroll" class="fit scroll">
     <section id="thread-introduction" class="StartAskingMessage vbox">
-      <span>{{ _('We can help<br>Ask us anything!') }}</span>
+      <span>{{ _('We can help<br>Ask us anything!')|safe }}</span>
     </section>
     <section id="suggestions" class="hide">
       <ul>
@@ -24,7 +24,7 @@
   </main>
   <footer class="QuestionFooter">
     <form id="question_form" class="hbox">
-      <textarea id="question_field" class="QuestionField" rows="1" placeholder="{{ _('Write your message&hellip;') }}"></textarea>
+      <textarea id="question_field" class="QuestionField" rows="1" placeholder="{{ _('Write your message…') }}"></textarea>
       <div class="QuestionSubmitButton">
         <a href="#" role="button" data-icon="send" id="question_submit_button" class="QuestionSubmitButton-click-area"></a>
       </div>
diff --git a/app/views/main/unsupported_locale.html b/app/views/main/unsupported_locale.html
index c617bf5..785caa4 100644
--- a/app/views/main/unsupported_locale.html
+++ b/app/views/main/unsupported_locale.html
@@ -5,10 +5,10 @@
 </section>
 <main id="unsupported_locale_container" class="UnsupportedLocaleMessage fit scroll">
   <p>
-    {{ _('BuddyUp currently doesn\'t support "<span id="language"></span>".') }}
+    {{ _('BuddyUp currently doesn\'t support "<span id="language"></span>".')|safe }}
   </p>
   <p>
-    {{ _('Please ask your questions in English, or go to <a href="http://support.mozilla.org">http://support.mozilla.org</a> for more help.') }}
+    {{ _('Please ask your questions in English, or go to <a href="http://support.mozilla.org">http://support.mozilla.org</a> for more help.')|safe }}
   </p>
   <div class="gaia-footer gaia-footer--pinned">
     <button id="continue_button">{{ _('Continue') }}</button>