diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-06-10 08:07:55 -0700 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-06-10 08:07:55 -0700 |
| commit | 5f2d2cc229f4d80495a8335c5fa72e6589af230f (patch) | |
| tree | 74bdb0c08232b7d7ba03a6e342c4c98dfd7b0885 /app/models/user.rb | |
| parent | 4d7753519608daba86e3449bae9662f04933b14d (diff) | |
| parent | 9e77408fdd0ffc170b51be1d225bc10cf1034add (diff) | |
Merge branch 'hotfix/0.11.0.4' into rails-3-develop
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 257acd0fc..306d6ad4a 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -106,7 +106,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 |