diff --git a/resources/views/about.ejs b/resources/views/about.ejs
index 7db844f68823d867c001eb5574b78035f511f485..ce1ee940a016969c1bba1a1a84caf5a1fd66475b 100644
--- a/resources/views/about.ejs
+++ b/resources/views/about.ejs
@@ -9,7 +9,13 @@
<article class="blurb">
<div class="info first">
<h1><%- gettext('Persona replaces multiple passwords') %></h1>
- <p><%- gettext('Sites such as <a href="http://crossword.thetimes.co.uk/" target="_blank">The Times Crossword</a>, <a href="http://current.openphoto.me/" target="_blank">OpenPhoto</a> and <a href="https://www.voo.st/" target="_blank">Voost</a> use Persona instead of usernames to sign you in.') %></p><p><%- gettext('This means you only need one password to sign in to many sites.') %></p>
+ <p><%- format(gettext('Sites such as <a %(timesLink)>The Times Crossword</a>, <a %(openphotoLink)>OpenPhoto</a> and <a %(voostLink)>Voost</a> use Persona instead of usernames to sign you in.'),
+ {
+ timesLink: 'href="http://crossword.thetimes.co.uk/" target="_blank"',
+ openphotoLink: 'href="http://current.openphoto.me/" target="_blank"',
+ voostLink: 'href="https://www.voo.st/" target="_blank"'
+ })
+ %></p><p><%- gettext('This means you only need one password to sign in to many sites.') %></p>
</div>
<div class="graphic">
diff --git a/resources/views/forgot.ejs b/resources/views/forgot.ejs
index 59a0c5d591a27cfb5768b6e1ac5ccb0ed1d1ec93..726a316b1fbb92f53b8403f03f32730d4e3a85a2 100644
--- a/resources/views/forgot.ejs
+++ b/resources/views/forgot.ejs
@@ -12,7 +12,7 @@
<h2><%- gettext('Confirm your email address') %></h2>
<p>
- <%- gettext('Check your email at <strong id="sentToEmail"></strong>.') %>
+ <%- format(gettext('Check your email at <strong %(checkId)></strong>.'), { checkId: 'id="sentToEmail"' }) %>
</p>
<p>
diff --git a/resources/views/index.ejs b/resources/views/index.ejs
index 98c47d935442bea0271471800a9297be03b1ab45..c1dcdf8c9756576bce2888d6d71b0a06543ff563 100644
--- a/resources/views/index.ejs
+++ b/resources/views/index.ejs
@@ -29,7 +29,7 @@
<script type="text/html" id="templateManage">
<div id="content">
<div class="newsbanner" id="newuser">
- <%- gettext('New to Mozilla Persona? <a href="/about">Learn more</a>') %>
+ <%- format(gettext('New to Mozilla Persona? <a %(learnMoreLink)>Learn more</a>'), { learnMoreLink: 'href="/about"' }) %>
</div>
<div id="manage">
@@ -74,7 +74,7 @@
</section>
- <p id="disclaimer"><%- gettext('You may, at any time, <a href="#" id="cancelAccount" class="action">cancel your account</a>') %></p>
+ <p id="disclaimer"><%- format(gettext('You may, at any time, <a %(cancelLink)>cancel your account</a>'), { cancelLink: 'href="#" id="cancelAccount" class="action"' }) %></p>
</div>
</div>
diff --git a/resources/views/signin.ejs b/resources/views/signin.ejs
index 683af56d65753361e8a228c85fec202bd3111e51..7717ff0279afa8f5cfbbe5db5f308258c5a8c5b3 100644
--- a/resources/views/signin.ejs
+++ b/resources/views/signin.ejs
@@ -10,7 +10,8 @@
<ul class="notifications">
<li class="notification" id="unknown_secondary">
- <%- gettext('<strong id="unknown_email">Email</strong> is not registered. Would you like to <a class="action" href="/signup">sign up</a> instead?') %>
+ <%- format(gettext('<strong %(emailId)>Email</strong> is not registered. Would you like to <a %(signUpLink)>sign up</a> instead?'),
+ { emailId: 'id="unknown_email"', signUpLink: 'class="action" href="/signup"' }) %>
</li>
</ul>
@@ -57,7 +58,8 @@
<ul class="notifications">
<li class="notification" id="verify_primary">
<p>
- <%- gettext('To verify that you own <strong id="primary_email">address</strong>, you must sign in with your provider. A new window will be opened.') %>
+ <%- format(gettext('To verify that you own <strong %(primaryId)>address</strong>, you must sign in with your provider. A new window will be opened.'),
+ { primaryId: 'id="primary_email"' }) %>
</p>
<p>
diff --git a/resources/views/signup.ejs b/resources/views/signup.ejs
index 14e823d4f5c38012dd5a14151699bbefc597962f..364e1ad40a2453d138fd69fd20f53617a0757cbe 100644
--- a/resources/views/signup.ejs
+++ b/resources/views/signup.ejs
@@ -10,14 +10,15 @@
<ul class="notifications">
<li class="notification alreadyRegistered">
- <%- gettext('<strong id="registeredEmail"></strong> is already registered. Would you like to <a class="action" href="/signin">sign in</a> instead?') %>
+ <%- format(gettext('<strong %(emailId)></strong> is already registered. Would you like to <a %(signInLink)>sign in</a> instead?'),
+ { emailId: 'id="registeredEmail"', signInLink: 'class="action" href="/signin"' }) %>
</li>
<li class="notification emailsent">
<h2><%- gettext('Confirm your email address') %></h2>
<p>
- <%- gettext('Check your email at <strong id="sentToEmail"></strong>.') %>
+ <%- format(gettext('Check your email at <strong %(emailId)></strong>.'), { emailId: 'id="sentToEmail"' }) %>
</p>
<p>
@@ -94,7 +95,7 @@
<!-- This has to go down here because of the button. Firefox clicks the first button in the form whenever the user hits enter in the form, whether the button is shown or not, and even if there is an input[type=submit]. Ghetto. -->
<li class="notification" id="primary_verify">
<p>
- <%- gettext('To verify that you own <strong id="primary_email">address</strong>, you must sign in with your provider. A new window will be opened.') %>
+ <%- format(gettext('To verify that you own <strong %(emailId)>address</strong>, you must sign in with your provider. A new window will be opened.'), { emailId: 'id="primary_email"' }) %>
</p>
<p class="submit">
diff --git a/resources/views/unsupported_dialog.ejs b/resources/views/unsupported_dialog.ejs
index 01340c242be8f592d8a1f76fa488d1e877d69eb9..942164297d1a294ccdaa5efc658660980300a9e9 100644
--- a/resources/views/unsupported_dialog.ejs
+++ b/resources/views/unsupported_dialog.ejs
@@ -13,11 +13,11 @@
</a>
<p>
- <%- gettext('Persona works with <a href="http://getfirefox.com" target="_blank" title="Get Firefox">Firefox</a>') %>
+ <%- format(gettext('Persona works with <a %(getFirefoxLink)>Firefox</a>'), { getFirefoxLink: 'href="http://getfirefox.com" target="_blank" title="Get Firefox"' }) %>
</p>
<p class="lighter">
- <%- gettext('and other <a href="http://whatbrowser.org" target="_blank">modern browsers.</a>') %>
+ <%- format(gettext('and other <a %(otherBrowserLink)>modern browsers.</a>'), { otherBrowserLink: 'href="http://whatbrowser.org" target="_blank"' }) %>
</p>
</section>