Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: 1.9 regression on i18n strings with variables

This commit is contained in:
Régis Hanol 2014-12-25 18:04:23 +01:00
parent 9932bea7ce
commit b65ac132b7
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/templates/modal/not_activated.hbs
View File

@ -1,8 +1,8 @@
<div class="modal-body"> <div class="modal-body">
{{#if emailSent}} {{#if emailSent}}
{{{i18n 'login.sent_activation_email_again' currentEmail="currentEmail"}}} {{{i18n 'login.sent_activation_email_again' currentEmail=currentEmail}}}
{{else}} {{else}}
{{{i18n 'login.not_activated' sentTo="sentTo"}}} {{{i18n 'login.not_activated' sentTo=sentTo}}}
<a href="#" {{action "sendActivationEmail"}}>{{i18n 'login.resend_activation_email'}}</a> <a href="#" {{action "sendActivationEmail"}}>{{i18n 'login.resend_activation_email'}}</a>
{{/if}} {{/if}}
</div> </div>

2
app/assets/javascripts/discourse/templates/user-card.hbs
View File

@ -43,7 +43,7 @@
{{#if isSuspended}} {{#if isSuspended}}
<div class='suspended'> <div class='suspended'>
{{fa-icon "ban"}} {{fa-icon "ban"}}
<b>{{i18n 'user.suspended_notice' date="user.suspendedTillDate"}}</b><br/> <b>{{i18n 'user.suspended_notice' date=user.suspendedTillDate}}</b><br/>
<b>{{i18n 'user.suspended_reason'}}</b> {{user.suspend_reason}} <b>{{i18n 'user.suspended_reason'}}</b> {{user.suspend_reason}}
</div> </div>
{{else}} {{else}}

2
app/assets/javascripts/discourse/templates/user/preferences.hbs
View File

@ -17,7 +17,7 @@
{{/if}} {{/if}}
</div> </div>
<div class='instructions'> <div class='instructions'>
{{{i18n 'user.username.short_instructions' username="username"}}} {{{i18n 'user.username.short_instructions' username=username}}}
</div> </div>
</div> </div>

2
app/assets/javascripts/discourse/templates/user/user.hbs
View File

@ -79,7 +79,7 @@
{{#if isSuspended}} {{#if isSuspended}}
<div class='suspended'> <div class='suspended'>
{{fa-icon "ban"}} {{fa-icon "ban"}}
<b>{{i18n 'user.suspended_notice' date="suspendedTillDate"}}</b><br/> <b>{{i18n 'user.suspended_notice' date=suspendedTillDate}}</b><br/>
<b>{{i18n 'user.suspended_reason'}}</b> {{suspend_reason}} <b>{{i18n 'user.suspended_reason'}}</b> {{suspend_reason}}
</div> </div>
{{/if}} {{/if}}