diff options
| author | Robin Houston <robin.houston@gmail.com> | 2012-02-01 22:04:40 +0000 |
|---|---|---|
| committer | Robin Houston <robin.houston@gmail.com> | 2012-02-01 22:04:40 +0000 |
| commit | a76010c99459559a29901ed75b847384248c7c6e (patch) | |
| tree | f199e3f4187091a7a7c78f7fd6901529658174f7 /app/models/user.rb | |
| parent | 9f9befeba613deff85c2325f629e77099d44af6f (diff) | |
| parent | 18c9436ba00574d44dc258a2f231d4758b378eae (diff) | |
Merge branch 'wdtk' into release/0.5
Conflicts:
locale/app.pot
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 2193805ea..8c4b35fe6 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -132,7 +132,7 @@ class User < ActiveRecord::Base name.strip! end if self.public_banned? - name = _("{{user_name}} (Banned)", :user_name=>name) + name = _("{{user_name}} (Account suspended)", :user_name=>name) end name end |