diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-05-28 11:25:40 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-05-28 11:25:40 +0100 |
| commit | 8c3578d84c5d1e65c5dea61be1a6b8790d9f3ed3 (patch) | |
| tree | 6f0859985e01316fcd565589516ea550c348e901 /app/models/user.rb | |
| parent | 2cbd12b49db28e46ab507f948039a7d81f84ca0a (diff) | |
| parent | 774b8d159c8095977148cc2f6d7902c2636cccbd (diff) | |
Merge branch 'hotfix/0.9.0.5'0.9.0.5
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 6b66e1a8d..37edbe360 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -114,7 +114,9 @@ class User < ActiveRecord::Base name.strip! end if self.public_banned? - name = _("{{user_name}} (Account suspended)", :user_name=>name) + # Use interpolation to return a string rather than a SafeBuffer so that + # gsub can be called on it until we upgrade to Rails 3.2 + name = "#{_("{{user_name}} (Account suspended)", :user_name=> name)}" end name end |