diff options
author | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2013-01-10 09:20:30 -0600 |
---|---|---|
committer | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2013-01-10 09:20:30 -0600 |
commit | 3087781bbba06373797e3010f5ae78abcc9b380a (patch) | |
tree | fad448b8e3e885ad723a590ea1853e76cef59707 | |
parent | 5978e13180a88339c9d276cb2c689befa9dd3662 (diff) | |
parent | 345ddc64175757de53c725f6b21dd242a5443306 (diff) | |
download | askbot-3087781bbba06373797e3010f5ae78abcc9b380a.tar.gz askbot-3087781bbba06373797e3010f5ae78abcc9b380a.tar.bz2 askbot-3087781bbba06373797e3010f5ae78abcc9b380a.zip |
Merge branch 'master' of github.com:ASKBOT/askbot-devel
38 files changed, 115 insertions, 99 deletions
diff --git a/askbot/deps/django_authopenid/backends.py b/askbot/deps/django_authopenid/backends.py index 2e7a8fc6..f719e811 100644 --- a/askbot/deps/django_authopenid/backends.py +++ b/askbot/deps/django_authopenid/backends.py @@ -7,7 +7,7 @@ import logging from django.contrib.auth.models import User from django.core.exceptions import ImproperlyConfigured from django.conf import settings as django_settings -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import ugettext as _ from askbot.deps.django_authopenid.models import UserAssociation from askbot.deps.django_authopenid import util from askbot.deps.django_authopenid.ldap_auth import ldap_authenticate diff --git a/askbot/deps/django_authopenid/forms.py b/askbot/deps/django_authopenid/forms.py index 01534698..332496b5 100644 --- a/askbot/deps/django_authopenid/forms.py +++ b/askbot/deps/django_authopenid/forms.py @@ -32,7 +32,8 @@ import logging from django import forms from django.contrib.auth.models import User -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy from django.conf import settings as django_settings from askbot.conf import settings as askbot_settings from askbot import const as askbot_const @@ -334,7 +335,7 @@ class SafeClassicRegisterForm(ClassicRegisterForm): class ChangePasswordForm(SetPasswordForm): """ change password form """ oldpw = forms.CharField(widget=forms.PasswordInput(attrs={'class':'required'}), - label=mark_safe(_('Current password'))) + label=mark_safe(ugettext_lazy('Current password'))) def __init__(self, data=None, user=None, *args, **kwargs): if user is None: @@ -434,7 +435,12 @@ class DeleteForm(forms.Form): class EmailPasswordForm(forms.Form): """ send new password form """ - username = UserNameField(skip_clean=True,label=mark_safe(_('Your user name (<i>required</i>)'))) + username = UserNameField( + skip_clean=True, + label=mark_safe( + ugettext_lazy('Your user name (<i>required</i>)') + ) + ) def __init__(self, data=None, files=None, auto_id='id_%s', prefix=None, initial=None): diff --git a/askbot/deps/django_authopenid/urls.py b/askbot/deps/django_authopenid/urls.py index 2ad13afe..f9098995 100644 --- a/askbot/deps/django_authopenid/urls.py +++ b/askbot/deps/django_authopenid/urls.py @@ -3,7 +3,7 @@ from django.conf import settings as django_settings from django.conf.urls.defaults import patterns, url if django_settings.ASKBOT_TRANSLATE_URL == True: - from django.utils.translation import ugettext_lazy as _ + from django.utils.translation import ugettext as _ else: _ = lambda val: val diff --git a/askbot/deps/django_authopenid/util.py b/askbot/deps/django_authopenid/util.py index 450e5fe7..75169cc9 100644 --- a/askbot/deps/django_authopenid/util.py +++ b/askbot/deps/django_authopenid/util.py @@ -16,7 +16,7 @@ from django.conf import settings from django.core.urlresolvers import reverse from django.utils import simplejson from django.utils.datastructures import SortedDict -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import ugettext as _ from django.core.exceptions import ImproperlyConfigured try: diff --git a/askbot/deps/django_authopenid/views.py b/askbot/deps/django_authopenid/views.py index ce3b449b..8f33e8c0 100644 --- a/askbot/deps/django_authopenid/views.py +++ b/askbot/deps/django_authopenid/views.py @@ -48,7 +48,7 @@ from django.views.decorators import csrf from django.utils.encoding import smart_unicode from askbot.utils.functions import generate_random_key from django.utils.html import escape -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import ugettext as _ from django.utils.safestring import mark_safe from askbot.mail import send_mail from recaptcha_works.decorators import fix_recaptcha_remote_ip diff --git a/askbot/deps/group_messaging/models.py b/askbot/deps/group_messaging/models.py index 20cbaffa..4442170f 100644 --- a/askbot/deps/group_messaging/models.py +++ b/askbot/deps/group_messaging/models.py @@ -12,7 +12,7 @@ from django.contrib.auth.models import Group from django.contrib.auth.models import User from django.contrib.sites.models import Site from django.utils.importlib import import_module -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import ugettext as _ MAX_HEADLINE_LENGTH = 80 MAX_SENDERS_INFO_LENGTH = 64 diff --git a/askbot/deps/livesettings/functions.py b/askbot/deps/livesettings/functions.py index bc1dc992..6634aa20 100644 --- a/askbot/deps/livesettings/functions.py +++ b/askbot/deps/livesettings/functions.py @@ -1,4 +1,4 @@ -from django.utils.translation import ugettext_lazy +from django.utils.translation import ugettext as _ from askbot.deps.livesettings import values from askbot.deps.livesettings.models import SettingNotSet from askbot.deps.livesettings.utils import is_string_like @@ -247,7 +247,7 @@ def config_choice_values(group, key, skip_missing=True, translate=False): raise SettingNotSet('%s.%s' % (group, key)) if translate: - choices = [(k, ugettext_lazy(v)) for k, v in choices] + choices = [(k, _(v)) for k, v in choices] return choices diff --git a/askbot/deps/livesettings/models.py b/askbot/deps/livesettings/models.py index 71db8acf..3f42b59d 100644 --- a/askbot/deps/livesettings/models.py +++ b/askbot/deps/livesettings/models.py @@ -2,7 +2,7 @@ from django.conf import settings from django.contrib.sites.models import Site from django.db import models from django.db.models import loading -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import ugettext_lazy from keyedcache import cache_key, cache_get, cache_set, NotCachedError from keyedcache.models import CachedObjectMixin from askbot.deps.livesettings.overrides import get_overrides @@ -104,7 +104,7 @@ class ImmutableSetting(object): class Setting(models.Model, CachedObjectMixin): - site = models.ForeignKey(Site, verbose_name=_('Site')) + site = models.ForeignKey(Site, verbose_name=ugettext_lazy('Site')) group = models.CharField(max_length=100, blank=False, null=False) key = models.CharField(max_length=100, blank=False, null=False) value = models.CharField(max_length=255, blank=True) @@ -150,7 +150,7 @@ class LongSettingManager(models.Manager): class LongSetting(models.Model, CachedObjectMixin): """A Setting which can handle more than 255 characters""" - site = models.ForeignKey(Site, verbose_name=_('Site')) + site = models.ForeignKey(Site, verbose_name=ugettext_lazy('Site')) group = models.CharField(max_length=100, blank=False, null=False) key = models.CharField(max_length=100, blank=False, null=False) value = models.TextField(blank=True) diff --git a/askbot/deps/livesettings/values.py b/askbot/deps/livesettings/values.py index 95ca1069..92b5d24e 100644 --- a/askbot/deps/livesettings/values.py +++ b/askbot/deps/livesettings/values.py @@ -10,7 +10,8 @@ from django.core.cache import cache from django.utils import simplejson from django.utils.datastructures import SortedDict from django.utils.encoding import smart_str -from django.utils.translation import gettext, ugettext_lazy as _ +from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy from django.core.files import storage from askbot.deps.livesettings.models import find_setting, LongSetting, Setting, SettingNotSet from askbot.deps.livesettings.overrides import get_overrides @@ -67,7 +68,7 @@ class SuperGroup(object): self.groups.append(group) -BASE_SUPER_GROUP = SuperGroup(_('Main')) +BASE_SUPER_GROUP = SuperGroup(ugettext_lazy('Main')) class ConfigurationGroup(SortedDotDict): """A simple wrapper for a group of configuration values""" @@ -126,7 +127,11 @@ class ConfigurationGroup(SortedDotDict): vals = super(ConfigurationGroup, self).values() return [v for v in vals if v.enabled()] -BASE_GROUP = ConfigurationGroup('BASE', _('Base Settings'), ordering=0) +BASE_GROUP = ConfigurationGroup( + 'BASE', + ugettext_lazy('Base Settings'), + ordering=0 + ) class Value(object): @@ -242,7 +247,7 @@ class Value(object): for x in self.choices: if x[0] in self.default: work.append(smart_str(x[1])) - note = gettext('Default value: ') + ", ".join(work) + note = _('Default value: ') + ", ".join(work) else: note = _("Default value: %s") % unicode(self.default) diff --git a/askbot/exceptions.py b/askbot/exceptions.py index d47053e1..12802e7e 100644 --- a/askbot/exceptions.py +++ b/askbot/exceptions.py @@ -1,5 +1,5 @@ from django.core import exceptions -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import ugettext as _ class DeploymentError(exceptions.ImproperlyConfigured): """raised when there is some error with deployment""" diff --git a/askbot/mail/__init__.py b/askbot/mail/__init__.py index 9da53ac4..60deec68 100644 --- a/askbot/mail/__init__.py +++ b/askbot/mail/__init__.py @@ -18,7 +18,8 @@ from django.core import mail from django.conf import settings as django_settings from django.core.exceptions import PermissionDenied from django.forms import ValidationError -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy from django.utils.translation import string_concat from django.template import Context from django.utils.html import strip_tags @@ -179,22 +180,22 @@ def mail_moderators( if raise_on_failure == True: raise exceptions.EmailNotSent(unicode(error)) -INSTRUCTIONS_PREAMBLE = _('<p>To ask by email, please:</p>') -QUESTION_TITLE_INSTRUCTION = _( +INSTRUCTIONS_PREAMBLE = ugettext_lazy('<p>To ask by email, please:</p>') +QUESTION_TITLE_INSTRUCTION = ugettext_lazy( '<li>Type title in the subject line</li>' ) -QUESTION_DETAILS_INSTRUCTION = _( +QUESTION_DETAILS_INSTRUCTION = ugettext_lazy( '<li>Type details of your question into the email body</li>' ) -OPTIONAL_TAGS_INSTRUCTION = _( +OPTIONAL_TAGS_INSTRUCTION = ugettext_lazy( """<li>The beginning of the subject line can contain tags, <em>enclosed in the square brackets</em> like so: [Tag1; Tag2]</li>""" ) -REQUIRED_TAGS_INSTRUCTION = _( +REQUIRED_TAGS_INSTRUCTION = ugettext_lazy( """<li>In the beginning of the subject add at least one tag <em>enclosed in the brackets</em> like so: [Tag1; Tag2].</li>""" ) -TAGS_INSTRUCTION_FOOTNOTE = _( +TAGS_INSTRUCTION_FOOTNOTE = ugettext_lazy( """<p>Note that a tag may consist of more than one word, to separate the tags, use a semicolon or a comma, for example, [One tag; Other tag]</p>""" ) diff --git a/askbot/mail/lamson_handlers.py b/askbot/mail/lamson_handlers.py index e8caf4d7..8bfa86f7 100644 --- a/askbot/mail/lamson_handlers.py +++ b/askbot/mail/lamson_handlers.py @@ -4,7 +4,7 @@ from django.core.files.uploadedfile import SimpleUploadedFile from django.conf import settings as django_settings from django.template import Context from django.template.loader import get_template -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import ugettext as _ from lamson.routing import route, stateless from lamson.server import Relay from askbot.models import ReplyAddress, Group, Tag diff --git a/askbot/management/commands/send_accept_answer_reminders.py b/askbot/management/commands/send_accept_answer_reminders.py index eef74ca9..2b8b0851 100644 --- a/askbot/management/commands/send_accept_answer_reminders.py +++ b/askbot/management/commands/send_accept_answer_reminders.py @@ -5,8 +5,8 @@ from django.template.loader import get_template from askbot import models from askbot import const from askbot.conf import settings as askbot_settings -from django.utils.translation import ugettext_lazy as _ -from django.utils.translation import ungettext_lazy +from django.utils.translation import ugettext as _ +from django.utils.translation import ungettext from askbot import mail from askbot.utils.classes import ReminderSchedule from django.template import Context diff --git a/askbot/management/commands/send_unanswered_question_reminders.py b/askbot/management/commands/send_unanswered_question_reminders.py index b91c043d..982dbafb 100644 --- a/askbot/management/commands/send_unanswered_question_reminders.py +++ b/askbot/management/commands/send_unanswered_question_reminders.py @@ -3,7 +3,7 @@ from django.template.loader import get_template from askbot import models from askbot import const from askbot.conf import settings as askbot_settings -from django.utils.translation import ungettext_lazy +from django.utils.translation import ungettext from askbot import mail from askbot.utils.classes import ReminderSchedule from askbot.models.question import Thread @@ -62,7 +62,7 @@ class Command(NoArgsCommand): threads = Thread.objects.filter(id__in=[qq.thread_id for qq in final_question_list]) tag_summary = Thread.objects.get_tag_summary_from_threads(threads) - subject_line = ungettext_lazy( + subject_line = ungettext( '%(question_count)d unanswered question about %(topics)s', '%(question_count)d unanswered questions about %(topics)s', question_count diff --git a/askbot/middleware/forum_mode.py b/askbot/middleware/forum_mode.py index 0a3d853e..331fe85b 100644 --- a/askbot/middleware/forum_mode.py +++ b/askbot/middleware/forum_mode.py @@ -3,7 +3,7 @@ contains :class:`ForumModeMiddleware`, which is enabling support of closed forum mode """ from django.http import HttpResponseRedirect -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import ugettext as _ from django.conf import settings from django.core.urlresolvers import resolve from askbot.shims.django_shims import ResolverMatch diff --git a/askbot/models/__init__.py b/askbot/models/__init__.py index ba824029..7838cab3 100644 --- a/askbot/models/__init__.py +++ b/askbot/models/__init__.py @@ -22,8 +22,8 @@ from django.core.urlresolvers import reverse, NoReverseMatch from django.db.models import signals as django_signals from django.template import Context from django.template.loader import get_template -from django.utils.translation import ugettext_lazy as _ -from django.utils.translation import ungettext_lazy +from django.utils.translation import ugettext as _ +from django.utils.translation import ungettext from django.utils.safestring import mark_safe from django.utils.html import escape from django.db import models @@ -738,7 +738,7 @@ def user_assert_can_edit_comment(self, comment = None): if now - comment.added_at > datetime.timedelta(0, delta_seconds): if comment.is_last(): return - error_message = ungettext_lazy( + error_message = ungettext( 'Sorry, comments (except the last one) are editable only ' 'within %(minutes)s minute from posting', 'Sorry, comments (except the last one) are editable only ' @@ -920,7 +920,7 @@ def user_assert_can_delete_question(self, question = None): if self.is_administrator() or self.is_moderator(): return else: - msg = ungettext_lazy( + msg = ungettext( 'Sorry, cannot delete your question since it ' 'has an upvoted answer posted by someone else', 'Sorry, cannot delete your question since it ' @@ -1113,7 +1113,7 @@ def user_assert_can_remove_flag_offensive(self, post = None): ) min_rep_setting = askbot_settings.MIN_REP_TO_FLAG_OFFENSIVE - low_rep_error_message = ungettext_lazy( + low_rep_error_message = ungettext( 'Sorry, to flag posts a minimum reputation of %(min_rep)d is required', 'Sorry, to flag posts a minimum reputation of %(min_rep)d is required', min_rep_setting @@ -1887,10 +1887,10 @@ def user_post_answer( elif days == 1: left = _('tomorrow') elif minutes >= 60: - left = ungettext_lazy('in %(hr)d hour','in %(hr)d hours',hours) % {'hr':hours} + left = ungettext('in %(hr)d hour','in %(hr)d hours',hours) % {'hr':hours} else: - left = ungettext_lazy('in %(min)d min','in %(min)d mins',minutes) % {'min':minutes} - day = ungettext_lazy('%(days)d day','%(days)d days',askbot_settings.MIN_DAYS_TO_ANSWER_OWN_QUESTION) % {'days':askbot_settings.MIN_DAYS_TO_ANSWER_OWN_QUESTION} + left = ungettext('in %(min)d min','in %(min)d mins',minutes) % {'min':minutes} + day = ungettext('%(days)d day','%(days)d days',askbot_settings.MIN_DAYS_TO_ANSWER_OWN_QUESTION) % {'days':askbot_settings.MIN_DAYS_TO_ANSWER_OWN_QUESTION} error_message = _( 'New users must wait %(days)s before answering their own question. ' ' You can post an answer %(left)s' @@ -2387,21 +2387,21 @@ def user_get_badge_summary(self): by the user. It is assumed that user has some badges""" badge_bits = list() if self.gold: - bit = ungettext_lazy( + bit = ungettext( 'one gold badge', '%(count)d gold badges', self.gold ) % {'count': self.gold} badge_bits.append(bit) if self.silver: - bit = ungettext_lazy( + bit = ungettext( 'one silver badge', '%(count)d silver badges', self.silver ) % {'count': self.silver} badge_bits.append(bit) if self.bronze: - bit = ungettext_lazy( + bit = ungettext( 'one bronze badge', '%(count)d bronze badges', self.bronze @@ -2549,7 +2549,7 @@ def user_fix_html_links(self, text): if is_simple_user and has_low_rep: result = replace_links_with_text(text) if result != text: - message = ungettext_lazy( + message = ungettext( 'At least %d karma point is required to post links', 'At least %d karma points is required to post links', askbot_settings.MIN_REP_TO_INSERT_LINK diff --git a/askbot/models/badges.py b/askbot/models/badges.py index afd0ff5f..244c8e2f 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 ugettext_lazy 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 diff --git a/askbot/models/message.py b/askbot/models/message.py index 31a0e0d4..a2da9c51 100644 --- a/askbot/models/message.py +++ b/askbot/models/message.py @@ -1,7 +1,7 @@ '''Copied from Django 1.3.1 source code, it will use this model to''' from django.db import models from django.contrib.auth.models import User -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import ugettext_lazy class Message(models.Model): """ @@ -13,7 +13,7 @@ class Message(models.Model): message. """ user = models.ForeignKey(User, related_name='_message_set') - message = models.TextField(_('message')) + message = models.TextField(ugettext_lazy('message')) class Meta: '''Added for backwards compatibility with databases diff --git a/askbot/models/post.py b/askbot/models/post.py index cec88f1a..956f875e 100644 --- a/askbot/models/post.py +++ b/askbot/models/post.py @@ -12,8 +12,7 @@ from django.contrib.auth.models import User from django.core import urlresolvers from django.db import models from django.utils import html as html_utils -from django.utils.translation import ugettext_lazy as _ -from django.utils.translation import ungettext_lazy +from django.utils.translation import ugettext as _ from django.utils.http import urlquote as django_urlquote from django.core import exceptions as django_exceptions from django.core import cache @@ -243,7 +242,7 @@ class PostManager(BaseQuerySetManager): author = author, revised_at = added_at, text = text, - comment = const.POST_STATUS['default_version'], + comment = unicode(const.POST_STATUS['default_version']), by_email = by_email ) diff --git a/askbot/models/question.py b/askbot/models/question.py index 7bf66c26..f1fb9a0f 100644 --- a/askbot/models/question.py +++ b/askbot/models/question.py @@ -10,8 +10,8 @@ from django.core import exceptions as django_exceptions from django.core.urlresolvers import reverse from django.template.loader import get_template from django.utils.hashcompat import md5_constructor -from django.utils.translation import ugettext_lazy as _ -from django.utils.translation import ungettext_lazy +from django.utils.translation import ugettext as _ +from django.utils.translation import ungettext from django.utils.translation import string_concat from django.utils.translation import get_language @@ -740,7 +740,7 @@ class Thread(models.Model): output = question.format_for_email_as_subthread() if answers: - answer_heading = ungettext_lazy( + answer_heading = ungettext( '%(count)d answer:', '%(count)d answers:', len(answers) diff --git a/askbot/models/reply_by_email.py b/askbot/models/reply_by_email.py index 68033896..983edc8f 100644 --- a/askbot/models/reply_by_email.py +++ b/askbot/models/reply_by_email.py @@ -4,7 +4,8 @@ import string import logging from django.db import models from django.contrib.auth.models import User -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy from askbot.models.post import Post from askbot.models.base import BaseQuerySetManager from askbot.conf import settings as askbot_settings @@ -34,12 +35,12 @@ class ReplyAddressManager(BaseQuerySetManager): REPLY_ACTION_CHOICES = ( - ('post_answer', _('Post an answer')), - ('post_comment', _('Post a comment')), - ('replace_content', _('Edit post')), - ('append_content', _('Append to post')), - ('auto_answer_or_comment', _('Answer or comment, depending on the size of post')), - ('validate_email', _('Validate email and record signature')), + ('post_answer', ugettext_lazy('Post an answer')), + ('post_comment', ugettext_lazy('Post a comment')), + ('replace_content', ugettext_lazy('Edit post')), + ('append_content', ugettext_lazy('Append to post')), + ('auto_answer_or_comment', ugettext_lazy('Answer or comment, depending on the size of post')), + ('validate_email', ugettext_lazy('Validate email and record signature')), ) class ReplyAddress(models.Model): """Stores a reply address for the post diff --git a/askbot/models/repute.py b/askbot/models/repute.py index 1cc830dc..e48773e6 100644 --- a/askbot/models/repute.py +++ b/askbot/models/repute.py @@ -3,7 +3,7 @@ from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes import generic from django.contrib.auth.models import User from django.db import models -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import ugettext as _ from django.utils.html import escape from askbot import const from django.core.urlresolvers import reverse diff --git a/askbot/models/tag.py b/askbot/models/tag.py index 106e7174..7b51e6db 100644 --- a/askbot/models/tag.py +++ b/askbot/models/tag.py @@ -1,7 +1,8 @@ import re from django.db import models from django.contrib.auth.models import User -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy from django.conf import settings from askbot.models.base import BaseQuerySetManager from askbot import const @@ -307,9 +308,9 @@ class Tag(models.Model): class MarkedTag(models.Model): TAG_MARK_REASONS = ( - ('good', _('interesting')), - ('bad', _('ignored')), - ('subscribed', _('subscribed')), + ('good', ugettext_lazy('interesting')), + ('bad', ugettext_lazy('ignored')), + ('subscribed', ugettext_lazy('subscribed')), ) tag = models.ForeignKey('Tag', related_name='user_selections') user = models.ForeignKey(User, related_name='tag_selections') diff --git a/askbot/models/user.py b/askbot/models/user.py index 45755fbe..6601fc7e 100644 --- a/askbot/models/user.py +++ b/askbot/models/user.py @@ -9,7 +9,8 @@ from django.contrib.auth.models import User from django.contrib.auth.models import Group as AuthGroup from django.core import exceptions from django.forms import EmailField, URLField -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy from django.utils.html import strip_tags from askbot import const from askbot.conf import settings as askbot_settings @@ -279,17 +280,17 @@ class EmailFeedSetting(models.Model): 'm_and_c': 'i' } FEED_TYPE_CHOICES = ( - ('q_all',_('Entire forum')), - ('q_ask',_('Questions that I asked')), - ('q_ans',_('Questions that I answered')), - ('q_sel',_('Individually selected questions')), - ('m_and_c',_('Mentions and comment responses')), + ('q_all', ugettext_lazy('Entire forum')), + ('q_ask', ugettext_lazy('Questions that I asked')), + ('q_ans', ugettext_lazy('Questions that I answered')), + ('q_sel', ugettext_lazy('Individually selected questions')), + ('m_and_c', ugettext_lazy('Mentions and comment responses')), ) UPDATE_FREQUENCY = ( - ('i',_('Instantly')), - ('d',_('Daily')), - ('w',_('Weekly')), - ('n',_('No email')), + ('i', ugettext_lazy('Instantly')), + ('d', ugettext_lazy('Daily')), + ('w', ugettext_lazy('Weekly')), + ('n', ugettext_lazy('No email')), ) diff --git a/askbot/models/widgets.py b/askbot/models/widgets.py index 8ffe9577..bdec5eb2 100644 --- a/askbot/models/widgets.py +++ b/askbot/models/widgets.py @@ -1,5 +1,5 @@ from django.db import models -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import ugettext_lazy from askbot.models import Tag, Group from askbot.const import DEFAULT_QUESTION_WIDGET_STYLE, SEARCH_ORDER_BY @@ -24,14 +24,14 @@ class AskWidget(models.Model): class QuestionWidget(models.Model): title = models.CharField(max_length=100) question_number = models.PositiveIntegerField(default=7) - tagnames = models.CharField(_('tags'), max_length=50) + tagnames = models.CharField(ugettext_lazy('tags'), max_length=50) group = models.ForeignKey(Group, null=True, blank=True) search_query = models.CharField( max_length=50, null=True, blank=True, default='' ) order_by = models.CharField(max_length=18, choices=SEARCH_ORDER_BY, default='-added_at') - style = models.TextField(_('css for the widget'), + style = models.TextField(ugettext_lazy('css for the widget'), default=DEFAULT_QUESTION_WIDGET_STYLE, blank=True) class Meta: diff --git a/askbot/startup_procedures.py b/askbot/startup_procedures.py index 76afcb91..c59958d4 100644 --- a/askbot/startup_procedures.py +++ b/askbot/startup_procedures.py @@ -812,7 +812,7 @@ def test_secret_key(): def test_multilingual(): is_multilang = getattr(django_settings, 'ASKBOT_MULTILINGUAL', False) django_version = django.VERSION - if django_version[0] == 1 and django_version[1] < 4: + if is_multilang and django_version[0] == 1 and django_version[1] < 4: print_errors([ 'ASKBOT_MULTILINGUAL=True works only with django >= 1.4' ]) diff --git a/askbot/tasks.py b/askbot/tasks.py index bd270bf8..0ae96c09 100644 --- a/askbot/tasks.py +++ b/askbot/tasks.py @@ -25,7 +25,7 @@ import uuid from django.contrib.contenttypes.models import ContentType from django.template import Context from django.template.loader import get_template -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import ugettext as _ from celery.decorators import task from askbot.conf import settings as askbot_settings from askbot import const diff --git a/askbot/templatetags/extra_filters_jinja.py b/askbot/templatetags/extra_filters_jinja.py index ba510bf5..e927ccbf 100644 --- a/askbot/templatetags/extra_filters_jinja.py +++ b/askbot/templatetags/extra_filters_jinja.py @@ -5,7 +5,7 @@ import time import urllib from coffin import template as coffin_template from django.core import exceptions as django_exceptions -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import ugettext as _ from django.utils.translation import get_language as django_get_language from django.contrib.humanize.templatetags import humanize from django.template import defaultfilters diff --git a/askbot/templatetags/extra_tags.py b/askbot/templatetags/extra_tags.py index 6ec77bcc..a74438de 100644 --- a/askbot/templatetags/extra_tags.py +++ b/askbot/templatetags/extra_tags.py @@ -3,7 +3,7 @@ from django import template from django.template import RequestContext from django.template.loader import get_template from django.utils.safestring import mark_safe -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import ugettext as _ from django.core.urlresolvers import reverse from askbot.utils import functions from askbot.utils.slug import slugify @@ -15,7 +15,7 @@ GRAVATAR_TEMPLATE = ( '<a style="text-decoration:none" ' 'href="%(user_profile_url)s"><img class="gravatar" ' 'width="%(size)s" height="%(size)s" ' - 'src="http://www.gravatar.com/avatar/%(gravatar_hash)s' + 'src="//www.gravatar.com/avatar/%(gravatar_hash)s' '?s=%(size)s&d=%(gravatar_type)s&r=PG" ' 'title="%(username)s" ' 'alt="%(alt_text)s" /></a>') diff --git a/askbot/urls.py b/askbot/urls.py index 5c3b21ba..9bb00406 100644 --- a/askbot/urls.py +++ b/askbot/urls.py @@ -16,7 +16,7 @@ admin.autodiscover() #update_media_revision()#needs to be run once, so put it here if getattr(settings, "ASKBOT_TRANSLATE_URL", False): - from django.utils.translation import ugettext_lazy as _ + from django.utils.translation import ugettext as _ else: _ = lambda s:s diff --git a/askbot/utils/decorators.py b/askbot/utils/decorators.py index 9b409a1e..da1cd7db 100644 --- a/askbot/utils/decorators.py +++ b/askbot/utils/decorators.py @@ -12,7 +12,7 @@ from django.core.exceptions import ImproperlyConfigured from django.http import HttpResponse, HttpResponseForbidden, Http404 from django.http import HttpResponseRedirect from django.utils import simplejson -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import ugettext as _ from django.utils.encoding import smart_str from askbot import exceptions as askbot_exceptions from askbot.conf import settings as askbot_settings diff --git a/askbot/utils/functions.py b/askbot/utils/functions.py index 121ebac5..2579728b 100644 --- a/askbot/utils/functions.py +++ b/askbot/utils/functions.py @@ -1,8 +1,8 @@ import re import random import datetime -from django.utils.translation import ugettext_lazy as _ -from django.utils.translation import ungettext_lazy +from django.utils.translation import ugettext as _ +from django.utils.translation import ungettext def get_from_dict_or_object(source, key): try: @@ -102,13 +102,13 @@ def diff_date(date, use_on_prefix = False): elif days == 1: return _('yesterday') elif minutes >= 60: - return ungettext_lazy( + return ungettext( '%(hr)d hour ago', '%(hr)d hours ago', hours ) % {'hr':hours} else: - return ungettext_lazy( + return ungettext( '%(min)d min ago', '%(min)d mins ago', minutes diff --git a/askbot/views/avatar_views.py b/askbot/views/avatar_views.py index 32d2671f..94252860 100644 --- a/askbot/views/avatar_views.py +++ b/askbot/views/avatar_views.py @@ -10,7 +10,7 @@ from django.http import HttpResponseRedirect from django.template import RequestContext from django.template.loader import get_template from django.shortcuts import render -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import ugettext as _ from django.views.decorators import csrf from django.conf import settings diff --git a/askbot/views/commands.py b/askbot/views/commands.py index d82d8db1..e524b81f 100644 --- a/askbot/views/commands.py +++ b/askbot/views/commands.py @@ -25,7 +25,7 @@ from django.template.loader import get_template from django.views.decorators import csrf from django.utils import simplejson from django.utils.html import escape -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import ugettext as _ from django.utils.translation import string_concat from askbot.utils.slug import slugify from askbot import models diff --git a/askbot/views/meta.py b/askbot/views/meta.py index 79c3a232..6714f61e 100644 --- a/askbot/views/meta.py +++ b/askbot/views/meta.py @@ -11,7 +11,8 @@ from django.template import RequestContext, Template from django.template.loader import get_template from django.http import HttpResponseRedirect, HttpResponse, Http404 from django.core.urlresolvers import reverse -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy from django.views import static from django.views.decorators import csrf from django.db.models import Max, Count @@ -127,7 +128,7 @@ def feedback(request): data['form'] = form return render(request, 'feedback.html', data) -feedback.CANCEL_MESSAGE=_('We look forward to hearing your feedback! Please, give it next time :)') +feedback.CANCEL_MESSAGE=ugettext_lazy('We look forward to hearing your feedback! Please, give it next time :)') def privacy(request): data = { diff --git a/askbot/views/readers.py b/askbot/views/readers.py index c040e67a..d2c9df49 100644 --- a/askbot/views/readers.py +++ b/askbot/views/readers.py @@ -18,8 +18,8 @@ from django.template.loader import get_template from django.template import RequestContext from django.utils import simplejson from django.utils.html import escape -from django.utils.translation import ugettext_lazy as _ -from django.utils.translation import ungettext_lazy +from django.utils.translation import ugettext as _ +from django.utils.translation import ungettext from django.utils import translation from django.views.decorators import csrf from django.core.urlresolvers import reverse @@ -148,7 +148,7 @@ def questions(request, **kwargs): if request.is_ajax(): q_count = paginator.count - question_counter = ungettext_lazy('%(q_num)s question', '%(q_num)s questions', q_count) + question_counter = ungettext('%(q_num)s question', '%(q_num)s questions', q_count) question_counter = question_counter % {'q_num': humanize.intcomma(q_count),} if q_count > page_size: diff --git a/askbot/views/users.py b/askbot/views/users.py index 16e00c38..8763c3ec 100644 --- a/askbot/views/users.py +++ b/askbot/views/users.py @@ -24,7 +24,7 @@ from django.shortcuts import get_object_or_404 from django.shortcuts import render from django.http import HttpResponse, HttpResponseForbidden from django.http import HttpResponseRedirect, Http404 -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import ugettext as _ from django.utils import simplejson from django.views.decorators import csrf diff --git a/askbot/views/writers.py b/askbot/views/writers.py index f411f716..bb87d27c 100644 --- a/askbot/views/writers.py +++ b/askbot/views/writers.py @@ -20,7 +20,8 @@ from django.contrib.auth.models import User from django.http import HttpResponseRedirect, HttpResponse, HttpResponseForbidden, Http404 from django.utils import simplejson from django.utils.html import strip_tags, escape -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy from django.core.urlresolvers import reverse from django.core import exceptions from django.conf import settings @@ -196,7 +197,7 @@ def import_data(request): #@login_required #actually you can post anonymously, but then must register @csrf.csrf_protect -@decorators.check_authorization_to_post(_( +@decorators.check_authorization_to_post(ugettext_lazy( "<span class=\"strong big\">You are welcome to start submitting your question " "anonymously</span>. When you submit the post, you will be redirected to the " "login/signup page. Your question will be saved in the current session and " @@ -527,7 +528,7 @@ def edit_answer(request, id): return HttpResponseRedirect(answer.get_absolute_url()) #todo: rename this function to post_new_answer -@decorators.check_authorization_to_post(_('Please log in to answer questions')) +@decorators.check_authorization_to_post(ugettext_lazy('Please log in to answer questions')) @decorators.check_spam('text') def answer(request, id):#process a new answer """view that posts new answer |