diff --git a/preferences/migrations/0035_optionaluser_mail_extension.py b/preferences/migrations/0035_optionaluser_mail_extension.py index 3d1b42b4..dd26f433 100644 --- a/preferences/migrations/0035_optionaluser_mail_extension.py +++ b/preferences/migrations/0035_optionaluser_mail_extension.py @@ -15,6 +15,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name='optionaluser', name='mail_extension', - field=models.CharField(default='@example.org', help_text='Extension principale pour les mails internes', max_length=32), + field=models.CharField(default='@example.org', help_text='Main extension for internal address', max_length=32), ), ] diff --git a/preferences/migrations/0036_optionaluser_mail_accounts.py b/preferences/migrations/0036_optionaluser_mail_accounts.py index c3bf4fa8..db604287 100644 --- a/preferences/migrations/0036_optionaluser_mail_accounts.py +++ b/preferences/migrations/0036_optionaluser_mail_accounts.py @@ -15,6 +15,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name='optionaluser', name='mail_accounts', - field=models.BooleanField(default=False, help_text='Activation des comptes mails pour les utilisateurs'), + field=models.BooleanField(default=False, help_text='Enable mail accounts for users'), ), ] diff --git a/preferences/migrations/0037_optionaluser_max_mail_alias.py b/preferences/migrations/0037_optionaluser_max_mail_alias.py index 8d6ca609..f5198177 100644 --- a/preferences/migrations/0037_optionaluser_max_mail_alias.py +++ b/preferences/migrations/0037_optionaluser_max_mail_alias.py @@ -15,6 +15,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name='optionaluser', name='max_mail_alias', - field=models.IntegerField(default=15, help_text="Nombre maximal d'alias pour un utilisateur lambda"), + field=models.IntegerField(default=15, help_text="Max alias mail for a lambda user"), ), ] diff --git a/preferences/models.py b/preferences/models.py index ebfae5fe..aa1a662b 100644 --- a/preferences/models.py +++ b/preferences/models.py @@ -87,16 +87,16 @@ class OptionalUser(AclMixin, PreferencesModel): ) mail_accounts = models.BooleanField( default=False, - help_text="Activation des comptes mails pour les utilisateurs" + help_text="Enable mail accounts for users" ) mail_extension = models.CharField( max_length = 32, default = "@example.org", - help_text="Extension principale pour les mails internes", + help_text="Main extension for internal address", ) max_mail_alias = models.IntegerField( default = 15, - help_text = "Nombre maximal d'alias pour un utilisateur lambda" + help_text = "Max alias mail for a lambda user" ) class Meta: @@ -105,12 +105,11 @@ class OptionalUser(AclMixin, PreferencesModel): ) def clean(self): - """Clean du model: - Creation du mode de paiement par solde - Vérifie que l'extension mail commence bien par @ + """Clean model: + Check the mail_extension """ if self.mail_extension[0] != "@": - raise ValidationError("L'extension mail doit commencer par un @") + raise ValidationError("Mail extension must begin with @") @receiver(post_save, sender=OptionalUser) diff --git a/users/forms.py b/users/forms.py index 144d5ecc..14a630bd 100644 --- a/users/forms.py +++ b/users/forms.py @@ -591,26 +591,26 @@ class WhitelistForm(FormRevMixin, ModelForm): class MailAliasForm(FormRevMixin, ModelForm): - """Creation, edition d'un objet alias mail""" + """Create and edit a mailalias""" def __init__(self, *args, **kwargs): prefix = kwargs.pop('prefix', self.Meta.model.__name__) super(MailAliasForm, self).__init__(*args, prefix=prefix, **kwargs) - self.fields['valeur'].label = "Prefixe de l'alias mail. Ne peut contenir de @" + self.fields['valeur'].label = "Prefix of mailalias. Can't contain @" class Meta: model = MailAlias exclude = ['user'] class MailForm(FormRevMixin, FieldPermissionFormMixin, ModelForm): - """Creation, edition des paramètres mail""" + """Edit mail settings""" def __init__(self, *args, **kwargs): prefix = kwargs.pop('prefix', self.Meta.model.__name__) super(MailForm, self).__init__(*args, prefix=prefix, **kwargs) - self.fields['external_mail'].label = 'Adresse mail externe' + self.fields['external_mail'].label = 'External mail address' if 'redirection' in self.fields: - self.fields['redirection'].label = 'Activation de la redirection vers l\'adress externe' + self.fields['redirection'].label = 'Enable redirect to external address' if 'internal_address' in self.fields: - self.fields['internal_address'].label = 'Adresse mail interne' + self.fields['internal_address'].label = 'Internal mail address' class Meta: model = User diff --git a/users/templates/users/index_alias.html b/users/templates/users/index_alias.html index dc9af095..52c68733 100644 --- a/users/templates/users/index_alias.html +++ b/users/templates/users/index_alias.html @@ -25,7 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc., {% load bootstrap3 %} -{% block title %}Utilisateurs{% endblock %} +{% block title %}Users{% endblock %} {% block content %}