Skip to content
This repository has been archived by the owner on Feb 8, 2019. It is now read-only.

Commit

Permalink
[Bug 1201151] Mark html strings in templates as safe.
Browse files Browse the repository at this point in the history
  • Loading branch information
mythmon committed Sep 2, 2015
1 parent c268b4b commit 0a80c7d
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Gruntfile.js
Expand Up @@ -21,7 +21,7 @@ module.exports = function(grunt) {
},
watch: {
scripts: {
files: ['js/app.js', 'app/views/*'],
files: ['js/app.js', 'app/views/**'],
tasks: ['nunjucks']
}
},
Expand Down
4 changes: 2 additions & 2 deletions app/views/main/question.html
Expand Up @@ -12,7 +12,7 @@ <h1>{{ _('My Question') }}</h1>
</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>
Expand All @@ -24,7 +24,7 @@ <h1>{{ _('My Question') }}</h1>
</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>
Expand Down
4 changes: 2 additions & 2 deletions app/views/main/unsupported_locale.html
Expand Up @@ -5,10 +5,10 @@ <h1>{{ _('Unsupported Language') }}</h1>
</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>
Expand Down

0 comments on commit 0a80c7d

Please sign in to comment.