Commit 5d8e07eb by Adam Palay Committed by Jay Zoldak

replace html strings wtih tokens in templates

parent eafd7138
...@@ -91,7 +91,11 @@ ...@@ -91,7 +91,11 @@
<div role="alert" class="status message system-error"> <div role="alert" class="status message system-error">
<h3 class="message-title">{% trans "We're sorry, our systems seem to be having trouble processing your password reset" %}</h3> <h3 class="message-title">{% trans "We're sorry, our systems seem to be having trouble processing your password reset" %}</h3>
<p class="message-copy">{% trans 'Someone has been made aware of this issue. Please try again shortly. Please <a href="{{MKTG_URL_CONTACT}}">contact us</a> about any concerns you have.' %}</p> <p class="message-copy">
{% blocktrans with start_link='<a href="{{MKTG_URL_CONTACT}}">' end_link='</a>' %}
Someone has been made aware of this issue. Please try again shortly. Please {{ start_link }}contact us{{ end_link }} about any concerns you have.
{% endblocktrans %}
</p>
</div> </div>
<p class="instructions"> <p class="instructions">
...@@ -123,7 +127,11 @@ ...@@ -123,7 +127,11 @@
<header> <header>
<h2 class="sr">{% trans "Your Password Reset Was Unsuccessful" %}</h2> <h2 class="sr">{% trans "Your Password Reset Was Unsuccessful" %}</h2>
</header> </header>
<p>{% trans 'The password reset link was invalid, possibly because the link has already been used. Please return to the <a href="/login">login page</a> and start the password reset process again.' %}</p> <p>
{% blocktrans with start_link='<a href="/login">' end_link='</a>' %}
The password reset link was invalid, possibly because the link has already been used. Please return to the {{ start_link }}login page{{ end_link }} and start the password reset process again.
{% endblocktrans %}
</p>
{% endif %} {% endif %}
</section> </section>
...@@ -135,7 +143,11 @@ ...@@ -135,7 +143,11 @@
<div class="cta cta-help"> <div class="cta cta-help">
<h3>{% trans "Need Help?" %}</h3> <h3>{% trans "Need Help?" %}</h3>
<p>{% trans 'View our <a href="{{MKTG_URL_FAQ}}">help section for contact information and answers to commonly asked questions</a>' %}</p> <p>
{% blocktrans with start_link='<a href="{{MKTG_URL_FAQ}}">' end_link='</a>' %}
View our {{ start_link }}help section for contact information and answers to commonly asked questions{{ end_link }}
{% endblocktrans %}
</p>
</div> </div>
</aside> </aside>
</section> </section>
......
...@@ -7,9 +7,9 @@ ...@@ -7,9 +7,9 @@
<h2>{% trans "Wiki Syntax Help" %}</h2> <h2>{% trans "Wiki Syntax Help" %}</h2>
<p>{% trans "This wiki uses <strong>Markdown</strong> for styling. There are several useful guides online. See any of the links below for in-depth details:" %}</p> <p>{% trans "This wiki uses <strong>Markdown</strong> for styling. There are several useful guides online. See any of the links below for in-depth details:" %}</p>
<ul> <ul>
<li>{% trans '<a href="http://daringfireball.net/projects/markdown/basics" target="_blank">Markdown: Basics</a>' %}</li> <li><a href="http://daringfireball.net/projects/markdown/basics" target="_blank">{% trans 'Markdown: Basics' %}</a></li>
<li>{% trans '<a href="http://greg.vario.us/doc/markdown.txt" target="_blank">Quick Markdown Syntax Guide</a>' %}</li> <li><a href="http://greg.vario.us/doc/markdown.txt" target="_blank">{% trans 'Quick Markdown Syntax Guide' %}</a></li>
<li>{% trans '<a href="http://www.lowendtalk.com/discussion/6/miniature-markdown-guide" target="_blank">Miniature Markdown Guide</a>' %}</li> <li><a href="http://www.lowendtalk.com/discussion/6/miniature-markdown-guide" target="_blank">{% trans 'Miniature Markdown Guide' %}</a></li>
</ul> </ul>
<p>{% trans "To create a new wiki article, create a link to it. Clicking the link gives you the creation page." %}</p> <p>{% trans "To create a new wiki article, create a link to it. Clicking the link gives you the creation page." %}</p>
<pre>{% trans "[Article Name](wiki:ArticleName)" %}</pre> <pre>{% trans "[Article Name](wiki:ArticleName)" %}</pre>
......
...@@ -4,5 +4,7 @@ ...@@ -4,5 +4,7 @@
{% comment %} {% comment %}
Translators: Do not translate 'cheatsheetLink' Translators: Do not translate 'cheatsheetLink'
{% endcomment %} {% endcomment %}
{% trans "Markdown syntax is allowed. See the <a id='cheatsheetLink' href='#'>cheatsheet</a> for help." %} {% blocktrans with start_link="<a id='cheatsheetLink' href='#'>" end_link="</a>" %}
Markdown syntax is allowed. See the {{ start_link }}cheatsheet{{ end_link }} for help.
{% endblocktrans %}
</p> </p>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment