diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2010-12-14 14:37:18 -0500 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2010-12-14 14:37:18 -0500 |
| commit | dd11b64a31ea218dff0236d3e51445ec06b58161 (patch) | |
| tree | ac42edebb83f2acd5c39338c9b96d44d68abbeb6 | |
| parent | a4b21c94a8412861d4b3f079b60916a51e22fce7 (diff) | |
| download | askbot-dd11b64a31ea218dff0236d3e51445ec06b58161.tar.gz askbot-dd11b64a31ea218dff0236d3e51445ec06b58161.tar.bz2 askbot-dd11b64a31ea218dff0236d3e51445ec06b58161.zip | |
fixed a translation bug in badges - used ascii translation function instead of unicode
| -rw-r--r-- | askbot/models/badges.py | 4 | ||||
| -rw-r--r-- | askbot/skins/default/templates/badges.html | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/askbot/models/badges.py b/askbot/models/badges.py index 6e27c46b..37477530 100644 --- a/askbot/models/badges.py +++ b/askbot/models/badges.py @@ -20,7 +20,7 @@ corresponding event name, actor (user object), context_object and optionally import datetime from django.template.defaultfilters import slugify from django.contrib.contenttypes.models import ContentType -from django.utils.translation import gettext as _ +from django.utils.translation import ugettext as _ from django.dispatch import Signal from askbot.models.repute import BadgeData, Award from askbot.models.user import Activity @@ -147,7 +147,7 @@ class Disciplined(Badge): class PeerPressure(Badge): def __init__(self): description = _( - 'Deleted own post with %(votes)s or more downvotes' + u'Deleted own post with %(votes)s or more downvotes' ) % {'votes': askbot_settings.PEER_PRESSURE_BADGE_MIN_DOWNVOTES} super(PeerPressure, self).__init__( key = 'peer-pressure', diff --git a/askbot/skins/default/templates/badges.html b/askbot/skins/default/templates/badges.html index 671cbbbb..494fd23b 100644 --- a/askbot/skins/default/templates/badges.html +++ b/askbot/skins/default/templates/badges.html @@ -24,11 +24,11 @@ </div> <div style="float:left;width:230px;"> <a href="{{badge.get_absolute_url()}}" - title="{% trans type=badge.get_type_display() %}{{type}}{% endtrans %} : {% trans description=badge.description %}{{description}}{% endtrans %}" - class="medal"><span class="{{ badge.css_class }}">●</span> {% trans name=badge.name %}{{name}}{% endtrans %}</a><strong> + title="{{badge.get_type_display()}} : {{badge.description}}" + class="medal"><span class="{{ badge.css_class }}">●</span> {{badge.name}}</a><strong> × {{ badge.awarded_count|intcomma }}</strong> </div> - <p style="float:left;margin-top:8px;">{% trans description=badge.description %}{{description}}{% endtrans %}</p> + <p style="float:left;margin-top:8px;">{{badge.description}}</p> </div> {% endfor %} </div> |