Commit aefa7570 by Ned Batchelder

Use lazy translations for i18n

parent c7aa2e17
from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes.models import ContentType
from django.db.models import Model from django.db.models import Model
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext_lazy as _
import models import models
...@@ -37,4 +37,4 @@ def notify(message, key, target_object=None, url=None): ...@@ -37,4 +37,4 @@ def notify(message, key, target_object=None, url=None):
objects = models.Notification.create_notifications(key, object_id=object_id, objects = models.Notification.create_notifications(key, object_id=object_id,
message=message, url=url) message=message, url=url)
return len(objects) return len(objects)
\ No newline at end of file
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext_lazy as _
"""Base classes for different plugin objects. """Base classes for different plugin objects.
......
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from django import forms from django import forms
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext_lazy as _
from django.utils.safestring import mark_safe from django.utils.safestring import mark_safe
from django.forms.util import flatatt from django.forms.util import flatatt
from django.utils.encoding import force_unicode from django.utils.encoding import force_unicode
...@@ -261,9 +261,9 @@ class PermissionsForm(PluginSettingsFormMixin, forms.ModelForm): ...@@ -261,9 +261,9 @@ class PermissionsForm(PluginSettingsFormMixin, forms.ModelForm):
owner_username = forms.CharField(required=False, label=_(u'Owner'), owner_username = forms.CharField(required=False, label=_(u'Owner'),
help_text=_(u'Enter the username of the owner.')) help_text=_(u'Enter the username of the owner.'))
group = forms.ModelChoiceField(models.Group.objects.all(), empty_label=_(u'(none)'), group = forms.ModelChoiceField(models.Group.objects.all(), empty_label=_(u'(none)'),
required=False) required=False, label=_("Group"))
if settings.USE_BOOTSTRAP_SELECT_WIDGET: if settings.USE_BOOTSTRAP_SELECT_WIDGET:
group.widget= SelectWidgetBootstrap() group.widget = SelectWidgetBootstrap()
recursive = forms.BooleanField(label=_(u'Inherit permissions'), help_text=_(u'Check here to apply the above permissions recursively to articles under this one.'), recursive = forms.BooleanField(label=_(u'Inherit permissions'), help_text=_(u'Check here to apply the above permissions recursively to articles under this one.'),
required=False) required=False)
......
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from django import forms from django import forms
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext_lazy as _
from wiki.plugins.attachments import models from wiki.plugins.attachments import models
......
...@@ -2,7 +2,7 @@ import markdown ...@@ -2,7 +2,7 @@ import markdown
import re import re
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext_lazy as _
ATTACHMENT_RE = re.compile(r'.*(\[attachment\:(?P<id>\d+)\]).*', re.IGNORECASE) ATTACHMENT_RE = re.compile(r'.*(\[attachment\:(?P<id>\d+)\]).*', re.IGNORECASE)
......
...@@ -5,7 +5,7 @@ from django.db.models import Q ...@@ -5,7 +5,7 @@ from django.db.models import Q
from django.http import Http404 from django.http import Http404
from django.shortcuts import redirect, get_object_or_404 from django.shortcuts import redirect, get_object_or_404
from django.utils.decorators import method_decorator from django.utils.decorators import method_decorator
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext_lazy as _
from django.views.generic.base import TemplateView, View from django.views.generic.base import TemplateView, View
from django.views.generic.edit import FormView from django.views.generic.edit import FormView
from django.views.generic.list import ListView from django.views.generic.list import ListView
......
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from django.conf.urls.defaults import patterns, url from django.conf.urls.defaults import patterns, url
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext_lazy as _
from wiki.core.plugins import registry from wiki.core.plugins import registry
from wiki.core.plugins.base import BasePlugin from wiki.core.plugins.base import BasePlugin
......
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from django.conf.urls.defaults import patterns from django.conf.urls.defaults import patterns
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext_lazy as _
from wiki.core.plugins import registry from wiki.core.plugins import registry
from wiki.core.plugins.base import BasePlugin from wiki.core.plugins.base import BasePlugin
......
from django import forms from django import forms
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext_lazy as _
from wiki.core.plugins.base import PluginSidebarFormMixin from wiki.core.plugins.base import PluginSidebarFormMixin
from wiki.plugins.images import models from wiki.plugins.images import models
...@@ -61,4 +61,4 @@ class PurgeForm(forms.Form): ...@@ -61,4 +61,4 @@ class PurgeForm(forms.Form):
confirm = self.cleaned_data['confirm'] confirm = self.cleaned_data['confirm']
if not confirm: if not confirm:
raise forms.ValidationError(_(u'You are not sure enough!')) raise forms.ValidationError(_(u'You are not sure enough!'))
return confirm return confirm
\ No newline at end of file
...@@ -2,7 +2,7 @@ from django.contrib import messages ...@@ -2,7 +2,7 @@ from django.contrib import messages
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from django.shortcuts import get_object_or_404, redirect from django.shortcuts import get_object_or_404, redirect
from django.utils.decorators import method_decorator from django.utils.decorators import method_decorator
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext_lazy as _
from django.views.generic.base import RedirectView from django.views.generic.base import RedirectView
from django.views.generic.list import ListView from django.views.generic.list import ListView
......
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from django.conf.urls.defaults import patterns, url from django.conf.urls.defaults import patterns, url
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext_lazy as _
from wiki.core.plugins import registry from wiki.core.plugins import registry
from wiki.core.plugins.base import BasePlugin from wiki.core.plugins.base import BasePlugin
......
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from django.conf.urls.defaults import patterns, url from django.conf.urls.defaults import patterns, url
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext_lazy as _
from wiki.core.plugins import registry from wiki.core.plugins import registry
from wiki.core.plugins.base import BasePlugin from wiki.core.plugins.base import BasePlugin
......
from django import forms from django import forms
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext_lazy as _
from django_notify.models import Settings, NotificationType from django_notify.models import Settings, NotificationType
from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes.models import ContentType
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
{% load wiki_tags i18n %} {% load wiki_tags i18n %}
{% if not hidedate %}{{ revision.created }}{% endif %} {% if not hidenumber %}(#{{ revision.revision_number }}) {% trans "by" %}{% endif %} {% if revision.user %}{{ revision.user }}{% else %}{% if article|can_moderate:user %}{{ revision.ip_address|default:"anonymous (IP not logged)" }}{% else %}{% trans "anonymous (IP logged)" %}{% endif %}{% endif %} {% if not hidedate %}{{ revision.created }}{% endif %} {% if not hidenumber %}(#{{ revision.revision_number }}) {% trans "by" %}{% endif %} {% if revision.user %}{{ revision.user }}{% else %}{% if article|can_moderate:user %}{{ revision.ip_address|default:_("anonymous (IP not logged)") }}{% else %}{% trans "anonymous (IP logged)" %}{% endif %}{% endif %}
{% if revision == current_revision %} {% if revision == current_revision %}
<strong>*</strong> <strong>*</strong>
{% endif %} {% endif %}
......
...@@ -9,7 +9,7 @@ from django.contrib.auth.forms import AuthenticationForm, UserCreationForm ...@@ -9,7 +9,7 @@ from django.contrib.auth.forms import AuthenticationForm, UserCreationForm
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from django.shortcuts import redirect from django.shortcuts import redirect
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext_lazy as _
from django.views.generic.base import View from django.views.generic.base import View
from django.views.generic.edit import CreateView, FormView from django.views.generic.edit import CreateView, FormView
...@@ -63,4 +63,4 @@ class Login(FormView): ...@@ -63,4 +63,4 @@ class Login(FormView):
if not self.referer: if not self.referer:
return redirect('wiki:get', path='') return redirect('wiki:get', path='')
return redirect(self.referer) return redirect(self.referer)
\ No newline at end of file
...@@ -7,7 +7,7 @@ from django.db.models import Q ...@@ -7,7 +7,7 @@ from django.db.models import Q
from django.shortcuts import render_to_response, redirect, get_object_or_404 from django.shortcuts import render_to_response, redirect, get_object_or_404
from django.template.context import RequestContext from django.template.context import RequestContext
from django.utils.decorators import method_decorator from django.utils.decorators import method_decorator
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext_lazy as _
from django.views.generic.base import TemplateView, View from django.views.generic.base import TemplateView, View
from django.views.generic.edit import FormView from django.views.generic.edit import FormView
from django.views.generic.list import ListView from django.views.generic.list import ListView
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment