From b65ac132b7c2962fd89951c569641cabe5b8212e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Thu, 25 Dec 2014 18:04:23 +0100
Subject: [PATCH] FIX: 1.9 regression on i18n strings with variables

---
 .../javascripts/discourse/templates/modal/not_activated.hbs   | 4 ++--
 app/assets/javascripts/discourse/templates/user-card.hbs      | 2 +-
 .../javascripts/discourse/templates/user/preferences.hbs      | 2 +-
 app/assets/javascripts/discourse/templates/user/user.hbs      | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/modal/not_activated.hbs b/app/assets/javascripts/discourse/templates/modal/not_activated.hbs
index f4d0f2e14f5..4266126c8d3 100644
--- a/app/assets/javascripts/discourse/templates/modal/not_activated.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/not_activated.hbs
@@ -1,8 +1,8 @@
 <div class="modal-body">
   {{#if emailSent}}
-    {{{i18n 'login.sent_activation_email_again' currentEmail="currentEmail"}}}
+    {{{i18n 'login.sent_activation_email_again' currentEmail=currentEmail}}}
   {{else}}
-    {{{i18n 'login.not_activated' sentTo="sentTo"}}}
+    {{{i18n 'login.not_activated' sentTo=sentTo}}}
     <a href="#" {{action "sendActivationEmail"}}>{{i18n 'login.resend_activation_email'}}</a>
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/user-card.hbs b/app/assets/javascripts/discourse/templates/user-card.hbs
index b04b659f58f..3f65a1865e8 100644
--- a/app/assets/javascripts/discourse/templates/user-card.hbs
+++ b/app/assets/javascripts/discourse/templates/user-card.hbs
@@ -43,7 +43,7 @@
   {{#if isSuspended}}
     <div class='suspended'>
       {{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}}
     </div>
   {{else}}
diff --git a/app/assets/javascripts/discourse/templates/user/preferences.hbs b/app/assets/javascripts/discourse/templates/user/preferences.hbs
index 4a9e7e436c5..a1d50a4b569 100644
--- a/app/assets/javascripts/discourse/templates/user/preferences.hbs
+++ b/app/assets/javascripts/discourse/templates/user/preferences.hbs
@@ -17,7 +17,7 @@
         {{/if}}
       </div>
       <div class='instructions'>
-        {{{i18n 'user.username.short_instructions' username="username"}}}
+        {{{i18n 'user.username.short_instructions' username=username}}}
       </div>
     </div>
 
diff --git a/app/assets/javascripts/discourse/templates/user/user.hbs b/app/assets/javascripts/discourse/templates/user/user.hbs
index 524a0232fdf..cccf2d5b27c 100644
--- a/app/assets/javascripts/discourse/templates/user/user.hbs
+++ b/app/assets/javascripts/discourse/templates/user/user.hbs
@@ -79,7 +79,7 @@
               {{#if isSuspended}}
                 <div class='suspended'>
                   {{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}}
                 </div>
               {{/if}}