diff options
| author | David Cabo <david@calibea.com> | 2011-08-02 00:10:01 +0200 |
|---|---|---|
| committer | David Cabo <david@calibea.com> | 2011-08-02 00:10:01 +0200 |
| commit | 18d5f7588c3040c8bce6798f9d6c9f80172c220c (patch) | |
| tree | 0ad3a6474bf39d630a4120343ab0b0da9c414cc1 /app/models | |
| parent | 13035996a5a794051507f5927cb2f00104be34c0 (diff) | |
| parent | 38029517f95d42539dad12db748b789574a8207b (diff) | |
merging from master branch
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/user.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index e29ae3101..fddb6b035 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -118,6 +118,9 @@ class User < ActiveRecord::Base if not name.nil? name.strip! end + if self.public_banned? + name = _("{{user_name}} (Banned)", :user_name=>name) + end name end |