diff options
author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2012-07-31 21:36:24 -0400 |
---|---|---|
committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2012-07-31 21:36:24 -0400 |
commit | d8c9ababadf91da68cbe4a1be72ca8b992852464 (patch) | |
tree | 4f044c60ebdb5ead9f183ba88bebf75e77d02270 | |
parent | c9bc80fdb6316cfe377790c3a038ba017c89d246 (diff) | |
parent | ee1b46d67cd4c2981a2f9a3eedce21c52a457fba (diff) | |
download | askbot-d8c9ababadf91da68cbe4a1be72ca8b992852464.tar.gz askbot-d8c9ababadf91da68cbe4a1be72ca8b992852464.tar.bz2 askbot-d8c9ababadf91da68cbe4a1be72ca8b992852464.zip |
Merge branch 'github-master'
-rw-r--r-- | askbot/models/__init__.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/askbot/models/__init__.py b/askbot/models/__init__.py index 686190b7..c1beb594 100644 --- a/askbot/models/__init__.py +++ b/askbot/models/__init__.py @@ -2191,14 +2191,14 @@ def user_get_badge_summary(self): bit = ungettext( 'one silver badge', '%(count)d silver badges', - self.gold + self.silver ) % {'count': self.silver} badge_bits.append(bit) - if self.silver: + if self.bronze: bit = ungettext( 'one bronze badge', '%(count)d bronze badges', - self.gold + self.bronze ) % {'count': self.bronze} badge_bits.append(bit) |