[Bug 1201151] Mark html strings in templates as safe.

This commit is contained in:
Mike Cooper 2015-09-02 10:44:49 -07:00
Родитель c268b4bc9a
Коммит 0a80c7d4ab
3 изменённых файлов: 5 добавлений и 5 удалений

Просмотреть файл

@ -21,7 +21,7 @@ module.exports = function(grunt) {
}, },
watch: { watch: {
scripts: { scripts: {
files: ['js/app.js', 'app/views/*'], files: ['js/app.js', 'app/views/**'],
tasks: ['nunjucks'] tasks: ['nunjucks']
} }
}, },

Просмотреть файл

@ -12,7 +12,7 @@
</header> </header>
<main id="thread-scroll" class="fit scroll"> <main id="thread-scroll" class="fit scroll">
<section id="thread-introduction" class="StartAskingMessage vbox"> <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>
<section id="suggestions" class="hide"> <section id="suggestions" class="hide">
<ul> <ul>
@ -24,7 +24,7 @@
</main> </main>
<footer class="QuestionFooter"> <footer class="QuestionFooter">
<form id="question_form" class="hbox"> <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"> <div class="QuestionSubmitButton">
<a href="#" role="button" data-icon="send" id="question_submit_button" class="QuestionSubmitButton-click-area"></a> <a href="#" role="button" data-icon="send" id="question_submit_button" class="QuestionSubmitButton-click-area"></a>
</div> </div>

Просмотреть файл

@ -5,10 +5,10 @@
</section> </section>
<main id="unsupported_locale_container" class="UnsupportedLocaleMessage fit scroll"> <main id="unsupported_locale_container" class="UnsupportedLocaleMessage fit scroll">
<p> <p>
{{ _('BuddyUp currently doesn\'t support "<span id="language"></span>".') }} {{ _('BuddyUp currently doesn\'t support "<span id="language"></span>".')|safe }}
</p> </p>
<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> </p>
<div class="gaia-footer gaia-footer--pinned"> <div class="gaia-footer gaia-footer--pinned">
<button id="continue_button">{{ _('Continue') }}</button> <button id="continue_button">{{ _('Continue') }}</button>