Use lazy translation when needed.

This commit is contained in:
Antoine Nguyen
2013-06-20 09:52:14 +02:00
parent f0144920ea
commit dbe92a9409
6 changed files with 9 additions and 9 deletions
+1 -1
View File
@@ -13,7 +13,7 @@ class AdminConsole(ModoExtension):
def load(self):
from app_settings import GeneralParametersForm
parameters.register(GeneralParametersForm, _("General"))
parameters.register(GeneralParametersForm, ugettext_lazy("General"))
def destroy(self):
parameters.unregister()
+1 -1
View File
@@ -42,7 +42,7 @@ class Amavis(ModoExtension):
def load(self):
from app_settings import ParametersForm, UserSettings
parameters.register(ParametersForm, "Amavis")
parameters.register(UserSettings, _("Quarantine"))
parameters.register(UserSettings, ugettext_lazy("Quarantine"))
def destroy(self):
events.unregister("UserMenuDisplay", menu)
+2 -2
View File
@@ -7,7 +7,7 @@ The *limits* extension
from django.contrib.auth.models import Permission, Group
from django.db import IntegrityError
from django.contrib.contenttypes.models import ContentType
from django.utils.translation import ugettext as _
from django.utils.translation import ugettext as _, ugettext_lazy
from django.core.urlresolvers import reverse
from modoboa.lib import events, parameters
from modoboa.extensions import ModoExtension, exts_pool
@@ -51,7 +51,7 @@ class Limits(ModoExtension):
def load(self):
from app_settings import ParametersForm
parameters.register(ParametersForm, _("Limits"))
parameters.register(ParametersForm, ugettext_lazy("Limits"))
def destroy(self):
parameters.unregister()
@@ -38,7 +38,7 @@ class PostfixAutoreply(ModoExtension):
def load(self):
from app_settings import ParametersForm
parameters.register(ParametersForm, _("Automatic replies"))
parameters.register(ParametersForm, ugettext_lazy("Automatic replies"))
def destroy(self):
events.unregister("CreateDomain", onCreateDomain)
+2 -2
View File
@@ -14,8 +14,8 @@ class SieveFilters(ModoExtension):
def load(self):
from app_settings import ParametersForm, UserSettings
parameters.register(ParametersForm, _("Sieve filters"))
parameters.register(UserSettings, _("Message filters"))
parameters.register(ParametersForm, ugettext_lazy("Sieve filters"))
parameters.register(UserSettings, ugettext_lazy("Message filters"))
def destroy(self):
events.unregister("UserMenuDisplay", menu)
+2 -2
View File
@@ -1,6 +1,6 @@
# coding: utf-8
import re
from django.utils.translation import ugettext as _
from django.utils.translation import ugettext as _, ugettext_lazy
from django.forms.widgets import RadioSelect, RadioInput
from django.forms.fields import CharField, Field, ChoiceField
from django.core.exceptions import ValidationError
@@ -203,6 +203,6 @@ class SeparatorField(Field):
class YesNoField(ChoiceField):
def __init__(self, *args, **kwargs):
kwargs["choices"] = [("yes", _("Yes")), ("no", _("No"))]
kwargs["choices"] = [("yes", ugettext_lazy("Yes")), ("no", ugettext_lazy("No"))]
kwargs["widget"] = InlineRadioSelect
super(YesNoField, self).__init__(*args, **kwargs)