From 937e09c7235f64f041f595b17687193c02782493 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Wed, 14 Aug 2013 15:43:16 +0200 Subject: [PATCH 01/97] wip: big refactoring Moving files. --- modoboa/admin/models/__init__.py | 0 modoboa/core/__init__.py | 8 + modoboa/core/app_settings.py | 276 ++++++++++ .../{ => commands}/templates/settings.py.tpl | 0 .../core/{ => commands}/templates/urls.py.tpl | 0 modoboa/core/exceptions.py | 14 + modoboa/core/extensions.py | 92 ++++ modoboa/core/fixtures/initial_users.json | 1 + modoboa/core/forms.py | 71 +++ modoboa/core/loggers.py | 11 + modoboa/core/models.py | 510 ++++++++++++++++++ modoboa/core/tables.py | 12 + modoboa/core/templates/core/extensions.html | 6 + modoboa/core/templates/core/information.html | 17 + modoboa/core/templates/core/logs.html | 20 + modoboa/core/templates/core/parameters.html | 8 + .../core/templates/core/settings_header.html | 23 + modoboa/core/templates/core/user_index.html | 21 + .../core/templates/core/user_preferences.html | 9 + modoboa/core/templates/core/user_profile.html | 10 + modoboa/core/templatetags/__init__.py | 0 modoboa/core/templatetags/core_tags.py | 151 ++++++ modoboa/core/urls.py | 14 + modoboa/core/views/__init__.py | 0 modoboa/core/views/admin.py | 128 +++++ modoboa/core/views/auth.py | 71 +++ modoboa/core/views/user.py | 73 +++ modoboa/extensions/__init__.py | 91 ---- modoboa/lib/authbackends.py | 10 +- modoboa/lib/cryptutils.py | 41 ++ modoboa/lib/listing.py | 30 ++ modoboa/lib/middleware.py | 14 +- modoboa/lib/models.py | 7 - modoboa/lib/parameters.py | 4 +- modoboa/lib/templatetags/libextras.py | 2 +- modoboa/lib/webutils.py | 10 +- modoboa/templates/nlayout.html | 6 +- modoboa/templates/registration/login.html | 2 +- modoboa/urls.py | 22 +- 39 files changed, 1664 insertions(+), 121 deletions(-) create mode 100644 modoboa/admin/models/__init__.py create mode 100644 modoboa/core/app_settings.py rename modoboa/core/{ => commands}/templates/settings.py.tpl (100%) rename modoboa/core/{ => commands}/templates/urls.py.tpl (100%) create mode 100644 modoboa/core/exceptions.py create mode 100644 modoboa/core/extensions.py create mode 100644 modoboa/core/fixtures/initial_users.json create mode 100644 modoboa/core/forms.py create mode 100644 modoboa/core/loggers.py create mode 100644 modoboa/core/models.py create mode 100644 modoboa/core/tables.py create mode 100644 modoboa/core/templates/core/extensions.html create mode 100644 modoboa/core/templates/core/information.html create mode 100644 modoboa/core/templates/core/logs.html create mode 100644 modoboa/core/templates/core/parameters.html create mode 100644 modoboa/core/templates/core/settings_header.html create mode 100644 modoboa/core/templates/core/user_index.html create mode 100644 modoboa/core/templates/core/user_preferences.html create mode 100644 modoboa/core/templates/core/user_profile.html create mode 100644 modoboa/core/templatetags/__init__.py create mode 100644 modoboa/core/templatetags/core_tags.py create mode 100644 modoboa/core/urls.py create mode 100644 modoboa/core/views/__init__.py create mode 100644 modoboa/core/views/admin.py create mode 100644 modoboa/core/views/auth.py create mode 100644 modoboa/core/views/user.py create mode 100644 modoboa/lib/cryptutils.py create mode 100644 modoboa/lib/listing.py diff --git a/modoboa/admin/models/__init__.py b/modoboa/admin/models/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/modoboa/core/__init__.py b/modoboa/core/__init__.py index e69de29bb..b85142032 100644 --- a/modoboa/core/__init__.py +++ b/modoboa/core/__init__.py @@ -0,0 +1,8 @@ +from django.utils.translation import ugettext_lazy +from modoboa.lib import parameters + + +def load_settings(): + from app_settings import GeneralParametersForm, UserSettings + parameters.register(GeneralParametersForm, ugettext_lazy("General")) + parameters.register(UserSettings, ugettext_lazy("General")) diff --git a/modoboa/core/app_settings.py b/modoboa/core/app_settings.py new file mode 100644 index 000000000..fb49d4b1a --- /dev/null +++ b/modoboa/core/app_settings.py @@ -0,0 +1,276 @@ +# coding: utf-8 +from django import forms +from django.conf import settings +from django.utils.translation import ugettext as _, ugettext_lazy +from modoboa.lib.formutils import YesNoField, SeparatorField, InlineRadioSelect +from modoboa.lib.sysutils import exec_cmd +from modoboa.lib import parameters +from modoboa.auth.lib import random_key + + +def enabled_applications(): + """Return the list of currently enabled extensions + + We check if the table exists before trying to fetch activated + extensions because the admin module is always imported by Django, + even before the database exists (example: the first ``syncdb``). + + :return: a list + """ + from modoboa.core.models import Extension + from modoboa.lib.dbutils import db_table_exists + + result = [("core", "core")] + if db_table_exists("core_extension"): + exts = Extension.objects.filter(enabled=True) + result += [(ext.name, ext.name) for ext in exts] + return sorted(result, key=lambda e: e[0]) + + +class GeneralParametersForm(parameters.AdminParametersForm): + app = "core" + + sep1 = SeparatorField(label=ugettext_lazy("Authentication")) + + authentication_type = forms.ChoiceField( + label=ugettext_lazy("Authentication type"), + choices=[('local', ugettext_lazy("Local")), + ('ldap', "LDAP")], + initial="local", + help_text=ugettext_lazy("The backend used for authentication"), + widget=InlineRadioSelect + ) + + password_scheme = forms.ChoiceField( + label=ugettext_lazy("Default password scheme"), + choices=[("crypt", "crypt"), + ("md5", "md5"), + ("md5crypt", "md5crypt"), + ("sha256", "sha256"), + ("plain", "plain")], + initial="md5crypt", + help_text=ugettext_lazy("Scheme used to crypt mailbox passwords") + ) + + secret_key = forms.CharField( + label=ugettext_lazy("Secret key"), + initial=random_key(), + help_text=ugettext_lazy("Key used to encrypt/decrypt passwords") + ) + + # LDAP specific settings + ldap_sep = SeparatorField(label=ugettext_lazy("LDAP settings")) + + ldap_server_address = forms.CharField( + label=ugettext_lazy("Server address"), + initial="localhost", + help_text=ugettext_lazy("The IP address of the DNS name of the LDAP server") + ) + + ldap_server_port = forms.IntegerField( + label=ugettext_lazy("Server port"), + initial=389, + help_text=ugettext_lazy("The TCP port number used by the LDAP server") + ) + + ldap_secured = YesNoField( + label=ugettext_lazy("Use a secured connection"), + initial="no", + help_text=ugettext_lazy("Use an SSL/TLS connection to access the LDAP server") + ) + + ldap_auth_method = forms.ChoiceField( + label=ugettext_lazy("Authentication method"), + choices=[('searchbind', ugettext_lazy("Search and bind")), + ('directbind', ugettext_lazy("Direct bind"))], + initial='searchbind', + help_text=ugettext_lazy("Choose the authentication method to use"), + widget=InlineRadioSelect + ) + + ldap_bind_dn = forms.CharField( + label=ugettext_lazy("Bind DN"), + initial='', + help_text=ugettext_lazy("The distinguished name to use when binding to the LDAP server. Leave empty for an anonymous bind"), + required=False + ) + + ldap_bind_password = forms.CharField( + label=ugettext_lazy("Bind password"), + initial='', + help_text=ugettext_lazy("The password to use when binding to the LDAP server (with 'Bind DN')"), + widget=forms.PasswordInput, + required=False + ) + + ldap_search_base = forms.CharField( + label=ugettext_lazy("Search base"), + initial="", + help_text=ugettext_lazy("The distinguished name of the search base"), + required=False + ) + + ldap_search_filter = forms.CharField( + label=ugettext_lazy("Search filter"), + initial="(mail=%(user)s)", + help_text=ugettext_lazy("An optional filter string (e.g. '(objectClass=person)'). In order to be valid, it must be enclosed in parentheses."), + required=False + ) + + ldap_user_dn_template = forms.CharField( + label=ugettext_lazy("User DN template"), + initial="", + help_text=ugettext_lazy("The template used to construct a user's DN. It should contain one placeholder (ie. %(user)s)"), + required=False + ) + + ldap_password_attribute = forms.CharField( + label=ugettext_lazy("Password attribute"), + initial="userPassword", + help_text=ugettext_lazy("The attribute used to store user passwords") + ) + + ldap_is_active_directory = YesNoField( + label=ugettext_lazy("Active Directory"), + initial="no", + help_text=ugettext_lazy("Tell if the LDAP server is an Active Directory one") + ) + + sep3 = SeparatorField(label=ugettext_lazy("Miscellaneous")) + + log_maximum_age = forms.IntegerField( + label=ugettext_lazy("Maximum log record age"), + initial=365, + help_text=ugettext_lazy("The maximum age in days of a log record") + ) + + items_per_page = forms.IntegerField( + label=ugettext_lazy("Items per page"), + initial=30, + help_text=ugettext_lazy("Number of displayed items per page") + ) + + default_top_redirection = forms.ChoiceField( + label=ugettext_lazy("Default top redirection"), + choices=[], + initial="admin", + help_text=ugettext_lazy("The default redirection used when no application is specified") + ) + + # Visibility rules + visibility_rules = { + "ldap_sep": "authentication_type=ldap", + "ldap_server_address": "authentication_type=ldap", + "ldap_server_port": "authentication_type=ldap", + "ldap_secured": "authentication_type=ldap", + "ldap_auth_method": "authentication_type=ldap", + "ldap_bind_dn": "ldap_auth_method=searchbind", + "ldap_bind_password": "ldap_auth_method=searchbind", + "ldap_search_base": "ldap_auth_method=searchbind", + "ldap_search_filter": "ldap_auth_method=searchbind", + "ldap_user_dn_template": "ldap_auth_method=directbind", + "ldap_password_attribute": "authentication_type=ldap", + "ldap_is_active_directory": "authentication_type=ldap" + } + + def __init__(self, *args, **kwargs): + super(GeneralParametersForm, self).__init__(*args, **kwargs) + self.fields["default_top_redirection"].choices = enabled_applications() + + def clean_ldap_user_dn_template(self): + tpl = self.cleaned_data["ldap_user_dn_template"] + try: + test = tpl % {"user": "toto"} + except ValueError: + raise forms.ValidationError(_("Invalid syntax")) + return tpl + + def clean(self): + """Custom validation method + + Depending on 'ldap_auth_method' value, we check for different + required parameters. + """ + super(GeneralParametersForm, self).clean() + if len(self._errors): + raise forms.ValidationError(self._errors) + cleaned_data = self.cleaned_data + if cleaned_data["authentication_type"] != "ldap": + return cleaned_data + + if cleaned_data["ldap_auth_method"] == "searchbind": + required_fields = ["ldap_search_base", "ldap_search_filter"] + else: + required_fields = ["ldap_user_dn_template"] + + for f in required_fields: + if not f in cleaned_data or cleaned_data[f] == u'': + self._errors[f] = self.error_class([_("This field is required")]) + + return cleaned_data + + def to_django_settings(self): + """Apply LDAP related parameters to Django settings + + Doing so, we can use the django_auth_ldap module. + """ + from django.conf import settings + try: + import ldap + from django_auth_ldap.config import LDAPSearch + ldap_available = True + except ImportError: + ldap_available = False + + values = self.get_current_values() + if not ldap_available or values["authentication_type"] != "ldap": + return + if not hasattr(settings, "AUTH_LDAP_USER_ATTR_MAP"): + setattr(settings, "AUTH_LDAP_USER_ATTR_MAP", { + "first_name": "givenName", + "email": "mail", + "last_name": "sn" + }) + ldap_uri = 'ldaps://' if values["ldap_secured"] == "yes" else "ldap://" + ldap_uri += "%s:%s" % (values["ldap_server_address"], values["ldap_server_port"]) + setattr(settings, "AUTH_LDAP_SERVER_URI", ldap_uri) + if values["ldap_auth_method"] == "searchbind": + setattr(settings, "AUTH_LDAP_BIND_DN", values["ldap_bind_dn"]) + setattr(settings, "AUTH_LDAP_BIND_PASSWORD", values["ldap_bind_password"]) + search = LDAPSearch( + values["ldap_search_base"], ldap.SCOPE_SUBTREE, + values["ldap_search_filter"] + ) + setattr(settings, "AUTH_LDAP_USER_SEARCH", search) + else: + setattr(settings, "AUTH_LDAP_USER_DN_TEMPLATE", values["ldap_user_dn_template"]) + + if values["ldap_is_active_directory"] == "yes": + if not hasattr(settings, "AUTH_LDAP_GLOBAL_OPTIONS"): + setattr(settings, "AUTH_LDAP_GLOBAL_OPTIONS", { + ldap.OPT_REFERRALS: False + }) + else: + settings.AUTH_LDAP_GLOBAL_OPTIONS[ldap.OPT_REFERRALS] = False + + +def translate_language_code(value): + if "-" in value: + return value.split("-")[0] + return value + + +class UserSettings(parameters.UserParametersForm): + app = "core" + + sep = SeparatorField(label=ugettext_lazy("Display")) + + lang = forms.ChoiceField( + initial=translate_language_code(settings.LANGUAGE_CODE), + label=ugettext_lazy("Prefered language"), + choices=[("de", "deutsch"), ("en", "english"), + ("es", "español"), ("fr", "français"), + ("it", "italiano"), ("pt", "português"), + ("sv", "svenska"),], + help_text=ugettext_lazy("Prefered language to display pages") + ) diff --git a/modoboa/core/templates/settings.py.tpl b/modoboa/core/commands/templates/settings.py.tpl similarity index 100% rename from modoboa/core/templates/settings.py.tpl rename to modoboa/core/commands/templates/settings.py.tpl diff --git a/modoboa/core/templates/urls.py.tpl b/modoboa/core/commands/templates/urls.py.tpl similarity index 100% rename from modoboa/core/templates/urls.py.tpl rename to modoboa/core/commands/templates/urls.py.tpl diff --git a/modoboa/core/exceptions.py b/modoboa/core/exceptions.py new file mode 100644 index 000000000..063db7ad9 --- /dev/null +++ b/modoboa/core/exceptions.py @@ -0,0 +1,14 @@ +""" +:mod:`exceptions` --- Custom exceptions of the admin. application +----------------------------------------------------------------- +""" + +from modoboa.lib.exceptions import ModoboaException + + +class AdminError(ModoboaException): + """ + Just a Custom exception to identify errors coming from the admin + application. + """ + pass diff --git a/modoboa/core/extensions.py b/modoboa/core/extensions.py new file mode 100644 index 000000000..95999dbd0 --- /dev/null +++ b/modoboa/core/extensions.py @@ -0,0 +1,92 @@ +import os +import sys +import re +from django.conf import settings +from django.conf.urls import include + + +class ModoExtension(object): + """Base extension class + + Each Modoboa extension must inherit from this class to be + considered as valid. + """ + name = None + version = None + description = "" + url = None + needs_media = False + always_active = False + + def infos(self): + return dict(name=self.name, label=self.label, version=self.version, + description=self.description, url=self.url) + + def init(self): + pass + + def destroy(self): + pass + + def load(self): + pass + + +class ExtensionsPool(object): + """The extensions manager""" + + def __init__(self): + self.extensions = dict() + + def register_extension(self, ext, show=True): + self.extensions[ext.name] = dict(cls=ext, show=show) + + def get_extension(self, name): + if not name in self.extensions: + return None + if not "instance" in self.extensions[name]: + self.extensions[name]["instance"] = self.extensions[name]["cls"]() + return self.extensions[name]["instance"] + + def get_extension_infos(self, name): + instance = self.get_extension(name) + if instance is None: + return None + return instance.infos() + + def load_all(self): + from modoboa.core.models import Extension + + for ext in settings.MODOBOA_APPS: + __import__(ext) + result = [] + for extname in self.extensions.keys(): + extinstance = self.get_extension(extname) + if not extinstance.always_active: + try: + ext = Extension.objects.get(name=extname) + if not ext.enabled: + continue + except Extension.DoesNotExist: + continue + extinstance.load() + try: + baseurl = extinstance.url if extinstance.url is not None else extname + result += [(r'^%s/' % (baseurl), + include("%s.urls" % extinstance.__module__))] + except ImportError: + # No urls for this extension + pass + return result + + def list_all(self): + result = [] + for extname, extdef in self.extensions.iteritems(): + if not extdef["show"]: + continue + infos = extdef["instance"].infos() + infos["id"] = extname + result += [infos] + return sorted(result, key=lambda i: i["name"]) + +exts_pool = ExtensionsPool() diff --git a/modoboa/core/fixtures/initial_users.json b/modoboa/core/fixtures/initial_users.json new file mode 100644 index 000000000..bf60843ba --- /dev/null +++ b/modoboa/core/fixtures/initial_users.json @@ -0,0 +1 @@ +[{"pk": 1, "model": "core.user", "fields": {"username": "admin", "first_name": "", "last_name": "", "is_active": true, "is_superuser": true, "is_staff": false, "last_login": "2012-01-26 15:19:25", "groups": [], "user_permissions": [], "password": "{CRYPT}dTTsGDkA5ZHKg", "email": "", "date_joined": "2012-01-26 15:19:25"}},{"pk": 1, "model": "core.objectaccess", "fields": {"is_owner": true, "user": 1, "content_type": ["core", "user"], "object_id": 1}}] \ No newline at end of file diff --git a/modoboa/core/forms.py b/modoboa/core/forms.py new file mode 100644 index 000000000..00c2119a0 --- /dev/null +++ b/modoboa/core/forms.py @@ -0,0 +1,71 @@ +# coding: utf-8 +from django import forms +from django.utils.translation import ugettext as _, ugettext_lazy +from modoboa.core.models import User +from modoboa.lib import parameters + + +class LoginForm(forms.Form): + username = forms.CharField( + label=ugettext_lazy("Username"), + widget=forms.TextInput(attrs={"class": "input-block-level"}) + ) + password = forms.CharField( + label=ugettext_lazy("Password"), + widget=forms.PasswordInput(attrs={"class": "input-block-level"}) + ) + rememberme = forms.BooleanField( + initial=False, + required=False + ) + + +class ProfileForm(forms.ModelForm): + oldpassword = forms.CharField( + label=ugettext_lazy("Old password"), required=False, + widget=forms.PasswordInput + ) + newpassword = forms.CharField( + label=ugettext_lazy("New password"), required=False, + widget=forms.PasswordInput + ) + confirmation = forms.CharField( + label=ugettext_lazy("Confirmation"), required=False, + widget=forms.PasswordInput + ) + + class Meta: + model = User + fields = ("first_name", "last_name") + + def __init__(self, update_password, *args, **kwargs): + super(ProfileForm, self).__init__(*args, **kwargs) + if not update_password: + del self.fields["oldpassword"] + del self.fields["newpassword"] + del self.fields["confirmation"] + + def clean_oldpassword(self): + if self.cleaned_data["oldpassword"] == "": + return self.cleaned_data["oldpassword"] + + if parameters.get_admin("AUTHENTICATION_TYPE", app="admin") != "local": + return self.cleaned_data["oldpassword"] + + if not self.instance.check_password(self.cleaned_data["oldpassword"]): + raise forms.ValidationError(_("Old password mismatchs")) + return self.cleaned_data["oldpassword"] + + def clean_confirmation(self): + if self.cleaned_data["newpassword"] != self.cleaned_data["confirmation"]: + raise forms.ValidationError(_("Passwords mismatch")) + return self.cleaned_data["confirmation"] + + def save(self, commit=True): + user = super(ProfileForm, self).save(commit=False) + if commit: + if self.cleaned_data.has_key("confirmation") and \ + self.cleaned_data["confirmation"] != "": + user.set_password(self.cleaned_data["confirmation"], self.cleaned_data["oldpassword"]) + user.save() + return user diff --git a/modoboa/core/loggers.py b/modoboa/core/loggers.py new file mode 100644 index 000000000..210fd63eb --- /dev/null +++ b/modoboa/core/loggers.py @@ -0,0 +1,11 @@ +import logging +from models import Log + + +class SQLHandler(logging.Handler): + + def emit(self, record): + Log.objects.create( + message=record.getMessage(), level=record.levelname, + logger=record.name + ) diff --git a/modoboa/core/models.py b/modoboa/core/models.py new file mode 100644 index 000000000..c277af0f2 --- /dev/null +++ b/modoboa/core/models.py @@ -0,0 +1,510 @@ +import re +import hashlib +import crypt +import base64 +from random import Random +import reversion +from django.db import models +from django.db.models import Q +from django.dispatch import receiver +from django.utils import timezone +from django.utils.translation import ugettext as _, ugettext_lazy +from django.utils.crypto import constant_time_compare +from django.contrib.contenttypes.models import ContentType +from django.contrib.contenttypes import generic +from django.contrib.auth.models import ( + UserManager, Group, AbstractBaseUser, PermissionsMixin +) +from modoboa.lib import events, md5crypt, parameters +from modoboa.lib.exceptions import PermDeniedException +from modoboa.core.extensions import exts_pool +from modoboa.core.exceptions import AdminError + +try: + from modoboa.lib.ldaputils import * + ldap_available = True +except ImportError: + ldap_available = False + + +class User(AbstractBaseUser, PermissionsMixin): + """Custom User model. + + It overloads the way passwords are stored into the database. The + main reason to change this mechanism is to ensure the + compatibility with the way Dovecot stores passwords. + + It also adds new attributes and methods. + """ + username = models.CharField(max_length=254, unique=True) + first_name = models.CharField(max_length=30, blank=True) + last_name = models.CharField(max_length=30, blank=True) + email = models.EmailField(max_length=254, blank=True) + is_staff = models.BooleanField(default=False) + is_active = models.BooleanField(default=True) + date_joined = models.DateTimeField(default=timezone.now) + + objects = UserManager() + + USERNAME_FIELD = 'username' + REQUIRED_FIELDS = ['email'] + + class Meta: + ordering = ["username"] + + password_expr = re.compile(r'(\{(\w+)\}|(\$1\$))(.+)') + + def delete(self, fromuser, keep_mb_dir, *args, **kwargs): + """Custom delete method + + To check permissions properly, we need to make a distinction + between 2 cases: + + * If the user owns a mailbox, the check is made on that object + (useful for domain admins) + + * Otherwise, the check is made on the user + """ + from modoboa.lib.permissions import \ + get_object_owner, grant_access_to_object, ungrant_access_to_object + + if fromuser == self: + raise AdminError(_("You can't delete your own account")) + + if not fromuser.can_access(self): + raise PermDeniedException + + # if self.has_mailbox: + # mb = self.mailbox_set.all()[0] + # if not fromuser.can_access(mb): + # raise PermDeniedException + # mb.delete(keepdir=keep_mb_dir) + + owner = get_object_owner(self) + for ooentry in self.objectaccess_set.filter(is_owner=True): + if ooentry.content_object is not None: + grant_access_to_object(owner, ooentry.content_object, True) + + events.raiseEvent("AccountDeleted", self) + ungrant_access_to_object(self) + super(User, self).delete(*args, **kwargs) + + @staticmethod + def get_content_type(): + """An uggly hack to retrieve the appropriate content_type! + + The explanation is available here: + https://code.djangoproject.com/ticket/11154 + + Quickly, the content_types framework does not retrieve the + appropriate content type for proxy models, it retrieves the + one of the first parent that is not a proxy. + """ + if not hasattr(User, "ct"): + User.ct = ContentType.objects.get(app_label="admin", model="user") + return User.ct + + def _crypt_password(self, raw_value): + scheme = parameters.get_admin("PASSWORD_SCHEME") + if type(raw_value) is unicode: + raw_value = raw_value.encode("utf-8") + if scheme == "crypt": + salt = "".join(Random().sample(string.letters + string.digits, 2)) + result = crypt.crypt(raw_value, salt) + prefix = "{CRYPT}" + elif scheme == "md5": + obj = hashlib.md5(raw_value) + result = obj.hexdigest() + prefix = "{MD5}" + # The md5crypt scheme is the only supported method that has both: + # (a) a salt ("crypt" has this too), + # (b) supports passwords lengths of more than 8 characters (all except + # "crypt"). + elif scheme == "md5crypt": + # The salt may vary from 12 to 48 bits. (Using all six bytes here + # with a subset of characters means we get only 35 random bits.) + salt = "".join(Random().sample(string.letters + string.digits, 6)) + result = md5crypt(raw_value, salt) + prefix = "" # the result already has $1$ prepended to it + # to signify what this is + elif scheme == "sha256": + obj = hashlib.sha256(raw_value) + result = base64.b64encode(obj.digest()) + prefix = "{SHA256}" + else: + scheme = "plain" + result = raw_value + prefix = "{PLAIN}" + return "%s%s" % (prefix, result) + + def set_password(self, raw_value, curvalue=None): + """Password update + + Update the current mailbox's password with the given clear + value. This value is encrypted according to the defined method + before it is saved. + + :param raw_value: the new password's value + :param curvalue: the current password (for LDAP authentication) + """ + if parameters.get_admin("AUTHENTICATION_TYPE") == "local": + self.password = self._crypt_password(raw_value) + else: + if not ldap_available: + raise AdminError( + _("Failed to update password: LDAP module not installed") + ) + + ab = LDAPAuthBackend() + try: + ab.update_user_password(self.username, curvalue, raw_value) + except LDAPException, e: + raise AdminError(_("Failed to update password: %s" % str(e))) + events.raiseEvent( + "PasswordUpdated", self, raw_value, self.pk is None + ) + + def check_password(self, raw_value): + m = self.password_expr.match(self.password) + if m is None: + return False + if type(raw_value) is unicode: + raw_value = raw_value.encode("utf-8") + scheme = (m.group(2) or m.group(3)).lower() + val2 = m.group(4) + if scheme == u"crypt": + val1 = crypt.crypt(raw_value, val2) + elif scheme == u"md5": + val1 = hashlib.md5(raw_value).hexdigest() + elif scheme == u"sha256": + val1 = base64.b64encode(hashlib.sha256(raw_value).digest()) + elif scheme == u"$1$": # md5crypt + salt, hashed = val2.split('$') + val1 = md5crypt(raw_value, str(salt)) + val2 = self.password # re-add scheme for comparison below + else: + val1 = raw_value + return constant_time_compare(val1, val2) + + @property + def tags(self): + return [{"name": "account", "label": _("account"), "type": "idt"}, + {"name": self.group, "label": self.group, "type": "grp", "color": "info"}] + + # @property + # def has_mailbox(self): + # return self.mailbox_set.count() != 0 + + @property + def fullname(self): + if self.first_name != u"": + return u"%s %s" % (self.first_name, self.last_name) + return self.username + + @property + def identity(self): + return self.username + + @property + def name_or_rcpt(self): + if self.first_name != "": + return "%s %s" % (self.first_name, self.last_name) + return "----" + + @property + def group(self): + if self.is_superuser: + return "SuperAdmins" + try: + return self.groups.all()[0].name + except IndexError: + return "SimpleUsers" + + @property + def enabled(self): + return self.is_active + + @property + def encoded_address(self): + from email.header import Header + if self.first_name != "" or self.last_name != "": + return "%s <%s>" % \ + (Header(self.fullname, 'utf8').encode(), self.email) + return self.email + + def belongs_to_group(self, name): + """Simple shortcut to check if this user is a member of a + specific group. + + :param name: the group's name + :return: a boolean + """ + try: + self.groups.get(name=name) + except Group.DoesNotExist: + return False + return True + + def is_owner(self, obj): + """Tell is the user is the unique owner of this object + + :param obj: an object inheriting from ``models.Model`` + :return: a boolean + """ + from modoboa.lib.permissions import get_content_type + + ct = get_content_type(obj) + try: + ooentry = self.objectaccess_set.get(content_type=ct, object_id=obj.id) + except ObjectAccess.DoesNotExist: + return False + return ooentry.is_owner + + def can_access(self, obj): + """Check if the user can access a specific object + + This function is recursive : if the given user hasn't got direct + access to this object and if he has got access other ``User`` + objects, we check if one of those users owns the object. + + :param obj: a admin object + :return: a boolean + """ + from modoboa.lib.permissions import get_content_type + + if self.is_superuser: + return True + + ct = get_content_type(obj) + try: + ooentry = self.objectaccess_set.get(content_type=ct, object_id=obj.id) + except ObjectAccess.DoesNotExist: + pass + else: + return True + if ct.model == "user": + return False + + ct = self.get_content_type() + qs = self.objectaccess_set.filter(content_type=ct) + for ooentry in qs.all(): + if ooentry.content_object.is_owner(obj): + return True + return False + + def grant_access_to_all_objects(self): + """Give access to all objects defined in the database + + Must be used when an account is promoted as a super user. + """ + from modoboa.lib.permissions import grant_access_to_objects, get_content_type + grant_access_to_objects(self, User.objects.all(), get_content_type(User)) + grant_access_to_objects(self, Domain.objects.all(), get_content_type(Domain)) + grant_access_to_objects(self, DomainAlias.objects.all(), get_content_type(DomainAlias)) + grant_access_to_objects(self, Mailbox.objects.all(), get_content_type(Mailbox)) + grant_access_to_objects(self, Alias.objects.all(), get_content_type(Alias)) + + def set_role(self, role): + """Set administrative role for this account + + :param string role: the role to set + """ + if role is None or self.group == role: + return + self.groups.clear() + if role == "SuperAdmins": + self.is_superuser = True + self.grant_access_to_all_objects() + else: + if self.is_superuser: + ObjectAccess.objects.filter(user=self).delete() + self.is_superuser = False + try: + self.groups.add(Group.objects.get(name=role)) + except Group.DoesNotExist: + self.groups.add(Group.objects.get(name="SimpleUsers")) + if self.group != "SimpleUsers" and not self.can_access(self): + from modoboa.lib.permissions import grant_access_to_object + grant_access_to_object(self, self) + self.save() + + def post_create(self, creator): + from modoboa.lib.permissions import grant_access_to_object + grant_access_to_object(creator, self, is_owner=True) + events.raiseEvent("AccountCreated", self) + + def save(self, *args, **kwargs): + if "creator" in kwargs: + creator = kwargs["creator"] + del kwargs["creator"] + else: + creator = None + super(User, self).save(*args, **kwargs) + if creator is not None: + self.post_create(creator) + + def from_csv(self, user, row, crypt_password=True): + """Create a new account from a CSV file entry + + The expected order is the following:: + + loginname, password, first name, last name, enabled, group, address[, domain, ...] + + :param user: + :param row: a list containing the expected information + :param crypt_password: + """ + if len(row) < 6: + raise AdminError(_("Invalid line")) + role = row[6].strip() + if not user.is_superuser and not role in ["SimpleUsers", "DomainAdmins"]: + raise PermDeniedException( + _("You can't import an account with a role greater than yours") + ) + self.username = row[1].strip() + if crypt_password: + self.set_password(row[2].strip()) + else: + self.password = row[2].strip() + self.first_name = row[3].strip() + self.last_name = row[4].strip() + self.is_active = (row[5].strip() == 'True') + self.save(creator=user) + self.set_role(role) + + self.email = row[7].strip() + if self.email != "": + mailbox, domname = split_mailbox(self.email) + try: + domain = Domain.objects.get(name=domname) + except Domain.DoesNotExist: + raise AdminError( + _("Account import failed (%s): domain does not exist" % self.username) + ) + if not user.can_access(domain): + raise PermDeniedException + mb = Mailbox(address=mailbox, domain=domain, user=self, use_domain_quota=True) + mb.set_quota(override_rules=user.has_perm("admin.change_domain")) + mb.save(creator=user) + if self.group == "DomainAdmins": + for domname in row[8:]: + try: + dom = Domain.objects.get(name=domname.strip()) + except Domain.DoesNotExist: + continue + dom.add_admin(self) + + def to_csv(self, csvwriter): + row = ["account", self.username.encode("utf-8"), self.password, + self.first_name.encode("utf-8"), self.last_name.encode("utf-8"), + self.is_active, self.group, self.email] + if self.group == "DomainAdmins": + row += [dom.name for dom in self.get_domains()] + csvwriter.writerow(row) + +reversion.register(User) + + +class ObjectAccess(models.Model): + user = models.ForeignKey(User) + content_type = models.ForeignKey(ContentType) + object_id = models.PositiveIntegerField() + content_object = generic.GenericForeignKey('content_type', 'object_id') + is_owner = models.BooleanField(default=False) + + class Meta: + unique_together = (("user", "content_type", "object_id"),) + + def __unicode__(self): + return "%s => %s (%s)" % (self.user, self.content_object, self.content_type) + + +class Extension(models.Model): + name = models.CharField(max_length=150) + enabled = models.BooleanField( + ugettext_lazy('enabled'), + help_text=ugettext_lazy("Check to enable this extension") + ) + + def __init__(self, *args, **kwargs): + super(Extension, self).__init__(*args, **kwargs) + + def __unicode__(self): + return self.name + + def __get_ext_instance(self): + if not self.name: + return None + if hasattr(self, "instance") and self.instance: + return + self.instance = exts_pool.get_extension(self.name) + if self.instance: + self.__get_ext_dir() + + def __get_ext_dir(self): + modname = self.instance.__module__ + path = os.path.realpath(sys.modules[modname].__file__) + self.extdir = os.path.dirname(path) + + def on(self): + self.enabled = True + self.save() + + self.__get_ext_instance() + self.instance.load() + self.instance.init() + + if self.instance.needs_media: + path = os.path.join(settings.MEDIA_ROOT, self.name) + exec_cmd("mkdir %s" % path) + + events.raiseEvent("ExtEnabled", self) + + def off(self): + self.__get_ext_instance() + if self.instance is None: + return + self.instance.destroy() + + self.enabled = False + self.save() + + if self.instance.needs_media: + path = os.path.join(settings.MEDIA_ROOT, self.name) + exec_cmd("rm -r %s" % path) + + events.raiseEvent("ExtDisabled", self) + +reversion.register(Extension) + + +class Log(models.Model): + date_created = models.DateTimeField(auto_now_add=True) + message = models.CharField(max_length=255) + level = models.CharField(max_length=15) + logger = models.CharField(max_length=30) + + +@receiver(reversion.post_revision_commit) +def post_revision_commit(sender, **kwargs): + import logging + + if kwargs["revision"].user is None: + return + logger = logging.getLogger("modoboa.admin") + for version in kwargs["versions"]: + if version.type == reversion.models.VERSION_ADD: + action = _("added") + level = "info" + elif version.type == reversion.models.VERSION_CHANGE: + action = _("modified") + level = "warning" + else: + action = _("deleted") + level = "critical" + message = _("%(object)s '%(name)s' %(action)s by user %(user)s") % { + "object": unicode(version.content_type).capitalize(), + "name": version.object_repr, "action": action, + "user": kwargs["revision"].user.username + } + getattr(logger, level)(message) diff --git a/modoboa/core/tables.py b/modoboa/core/tables.py new file mode 100644 index 000000000..9e1d79a53 --- /dev/null +++ b/modoboa/core/tables.py @@ -0,0 +1,12 @@ +from django.utils.translation import ugettext as _, ugettext_lazy +from modoboa.lib import tables + + +class ExtensionsTable(tables.Table): + idkey = "id" + selection = tables.SelectionColumn("selection", width="4%", header=False) + label = tables.Column("label", label=ugettext_lazy("Name"), width="15%") + version = tables.Column("version", label=ugettext_lazy("Version"), width="6%") + descr = tables.Column("description", label=ugettext_lazy("Description")) + + cols_order = ["selection", "label", "version", "descr"] diff --git a/modoboa/core/templates/core/extensions.html b/modoboa/core/templates/core/extensions.html new file mode 100644 index 000000000..276524756 --- /dev/null +++ b/modoboa/core/templates/core/extensions.html @@ -0,0 +1,6 @@ +{% load i18n %}{% load url from future %} +

{% trans "Extensions" %} {% trans "Choose the extension(s) to use" %}

+
{% csrf_token %} + {{ extensions|safe }} +
+{% trans 'Save' %} diff --git a/modoboa/core/templates/core/information.html b/modoboa/core/templates/core/information.html new file mode 100644 index 000000000..80f7500a3 --- /dev/null +++ b/modoboa/core/templates/core/information.html @@ -0,0 +1,17 @@ +{% load i18n libextras %} +

{% trans "Information" %} {% trans "Various information about Modoboa" %}

+
Modoboa {% get_version %} {% trans "is currently in use." %}
+ +

{% trans "Active users" %}

+ + + + + + + {% connected_users as users %}{% for u in users %} + + + + {% endfor %} +
{% trans "Name" %}{% trans "Group name" %}{% trans "Last login" %}
{{ u.username }}{{ u.group }}{{ u.last_login }}
diff --git a/modoboa/core/templates/core/logs.html b/modoboa/core/templates/core/logs.html new file mode 100644 index 000000000..741e9e6eb --- /dev/null +++ b/modoboa/core/templates/core/logs.html @@ -0,0 +1,20 @@ +{% load i18n core_tags %} +

{% trans "Logs" %} {% trans "Previously on Modoboa..." %}

+ + + + + + + + + + + {% for l in logs %} + + + + + {% endfor %} + +
{% trans "Date" %}{% trans "Level" %}{% trans "Logger" %}{% trans "Message" %}
{{ l.date_created }}{{ l.level|colorize_level|safe }}{{ l.logger }}{{ l.message|tohtml|safe }}
diff --git a/modoboa/core/templates/core/parameters.html b/modoboa/core/templates/core/parameters.html new file mode 100644 index 000000000..c425d0e60 --- /dev/null +++ b/modoboa/core/templates/core/parameters.html @@ -0,0 +1,8 @@ +{% load i18n libextras %}{% load url from future %} +{% url "modoboa.admin.views.saveparameters" as action %} +

{% trans "Parameters" %} {% trans "Configure Modoboa" %}

+
{% csrf_token %} + {% include "common/parameters.html" %} +
+
+{% trans 'Save' %} diff --git a/modoboa/core/templates/core/settings_header.html b/modoboa/core/templates/core/settings_header.html new file mode 100644 index 000000000..b9fc504ec --- /dev/null +++ b/modoboa/core/templates/core/settings_header.html @@ -0,0 +1,23 @@ +{% extends "twocols.html" %} +{% load i18n libextras core_tags %} +{% block pagetitle %}{% trans "Modoboa settings" %}{% endblock %} +{% block html_head %} + + + + + + + +{% endblock %} +{% block leftcol %}
{% admin_menu left_selection user %}
{% endblock %} +{% block apparea %}
{% endblock %} diff --git a/modoboa/core/templates/core/user_index.html b/modoboa/core/templates/core/user_index.html new file mode 100644 index 000000000..e721beabe --- /dev/null +++ b/modoboa/core/templates/core/user_index.html @@ -0,0 +1,21 @@ +{% extends "twocols.html" %}{% load i18n core_tags libextras %} +{% block pagetitle %}{% trans "Settings" %}{% endblock %} +{% block html_head %} + + + + + +{% endblock %} +{% block leftcol %}
{% uprefs_menu left_selection user %}
{% endblock %} +{% block apparea %}
{% endblock %} diff --git a/modoboa/core/templates/core/user_preferences.html b/modoboa/core/templates/core/user_preferences.html new file mode 100644 index 000000000..c63f285c0 --- /dev/null +++ b/modoboa/core/templates/core/user_preferences.html @@ -0,0 +1,9 @@ +{% load i18n %}{% load url from future %} +

{% trans "Preferences" %} {% trans "Customize Modoboa" %}

+
+
{% csrf_token %} + {% include "common/parameters.html" %} +
+ +
diff --git a/modoboa/core/templates/core/user_profile.html b/modoboa/core/templates/core/user_profile.html new file mode 100644 index 000000000..462892b52 --- /dev/null +++ b/modoboa/core/templates/core/user_profile.html @@ -0,0 +1,10 @@ +{% load i18n libextras %}{% load url from future %} +

{% trans "Profile" %} {% trans "Update your personal information" %}

+
+
{% csrf_token %} + {% render_form form %} +
+ +
+
diff --git a/modoboa/core/templatetags/__init__.py b/modoboa/core/templatetags/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/modoboa/core/templatetags/core_tags.py b/modoboa/core/templatetags/core_tags.py new file mode 100644 index 000000000..3c7d720ac --- /dev/null +++ b/modoboa/core/templatetags/core_tags.py @@ -0,0 +1,151 @@ +import re +from django import template +from django.template.loader import render_to_string +from django.utils.translation import ugettext as _ +from django.core.urlresolvers import reverse +from modoboa.lib import events + + +register = template.Library() + + +@register.simple_tag +def core_menu(selection, user): + entries = [] + # if user.has_perm("admin.view_domains"): + # entries += [ + # {"name" : "domains", + # "url" : reverse("modoboa.admin.views.domains"), + # "label" : _("Domains")} + # ] + entries += \ + events.raiseQueryEvent("AdminMenuDisplay", "top_menu", user) + # if user.has_perm("admin.add_user") or user.has_perm("admin.add_alias"): + # entries += [ + # {"name" : "identities", + # "url" : reverse("modoboa.admin.views.identities"), + # "label" : _("Identities")}, + # ] + if user.is_superuser: + entries += [ + {"name": "settings", + "label": _("Modoboa"), + "url": reverse("modoboa.core.views.admin.viewsettings")} + ] + + if not len(entries): + return "" + return render_to_string("common/menulist.html", { + "entries": entries, + "selection": selection, + "user": user} + ) + + +@register.simple_tag +def extensions_menu(selection, user): + menu = events.raiseQueryEvent("UserMenuDisplay", "top_menu", user) + return render_to_string('common/menulist.html', { + "selection": selection, "entries": menu, "user": user + }) + + +@register.simple_tag +def admin_menu(selection, user): + entries = [ + {"name": "extensions", + "class": "ajaxlink", + "url": "extensions/", + "label": _("Extensions"), + "img": ""}, + {"name": "info", + "class": "ajaxlink", + "url": "info/", + "label": _("Information")}, + {"name": "logs", + "class": "ajaxlink", + "url": "logs/", + "label": _("Logs")}, + {"name": "parameters", + "class": "ajaxlink", + "url": "parameters/", + "img": "", + "label": _("Parameters")}, + ] + return render_to_string('common/menu.html', { + "entries": entries, + "css": "nav nav-list", + "selection": selection, + "user": user + }) + + +@register.simple_tag +def user_menu(user, selection): + entries = [ + {"name": "user", + "img": "icon-user icon-white", + "label": user.fullname, + "menu": [ + {"name": "settings", + "img": "icon-list", + "label": _("Settings"), + "url": reverse("modoboa.core.views.user.index")} + ]} + ] + + entries[0]["menu"] += \ + events.raiseQueryEvent("UserMenuDisplay", "options_menu", user) \ + + [{"name": "logout", + "url": reverse("modoboa.core.views.auth.dologout"), + "label": _("Logout"), + "img": "icon-off"}] + + return render_to_string("common/menulist.html", { + "selection": selection, "entries": entries, "user": user + }) + + +@register.simple_tag +def uprefs_menu(selection, user): + entries = [ + {"name": "profile", + "class": "ajaxlink", + "url": "profile/", + "label": _("Profile")}, + {"name": "preferences", + "class": "ajaxlink", + "url": "preferences/", + "label": _("Preferences")}, + ] + # if user.has_mailbox: + # entries.insert(0, {"name": "forward", + # "class": "ajaxlink", + # "url": "forward/", + # "label": _("Forward")}) + + entries += events.raiseQueryEvent("UserMenuDisplay", "uprefs_menu", user) + entries = sorted(entries, key=lambda e: e["label"]) + return render_to_string('common/menu.html', { + "entries": entries, + "css": "nav nav-list", + "selection": selection, + "user": user + }) + + +@register.filter +def colorize_level(level): + classes = { + "INFO": "text-info", + "WARNING": "text-warning", + "CRITICAL": "text-error" + } + if not level in classes: + return level + return "

%s

" % (classes[level], level) + + +@register.filter +def tohtml(message): + return re.sub("'(.*?)'", "\g<1>", message) diff --git a/modoboa/core/urls.py b/modoboa/core/urls.py new file mode 100644 index 000000000..a4d1147f9 --- /dev/null +++ b/modoboa/core/urls.py @@ -0,0 +1,14 @@ +from django.conf.urls import patterns, url + + +urlpatterns = patterns( + 'modoboa.core.views', + + (r'^settings/$', 'viewsettings'), + (r'^settings/parameters/$', 'viewparameters'), + (r'^settings/parameters/save/$', 'saveparameters'), + (r'^settings/extensions/$', 'viewextensions'), + (r'^settings/extensions/save/$', 'saveextensions'), + (r'^settings/info/$', 'information'), + (r'^settings/logs/$', 'logs'), +) diff --git a/modoboa/core/views/__init__.py b/modoboa/core/views/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/modoboa/core/views/admin.py b/modoboa/core/views/admin.py new file mode 100644 index 000000000..19a0009c3 --- /dev/null +++ b/modoboa/core/views/admin.py @@ -0,0 +1,128 @@ +from django.shortcuts import render +from django.template.loader import render_to_string +from django.utils.translation import ugettext as _ +from django.contrib.auth.decorators import ( + login_required, user_passes_test +) +from modoboa.lib import parameters +from modoboa.lib.webutils import ( + ajax_simple_response, _render_to_string +) +from modoboa.lib.listing import get_sort_order, get_listing_page +from modoboa.core.models import Extension, Log +from modoboa.core.tables import ExtensionsTable + + +@login_required +@user_passes_test(lambda u: u.is_superuser) +def viewsettings(request, tplname='core/settings_header.html'): + return render(request, tplname, { + "selection": "settings" + }) + + +@login_required +@user_passes_test(lambda u: u.is_superuser) +def viewparameters(request, tplname='core/parameters.html'): + return ajax_simple_response({ + "status": "ok", + "left_selection": "parameters", + "content": _render_to_string(request, tplname, { + "forms": parameters.get_admin_forms + }) + }) + + +@login_required +@user_passes_test(lambda u: u.is_superuser) +def saveparameters(request): + for formdef in parameters.get_admin_forms(request.POST): + form = formdef["form"] + if form.is_valid(): + form.save() + form.to_django_settings() + continue + return ajax_simple_response({ + "status": "ko", "prefix": form.app, "errors": form.errors + }) + return ajax_simple_response(dict( + status="ok", respmsg=_("Parameters saved") + )) + + +@login_required +@user_passes_test(lambda u: u.is_superuser) +def viewextensions(request, tplname='core/extensions.html'): + from modoboa.core.extensions import exts_pool + + exts = exts_pool.list_all() + for ext in exts: + try: + dbext = Extension.objects.get(name=ext["id"]) + ext["selection"] = dbext.enabled + except Extension.DoesNotExist: + dbext = Extension() + dbext.name = ext["id"] + dbext.enabled = False + dbext.save() + ext["selection"] = False + + tbl = ExtensionsTable(request, exts) + return ajax_simple_response({ + "status": "ok", + "content": _render_to_string(request, tplname, {"extensions": tbl}) + }) + + +@login_required +@user_passes_test(lambda u: u.is_superuser) +def saveextensions(request): + actived_exts = Extension.objects.filter(enabled=True) + found = [] + for k in request.POST.keys(): + if k.startswith("select_"): + parts = k.split("_", 1) + dbext = Extension.objects.get(name=parts[1]) + if not dbext in actived_exts: + dbext.on() + else: + found += [dbext] + for ext in actived_exts: + if not ext in found: + ext.off() + + return ajax_simple_response(dict( + status="ok", respmsg=_("Modifications applied.") + )) + + +@login_required +@user_passes_test(lambda u: u.is_superuser) +def information(request, tplname="core/information.html"): + return ajax_simple_response({ + "status": "ok", + "content": render_to_string(tplname, {}) + }) + + +@login_required +@user_passes_test(lambda u: u.is_superuser) +def logs(request, tplname="core/logs.html"): + from modoboa.lib.templatetags.libextras import pagination_bar + + sort_order, sort_dir = get_sort_order( + request.GET, "date_created", + allowed_values=['date_created', 'level', 'logger', 'message'] + ) + page = get_listing_page( + Log.objects.all().order_by("%s%s" % (sort_dir, sort_order)), + request.GET.get("page", 1) + ) + return ajax_simple_response({ + "status": "ok", + "content": render_to_string(tplname, { + "logs": page.object_list, + }), + "page": page.number, + "paginbar": pagination_bar(page), + }) diff --git a/modoboa/core/views/auth.py b/modoboa/core/views/auth.py new file mode 100644 index 000000000..b892b0f58 --- /dev/null +++ b/modoboa/core/views/auth.py @@ -0,0 +1,71 @@ +# coding: utf-8 +import logging +from django.views.decorators.cache import never_cache +from django.contrib.auth import authenticate, login, logout +from django.http import HttpResponse, HttpResponseRedirect +from django.core.urlresolvers import reverse +from django.utils.translation import ugettext as _ +from modoboa.lib import events, parameters +from modoboa.lib.webutils import _render_to_string +from modoboa.core.forms import LoginForm +from modoboa.auth.lib import encrypt + + +def dologin(request): + error = None + if request.method == "POST": + form = LoginForm(request.POST) + if form.is_valid(): + logger = logging.getLogger('modoboa.auth') + user = authenticate(username=form.cleaned_data["username"], + password=form.cleaned_data["password"]) + if user and user.is_active: + login(request, user) + if not form.cleaned_data["rememberme"]: + request.session.set_expiry(0) + # if request.user.has_mailbox: + # request.session["password"] = encrypt(form.cleaned_data["password"]) + + request.session["django_language"] = \ + parameters.get_user(request.user, "LANG") + + logger.info( + _("User '%s' successfully logged in" % user.username) + ) + events.raiseEvent("UserLogin", request, + form.cleaned_data["username"], + form.cleaned_data["password"]) + + nextlocation = request.POST.get("next", None) + if nextlocation is None or nextlocation == "None": + if user.group != "SimpleUsers": + nextlocation = reverse("modoboa.lib.webutils.topredirection") + else: + nextlocation = reverse("domains") + return HttpResponseRedirect(nextlocation) + error = _("Your username and password didn't match. Please try again.") + logger.warning("Failed connection attempt from '%(addr)s' as user '%(user)s'" \ + % {"addr": request.META["REMOTE_ADDR"], + "user": form.cleaned_data["username"]}) + + nextlocation = request.POST.get("next", None) + httpcode = 401 + else: + form = LoginForm() + nextlocation = request.GET.get("next", None) + httpcode = 200 + + return HttpResponse(_render_to_string(request, "registration/login.html", { + "form": form, "error": error, "next": nextlocation, + "annoucements": events.raiseQueryEvent("GetAnnouncement", "loginpage") + }), status=httpcode) + +dologin = never_cache(dologin) + + +def dologout(request): + events.raiseEvent("UserLogout", request) + logger = logging.getLogger("modoboa.auth") + logger.info(_("User '%s' logged out" % request.user.username)) + logout(request) + return HttpResponseRedirect(reverse(dologin)) diff --git a/modoboa/core/views/user.py b/modoboa/core/views/user.py new file mode 100644 index 000000000..3a9b077d0 --- /dev/null +++ b/modoboa/core/views/user.py @@ -0,0 +1,73 @@ +from django.shortcuts import render +from django.utils.translation import ugettext as _ +from django.contrib.auth.decorators import login_required, user_passes_test +from modoboa.lib import events, parameters +from modoboa.lib.webutils import ( + ajax_simple_response, _render_to_string +) +from modoboa.lib.cryptutils import encrypt +from modoboa.core.forms import ProfileForm + + +@login_required +def index(request, tplname="core/user_index.html"): + extrajs = events.raiseQueryEvent("ExtraUprefsJS", request.user) + return render(request, tplname, { + "selection": "user", + "extrajs": "".join(extrajs) + }) + + +@login_required +def profile(request, tplname='core/user_profile.html'): + update_password = True + if True in events.raiseQueryEvent("PasswordChange", request.user): + update_password = False + + if request.method == "POST": + form = ProfileForm( + update_password, request.POST, instance=request.user + ) + if form.is_valid(): + form.save() + if update_password and form.cleaned_data["confirmation"] != "": + request.session["password"] = encrypt(form.cleaned_data["confirmation"]) + return ajax_simple_response(dict( + status="ok", respmsg=_("Profile updated") + )) + return ajax_simple_response({ + "status": "ko", + "errors": form.errors + }) + + form = ProfileForm(update_password, instance=request.user) + return ajax_simple_response({ + "status": "ok", + "content": _render_to_string(request, tplname, { + "form": form + }) + }) + + +@login_required +def preferences(request): + if request.method == "POST": + for formdef in parameters.get_user_forms(request.user, request.POST)(): + form = formdef["form"] + if form.is_valid(): + form.save() + continue + return ajax_simple_response({ + "status": "ko", "prefix": form.app, "errors": form.errors + }) + + return ajax_simple_response({ + "status": "ok", "respmsg": _("Preferences saved") + }) + + return ajax_simple_response({ + "status": "ok", + "content": _render_to_string(request, "core/user_preferences.html", { + "forms": parameters.get_user_forms(request.user) + }) + }) diff --git a/modoboa/extensions/__init__.py b/modoboa/extensions/__init__.py index e8bddb244..e69de29bb 100644 --- a/modoboa/extensions/__init__.py +++ b/modoboa/extensions/__init__.py @@ -1,91 +0,0 @@ -# coding: utf-8 -import os -import sys -import re -from django.conf import settings -from django.conf.urls import include - - -class ModoExtension(object): - """Base extension class - - Each Modoboa extension must inherit from this class to be - considered as valid. - """ - name = None - version = None - description = "" - url = None - needs_media = False - always_active = False - - def infos(self): - return dict(name=self.name, label=self.label, version=self.version, - description=self.description, url=self.url) - - def init(self): - pass - - def destroy(self): - pass - - def load(self): - pass - - -class ExtensionsPool(object): - """The extensions manager""" - - def __init__(self): - self.extensions = dict() - - def register_extension(self, ext, show=True): - self.extensions[ext.name] = dict(cls=ext, show=show) - - def get_extension(self, name): - if not name in self.extensions: - return None - if not "instance" in self.extensions[name]: - self.extensions[name]["instance"] = self.extensions[name]["cls"]() - return self.extensions[name]["instance"] - - def get_extension_infos(self, name): - instance = self.get_extension(name) - return instance.infos() - - def load_all(self): - from modoboa.admin.models import Extension - - for ext in settings.MODOBOA_APPS: - __import__(ext) - result = [] - for extname in self.extensions.keys(): - extinstance = self.get_extension(extname) - if not extinstance.always_active: - try: - ext = Extension.objects.get(name=extname) - if not ext.enabled: - continue - except Extension.DoesNotExist: - continue - extinstance.load() - try: - baseurl = extinstance.url if extinstance.url is not None else extname - result += [(r'^%s/' % (baseurl), - include("%s.urls" % extinstance.__module__))] - except ImportError: - # No urls for this extension - pass - return result - - def list_all(self): - result = [] - for extname, extdef in self.extensions.iteritems(): - if not extdef["show"]: - continue - infos = extdef["instance"].infos() - infos["id"] = extname - result += [infos] - return sorted(result, key=lambda i: i["name"]) - -exts_pool = ExtensionsPool() diff --git a/modoboa/lib/authbackends.py b/modoboa/lib/authbackends.py index 01752a81c..4edefd86d 100644 --- a/modoboa/lib/authbackends.py +++ b/modoboa/lib/authbackends.py @@ -1,10 +1,9 @@ from django.contrib.auth.backends import ModelBackend -from django.utils.translation import gettext as _ -from modoboa.admin.models import User -from modoboa.lib.exceptions import ModoboaException +from modoboa.core.models import User from modoboa.lib import parameters from modoboa.lib.emailutils import split_mailbox + class SimpleBackend(ModelBackend): def authenticate(self, username=None, password=None): @@ -23,10 +22,11 @@ class SimpleBackend(ModelBackend): return None try: - from django_auth_ldap.backend import LDAPBackend as orig_LDAPBackend, _LDAPUser + from django_auth_ldap.backend import ( + LDAPBackend as orig_LDAPBackend, _LDAPUser + ) from modoboa.admin.models import populate_callback - class LDAPBackend(orig_LDAPBackend): def get_or_create_user(self, username, ldap_user): diff --git a/modoboa/lib/cryptutils.py b/modoboa/lib/cryptutils.py new file mode 100644 index 000000000..8808cd240 --- /dev/null +++ b/modoboa/lib/cryptutils.py @@ -0,0 +1,41 @@ +# coding: utf-8 +from Crypto.Cipher import AES +import base64 +import random +import string +from modoboa.lib import parameters + + +def random_key(l=16): + """Generate a random key + + :param integer l: the key's length + :return: a string + """ + char_set = string.digits + string.letters + string.punctuation + return ''.join(random.sample(char_set * l, l)) + + +def encrypt(clear): + key = parameters.get_admin("SECRET_KEY", app="admin") + obj = AES.new(key, AES.MODE_ECB) + if type(clear) is unicode: + clear = clear.encode("utf-8") + if len(clear) % AES.block_size: + clear += " " * (AES.block_size - len(clear) % AES.block_size) + ciph = obj.encrypt(clear) + ciph = base64.b64encode(ciph) + return ciph + + +def decrypt(ciph): + obj = AES.new( + parameters.get_admin("SECRET_KEY", app="admin"), AES.MODE_ECB + ) + ciph = base64.b64decode(ciph) + clear = obj.decrypt(ciph) + return clear.rstrip(' ') + + +def get_password(request): + return decrypt(request.session["password"]) diff --git a/modoboa/lib/listing.py b/modoboa/lib/listing.py new file mode 100644 index 000000000..9d1b0a38e --- /dev/null +++ b/modoboa/lib/listing.py @@ -0,0 +1,30 @@ +from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger +from modoboa.lib import parameters + + +def get_sort_order(qdict, default, allowed_values=None): + """Return a sort order from a querydict object + + :param QueryDict qdict: the object to analyse + :param string default: the default sort order if no one is found + :param list allowed_values: an optional list of allowed values + :return: a 2uple of strings + """ + sort_order = qdict.get("sort_order", default) + if sort_order.startswith("-"): + sort_dir = "-" + sort_order = sort_order[1:] + else: + sort_dir = "" + if allowed_values is not None and not sort_order in allowed_values: + return (default, "") + return (sort_order, sort_dir) + + +def get_listing_page(objects, pagenum): + paginator = Paginator(objects, int(parameters.get_admin("ITEMS_PER_PAGE", app="core"))) + try: + page = paginator.page(int(pagenum)) + except (EmptyPage, PageNotAnInteger, ValueError): + page = paginator.page(paginator.num_pages) + return page diff --git a/modoboa/lib/middleware.py b/modoboa/lib/middleware.py index eea67d1bf..bce9881fd 100644 --- a/modoboa/lib/middleware.py +++ b/modoboa/lib/middleware.py @@ -1,10 +1,11 @@ # coding: utf-8 import re from django.http import Http404, HttpResponseRedirect -from modoboa.admin.models import Extension +from modoboa.core.models import Extension from modoboa.lib.webutils import _render_error, ajax_response from modoboa.lib.exceptions import ModoboaException + class ExtControlMiddleware(object): def process_view(self, request, view, args, kwargs): m = re.match("modoboa\.extensions\.(\w+)", view.__module__) @@ -17,6 +18,7 @@ class ExtControlMiddleware(object): return None raise Http404 + class AjaxLoginRedirect(object): def process_response(self, request, response): if request.is_ajax(): @@ -24,12 +26,16 @@ class AjaxLoginRedirect(object): response.status_code = 278 return response + class CommonExceptionCatcher(object): def process_exception(self, request, exception): if not isinstance(exception, ModoboaException): return None if not request.is_ajax(): - return _render_error(request, user_context=dict(error=str(exception))) - - return ajax_response(request, status="ko", respmsg=unicode(exception), norefresh=True) + return _render_error( + request, user_context=dict(error=str(exception)) + ) + return ajax_response( + request, status="ko", respmsg=unicode(exception), norefresh=True + ) diff --git a/modoboa/lib/models.py b/modoboa/lib/models.py index 5bf2781de..f98bfdc34 100644 --- a/modoboa/lib/models.py +++ b/modoboa/lib/models.py @@ -25,10 +25,3 @@ class UserParameter(models.Model): @property def shortname(self): return self.name.split(".")[1].lower() - - -class Log(models.Model): - date_created = models.DateTimeField(auto_now_add=True) - message = models.CharField(max_length=255) - level = models.CharField(max_length=15) - logger = models.CharField(max_length=30) diff --git a/modoboa/lib/parameters.py b/modoboa/lib/parameters.py index 8e1671ea8..56d9a8590 100644 --- a/modoboa/lib/parameters.py +++ b/modoboa/lib/parameters.py @@ -285,7 +285,9 @@ def get_user(user, name, app=None, raise_error=True): def get_sorted_apps(level, first="admin"): - sorted_apps = [first] + sorted_apps = [] + if first in _params[level]: + sorted_apps.append(first) sorted_apps += sorted( [app for app in _params[level].keys() if app != first], key=lambda app: _params[level][app]["label"] diff --git a/modoboa/lib/templatetags/libextras.py b/modoboa/lib/templatetags/libextras.py index 2ed64725c..7c8f9cc81 100644 --- a/modoboa/lib/templatetags/libextras.py +++ b/modoboa/lib/templatetags/libextras.py @@ -194,7 +194,7 @@ class ConnectedUsers(template.Node): self.varname = varname def render(self, context): - from modoboa.admin.models import User + from modoboa.core.models import User sessions = Session.objects.filter(expire_date__gte=timezone.now()) uid_list = [] diff --git a/modoboa/lib/webutils.py b/modoboa/lib/webutils.py index 3e7ceec92..254af4938 100644 --- a/modoboa/lib/webutils.py +++ b/modoboa/lib/webutils.py @@ -149,16 +149,16 @@ def topredirection(request): :param request: a Request object """ from modoboa.lib import parameters - from modoboa.extensions import exts_pool + from modoboa.core.extensions import exts_pool - topredir = parameters.get_admin("DEFAULT_TOP_REDIRECTION", app="admin") - if not topredir in ["admin", "userprefs"]: + topredir = parameters.get_admin("DEFAULT_TOP_REDIRECTION", app="core") + if not topredir in ["core"]: infos = exts_pool.get_extension_infos(topredir) path = infos["url"] if infos["url"] else infos["name"] else: - path = topredir + path = "" # topredir - if topredir in ["admin", "stats"] and \ + if topredir in ["core", "stats"] and \ request.user.belongs_to_group('SimpleUsers'): path = "userprefs" diff --git a/modoboa/templates/nlayout.html b/modoboa/templates/nlayout.html index 0ded1dbd3..a4a3a5a81 100644 --- a/modoboa/templates/nlayout.html +++ b/modoboa/templates/nlayout.html @@ -1,4 +1,4 @@ -{% load i18n admin_extras uprefs_extras libextras %}{% load url from future %} +{% load i18n core_tags libextras %}{% load url from future %} @@ -38,8 +38,8 @@
diff --git a/modoboa/templates/registration/login.html b/modoboa/templates/registration/login.html index 12dd1377b..ecedd40ca 100644 --- a/modoboa/templates/registration/login.html +++ b/modoboa/templates/registration/login.html @@ -23,7 +23,7 @@ -
{% csrf_token %} {% render_field form.username %} diff --git a/modoboa/urls.py b/modoboa/urls.py index 36c376ea5..8f65d9399 100644 --- a/modoboa/urls.py +++ b/modoboa/urls.py @@ -1,15 +1,31 @@ from django.conf.urls import patterns, include, url from django.conf import settings -from modoboa.extensions import * +from modoboa.core.extensions import exts_pool from modoboa.lib import parameters +from modoboa.core import load_settings +load_settings() urlpatterns = patterns('', (r'^$', 'modoboa.lib.webutils.topredirection'), - (r'^accounts/login/$', 'modoboa.auth.views.dologin'), - (r'^accounts/logout/$', 'modoboa.auth.views.dologout'), (r'^jsi18n/$', 'django.views.i18n.javascript_catalog', {'packages': ('modoboa', ), }), + + (r'^accounts/login/$', 'modoboa.core.views.auth.dologin'), + (r'^accounts/logout/$', 'modoboa.core.views.auth.dologout'), + + (r'^admin/$', 'modoboa.core.views.admin.viewsettings'), + (r'^admin/parameters/$', 'modoboa.core.views.admin.viewparameters'), + (r'^admin/parameters/save/$', 'modoboa.core.views.admin.saveparameters'), + (r'^admin/extensions/$', 'modoboa.core.views.admin.viewextensions'), + (r'^admin/extensions/save/$', 'modoboa.core.views.admin.saveextensions'), + (r'^admin/info/$', 'modoboa.core.views.admin.information'), + (r'^admin/logs/$', 'modoboa.core.views.admin.logs'), + + (r'^user/$', 'modoboa.core.views.user.index'), + (r'^user/preferences/$', 'modoboa.core.views.user.preferences'), + (r'^user/profile/$', 'modoboa.core.views.user.profile'), + *exts_pool.load_all() ) From 115553236509754ceea3435327b8cd1c07260d06 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Fri, 16 Aug 2013 16:34:15 +0200 Subject: [PATCH 02/97] wip: Big refacto The admin application is now a true extension. --- modoboa/admin/__init__.py | 32 - modoboa/admin/app_settings.py | 291 ---- modoboa/admin/models.py | 1322 ----------------- modoboa/admin/views.py | 889 ----------- modoboa/core/__init__.py | 13 +- modoboa/core/app_settings.py | 2 +- modoboa/core/extensions.py | 10 +- modoboa/core/models.py | 1 + modoboa/core/templatetags/core_tags.py | 30 + modoboa/extensions/admin/__init__.py | 21 + modoboa/extensions/admin/app_settings.py | 48 + modoboa/{ => extensions}/admin/exceptions.py | 0 .../{ => extensions}/admin/fixtures/demo.json | 0 .../admin/fixtures/initial_data.json | 0 .../admin/fixtures/initial_users.json | 0 .../admin/fixtures/test_content.json | 0 modoboa/{ => extensions}/admin/forms.py | 9 +- modoboa/{ => extensions}/admin/lib.py | 0 .../admin/migrations/0001_initial.py | 0 .../0002_auto__del_field_alias_mbox.py | 0 .../migrations/0003_auto__add_extension.py | 0 .../admin/migrations/0004_add_permissions.py | 0 .../0005_increase_columns_length.py | 0 .../migrations/0006_auto__add_domainalias.py | 0 ...ess__chg_field_alias_address__del_field.py | 0 .../migrations/0008_update_mailbox_path.py | 0 .../0009_auto__add_field_alias_extmboxes.py | 0 .../migrations/0010_fill_alias_domain.py | 0 ...d_domain_dates__add_field_domainalias_d.py | 0 .../migrations/0012_fill_object_dates.py | 0 .../migrations/0013_update_mailbox_path.py | 0 .../0014_auto__add_unique_domain_name.py | 0 .../admin/migrations/0015_move_passwords.py | 0 ...que_objectaccess_user_content_type_obje.py | 0 .../admin/migrations/0017_set_permissions.py | 0 ...8_auto__add_unique_alias_domain_address.py | 0 .../migrations/0019_set_default_group.py | 0 .../migrations/0020_rename_amavis_ext.py | 0 .../0021_default_superadmin_ownership.py | 0 ...l_field_mailbox_gid__del_field_mailbox_.py | 0 .../admin/migrations/0023_auto__add_quota.py | 0 .../admin/migrations/0024_create_quotas.py | 0 .../0025_auto__add_field_quota_mbox.py | 0 .../admin/migrations/0026_set_quota_mbox.py | 0 ...uto__add_field_mailbox_use_domain_quota.py | 0 .../0028_auto__chg_field_mailbox_quota.py | 0 ...ilbox_user__chg_field_objectaccess_user.py | 0 .../migrations/0030_update_permissions.py | 0 .../0031_auto__add_aliases_to_alias.py | 0 .../0032_auto__chg_field_quota_bytes.py | 0 ...ilbox_address__chg_field_quota_username.py | 0 .../0034_auto__add_field_user_is_local.py | 0 .../admin/migrations/0035_set_local_flag.py | 0 .../admin/migrations/__init__.py | 0 modoboa/extensions/admin/models/__init__.py | 8 + modoboa/extensions/admin/models/alias.py | 195 +++ modoboa/extensions/admin/models/base.py | 49 + modoboa/extensions/admin/models/domain.py | 133 ++ .../extensions/admin/models/domain_alias.py | 78 + modoboa/extensions/admin/models/mailbox.py | 213 +++ .../admin/static/admin/css/admin.css | 0 .../admin/static/admin/css/settings.css | 0 .../admin/static/admin/js/admin.js | 0 modoboa/{ => extensions}/admin/tables.py | 17 +- .../admin/templates/admin/dlistform.html | 0 .../templates/admin/domain_general_form.html | 0 .../templates/admin/domain_options_form.html | 0 .../admin/templates/admin/domains.html | 2 +- .../admin/templates/admin/editdomainform.html | 0 .../admin/templates/admin/extensions.html | 0 .../admin/templates/admin/header.html | 0 .../admin/templates/admin/identities.html | 8 +- .../templates/admin/identities_table.html | 0 .../admin/templates/admin/import_done.html | 0 .../admin/templates/admin/importform.html | 0 .../admin/templates/admin/information.html | 0 .../admin/templates/admin/listing.html | 2 +- .../admin/templates/admin/logs.html | 0 .../admin/templates/admin/mailboxes_raw.html | 0 .../admin/templates/admin/mailform.html | 0 .../admin/templates/admin/newdomainform.html | 0 .../admin/templates/admin/parameters.html | 0 .../admin/templates/admin/permsform.html | 0 .../admin/templates/admin/quotas.html | 0 .../admin/templates/admin/searchform.html | 0 .../templates/admin/settings_header.html | 0 .../admin/templatetags}/__init__.py | 0 .../admin/templatetags/admin_tags.py} | 209 +-- modoboa/{ => extensions}/admin/tests.py | 0 modoboa/{ => extensions}/admin/urls.py | 35 +- .../admin/views}/__init__.py | 0 modoboa/extensions/admin/views/alias.py | 163 ++ modoboa/extensions/admin/views/domain.py | 184 +++ modoboa/extensions/admin/views/export.py | 83 ++ modoboa/extensions/admin/views/identity.py | 244 +++ modoboa/extensions/admin/views/import.py | 165 ++ modoboa/lib/middleware.py | 11 +- modoboa/lib/permissions.py | 2 +- modoboa/lib/webutils.py | 43 +- modoboa/urls.py | 14 +- 100 files changed, 1795 insertions(+), 2731 deletions(-) delete mode 100644 modoboa/admin/__init__.py delete mode 100644 modoboa/admin/app_settings.py delete mode 100644 modoboa/admin/models.py delete mode 100644 modoboa/admin/views.py create mode 100644 modoboa/extensions/admin/__init__.py create mode 100644 modoboa/extensions/admin/app_settings.py rename modoboa/{ => extensions}/admin/exceptions.py (100%) rename modoboa/{ => extensions}/admin/fixtures/demo.json (100%) rename modoboa/{ => extensions}/admin/fixtures/initial_data.json (100%) rename modoboa/{ => extensions}/admin/fixtures/initial_users.json (100%) rename modoboa/{ => extensions}/admin/fixtures/test_content.json (100%) rename modoboa/{ => extensions}/admin/forms.py (99%) rename modoboa/{ => extensions}/admin/lib.py (100%) rename modoboa/{ => extensions}/admin/migrations/0001_initial.py (100%) rename modoboa/{ => extensions}/admin/migrations/0002_auto__del_field_alias_mbox.py (100%) rename modoboa/{ => extensions}/admin/migrations/0003_auto__add_extension.py (100%) rename modoboa/{ => extensions}/admin/migrations/0004_add_permissions.py (100%) rename modoboa/{ => extensions}/admin/migrations/0005_increase_columns_length.py (100%) rename modoboa/{ => extensions}/admin/migrations/0006_auto__add_domainalias.py (100%) rename modoboa/{ => extensions}/admin/migrations/0007_auto__del_field_alias_full_address__chg_field_alias_address__del_field.py (100%) rename modoboa/{ => extensions}/admin/migrations/0008_update_mailbox_path.py (100%) rename modoboa/{ => extensions}/admin/migrations/0009_auto__add_field_alias_extmboxes.py (100%) rename modoboa/{ => extensions}/admin/migrations/0010_fill_alias_domain.py (100%) rename modoboa/{ => extensions}/admin/migrations/0011_auto__add_objectdates__add_field_domain_dates__add_field_domainalias_d.py (100%) rename modoboa/{ => extensions}/admin/migrations/0012_fill_object_dates.py (100%) rename modoboa/{ => extensions}/admin/migrations/0013_update_mailbox_path.py (100%) rename modoboa/{ => extensions}/admin/migrations/0014_auto__add_unique_domain_name.py (100%) rename modoboa/{ => extensions}/admin/migrations/0015_move_passwords.py (100%) rename modoboa/{ => extensions}/admin/migrations/0016_auto__add_objectaccess__add_unique_objectaccess_user_content_type_obje.py (100%) rename modoboa/{ => extensions}/admin/migrations/0017_set_permissions.py (100%) rename modoboa/{ => extensions}/admin/migrations/0018_auto__add_unique_alias_domain_address.py (100%) rename modoboa/{ => extensions}/admin/migrations/0019_set_default_group.py (100%) rename modoboa/{ => extensions}/admin/migrations/0020_rename_amavis_ext.py (100%) rename modoboa/{ => extensions}/admin/migrations/0021_default_superadmin_ownership.py (100%) rename modoboa/{ => extensions}/admin/migrations/0022_auto__del_field_mailbox_uid__del_field_mailbox_gid__del_field_mailbox_.py (100%) rename modoboa/{ => extensions}/admin/migrations/0023_auto__add_quota.py (100%) rename modoboa/{ => extensions}/admin/migrations/0024_create_quotas.py (100%) rename modoboa/{ => extensions}/admin/migrations/0025_auto__add_field_quota_mbox.py (100%) rename modoboa/{ => extensions}/admin/migrations/0026_set_quota_mbox.py (100%) rename modoboa/{ => extensions}/admin/migrations/0027_auto__add_field_mailbox_use_domain_quota.py (100%) rename modoboa/{ => extensions}/admin/migrations/0028_auto__chg_field_mailbox_quota.py (100%) rename modoboa/{ => extensions}/admin/migrations/0029_auto__add_user__chg_field_mailbox_user__chg_field_objectaccess_user.py (100%) rename modoboa/{ => extensions}/admin/migrations/0030_update_permissions.py (100%) rename modoboa/{ => extensions}/admin/migrations/0031_auto__add_aliases_to_alias.py (100%) rename modoboa/{ => extensions}/admin/migrations/0032_auto__chg_field_quota_bytes.py (100%) rename modoboa/{ => extensions}/admin/migrations/0033_auto__chg_field_mailbox_address__chg_field_quota_username.py (100%) rename modoboa/{ => extensions}/admin/migrations/0034_auto__add_field_user_is_local.py (100%) rename modoboa/{ => extensions}/admin/migrations/0035_set_local_flag.py (100%) rename modoboa/{ => extensions}/admin/migrations/__init__.py (100%) create mode 100644 modoboa/extensions/admin/models/__init__.py create mode 100644 modoboa/extensions/admin/models/alias.py create mode 100644 modoboa/extensions/admin/models/base.py create mode 100644 modoboa/extensions/admin/models/domain.py create mode 100644 modoboa/extensions/admin/models/domain_alias.py create mode 100644 modoboa/extensions/admin/models/mailbox.py rename modoboa/{ => extensions}/admin/static/admin/css/admin.css (100%) rename modoboa/{ => extensions}/admin/static/admin/css/settings.css (100%) rename modoboa/{ => extensions}/admin/static/admin/js/admin.js (100%) rename modoboa/{ => extensions}/admin/tables.py (84%) rename modoboa/{ => extensions}/admin/templates/admin/dlistform.html (100%) rename modoboa/{ => extensions}/admin/templates/admin/domain_general_form.html (100%) rename modoboa/{ => extensions}/admin/templates/admin/domain_options_form.html (100%) rename modoboa/{ => extensions}/admin/templates/admin/domains.html (79%) rename modoboa/{ => extensions}/admin/templates/admin/editdomainform.html (100%) rename modoboa/{ => extensions}/admin/templates/admin/extensions.html (100%) rename modoboa/{ => extensions}/admin/templates/admin/header.html (100%) rename modoboa/{ => extensions}/admin/templates/admin/identities.html (60%) rename modoboa/{ => extensions}/admin/templates/admin/identities_table.html (100%) rename modoboa/{ => extensions}/admin/templates/admin/import_done.html (100%) rename modoboa/{ => extensions}/admin/templates/admin/importform.html (100%) rename modoboa/{ => extensions}/admin/templates/admin/information.html (100%) rename modoboa/{ => extensions}/admin/templates/admin/listing.html (92%) rename modoboa/{ => extensions}/admin/templates/admin/logs.html (100%) rename modoboa/{ => extensions}/admin/templates/admin/mailboxes_raw.html (100%) rename modoboa/{ => extensions}/admin/templates/admin/mailform.html (100%) rename modoboa/{ => extensions}/admin/templates/admin/newdomainform.html (100%) rename modoboa/{ => extensions}/admin/templates/admin/parameters.html (100%) rename modoboa/{ => extensions}/admin/templates/admin/permsform.html (100%) rename modoboa/{ => extensions}/admin/templates/admin/quotas.html (100%) rename modoboa/{ => extensions}/admin/templates/admin/searchform.html (100%) rename modoboa/{ => extensions}/admin/templates/admin/settings_header.html (100%) rename modoboa/{admin/models => extensions/admin/templatetags}/__init__.py (100%) rename modoboa/{admin/templatetags/admin_extras.py => extensions/admin/templatetags/admin_tags.py} (61%) rename modoboa/{ => extensions}/admin/tests.py (100%) rename modoboa/{ => extensions}/admin/urls.py (76%) rename modoboa/{admin/templatetags => extensions/admin/views}/__init__.py (100%) create mode 100644 modoboa/extensions/admin/views/alias.py create mode 100644 modoboa/extensions/admin/views/domain.py create mode 100644 modoboa/extensions/admin/views/export.py create mode 100644 modoboa/extensions/admin/views/identity.py create mode 100644 modoboa/extensions/admin/views/import.py diff --git a/modoboa/admin/__init__.py b/modoboa/admin/__init__.py deleted file mode 100644 index 5ebe1de28..000000000 --- a/modoboa/admin/__init__.py +++ /dev/null @@ -1,32 +0,0 @@ -# coding: utf-8 -from django.utils.translation import ugettext as _, ugettext_lazy -from modoboa.extensions import ModoExtension, exts_pool -from modoboa.lib import parameters, events - - -class AdminConsole(ModoExtension): - name = "admin" - label = ugettext_lazy("Administration console") - version = "1.0" - description = ugettext_lazy("Web based console to manage domains, accounts and aliases") - always_active = True - - def load(self): - from app_settings import GeneralParametersForm - parameters.register(GeneralParametersForm, ugettext_lazy("General")) - - def destroy(self): - parameters.unregister() - -exts_pool.register_extension(AdminConsole, show=False) - - -@events.observe("ExtDisabled") -def unset_default_topredirection(extension): - """ - Simple callback to change the default redirection if the - corresponding extension is being disabled. - """ - topredirection = parameters.get_admin("DEFAULT_TOP_REDIRECTION") - if topredirection == extension.name: - parameters.save_admin("DEFAULT_TOP_REDIRECTION", "userprefs") diff --git a/modoboa/admin/app_settings.py b/modoboa/admin/app_settings.py deleted file mode 100644 index 1f02db899..000000000 --- a/modoboa/admin/app_settings.py +++ /dev/null @@ -1,291 +0,0 @@ -from django import forms -from django.utils.translation import ugettext as _, ugettext_lazy -from modoboa.lib.formutils import YesNoField, SeparatorField, InlineRadioSelect -from modoboa.lib.sysutils import exec_cmd -from modoboa.lib import parameters -from modoboa.auth.lib import random_key - - -def enabled_applications(): - """Return the list of currently enabled extensions - - We check if the table exists before trying to fetch activated - extensions because the admin module is always imported by Django, - even before the database exists (example: the first ``syncdb``). - - :return: a list - """ - from modoboa.admin.models import Extension - from modoboa.lib.dbutils import db_table_exists - - result = [("userprefs", "userprefs")] - if db_table_exists("admin_extension"): - exts = Extension.objects.filter(enabled=True) - result += [(ext.name, ext.name) for ext in exts] - return sorted(result, key=lambda e: e[0]) - - -class GeneralParametersForm(parameters.AdminParametersForm): - app = "admin" - - sep1 = SeparatorField(label=ugettext_lazy("Authentication")) - - authentication_type = forms.ChoiceField( - label=ugettext_lazy("Authentication type"), - choices=[('local', ugettext_lazy("Local")), - ('ldap', "LDAP")], - initial="local", - help_text=ugettext_lazy("The backend used for authentication"), - widget=InlineRadioSelect - ) - - password_scheme = forms.ChoiceField( - label=ugettext_lazy("Default password scheme"), - choices=[("crypt", "crypt"), - ("md5", "md5"), - ("md5crypt", "md5crypt"), - ("sha256", "sha256"), - ("plain", "plain")], - initial="md5crypt", - help_text=ugettext_lazy("Scheme used to crypt mailbox passwords") - ) - - secret_key = forms.CharField( - label=ugettext_lazy("Secret key"), - initial=random_key(), - help_text=ugettext_lazy("Key used to encrypt/decrypt passwords") - ) - - # LDAP specific settings - ldap_sep = SeparatorField(label=ugettext_lazy("LDAP settings")) - - ldap_server_address = forms.CharField( - label=ugettext_lazy("Server address"), - initial="localhost", - help_text=ugettext_lazy("The IP address of the DNS name of the LDAP server") - ) - - ldap_server_port = forms.IntegerField( - label=ugettext_lazy("Server port"), - initial=389, - help_text=ugettext_lazy("The TCP port number used by the LDAP server") - ) - - ldap_secured = YesNoField( - label=ugettext_lazy("Use a secured connection"), - initial="no", - help_text=ugettext_lazy("Use an SSL/TLS connection to access the LDAP server") - ) - - ldap_auth_method = forms.ChoiceField( - label=ugettext_lazy("Authentication method"), - choices=[('searchbind', ugettext_lazy("Search and bind")), - ('directbind', ugettext_lazy("Direct bind"))], - initial='searchbind', - help_text=ugettext_lazy("Choose the authentication method to use"), - widget=InlineRadioSelect - ) - - ldap_bind_dn = forms.CharField( - label=ugettext_lazy("Bind DN"), - initial='', - help_text=ugettext_lazy("The distinguished name to use when binding to the LDAP server. Leave empty for an anonymous bind"), - required=False - ) - - ldap_bind_password = forms.CharField( - label=ugettext_lazy("Bind password"), - initial='', - help_text=ugettext_lazy("The password to use when binding to the LDAP server (with 'Bind DN')"), - widget=forms.PasswordInput(render_value=True), - required=False - ) - - ldap_search_base = forms.CharField( - label=ugettext_lazy("Search base"), - initial="", - help_text=ugettext_lazy("The distinguished name of the search base"), - required=False - ) - - ldap_search_filter = forms.CharField( - label=ugettext_lazy("Search filter"), - initial="(mail=%(user)s)", - help_text=ugettext_lazy("An optional filter string (e.g. '(objectClass=person)'). In order to be valid, it must be enclosed in parentheses."), - required=False - ) - - ldap_user_dn_template = forms.CharField( - label=ugettext_lazy("User DN template"), - initial="", - help_text=ugettext_lazy("The template used to construct a user's DN. It should contain one placeholder (ie. %(user)s)"), - required=False - ) - - ldap_password_attribute = forms.CharField( - label=ugettext_lazy("Password attribute"), - initial="userPassword", - help_text=ugettext_lazy("The attribute used to store user passwords") - ) - - ldap_is_active_directory = YesNoField( - label=ugettext_lazy("Active Directory"), - initial="no", - help_text=ugettext_lazy("Tell if the LDAP server is an Active Directory one") - ) - - sep2 = SeparatorField(label=ugettext_lazy("Mailboxes")) - - handle_mailboxes = YesNoField( - label=ugettext_lazy("Handle mailboxes on filesystem"), - initial="no", - help_text=ugettext_lazy("Rename or remove mailboxes on the filesystem when they get renamed or removed within Modoboa") - ) - - mailboxes_owner = forms.CharField( - label=ugettext_lazy("Mailboxes ower"), - initial="vmail", - help_text=ugettext_lazy("The UNIX account who owns mailboxes on the filesystem") - ) - - auto_account_removal = YesNoField( - label=ugettext_lazy("Automatic account removal"), - initial="no", - help_text=ugettext_lazy("When a mailbox is removed, also remove the associated account"), - ) - - sep3 = SeparatorField(label=ugettext_lazy("Miscellaneous")) - - log_maximum_age = forms.IntegerField( - label=ugettext_lazy("Maximum log record age"), - initial=365, - help_text=ugettext_lazy("The maximum age in days of a log record") - ) - - items_per_page = forms.IntegerField( - label=ugettext_lazy("Items per page"), - initial=30, - help_text=ugettext_lazy("Number of displayed items per page") - ) - - default_top_redirection = forms.ChoiceField( - label=ugettext_lazy("Default top redirection"), - choices=[], - initial="userprefs", - help_text=ugettext_lazy("The default redirection used when no application is specified") - ) - - # Visibility rules - visibility_rules = { - "mailboxes_owner": "handle_mailboxes=yes", - "ldap_sep": "authentication_type=ldap", - "ldap_server_address": "authentication_type=ldap", - "ldap_server_port": "authentication_type=ldap", - "ldap_secured": "authentication_type=ldap", - "ldap_auth_method": "authentication_type=ldap", - "ldap_bind_dn": "ldap_auth_method=searchbind", - "ldap_bind_password": "ldap_auth_method=searchbind", - "ldap_search_base": "ldap_auth_method=searchbind", - "ldap_search_filter": "ldap_auth_method=searchbind", - "ldap_user_dn_template": "ldap_auth_method=directbind", - "ldap_password_attribute": "authentication_type=ldap", - "ldap_is_active_directory": "authentication_type=ldap" - } - - def __init__(self, *args, **kwargs): - super(GeneralParametersForm, self).__init__(*args, **kwargs) - self.fields["default_top_redirection"].choices = enabled_applications() - hide_fields = False - try: - code, version = exec_cmd("dovecot --version") - except OSError, e: - hide_fields = True - else: - if code or not version.strip().startswith("2"): - hide_fields = True - if hide_fields: - del self.fields["handle_mailboxes"] - del self.fields["mailboxes_owner"] - - def clean_secret_key(self): - if len(self.cleaned_data["secret_key"]) not in [16, 24, 32]: - raise forms.ValidationError( - _("Key must be either 16, 24, or 32 bytes long") - ) - return self.cleaned_data["secret_key"] - - def clean_ldap_user_dn_template(self): - tpl = self.cleaned_data["ldap_user_dn_template"] - try: - test = tpl % {"user": "toto"} - except ValueError: - raise forms.ValidationError(_("Invalid syntax")) - return tpl - - def clean(self): - """Custom validation method - - Depending on 'ldap_auth_method' value, we check for different - required parameters. - """ - super(GeneralParametersForm, self).clean() - if len(self._errors): - raise forms.ValidationError(self._errors) - cleaned_data = self.cleaned_data - if cleaned_data["authentication_type"] != "ldap": - return cleaned_data - - if cleaned_data["ldap_auth_method"] == "searchbind": - required_fields = ["ldap_search_base", "ldap_search_filter"] - else: - required_fields = ["ldap_user_dn_template"] - - for f in required_fields: - if not f in cleaned_data or cleaned_data[f] == u'': - self._errors[f] = self.error_class([_("This field is required")]) - - return cleaned_data - - def to_django_settings(self): - """Apply LDAP related parameters to Django settings - - Doing so, we can use the django_auth_ldap module. - """ - from django.conf import settings - try: - import ldap - from django_auth_ldap.config import LDAPSearch - ldap_available = True - except ImportError: - ldap_available = False - - values = self.get_current_values() - if not ldap_available or values["authentication_type"] != "ldap": - return - if not hasattr(settings, "AUTH_LDAP_USER_ATTR_MAP"): - setattr(settings, "AUTH_LDAP_USER_ATTR_MAP", { - "first_name": "givenName", - "email": "mail", - "last_name": "sn" - }) - ldap_uri = 'ldaps://' if values["ldap_secured"] == "yes" else "ldap://" - ldap_uri += "%s:%s" % (values["ldap_server_address"], values["ldap_server_port"]) - setattr(settings, "AUTH_LDAP_SERVER_URI", ldap_uri) - if values["ldap_auth_method"] == "searchbind": - setattr(settings, "AUTH_LDAP_BIND_DN", values["ldap_bind_dn"]) - setattr(settings, "AUTH_LDAP_BIND_PASSWORD", values["ldap_bind_password"]) - search = LDAPSearch( - values["ldap_search_base"], ldap.SCOPE_SUBTREE, - values["ldap_search_filter"] - ) - setattr(settings, "AUTH_LDAP_USER_SEARCH", search) - else: - setattr(settings, "AUTH_LDAP_USER_DN_TEMPLATE", values["ldap_user_dn_template"]) - - if values["ldap_is_active_directory"] == "yes": - if not hasattr(settings, "AUTH_LDAP_GLOBAL_OPTIONS"): - setattr(settings, "AUTH_LDAP_GLOBAL_OPTIONS", { - ldap.OPT_REFERRALS: False - }) - else: - settings.AUTH_LDAP_GLOBAL_OPTIONS[ldap.OPT_REFERRALS] = False diff --git a/modoboa/admin/models.py b/modoboa/admin/models.py deleted file mode 100644 index 6a2134c29..000000000 --- a/modoboa/admin/models.py +++ /dev/null @@ -1,1322 +0,0 @@ -# coding: utf-8 -from django.db import models -from django.db.models import Q -from django.db.models.signals import pre_delete -from django.dispatch import receiver -from django.contrib.contenttypes.models import ContentType -from django.contrib.contenttypes import generic -from django.contrib.auth.models import ( - UserManager, Group, AbstractBaseUser, PermissionsMixin -) -from django.utils.translation import ugettext as _, ugettext_lazy -from django.utils.crypto import constant_time_compare -from django.utils import timezone -from django.conf import settings -from modoboa.lib import md5crypt, parameters, events -from modoboa.lib.exceptions import PermDeniedException -from modoboa.lib.sysutils import exec_cmd -from modoboa.lib.emailutils import split_mailbox -from modoboa.extensions import exts_pool -from exceptions import AdminError -import reversion -import os -import sys -import pwd -import re -import crypt, hashlib, string, base64 -from random import Random - -try: - from modoboa.lib.ldaputils import * - ldap_available = True -except ImportError: - ldap_available = False - - -class User(AbstractBaseUser, PermissionsMixin): - """Custom User model. - - It overloads the way passwords are stored into the database. The - main reason to change this mechanism is to ensure the - compatibility with the way Dovecot stores passwords. - - It also adds new attributes and methods. - """ - username = models.CharField(max_length=254, unique=True) - first_name = models.CharField(max_length=30, blank=True) - last_name = models.CharField(max_length=30, blank=True) - email = models.EmailField(max_length=254, blank=True) - is_staff = models.BooleanField(default=False) - is_active = models.BooleanField(default=True) - date_joined = models.DateTimeField(default=timezone.now) - is_local = models.BooleanField(default=True) - - objects = UserManager() - - USERNAME_FIELD = 'username' - REQUIRED_FIELDS = ['email'] - - class Meta: - ordering = ["username"] - - password_expr = re.compile(r'(\{(\w+)\}|(\$1\$))(.+)') - - def delete(self, fromuser, keep_mb_dir, *args, **kwargs): - """Custom delete method - - To check permissions properly, we need to make a distinction - between 2 cases: - - * If the user owns a mailbox, the check is made on that object - (useful for domain admins) - - * Otherwise, the check is made on the user - """ - from modoboa.lib.permissions import \ - get_object_owner, grant_access_to_object, ungrant_access_to_object - - if fromuser == self: - raise AdminError(_("You can't delete your own account")) - - if not fromuser.can_access(self): - raise PermDeniedException - - if self.has_mailbox: - mb = self.mailbox_set.all()[0] - if not fromuser.can_access(mb): - raise PermDeniedException - mb.delete(keepdir=keep_mb_dir) - - owner = get_object_owner(self) - for ooentry in self.objectaccess_set.filter(is_owner=True): - if ooentry.content_object is not None: - grant_access_to_object(owner, ooentry.content_object, True) - - events.raiseEvent("AccountDeleted", self) - ungrant_access_to_object(self) - super(User, self).delete(*args, **kwargs) - - @staticmethod - def get_content_type(): - """An uggly hack to retrieve the appropriate content_type! - - The explanation is available here: - https://code.djangoproject.com/ticket/11154 - - Quickly, the content_types framework does not retrieve the - appropriate content type for proxy models, it retrieves the - one of the first parent that is not a proxy. - """ - if not hasattr(User, "ct"): - User.ct = ContentType.objects.get(app_label="admin", model="user") - return User.ct - - def _crypt_password(self, raw_value): - scheme = parameters.get_admin("PASSWORD_SCHEME") - if type(raw_value) is unicode: - raw_value = raw_value.encode("utf-8") - if scheme == "crypt": - salt = "".join(Random().sample(string.letters + string.digits, 2)) - result = crypt.crypt(raw_value, salt) - prefix = "{CRYPT}" - elif scheme == "md5": - obj = hashlib.md5(raw_value) - result = obj.hexdigest() - prefix = "{MD5}" - # The md5crypt scheme is the only supported method that has both: - # (a) a salt ("crypt" has this too), - # (b) supports passwords lengths of more than 8 characters (all except - # "crypt"). - elif scheme == "md5crypt": - # The salt may vary from 12 to 48 bits. (Using all six bytes here - # with a subset of characters means we get only 35 random bits.) - salt = "".join(Random().sample(string.letters + string.digits, 6)) - result = md5crypt(raw_value, salt) - prefix = "" # the result already has $1$ prepended to it to signify what this is - elif scheme == "sha256": - obj = hashlib.sha256(raw_value) - result = base64.b64encode(obj.digest()) - prefix = "{SHA256}" - else: - scheme = "plain" - result = raw_value - prefix = "{PLAIN}" - return "%s%s" % (prefix, result) - - def set_password(self, raw_value, curvalue=None): - """Password update - - Update the current mailbox's password with the given clear - value. This value is encrypted according to the defined method - before it is saved. - - :param raw_value: the new password's value - :param curvalue: the current password (for LDAP authentication) - """ - if self.is_local: - self.password = self._crypt_password(raw_value) - else: - if not ldap_available: - raise AdminError(_("Failed to update password: LDAP module not installed")) - - ab = LDAPAuthBackend() - try: - ab.update_user_password(self.username, curvalue, raw_value) - except LDAPException, e: - raise AdminError(_("Failed to update password: %s" % str(e))) - events.raiseEvent("PasswordUpdated", self, raw_value, self.pk is None) - - def check_password(self, raw_value): - m = self.password_expr.match(self.password) - if m is None: - return False - if type(raw_value) is unicode: - raw_value = raw_value.encode("utf-8") - scheme = (m.group(2) or m.group(3)).lower() - val2 = m.group(4) - if scheme == u"crypt": - val1 = crypt.crypt(raw_value, val2) - elif scheme == u"md5": - val1 = hashlib.md5(raw_value).hexdigest() - elif scheme == u"sha256": - val1 = base64.b64encode(hashlib.sha256(raw_value).digest()) - elif scheme == u"$1$": # md5crypt - salt, hashed = val2.split('$') - val1 = md5crypt(raw_value, str(salt)) - val2 = self.password # re-add scheme for comparison below - else: - val1 = raw_value - return constant_time_compare(val1, val2) - - @property - def tags(self): - return [{"name": "account", "label": _("account"), "type": "idt"}, - {"name": self.group, "label": self.group, "type": "grp", "color": "info"}] - - @property - def has_mailbox(self): - return self.mailbox_set.count() != 0 - - @property - def fullname(self): - if self.first_name != u"": - return u"%s %s" % (self.first_name, self.last_name) - return self.username - - @property - def identity(self): - return self.username - - @property - def name_or_rcpt(self): - if self.first_name != "": - return "%s %s" % (self.first_name, self.last_name) - return "----" - - @property - def group(self): - if self.is_superuser: - return "SuperAdmins" - try: - return self.groups.all()[0].name - except IndexError: - return "SimpleUsers" - - @property - def enabled(self): - return self.is_active - - @property - def encoded_address(self): - from email.header import Header - if self.first_name != "" or self.last_name != "": - return "%s <%s>" % \ - (Header(self.fullname, 'utf8').encode(), self.email) - return self.email - - def belongs_to_group(self, name): - """Simple shortcut to check if this user is a member of a - specific group. - - :param name: the group's name - :return: a boolean - """ - try: - self.groups.get(name=name) - except Group.DoesNotExist: - return False - return True - - def get_identities(self, querydict=None): - """Return all identities owned by this user - - :param querydict: a querydict object - :return: a queryset - """ - from modoboa.lib.permissions import get_content_type - from itertools import chain - - if querydict: - squery = querydict.get("searchquery", None) - idtfilter = querydict.getlist("idtfilter", None) - grpfilter = querydict.getlist("grpfilter", None) - else: - squery = None - idtfilter = None - grpfilter = None - - accounts = [] - if not idtfilter or "account" in idtfilter: - userct = get_content_type(self) - ids = self.objectaccess_set.filter(content_type=userct) \ - .values_list('object_id', flat=True) - q = Q(pk__in=ids) - if squery: - q &= Q(username__icontains=squery) | Q(email__icontains=squery) - if grpfilter and len(grpfilter): - if "SuperAdmins" in grpfilter: - q &= Q(is_superuser=True) - grpfilter.remove("SuperAdmins") - if len(grpfilter): - q |= Q(groups__name__in=grpfilter) - else: - q &= Q(groups__name__in=grpfilter) - accounts = User.objects.select_related().filter(q) - - aliases = [] - if not idtfilter or ("alias" in idtfilter - or "forward" in idtfilter - or "dlist" in idtfilter): - alct = get_content_type(Alias) - ids = self.objectaccess_set.filter(content_type=alct) \ - .values_list('object_id', flat=True) - q = Q(pk__in=ids) - if squery: - if '@' in squery: - local_part, domname = split_mailbox(squery) - if local_part: - q &= Q(address__icontains=local_part) - if domname: - q &= Q(domain__name__icontains=domname) - else: - q &= Q(address__icontains=squery) | Q(domain__name__icontains=squery) - aliases = Alias.objects.select_related().filter(q) - if idtfilter: - aliases = [al for al in aliases if al.type in idtfilter] - - return chain(accounts, aliases) - - def get_domains(self): - """Return the domains belonging to this user - - The result is a ``QuerySet`` object, so this function can be used - to fill ``ModelChoiceField`` objects. - """ - if self.is_superuser: - return Domain.objects.all() - return Domain.objects.filter(owners__user=self) - - def get_domaliases(self): - """Return the domain aliases that belong to this user - - The result will contain the domain aliases defined for each domain - that user can see. - - :return: a list of ``DomainAlias`` objects - """ - if self.is_superuser: - return DomainAlias.objects.all() - domains = self.get_domains() - domaliases = [] - for dom in domains: - domaliases += dom.domainalias_set.all() - return domaliases - - def get_mailboxes(self, squery=None): - """Return the mailboxes that belong to this user - - The result will contain the mailboxes defined for each domain that - user can see. - - :param string squery: a search query - :return: a list of ``Mailbox`` objects - """ - from modoboa.lib.permissions import get_content_type - - qf = None - if squery is not None: - if '@' in squery: - parts = squery.split('@') - addrfilter = '@'.join(parts[:-1]) - domfilter = parts[-1] - qf = Q(address__contains=addrfilter) & Q(domain__name__contains=domfilter) - else: - qf = Q(address__contains=squery) | Q(domain__name__contains=squery) - ids = self.objectaccess_set.filter(content_type=get_content_type(Mailbox)) \ - .values_list('object_id', flat=True) - if qf is not None: - qf = Q(pk__in=ids) & qf - else: - qf = Q(pk__in=ids) - return Mailbox.objects.filter(qf) - - def get_aliases(self): - from modoboa.lib.permissions import get_content_type - ids = self.objectaccess_set.filter(content_type=get_content_type(Alias)) \ - .values_list('object_id', flat=True) - return Alias.objects.filter(pk__in=ids) - - def get_mbaliases(self): - """Return the mailbox aliases that belong to this user - - The result will contain the mailbox aliases defined for each - domain that user can see. - - :return: a list of ``Alias`` objects - """ - if self.is_superuser: - return Alias.objects.all() - domains = self.get_domains() - mbaliases = [] - for dom in domains: - mbaliases += dom.alias_set.all() - return mbaliases - - def is_owner(self, obj): - """Tell is the user is the unique owner of this object - - :param obj: an object inheriting from ``models.Model`` - :return: a boolean - """ - from modoboa.lib.permissions import get_content_type - - ct = get_content_type(obj) - try: - ooentry = self.objectaccess_set.get(content_type=ct, object_id=obj.id) - except ObjectAccess.DoesNotExist: - return False - return ooentry.is_owner - - def can_access(self, obj): - """Check if the user can access a specific object - - This function is recursive : if the given user hasn't got direct - access to this object and if he has got access other ``User`` - objects, we check if one of those users owns the object. - - :param obj: a admin object - :return: a boolean - """ - from modoboa.lib.permissions import get_content_type - - if self.is_superuser: - return True - - ct = get_content_type(obj) - try: - ooentry = self.objectaccess_set.get(content_type=ct, object_id=obj.id) - except ObjectAccess.DoesNotExist: - pass - else: - return True - if ct.model == "user": - return False - - ct = self.get_content_type() - qs = self.objectaccess_set.filter(content_type=ct) - for ooentry in qs.all(): - if ooentry.content_object.is_owner(obj): - return True - return False - - def grant_access_to_all_objects(self): - """Give access to all objects defined in the database - - Must be used when an account is promoted as a super user. - """ - from modoboa.lib.permissions import grant_access_to_objects, get_content_type - grant_access_to_objects(self, User.objects.all(), get_content_type(User)) - grant_access_to_objects(self, Domain.objects.all(), get_content_type(Domain)) - grant_access_to_objects(self, DomainAlias.objects.all(), get_content_type(DomainAlias)) - grant_access_to_objects(self, Mailbox.objects.all(), get_content_type(Mailbox)) - grant_access_to_objects(self, Alias.objects.all(), get_content_type(Alias)) - - def set_role(self, role): - """Set administrative role for this account - - :param string role: the role to set - """ - if role is None or self.group == role: - return - self.groups.clear() - if role == "SuperAdmins": - self.is_superuser = True - self.grant_access_to_all_objects() - else: - if self.is_superuser: - ObjectAccess.objects.filter(user=self).delete() - self.is_superuser = False - try: - self.groups.add(Group.objects.get(name=role)) - except Group.DoesNotExist: - self.groups.add(Group.objects.get(name="SimpleUsers")) - if self.group != "SimpleUsers" and not self.can_access(self): - from modoboa.lib.permissions import grant_access_to_object - grant_access_to_object(self, self) - self.save() - - def post_create(self, creator): - from modoboa.lib.permissions import grant_access_to_object - grant_access_to_object(creator, self, is_owner=True) - events.raiseEvent("AccountCreated", self) - - def save(self, *args, **kwargs): - if "creator" in kwargs: - creator = kwargs["creator"] - del kwargs["creator"] - else: - creator = None - super(User, self).save(*args, **kwargs) - if creator is not None: - self.post_create(creator) - - def from_csv(self, user, row, crypt_password=True): - """Create a new account from a CSV file entry - - The expected order is the following:: - - "account", loginname, password, first name, last name, enabled, group, address[, domain, ...] - - :param user: the user importing a new account - :param row: a list containing the expected information - :param crypt_password: - """ - if len(row) < 7: - raise AdminError(_("Invalid line")) - role = row[6].strip() - if not user.is_superuser and not role in ["SimpleUsers", "DomainAdmins"]: - raise PermDeniedException( - _("You can't import an account with a role greater than yours") - ) - self.username = row[1].strip() - if role == "SimpleUsers": - if (len(row) < 8 or not row[7].strip()): - raise AdminError( - _("The simple user '%s' must have a valid email address" % self.username) - ) - if self.username != row[7].strip(): - raise AdminError( - _("username and email fields must not differ for '%s'" % self.username) - ) - - if crypt_password: - self.set_password(row[2].strip()) - else: - self.password = row[2].strip() - self.first_name = row[3].strip() - self.last_name = row[4].strip() - self.is_active = (row[5].strip() == 'True') - self.save(creator=user) - self.set_role(role) - - if len(row) < 8: - return - - self.email = row[7].strip() - if self.email != "": - self.save() - mailbox, domname = split_mailbox(self.email) - try: - domain = Domain.objects.get(name=domname) - except Domain.DoesNotExist: - raise AdminError( - _("Account import failed (%s): domain does not exist" % self.username) - ) - if not user.can_access(domain): - raise PermDeniedException - mb = Mailbox(address=mailbox, domain=domain, user=self, use_domain_quota=True) - mb.set_quota(override_rules=user.has_perm("admin.change_domain")) - mb.save(creator=user) - - if self.group == "DomainAdmins": - for domname in row[8:]: - try: - dom = Domain.objects.get(name=domname.strip()) - except Domain.DoesNotExist: - continue - dom.add_admin(self) - - def to_csv(self, csvwriter): - row = ["account", self.username.encode("utf-8"), self.password, - self.first_name.encode("utf-8"), self.last_name.encode("utf-8"), - self.is_active, self.group, self.email] - if self.group == "DomainAdmins": - row += [dom.name for dom in self.get_domains()] - csvwriter.writerow(row) - -reversion.register(User) - - -class ObjectAccess(models.Model): - user = models.ForeignKey(User) - content_type = models.ForeignKey(ContentType) - object_id = models.PositiveIntegerField() - content_object = generic.GenericForeignKey('content_type', 'object_id') - is_owner = models.BooleanField(default=False) - - class Meta: - unique_together = (("user", "content_type", "object_id"),) - - def __unicode__(self): - return "%s => %s (%s)" % (self.user, self.content_object, self.content_type) - - -class ObjectDates(models.Model): - """Dates recording for admin objects - - This table keeps creation and last modification dates for Domains, - domain aliases, mailboxes and aliases objects. - """ - creation = models.DateTimeField(auto_now_add=True) - last_modification = models.DateTimeField(auto_now=True) - - @staticmethod - def set_for_object(obj): - """Initialize or update dates for a given object. - - :param obj: an admin object (Domain, Mailbox, etc) - """ - try: - dates = getattr(obj, "dates") - except ObjectDates.DoesNotExist: - dates = ObjectDates() - dates.save() - obj.dates = dates - - -class DatesAware(models.Model): - """Abstract model to support dates - - Inherit from this model to automatically add the "dates" feature - to another model. It defines the appropriate field and handles - saves. - """ - dates = models.ForeignKey(ObjectDates) - - class Meta: - abstract = True - - def save(self, *args, **kwargs): - ObjectDates.set_for_object(self) - super(DatesAware, self).save(*args, **kwargs) - - @property - def creation(self): - return self.dates.creation - - @property - def last_modification(self): - return self.dates.last_modification - - -class Domain(DatesAware): - name = models.CharField(ugettext_lazy('name'), max_length=100, unique=True, - help_text=ugettext_lazy("The domain name")) - quota = models.IntegerField( - help_text=ugettext_lazy("Default quota in MB applied to mailboxes") - ) - enabled = models.BooleanField( - ugettext_lazy('enabled'), - help_text=ugettext_lazy("Check to activate this domain") - ) - owners = generic.GenericRelation(ObjectAccess) - - class Meta: - permissions = ( - ("view_domain", "View domain"), - ("view_domains", "View domains"), - ) - ordering = ["name"] - - @property - def domainalias_count(self): - return self.domainalias_set.count() - - @property - def mailbox_count(self): - return self.mailbox_set.count() - - @property - def mbalias_count(self): - return self.alias_set.count() - - @property - def admins(self): - """Return the domain administrators of this domain - - :return: a list of User objects - """ - return [oa.user for oa in self.owners.filter(user__is_superuser=False)] - - def add_admin(self, account): - """Add a new administrator for this domain - - :param User account: the administrotor to add - """ - from modoboa.lib.permissions import grant_access_to_object - grant_access_to_object(account, self) - for mb in self.mailbox_set.all(): - if mb.user.has_perm("admin.add_domain"): - continue - grant_access_to_object(account, mb) - grant_access_to_object(account, mb.user) - for al in self.alias_set.all(): - grant_access_to_object(account, al) - - def remove_admin(self, account): - """Remove an administrator for this domain - - :param User account: the administrotor to remove - """ - from modoboa.lib.permissions import ungrant_access_to_object - ungrant_access_to_object(self, account) - for mb in self.mailbox_set.all(): - if mb.user.has_perm("admin.add_domain"): - continue - ungrant_access_to_object(mb, account) - ungrant_access_to_object(mb.user, account) - for al in self.alias_set.all(): - ungrant_access_to_object(al, account) - - def delete(self, fromuser, keepdir=False): - from modoboa.lib.permissions import \ - ungrant_access_to_object, ungrant_access_to_objects - - if self.domainalias_set.count(): - events.raiseEvent("DomainAliasDeleted", self.domainalias_set.all()) - ungrant_access_to_objects(self.domainalias_set.all()) - if self.mailbox_set.count(): - Quota.objects.filter(username__contains='@%s' % self.name).delete() - events.raiseEvent("DeleteMailbox", self.mailbox_set.all()) - ungrant_access_to_objects(self.mailbox_set.all()) - hm = parameters.get_admin("HANDLE_MAILBOXES", raise_error=False) - if hm == "yes" and not keepdir: - for mb in self.mailbox_set.all(): - mb.delete_dir() - if self.alias_set.count(): - events.raiseEvent("MailboxAliasDelete", self.alias_set.all()) - ungrant_access_to_objects(self.alias_set.all()) - if parameters.get_admin("AUTO_ACCOUNT_REMOVAL") == "yes": - for account in User.objects.filter(mailbox__domain__name=self.name): - account.delete(fromuser, keepdir) - events.raiseEvent("DeleteDomain", self) - ungrant_access_to_object(self) - super(Domain, self).delete() - - def __str__(self): - return self.name - - def post_create(self, creator): - from modoboa.lib.permissions import grant_access_to_object - grant_access_to_object(creator, self, is_owner=True) - events.raiseEvent("CreateDomain", creator, self) - - def save(self, *args, **kwargs): - if "creator" in kwargs: - creator = kwargs["creator"] - del kwargs["creator"] - else: - creator = None - super(Domain, self).save(*args, **kwargs) - if creator is not None: - self.post_create(creator) - - def from_csv(self, user, row): - if len(row) < 4: - raise AdminError(_("Invalid line")) - self.name = row[1].strip() - self.quota = int(row[2].strip()) - self.enabled = (row[3].strip() == 'True') - self.save(creator=user) - - def to_csv(self, csvwriter): - csvwriter.writerow(["domain", self.name, self.quota, self.enabled]) - -reversion.register(Domain) - - -class DomainAlias(DatesAware): - name = models.CharField(ugettext_lazy("name"), max_length=100, unique=True, - help_text=ugettext_lazy("The alias name")) - target = models.ForeignKey( - Domain, verbose_name=ugettext_lazy('target'), - help_text=ugettext_lazy("The domain this alias points to") - ) - enabled = models.BooleanField( - ugettext_lazy('enabled'), - help_text=ugettext_lazy("Check to activate this alias") - ) - - class Meta: - permissions = ( - ("view_domaliases", "View domain aliases"), - ) - - def __unicode__(self): - return self.name - - def post_create(self, creator): - from modoboa.lib.permissions import grant_access_to_object - grant_access_to_object(creator, self, is_owner=True) - events.raiseEvent("DomainAliasCreated", creator, self) - - def save(self, *args, **kwargs): - if "creator" in kwargs: - creator = kwargs["creator"] - del kwargs["creator"] - else: - creator = None - super(DomainAlias, self).save(*args, **kwargs) - if creator is not None: - self.post_create(creator) - - def delete(self): - from modoboa.lib.permissions import ungrant_access_to_object - events.raiseEvent("DomainAliasDeleted", self) - ungrant_access_to_object(self) - super(DomainAlias, self).delete() - - def from_csv(self, user, row): - """Create a domain alias from a CSV row - - Expected format: ["domainalias", domain alias name, targeted domain, enabled] - - :param user: a ``User`` object - :param row: a list containing the alias definition - """ - if len(row) < 4: - raise AdminError(_("Invalid line")) - self.name = row[1].strip() - domname = row[2].strip() - try: - self.target = Domain.objects.get(name=domname) - except Domain.DoesNotExist: - raise AdminError(_("Unknown domain %s" % domname)) - self.enabled = row[3].strip() == 'True' - self.save(creator=user) - - def to_csv(self, csvwriter): - """Export a domain alias using CSV format - - :param csvwriter: a ``csv.writer`` object - """ - csvwriter.writerow(["domainalias", self.name, - self.target.name, self.enabled]) - -reversion.register(DomainAlias) - - -class Mailbox(DatesAware): - address = models.CharField( - ugettext_lazy('address'), max_length=252, - help_text=ugettext_lazy("Mailbox address (without the @domain.tld part)") - ) - quota = models.PositiveIntegerField() - use_domain_quota = models.BooleanField(default=False) - domain = models.ForeignKey(Domain) - user = models.ForeignKey(User) - - class Meta: - permissions = ( - ("view_mailboxes", "View mailboxes"), - ) - - def __init__(self, *args, **kwargs): - super(Mailbox, self).__init__(*args, **kwargs) - self.__mail_home = None - - def __str__(self): - return self.full_address - - def __full_address(self, localpart): - return "%s@%s" % (localpart, self.domain.name) - - @property - def full_address(self): - return self.__full_address(self.address) - - @property - def enabled(self): - return self.user.is_active - - @property - def alias_count(self): - return self.alias_set.count() - - @property - def mail_home(self): - """ - - """ - hm = parameters.get_admin("HANDLE_MAILBOXES", raise_error=False) - if hm is None or hm == "no": - return None - if self.__mail_home is None: - code, output = exec_cmd("doveadm user %s -f home" % self.full_address, - sudo_user=parameters.get_admin("MAILBOXES_OWNER")) - if code: - raise AdminError(_("Failed to retrieve mailbox location (%s)" % output)) - self.__mail_home = output.strip() - return self.__mail_home - - def rename_dir(self, old_mail_home): - hm = parameters.get_admin("HANDLE_MAILBOXES", raise_error=False) - if hm is None or hm == "no": - return - self.__mail_home = None - if not os.path.exists(old_mail_home): - return - code, output = exec_cmd( - "mv %s %s" % (old_mail_home, self.mail_home), - sudo_user=parameters.get_admin("MAILBOXES_OWNER") - ) - if code: - raise AdminError(_("Failed to rename mailbox: %s" % output)) - - def rename(self, address, domain): - """Rename the mailbox - - :param string address: the new mailbox's address (local part) - :param Domain domain: the new mailbox's domain - """ - old_mail_home = self.mail_home - qs = Quota.objects.filter(username=self.full_address) - self.address = address - self.domain = domain - self.rename_dir(old_mail_home) - qs.update(username=self.full_address) - - def delete_dir(self): - hm = parameters.get_admin("HANDLE_MAILBOXES", raise_error=False) - if hm is None or hm == "no": - return - if not os.path.exists(self.mail_home): - return - code, output = exec_cmd( - "rm -r %s" % self.mail_home, - sudo_user=parameters.get_admin("MAILBOXES_OWNER") - ) - if code: - raise AdminError(_("Failed to remove mailbox: %s" % output)) - - def set_quota(self, value=None, override_rules=False): - """Set or update quota's value for this mailbox. - - :param integer value: the quota's value - :param bool override_rules: allow to override defined quota rules - """ - if value is None: - if self.use_domain_quota: - self.quota = self.domain.quota - else: - self.quota = 0 - elif int(value) > self.domain.quota and not override_rules: - raise AdminError( - _("Quota is greater than the allowed domain's limit (%dM)" % self.domain.quota) - ) - else: - self.quota = value - if not self.quota and not override_rules: - raise AdminError(_("A quota is required")) - - def get_quota(self): - q = Quota.objects.get(username=self.full_address) - return int(q.bytes / 1048576) - - def get_quota_in_percent(self): - if not self.quota: - return 0 - q = Quota.objects.get(username=self.full_address) - return int(q.bytes / float(self.quota * 1048576) * 100) - - def post_create(self, creator): - from modoboa.lib.permissions import grant_access_to_object - grant_access_to_object(creator, self, True) - events.raiseEvent("CreateMailbox", creator, self) - if creator.is_superuser and not self.user.has_perm("admin.add_domain"): - # A super user is creating a new mailbox. Give - # access to that mailbox (and the associated - # account) to the appropriate domain admins, - # except if the new account has a more important - # role (SuperAdmin, Reseller) - for admin in self.domain.admins: - grant_access_to_object(admin, self) - grant_access_to_object(admin, self.user) - - def save(self, *args, **kwargs): - if "creator" in kwargs: - creator = kwargs["creator"] - del kwargs["creator"] - else: - creator = None - super(Mailbox, self).save(*args, **kwargs) - if creator is not None: - self.post_create(creator) - try: - q = self.quota_value - except Quota.DoesNotExist: - Quota.objects.create(mbox=self, username=self.full_address) - - def delete(self, keepdir=False): - """Custom delete method - - We try to delete the associated quota in the same time (it may - has already been removed if we're deleting a domain). - - :param bool keepdir: delete the mailbox home dir on the filesystem or not - """ - try: - q = Quota.objects.get(username=self.full_address) - except Quota.DoesNotExist: - pass - else: - q.delete() - if not keepdir: - self.delete_dir() - super(Mailbox, self).delete() - -reversion.register(Mailbox) - - -@receiver(pre_delete, sender=Mailbox) -def mailbox_deleted_handler(sender, **kwargs): - """``Mailbox`` pre_delete signal receiver - - In order to properly handle deletions (ie. we don't want to leave - orphan records into the db), we define this custom receiver. - - It manually removes the mailbox from the aliases it is linked to - and then remove all empty aliases. - """ - from modoboa.lib.permissions import ungrant_access_to_object - - mb = kwargs['instance'] - events.raiseEvent("DeleteMailbox", mb) - ungrant_access_to_object(mb) - for alias in mb.alias_set.all(): - alias.mboxes.remove(mb) - if alias.mboxes.count() == 0: - alias.delete() - - -class Quota(models.Model): - username = models.EmailField(primary_key=True, max_length=254) - bytes = models.BigIntegerField(default=0) - messages = models.IntegerField(default=0) - - mbox = models.OneToOneField(Mailbox, related_name="quota_value", null=True) - - -class Alias(DatesAware): - address = models.CharField( - ugettext_lazy('address'), max_length=254, - help_text=ugettext_lazy("The alias address (without the domain part). For a 'catch-all' address, just enter an * character.") - ) - domain = models.ForeignKey(Domain) - mboxes = models.ManyToManyField( - Mailbox, verbose_name=ugettext_lazy('mailboxes'), - help_text=ugettext_lazy("The mailboxes this alias points to") - ) - aliases = models.ManyToManyField( - 'Alias', - help_text=ugettext_lazy("The aliases this alias points to") - ) - extmboxes = models.TextField(blank=True) - enabled = models.BooleanField( - ugettext_lazy('enabled'), - help_text=ugettext_lazy("Check to activate this alias") - ) - - class Meta: - permissions = ( - ("view_aliases", "View aliases"), - ) - unique_together = (("address", "domain"),) - ordering = ["domain__name", "address"] - - def __unicode__(self): - return self.full_address - - @property - def full_address(self): - return "%s@%s" % (self.address, self.domain.name) - - @property - def identity(self): - return self.full_address - - @property - def name_or_rcpt(self): - rcpts_count = self.get_recipients_count() - if not rcpts_count: - return "---" - rcpts = self.get_recipients() - if rcpts_count > 1: - return "%s, ..." % rcpts[0] - return rcpts[0] - - @property - def type(self): - cpt = self.get_recipients_count() - if cpt > 1: - return "dlist" - if self.extmboxes != "": - return "forward" - return "alias" - - @property - def tags(self): - labels = { - "dlist": _("distribution list"), - "forward": _("forward"), - "alias": _("alias") - } - altype = self.type - return [{"name": altype, "label": labels[altype], "type": "idt"}] - - def post_create(self, creator): - from modoboa.lib.permissions import grant_access_to_object - grant_access_to_object(creator, self, is_owner=True) - events.raiseEvent("MailboxAliasCreated", creator, self) - if creator.is_superuser: - for admin in self.domain.admins: - grant_access_to_object(admin, self) - - def save(self, int_rcpts, ext_rcpts, *args, **kwargs): - if len(ext_rcpts): - self.extmboxes = ",".join(ext_rcpts) - else: - self.extmboxes = "" - if "creator" in kwargs: - creator = kwargs["creator"] - del kwargs["creator"] - else: - creator = None - super(Alias, self).save(*args, **kwargs) - if creator is not None: - self.post_create(creator) - curaliases = self.aliases.all() - curmboxes = self.mboxes.all() - for t in int_rcpts: - if isinstance(t, Alias): - if not t in curaliases: - self.aliases.add(t) - continue - if not t in curmboxes: - self.mboxes.add(t) - for t in curaliases: - if not t in int_rcpts: - self.aliases.remove(t) - for t in curmboxes: - if not t in int_rcpts: - self.mboxes.remove(t) - - def delete(self): - from modoboa.lib.permissions import ungrant_access_to_object - - events.raiseEvent("MailboxAliasDeleted", self) - ungrant_access_to_object(self) - super(Alias, self).delete() - - def get_recipients(self): - """Return the recipients list - - Internal and external addresses are mixed into a single list. - """ - result = [al.full_address for al in self.aliases.all()] - result += [mb.full_address for mb in self.mboxes.all()] - if self.extmboxes != "": - result += self.extmboxes.split(',') - return result - - def get_recipients_count(self): - total = 0 - if self.extmboxes != "": - total += len(self.extmboxes.split(',')) - return total + self.aliases.count() + self.mboxes.count() - - def ui_disabled(self, user): - if user.is_superuser: - return False - for mb in self.mboxes.all(): - if not user.is_owner(mb.domain): - return True - return False - - def from_csv(self, user, row, expected_elements=5): - """Create a new alias from a CSV file entry - - """ - if len(row) < expected_elements: - raise AdminError(_("Invalid line: %s" % row)) - localpart, domname = split_mailbox(row[1].strip()) - try: - domain = Domain.objects.get(name=domname) - except Domain.DoesNotExist: - raise AdminError(_("Domain '%s' does not exist" % domname)) - if not user.can_access(domain): - raise PermDeniedException - self.address = localpart - self.domain = domain - self.enabled = (row[2].strip() == 'True') - int_rcpts = [] - ext_rcpts = [] - for rcpt in row[3:]: - rcpt = rcpt.strip() - localpart, domname = split_mailbox(rcpt) - try: - Domain.objects.get(name=domname) - except Domain.DoesNotExist: - ext_rcpts += [rcpt] - continue - try: - target = Alias.objects.get(domain__name=domname, address=localpart) - if target.full_address == self.full_address: - target = None - except Alias.DoesNotExist: - target = None - if target is None: - try: - target = Mailbox.objects.get(address=localpart, - domain__name=domname) - except Mailbox.DoesNotExist: - raise AdminError(_("Local recipient %s not found" % rcpt)) - int_rcpts += [target] - self.save(int_rcpts, ext_rcpts, creator=user) - - def to_csv(self, csvwriter): - row = [self.type, self.full_address, self.enabled] - row += self.get_recipients() - csvwriter.writerow(row) - -reversion.register(Alias) - - -class Extension(models.Model): - name = models.CharField(max_length=150) - enabled = models.BooleanField( - ugettext_lazy('enabled'), - help_text=ugettext_lazy("Check to enable this extension") - ) - - def __init__(self, *args, **kwargs): - super(Extension, self).__init__(*args, **kwargs) - - def __unicode__(self): - return self.name - - def __get_ext_instance(self): - if not self.name: - return None - if hasattr(self, "instance") and self.instance: - return - self.instance = exts_pool.get_extension(self.name) - if self.instance: - self.__get_ext_dir() - - def __get_ext_dir(self): - modname = self.instance.__module__ - path = os.path.realpath(sys.modules[modname].__file__) - self.extdir = os.path.dirname(path) - - def on(self): - self.enabled = True - self.save() - - self.__get_ext_instance() - self.instance.load() - self.instance.init() - - if self.instance.needs_media: - path = os.path.join(settings.MEDIA_ROOT, self.name) - exec_cmd("mkdir %s" % path) - - events.raiseEvent("ExtEnabled", self) - - def off(self): - self.__get_ext_instance() - if self.instance is None: - return - self.instance.destroy() - - self.enabled = False - self.save() - - if self.instance.needs_media: - path = os.path.join(settings.MEDIA_ROOT, self.name) - exec_cmd("rm -r %s" % path) - - events.raiseEvent("ExtDisabled", self) - -reversion.register(Extension) - - -def populate_callback(user): - """Populate callback - - If the LDAP authentication backend is in use, this callback will - be called each time a new user authenticates succesfuly to - Modoboa. This function is in charge of creating the mailbox - associated to the provided ``User`` object. - - :param user: a ``User`` instance - """ - from modoboa.lib.permissions import grant_access_to_object - - sadmins = User.objects.filter(is_superuser=True) - user.set_role("SimpleUsers") - user.post_create(sadmins[0]) - for su in sadmins[1:]: - grant_access_to_object(su, user) - - localpart, domname = split_mailbox(user.username) - try: - domain = Domain.objects.get(name=domname) - except Domain.DoesNotExist: - domain = Domain(name=domname, enabled=True, quota=0) - domain.save(creator=sadmins[0]) - for su in sadmins[1:]: - grant_access_to_object(su, domain) - try: - mb = Mailbox.objects.get(domain=domain, address=localpart) - except Mailbox.DoesNotExist: - mb = Mailbox(address=localpart, domain=domain, user=user, use_domain_quota=True) - mb.set_quota(override_rules=True) - mb.save(creator=sadmins[0]) - for su in sadmins[1:]: - grant_access_to_object(su, mb) - - -@receiver(reversion.post_revision_commit) -def post_revision_commit(sender, **kwargs): - import logging - - if kwargs["revision"].user is None: - return - logger = logging.getLogger("modoboa.admin") - for version in kwargs["versions"]: - if version.type == reversion.models.VERSION_ADD: - action = _("added") - level = "info" - elif version.type == reversion.models.VERSION_CHANGE: - action = _("modified") - level = "warning" - else: - action = _("deleted") - level = "critical" - message = _("%(object)s '%(name)s' %(action)s by user %(user)s") % { - "object": unicode(version.content_type).capitalize(), - "name": version.object_repr, "action": action, - "user": kwargs["revision"].user.username - } - getattr(logger, level)(message) diff --git a/modoboa/admin/views.py b/modoboa/admin/views.py deleted file mode 100644 index b34136387..000000000 --- a/modoboa/admin/views.py +++ /dev/null @@ -1,889 +0,0 @@ -# coding: utf-8 -from django.http import HttpResponse, HttpResponseRedirect -from django.utils.translation import ugettext as _, ungettext -from django.core.urlresolvers import reverse -from django.contrib.auth.decorators \ - import login_required, permission_required, user_passes_test -from django.db.models import Q -from django.shortcuts import render -from django.template.loader import render_to_string -from django.db import transaction, IntegrityError -from django.views.decorators.csrf import ensure_csrf_cookie -import cStringIO -import csv - -from lib import get_sort_order, get_listing_page -from forms import * -from models import * -from modoboa.admin.tables import DomainsTable, ExtensionsTable -from modoboa.lib import events, parameters -from modoboa.lib.exceptions import ModoboaException, PermDeniedException -from modoboa.lib.webutils \ - import _render, ajax_response, ajax_simple_response, _render_to_string -from modoboa.lib.emailutils import split_mailbox -from modoboa.lib.models import Parameter, Log -from modoboa.lib.formutils import CreationWizard -from modoboa.lib.templatetags.libextras import pagination_bar - - -@login_required -def index(request): - return HttpResponseRedirect(reverse(domains)) - - -@login_required -@user_passes_test(lambda u: u.has_perm("admin.view_domains") or u.has_perm("admin.view_mailboxes")) -def _domains(request): - sort_order, sort_dir = get_sort_order(request.GET, "name") - domains = request.user.get_domains() - squery = request.GET.get("searchquery", None) - if squery is not None: - q = Q(name__contains=squery) - q |= Q(domainalias__name__contains=squery) - domains = domains.filter(q).distinct() - if sort_order in ["name", "domainalias__name"]: - domains = domains.order_by("%s%s" % (sort_dir, sort_order)) - page = get_listing_page(domains, request.GET.get("page", 1)) - return ajax_simple_response({ - "table": DomainsTable(request, page.object_list).render(), - "page": page.number, - "paginbar": pagination_bar(page), - "handle_mailboxes": parameters.get_admin("HANDLE_MAILBOXES", - raise_error=False), - "auto_account_removal": parameters.get_admin("AUTO_ACCOUNT_REMOVAL") - }) - - -@login_required -@ensure_csrf_cookie -def domains(request, tplname="admin/domains.html"): - if not request.user.has_perm("admin.view_domains"): - if request.user.has_perm("admin.view_mailboxes"): - return HttpResponseRedirect(reverse(identities)) - return HttpResponseRedirect(reverse("modoboa.userprefs.views.index")) - return render(request, tplname, {"selection": "domains"}) - - -@login_required -@permission_required("admin.add_user") -def domains_list(request): - doms = [dom.name for dom in request.user.get_domains()] - return ajax_simple_response(doms) - - -@login_required -@permission_required("admin.add_domain") -@transaction.commit_on_success -def newdomain(request, tplname="common/wizard_forms.html"): - events.raiseEvent("CanCreate", request.user, "domains") - - def newdomain_cb(steps): - genform = steps[0]["form"] - genform.is_valid() - domain = genform.save(request.user) - domain.post_create(request.user) - steps[1]["form"].save(request.user, domain) - - commonctx = {"title": _("New domain"), - "action_label": _("Create"), - "action_classes": "submit", - "action": reverse(newdomain), - "formid": "domform"} - cwizard = CreationWizard(newdomain_cb) - cwizard.add_step(DomainFormGeneral, _("General"), - [dict(classes="btn-inverse next", label=_("Next"))], - formtpl="admin/domain_general_form.html") - cwizard.add_step(DomainFormOptions, _("Options"), - [dict(classes="btn-primary submit", label=_("Create")), - dict(classes="btn-inverse prev", label=_("Previous"))], - formtpl="admin/domain_options_form.html") - - if request.method == "POST": - retcode, data = cwizard.validate_step(request) - if retcode == -1: - raise AdminError(data) - if retcode == 1: - return ajax_simple_response(dict( - status="ok", title=cwizard.get_title(data + 1), stepid=data - )) - if retcode == 2: - return ajax_simple_response( - dict(status="ok", respmsg=_("Domain created")) - ) - - from modoboa.lib.templatetags.libextras import render_form - return ajax_simple_response(dict( - status="ko", stepid=data, - form=render_form(cwizard.steps[data]["form"]) - )) - - cwizard.create_forms() - commonctx.update(steps=cwizard.steps) - commonctx.update(subtitle="1. %s" % cwizard.steps[0]['title']) - return render(request, tplname, commonctx) - - -@login_required -@permission_required("admin.view_domains") -def editdomain(request, dom_id, tplname="admin/editdomainform.html"): - domain = Domain.objects.get(pk=dom_id) - if not request.user.can_access(domain): - raise PermDeniedException - - domadmins = filter( - lambda u: request.user.can_access(u) and not u.is_superuser, - domain.admins - ) - if not request.user.is_superuser: - domadmins = filter(lambda u: u.group == "DomainAdmins", domadmins) - - instances = dict(general=domain) - events.raiseEvent("FillDomainInstances", request.user, domain, instances) - - commonctx = {"title": domain.name, - "action_label": _("Update"), - "action_classes": "submit", - "action": reverse(editdomain, args=[dom_id]), - "formid": "domform", - "domain": domain} - if request.method == "POST": - error = None - domain.oldname = domain.name - form = DomainForm(request.user, request.POST, instances=instances) - if form.is_valid(): - try: - form.save(request.user) - except AdminError, e: - error = str(e) - else: - events.raiseEvent("DomainModified", domain) - return ajax_simple_response({"status": "ok", "respmsg": _("Domain modified")}) - - commonctx["tabs"] = form - commonctx["error"] = error - return ajax_response(request, status="ko", template=tplname, **commonctx) - - commonctx["tabs"] = DomainForm(request.user, instances=instances) - commonctx["domadmins"] = domadmins - return render(request, tplname, commonctx) - - -@login_required -@permission_required("admin.delete_domain") -@transaction.commit_on_success -def deldomain(request, dom_id): - keepdir = True if request.POST.get("keepdir", "false") == "true" else False - try: - mb = Mailbox.objects.get(user__id=request.user.id) - except Mailbox.DoesNotExist: - mb = None - - dom = Domain.objects.get(pk=dom_id) - if not request.user.can_access(dom): - raise PermDeniedException - if mb and mb.domain == dom: - raise AdminError(_("You can't delete your own domain")) - dom.delete(request.user, keepdir) - - msg = ungettext("Domain deleted", "Domains deleted", 1) - return ajax_simple_response({"status": "ok", "respmsg": msg}) - - -def _validate_alias(request, form, successmsg, tplname, commonctx, callback=None): - """Alias validation - - Common function shared between creation and modification actions. - """ - error = None - if form.is_valid(): - form.set_recipients() - try: - alias = form.save() - except IntegrityError: - raise AdminError(_("Alias with this name already exists")) - if callback: - callback(request.user, alias) - return ajax_simple_response({"status": "ok", "respmsg": successmsg}) - - if "targets" in request.POST: - targets = request.POST.getlist("targets") - commonctx["targets"] = targets[:-1] - - commonctx["form"] = form - commonctx["error"] = error - return ajax_response(request, status="ko", template=tplname, **commonctx) - - -def _new_alias(request, title, action, successmsg, - tplname="common/generic_modal_form.html"): - events.raiseEvent("CanCreate", request.user, "mailbox_aliases") - ctx = { - "title": title, - "action": action, - "formid": "aliasform", - "action_label": _("Create"), - "action_classes": "submit" - } - if request.method == "POST": - def callback(user, alias): - alias.post_create(user) - - form = AliasForm(request.user, request.POST) - return _validate_alias( - request, form, successmsg, tplname, ctx, callback - ) - - form = AliasForm(request.user) - ctx["form"] = form - return render(request, tplname, ctx) - - -@login_required -@permission_required("admin.add_alias") -@transaction.commit_on_success -def newdlist(request): - return _new_alias( - request, _("New distribution list"), reverse(newdlist), - _("Distribution list created") - ) - - -@login_required -@permission_required("admin.add_alias") -@transaction.commit_on_success -def newalias(request): - return _new_alias( - request, _("New alias"), reverse(newalias), - _("Alias created") - ) - - -@login_required -@permission_required("admin.add_alias") -@transaction.commit_on_success -def newforward(request): - return _new_alias( - request, _("New forward"), reverse(newforward), - _("Forward created") - ) - - -@login_required -@permission_required("admin.change_alias") -def editalias(request, alid, tplname="common/generic_modal_form.html"): - alias = Alias.objects.get(pk=alid) - if not request.user.can_access(alias): - raise PermDeniedException - ctx = dict( - action=reverse(editalias, args=[alias.id]), - formid="aliasform", - title=alias.full_address, - action_label=_("Update"), - action_classes="submit" - ) - if len(alias.get_recipients()) >= 2: - successmsg = _("Distribution list modified") - elif alias.extmboxes != "": - successmsg = _("Forward modified") - else: - successmsg = _("Alias modified") - if request.method == "POST": - form = AliasForm(request.user, request.POST, instance=alias) - return _validate_alias(request, form, successmsg, tplname, ctx) - - form = AliasForm(request.user, instance=alias) - ctx["form"] = form - return render(request, tplname, ctx) - - -def _del_alias(request, msg, msgs): - selection = request.GET["selection"].split(",") - for alid in selection: - alias = Alias.objects.get(pk=alid) - if not request.user.can_access(alias): - raise PermDeniedException - alias.delete() - - msg = ungettext(msg, msgs, len(selection)) - return ajax_simple_response({"status": "ok", "respmsg": msg}) - - -@login_required -@permission_required("admin.delete_alias") -@transaction.commit_on_success -def delalias(request): - return _del_alias(request, "Alias deleted", "Aliases deleted") - - -@login_required -@permission_required("admin.delete_alias") -@transaction.commit_on_success -def deldlist(request): - return _del_alias(request, "Distribution list deleted", - "Distribution lists deleted") - - -@login_required -@permission_required("admin.delete_alias") -@transaction.commit_on_success -def delforward(request): - return _del_alias(request, "Forward deleted", "Forwards deleted") - - -@login_required -@user_passes_test(lambda u: u.has_perm("admin.add_user") or u.has_perm("admin.add_alias")) -def _identities(request): - idents_list = request.user.get_identities(request.GET) - sort_order, sort_dir = get_sort_order(request.GET, "identity", - ["identity", "name_or_rcpt", "tags"]) - if sort_order in ["identity", "name_or_rcpt"]: - objects = sorted(idents_list, key=lambda o: getattr(o, sort_order), - reverse=sort_dir == '-') - else: - objects = sorted(idents_list, key=lambda o: o.tags[0], - reverse=sort_dir == '-') - page = get_listing_page(objects, request.GET.get("page", 1)) - return ajax_simple_response({ - "table": _render_to_string(request, "admin/identities_table.html", { - "identities": page.object_list, - "tableid": "objects_table" - }), - "handle_mailboxes": parameters.get_admin("HANDLE_MAILBOXES", - raise_error=False), - "page": page.number, - "paginbar": pagination_bar(page) - }) - - -@login_required -@user_passes_test(lambda u: u.has_perm("admin.add_user") or u.has_perm("admin.add_alias")) -@ensure_csrf_cookie -def identities(request, tplname="admin/identities.html"): - return render(request, tplname, { - "selection": "identities", - "deflocation": "list/" - }) - - -@login_required -@permission_required("admin.add_user") -def accounts_list(request): - accs = User.objects.filter(is_superuser=False) \ - .exclude(groups__name='SimpleUsers') - res = [a.username for a in accs.all()] - return ajax_simple_response(res) - - -@login_required -@user_passes_test(lambda u: u.has_perm("admin.add_user") - or u.has_perm("admin.add_alias")) -def allowed_recipients_list(request): - ret = [mb.full_address for mb in request.user.get_mailboxes()] - ret += [al.full_address for al in request.user.get_aliases()] - return ajax_simple_response(ret) - - -@login_required -@permission_required("admin.add_mailbox") -def list_quotas(request, tplname="admin/quotas.html"): - from modoboa.lib.dbutils import db_type - - sort_order, sort_dir = get_sort_order(request.GET, "address") - mboxes = request.user.get_mailboxes(request.GET.get("searchquery", None)) - mboxes = mboxes.exclude(quota=0) - if sort_order in ["address", "quota", "quota_value__bytes"]: - mboxes = mboxes.order_by("%s%s" % (sort_dir, sort_order)) - elif sort_order == "quota_usage": - if db_type() == "postgres": - select = '(admin_quota.bytes::float / (CAST(admin_mailbox.quota AS BIGINT) * 1048576)) * 100' - else: - select = 'admin_quota.bytes / (admin_mailbox.quota * 1048576) * 100' - mboxes = mboxes.extra( - select={'quota_usage': select}, - where=["admin_quota.mbox_id=admin_mailbox.id"], - tables=["admin_quota"], - order_by=["%s%s" % (sort_dir, sort_order)] - ) - else: - raise AdminError(_("Invalid request")) - page = get_listing_page(mboxes, request.GET.get("page", 1)) - return ajax_simple_response({ - "status": "ok", - "page": page.number, - "paginbar": pagination_bar(page), - "table": _render_to_string(request, tplname, { - "mboxes": page - }) - }) - - -@login_required -@permission_required("admin.add_user") -@transaction.commit_on_success -def newaccount(request, tplname='common/wizard_forms.html'): - def create_account(steps): - """Account creation callback - - Called when all creation steps have been validated. - - :param steps: the steps data - """ - genform = steps[0]["form"] - genform.is_valid() - account = genform.save() - account.post_create(request.user) - - mailform = steps[1]["form"] - try: - mailform.save(request.user, account) - except AdminError: - # A bit uggly: transaction management doesn't work very - # well with nested functions. Need to wait for django 1.6 - # and atomicity. - account.delete(request.user, False) - raise - - ctx = dict( - title=_("New account"), - action=reverse(newaccount), - formid="newaccount_form", - submit_label=_("Create") - ) - cwizard = CreationWizard(create_account) - cwizard.add_step(AccountFormGeneral, _("General"), - [dict(classes="btn-inverse next", label=_("Next"))], - new_args=[request.user]) - cwizard.add_step(AccountFormMail, _("Mail"), - [dict(classes="btn-primary submit", label=_("Create")), - dict(classes="btn-inverse prev", label=_("Previous"))], - formtpl="admin/mailform.html") - - if request.method == "POST": - retcode, data = cwizard.validate_step(request) - if retcode == -1: - raise AdminError(data) - if retcode == 1: - return ajax_simple_response(dict( - status="ok", title=cwizard.get_title(data + 1), stepid=data - )) - if retcode == 2: - return ajax_simple_response(dict( - status="ok", respmsg=_("Account created") - )) - - from modoboa.lib.templatetags.libextras import render_form - return ajax_simple_response(dict( - status="ko", stepid=data, - form=render_form(cwizard.steps[data]["form"]) - )) - - cwizard.create_forms() - ctx.update(steps=cwizard.steps) - ctx.update(subtitle="1. %s" % cwizard.steps[0]['title']) - return render(request, tplname, ctx) - - -@login_required -@permission_required("admin.change_user") -@transaction.commit_on_success -def editaccount(request, accountid, tplname="common/tabforms.html"): - account = User.objects.get(pk=accountid) - if not request.user.can_access(account): - raise PermDeniedException - mb = None - if account.has_mailbox: - mb = account.mailbox_set.all()[0] - - instances = dict(general=account, mail=mb, perms=account) - events.raiseEvent("FillAccountInstances", request.user, account, instances) - - ctx = dict( - title=account.username, - formid="accountform", - action=reverse(editaccount, args=[accountid]), - action_label=_("Update"), - action_classes="submit" - ) - - if request.method == "POST": - classes = {} - form = AccountForm(request.user, request.POST, - instances=instances, classes=classes) - account.oldgroup = account.group - if form.is_valid(mandatory_only=True): - form.save_general_form() - if form.is_valid(optional_only=True): - events.raiseEvent("AccountModified", account, form.account) - form.save() - return ajax_simple_response( - dict(status="ok", respmsg=_("Account updated")) - ) - transaction.rollback() - - ctx["tabs"] = form - return ajax_response(request, status="ko", template=tplname, **ctx) - - ctx["tabs"] = AccountForm(request.user, instances=instances) - active_tab_id = request.GET.get("active_tab", "default") - if active_tab_id != "default": - ctx["tabs"].active_id = active_tab_id - return render(request, tplname, ctx) - - -@login_required -@permission_required("admin.delete_user") -@transaction.commit_on_success -def delaccount(request, accountid): - keepdir = True if request.POST.get("keepdir", "false") == "true" else False - - User.objects.get(pk=accountid).delete(request.user, keepdir) - - msg = ungettext("Account deleted", "Accounts deleted", 1) - return ajax_simple_response({"status": "ok", "respmsg": msg}) - - -@login_required -@permission_required("admin.add_domain") -def remove_permission(request): - domid = request.GET.get("domid", None) - daid = request.GET.get("daid", None) - if domid is None or daid is None: - raise AdminError(_("Invalid request")) - try: - account = User.objects.get(pk=daid) - domain = Domain.objects.get(pk=domid) - except (User.DoesNotExist, Domain.DoesNotExist): - raise AdminError(_("Invalid request")) - if not request.user.can_access(account) or not request.user.can_access(domain): - raise PermDeniedException - domain.remove_admin(account) - return ajax_simple_response(dict(status="ok")) - - -@login_required -@user_passes_test(lambda u: u.is_superuser) -def viewsettings(request, tplname='admin/settings_header.html'): - return render(request, tplname, { - "selection": "settings" - }) - - -@login_required -@user_passes_test(lambda u: u.is_superuser) -def viewparameters(request, tplname='admin/parameters.html'): - return ajax_simple_response({ - "status": "ok", - "left_selection": "parameters", - "content": _render_to_string(request, tplname, { - "forms": parameters.get_admin_forms - }) - }) - - -@login_required -@user_passes_test(lambda u: u.is_superuser) -def saveparameters(request): - for formdef in parameters.get_admin_forms(request.POST): - form = formdef["form"] - if form.is_valid(): - form.save() - form.to_django_settings() - continue - return ajax_simple_response({ - "status": "ko", "prefix": form.app, "errors": form.errors - }) - return ajax_simple_response(dict( - status="ok", respmsg=_("Parameters saved") - )) - - -@login_required -@user_passes_test(lambda u: u.is_superuser) -def viewextensions(request, tplname='admin/extensions.html'): - from modoboa.extensions import exts_pool - - exts = exts_pool.list_all() - for ext in exts: - try: - dbext = Extension.objects.get(name=ext["id"]) - ext["selection"] = dbext.enabled - except Extension.DoesNotExist: - dbext = Extension() - dbext.name = ext["id"] - dbext.enabled = False - dbext.save() - ext["selection"] = False - - tbl = ExtensionsTable(request, exts) - return ajax_simple_response({ - "status": "ok", - "content": _render_to_string(request, tplname, {"extensions": tbl}) - }) - - -@login_required -@user_passes_test(lambda u: u.is_superuser) -def saveextensions(request): - actived_exts = Extension.objects.filter(enabled=True) - found = [] - for k in request.POST.keys(): - if k.startswith("select_"): - parts = k.split("_", 1) - dbext = Extension.objects.get(name=parts[1]) - if not dbext in actived_exts: - dbext.on() - else: - found += [dbext] - for ext in actived_exts: - if not ext in found: - ext.off() - - return ajax_simple_response(dict( - status="ok", respmsg=_("Modifications applied.") - )) - - -@login_required -@user_passes_test(lambda u: u.is_superuser) -def information(request, tplname="admin/information.html"): - return ajax_simple_response({ - "status": "ok", - "content": render_to_string(tplname, {}) - }) - - -@login_required -@user_passes_test(lambda u: u.is_superuser) -def logs(request, tplname="admin/logs.html"): - sort_order, sort_dir = get_sort_order( - request.GET, "date_created", - allowed_values=['date_created', 'level', 'logger', 'message'] - ) - page = get_listing_page( - Log.objects.all().order_by("%s%s" % (sort_dir, sort_order)), - request.GET.get("page", 1) - ) - return ajax_simple_response({ - "status": "ok", - "content": render_to_string(tplname, { - "logs": page.object_list, - }), - "page": page.number, - "paginbar": pagination_bar(page), - }) - - -@transaction.commit_on_success -def import_domain(user, row, formopts): - """Specific code for domains import""" - dom = Domain() - dom.from_csv(user, row) - - -@transaction.commit_on_success -def import_domainalias(user, row, formopts): - """Specific code for domain aliases import""" - domalias = DomainAlias() - domalias.from_csv(user, row) - - -@transaction.commit_on_success -def import_account(user, row, formopts): - """Specific code for accounts import""" - account = User() - account.from_csv(user, row, formopts["crypt_password"]) - - -@transaction.commit_on_success -def _import_alias(user, row, **kwargs): - """Specific code for aliases import""" - alias = Alias() - alias.from_csv(user, row, **kwargs) - - -def import_alias(user, row, formopts): - _import_alias(user, row, expected_elements=4) - - -def import_forward(user, row, formopts): - _import_alias(user, row, expected_elements=4) - - -def import_dlist(user, row, formopts): - _import_alias(user, row) - -def importdata(request, formclass=ImportDataForm): - """Generic import function - - As the process of importing data from a CSV file is the same - whatever the type, we do a maximum of the work here. - - :param request: a ``Request`` instance - :param typ: a string indicating the object type being imported - :return: a ``Response`` instance - """ - error = None - form = formclass(request.POST, request.FILES) - if form.is_valid(): - try: - reader = csv.reader(request.FILES['sourcefile'], - delimiter=form.cleaned_data['sepchar']) - except csv.Error, e: - error = str(e) - - if error is None: - try: - cpt = 0 - for row in reader: - if not row: - continue - try: - fct = globals()["import_%s" % row[0].strip()] - except KeyError: - continue - try: - fct(request.user, row, form.cleaned_data) - except IntegrityError, e: - if form.cleaned_data["continue_if_exists"]: - continue - raise ModoboaException(_("Object already exists: %s" % row)) - cpt += 1 - msg = _("%d objects imported successfully" % cpt) - return render(request, "admin/import_done.html", { - "status": "ok", "msg": msg - }) - except (ModoboaException), e: - error = str(e) - - return render(request, "admin/import_done.html", { - "status": "ko", "msg": error - }) - - -@login_required -@user_passes_test(lambda u: u.has_perm("admin.add_user") or u.has_perm("admin.add_alias")) -def import_identities(request): - if request.method == "POST": - return importdata(request, ImportIdentitiesForm) - - helptext = _("""Provide a CSV file where lines respect one of the following formats: -
    -
  • account; loginname; password; first name; last name; enabled; group; address[, domain, ...]
    • -
  • alias; address; enabled; internal recipient
    • -
  • forward; address; enabled; external recipient
    • -
  • dlist; address; enabled; recipient; recipient; ...
    • -
-

The first element of each line is mandatory and must be equal to one of the previous values.

- -

You can use a different character as separator.

-""") - ctx = dict( - title=_("Import identities"), - action_label=_("Import"), - action_classes="submit", - action=reverse(import_identities), - formid="importform", - enctype="multipart/form-data", - target="import_target", - form=ImportIdentitiesForm(), - helptext=helptext - ) - return render(request, "admin/importform.html", ctx) - - -def _export(content, filename): - """Export a csv file's content - - :param content: the content to export (string) - :param filename: the name that will appear into the response - :return: an ``HttpResponse`` object - """ - resp = HttpResponse(content) - resp["Content-Type"] = "text/csv" - resp["Content-Length"] = len(content) - resp["Content-Disposition"] = 'attachment; filename="%s"' % filename - return resp - - -@login_required -@user_passes_test(lambda u: u.has_perm("admin.add_user") or u.has_perm("admin.add_alias")) -def export_identities(request): - ctx = { - "title": _("Export identities"), - "action_label": _("Export"), - "action_classes": "submit", - "formid": "exportform", - "action": reverse(export_identities), - } - - if request.method == "POST": - form = ExportIdentitiesForm(request.POST) - form.is_valid() - fp = cStringIO.StringIO() - csvwriter = csv.writer(fp, delimiter=form.cleaned_data["sepchar"]) - for ident in request.user.get_identities(): - ident.to_csv(csvwriter) - content = fp.getvalue() - fp.close() - return _export(content, form.cleaned_data["filename"]) - - ctx["form"] = ExportIdentitiesForm() - return render(request, "common/generic_modal_form.html", ctx) - - -@login_required -@permission_required("admin.add_domain") -@transaction.commit_on_success -def import_domains(request): - if request.method == "POST": - return importdata(request) - - helptext = _("""Provide a CSV file where lines respect one of the following formats: -
    -
  • domain; name; quota; enabled
    • -
  • domainalias; name; targeted domain; enabled
    • -
-

The first element of each line is mandatory and must be equal to one of the previous values.

-

You can use a different character as separator.

-""") - - ctx = dict( - title=_("Import domains"), - action_label=_("Import"), - action_classes="submit", - action=reverse(import_domains), - formid="importform", - enctype="multipart/form-data", - target="import_target", - helptext=helptext, - form=ImportDataForm() - ) - return render(request, "admin/importform.html", ctx) - - -@login_required -@permission_required("admin.add_domain") -def export_domains(request): - ctx = { - "title": _("Export domains"), - "action_label": _("Export"), - "action_classes": "submit", - "formid": "exportform", - "action": reverse(export_domains), - } - - if request.method == "POST": - form = ExportDomainsForm(request.POST) - form.is_valid() - fp = cStringIO.StringIO() - csvwriter = csv.writer(fp, delimiter=form.cleaned_data["sepchar"]) - for dom in request.user.get_domains(): - dom.to_csv(csvwriter) - for da in dom.domainalias_set.all(): - da.to_csv(csvwriter) - content = fp.getvalue() - fp.close() - return _export(content, form.cleaned_data["filename"]) - - ctx["form"] = ExportDomainsForm() - return render(request, "common/generic_modal_form.html", ctx) diff --git a/modoboa/core/__init__.py b/modoboa/core/__init__.py index b85142032..cf4bc5c04 100644 --- a/modoboa/core/__init__.py +++ b/modoboa/core/__init__.py @@ -1,8 +1,19 @@ from django.utils.translation import ugettext_lazy -from modoboa.lib import parameters +from modoboa.lib import parameters, events def load_settings(): from app_settings import GeneralParametersForm, UserSettings parameters.register(GeneralParametersForm, ugettext_lazy("General")) parameters.register(UserSettings, ugettext_lazy("General")) + + +@events.observe("ExtDisabled") +def unset_default_topredirection(extension): + """ + Simple callback to change the default redirection if the + corresponding extension is being disabled. + """ + topredirection = parameters.get_admin("DEFAULT_TOP_REDIRECTION") + if topredirection == extension.name: + parameters.save_admin("DEFAULT_TOP_REDIRECTION", "userprefs") diff --git a/modoboa/core/app_settings.py b/modoboa/core/app_settings.py index fb49d4b1a..484d59de6 100644 --- a/modoboa/core/app_settings.py +++ b/modoboa/core/app_settings.py @@ -153,7 +153,7 @@ class GeneralParametersForm(parameters.AdminParametersForm): default_top_redirection = forms.ChoiceField( label=ugettext_lazy("Default top redirection"), choices=[], - initial="admin", + initial="core", help_text=ugettext_lazy("The default redirection used when no application is specified") ) diff --git a/modoboa/core/extensions.py b/modoboa/core/extensions.py index 95999dbd0..2b7f91772 100644 --- a/modoboa/core/extensions.py +++ b/modoboa/core/extensions.py @@ -12,15 +12,19 @@ class ModoExtension(object): considered as valid. """ name = None - version = None + label = None + version = "NA" description = "" url = None needs_media = False always_active = False def infos(self): - return dict(name=self.name, label=self.label, version=self.version, - description=self.description, url=self.url) + return dict( + name=self.name, label=self.label, version=self.version, + description=self.description, url=self.url, + always_active=self.always_active + ) def init(self): pass diff --git a/modoboa/core/models.py b/modoboa/core/models.py index c277af0f2..2906089cc 100644 --- a/modoboa/core/models.py +++ b/modoboa/core/models.py @@ -50,6 +50,7 @@ class User(AbstractBaseUser, PermissionsMixin): REQUIRED_FIELDS = ['email'] class Meta: + db_table = "admin_user" ordering = ["username"] password_expr = re.compile(r'(\{(\w+)\}|(\$1\$))(.+)') diff --git a/modoboa/core/templatetags/core_tags.py b/modoboa/core/templatetags/core_tags.py index 3c7d720ac..3fe55b895 100644 --- a/modoboa/core/templatetags/core_tags.py +++ b/modoboa/core/templatetags/core_tags.py @@ -42,6 +42,36 @@ def core_menu(selection, user): ) +@register.simple_tag +def settings_menu(selection, user): + entries = [ + {"name": "extensions", + "class": "ajaxlink", + "url": "extensions/", + "label": _("Extensions"), + "img": ""}, + {"name": "info", + "class": "ajaxlink", + "url": "info/", + "label": _("Information")}, + {"name": "logs", + "class": "ajaxlink", + "url": "logs/", + "label": _("Logs")}, + {"name": "parameters", + "class": "ajaxlink", + "url": "parameters/", + "img": "", + "label": _("Parameters")}, + ] + return render_to_string('common/menu.html', { + "entries": entries, + "css": "nav nav-list", + "selection": selection, + "user": user + }) + + @register.simple_tag def extensions_menu(selection, user): menu = events.raiseQueryEvent("UserMenuDisplay", "top_menu", user) diff --git a/modoboa/extensions/admin/__init__.py b/modoboa/extensions/admin/__init__.py new file mode 100644 index 000000000..dfe89d830 --- /dev/null +++ b/modoboa/extensions/admin/__init__.py @@ -0,0 +1,21 @@ +# coding: utf-8 +from django.utils.translation import ugettext as _, ugettext_lazy +from modoboa.core.extensions import ModoExtension, exts_pool +from modoboa.lib import parameters, events + + +class AdminConsole(ModoExtension): + name = "admin" + label = ugettext_lazy("Administration console") + version = "1.0" + description = ugettext_lazy("Web based console to manage domains, accounts and aliases") + always_active = True + + def load(self): + from app_settings import AdminParametersForm + parameters.register(AdminParametersForm, ugettext_lazy("Administration")) + + def destroy(self): + parameters.unregister() + +exts_pool.register_extension(AdminConsole, show=False) diff --git a/modoboa/extensions/admin/app_settings.py b/modoboa/extensions/admin/app_settings.py new file mode 100644 index 000000000..c5fed0767 --- /dev/null +++ b/modoboa/extensions/admin/app_settings.py @@ -0,0 +1,48 @@ +from django import forms +from django.utils.translation import ugettext_lazy +from modoboa.lib.formutils import YesNoField, SeparatorField, InlineRadioSelect +from modoboa.lib.sysutils import exec_cmd +from modoboa.lib import parameters + + +class AdminParametersForm(parameters.AdminParametersForm): + app = "admin" + + mbsep = SeparatorField(label=ugettext_lazy("Mailboxes")) + + handle_mailboxes = YesNoField( + label=ugettext_lazy("Handle mailboxes on filesystem"), + initial="no", + help_text=ugettext_lazy("Rename or remove mailboxes on the filesystem when they get renamed or removed within Modoboa") + ) + + mailboxes_owner = forms.CharField( + label=ugettext_lazy("Mailboxes ower"), + initial="vmail", + help_text=ugettext_lazy("The UNIX account who owns mailboxes on the filesystem") + ) + + auto_account_removal = YesNoField( + label=ugettext_lazy("Automatic account removal"), + initial="no", + help_text=ugettext_lazy("When a mailbox is removed, also remove the associated account"), + ) + + # Visibility rules + visibility_rules = { + "mailboxes_owner": "handle_mailboxes=yes", + } + + def __init__(self, *args, **kwargs): + super(AdminParametersForm, self).__init__(*args, **kwargs) + hide_fields = False + try: + code, version = exec_cmd("dovecot --version") + except OSError: + hide_fields = True + else: + if code or not version.strip().startswith("2"): + hide_fields = True + if hide_fields: + del self.fields["handle_mailboxes"] + del self.fields["mailboxes_owner"] diff --git a/modoboa/admin/exceptions.py b/modoboa/extensions/admin/exceptions.py similarity index 100% rename from modoboa/admin/exceptions.py rename to modoboa/extensions/admin/exceptions.py diff --git a/modoboa/admin/fixtures/demo.json b/modoboa/extensions/admin/fixtures/demo.json similarity index 100% rename from modoboa/admin/fixtures/demo.json rename to modoboa/extensions/admin/fixtures/demo.json diff --git a/modoboa/admin/fixtures/initial_data.json b/modoboa/extensions/admin/fixtures/initial_data.json similarity index 100% rename from modoboa/admin/fixtures/initial_data.json rename to modoboa/extensions/admin/fixtures/initial_data.json diff --git a/modoboa/admin/fixtures/initial_users.json b/modoboa/extensions/admin/fixtures/initial_users.json similarity index 100% rename from modoboa/admin/fixtures/initial_users.json rename to modoboa/extensions/admin/fixtures/initial_users.json diff --git a/modoboa/admin/fixtures/test_content.json b/modoboa/extensions/admin/fixtures/test_content.json similarity index 100% rename from modoboa/admin/fixtures/test_content.json rename to modoboa/extensions/admin/fixtures/test_content.json diff --git a/modoboa/admin/forms.py b/modoboa/extensions/admin/forms.py similarity index 99% rename from modoboa/admin/forms.py rename to modoboa/extensions/admin/forms.py index 1459d4593..90f27dbe0 100644 --- a/modoboa/admin/forms.py +++ b/modoboa/extensions/admin/forms.py @@ -3,13 +3,16 @@ from django import forms from django.contrib.auth.models import Group from django.utils.translation import ugettext as _, ugettext_lazy from django.http import QueryDict -from modoboa.admin.templatetags.admin_extras import gender -from modoboa.admin.exceptions import AdminError from modoboa.lib import events, parameters from modoboa.lib.emailutils import split_mailbox from modoboa.lib.permissions import get_account_roles from modoboa.lib.formutils import * -from modoboa.admin.models import User, Domain, DomainAlias, Mailbox, Alias +from modoboa.core.models import User +from modoboa.extensions.admin.templatetags.admin_tags import gender +from modoboa.extensions.admin.exceptions import AdminError +from modoboa.extensions.admin.models import ( + Domain, DomainAlias, Mailbox, Alias +) class DomainFormGeneral(forms.ModelForm, DynamicForm): diff --git a/modoboa/admin/lib.py b/modoboa/extensions/admin/lib.py similarity index 100% rename from modoboa/admin/lib.py rename to modoboa/extensions/admin/lib.py diff --git a/modoboa/admin/migrations/0001_initial.py b/modoboa/extensions/admin/migrations/0001_initial.py similarity index 100% rename from modoboa/admin/migrations/0001_initial.py rename to modoboa/extensions/admin/migrations/0001_initial.py diff --git a/modoboa/admin/migrations/0002_auto__del_field_alias_mbox.py b/modoboa/extensions/admin/migrations/0002_auto__del_field_alias_mbox.py similarity index 100% rename from modoboa/admin/migrations/0002_auto__del_field_alias_mbox.py rename to modoboa/extensions/admin/migrations/0002_auto__del_field_alias_mbox.py diff --git a/modoboa/admin/migrations/0003_auto__add_extension.py b/modoboa/extensions/admin/migrations/0003_auto__add_extension.py similarity index 100% rename from modoboa/admin/migrations/0003_auto__add_extension.py rename to modoboa/extensions/admin/migrations/0003_auto__add_extension.py diff --git a/modoboa/admin/migrations/0004_add_permissions.py b/modoboa/extensions/admin/migrations/0004_add_permissions.py similarity index 100% rename from modoboa/admin/migrations/0004_add_permissions.py rename to modoboa/extensions/admin/migrations/0004_add_permissions.py diff --git a/modoboa/admin/migrations/0005_increase_columns_length.py b/modoboa/extensions/admin/migrations/0005_increase_columns_length.py similarity index 100% rename from modoboa/admin/migrations/0005_increase_columns_length.py rename to modoboa/extensions/admin/migrations/0005_increase_columns_length.py diff --git a/modoboa/admin/migrations/0006_auto__add_domainalias.py b/modoboa/extensions/admin/migrations/0006_auto__add_domainalias.py similarity index 100% rename from modoboa/admin/migrations/0006_auto__add_domainalias.py rename to modoboa/extensions/admin/migrations/0006_auto__add_domainalias.py diff --git a/modoboa/admin/migrations/0007_auto__del_field_alias_full_address__chg_field_alias_address__del_field.py b/modoboa/extensions/admin/migrations/0007_auto__del_field_alias_full_address__chg_field_alias_address__del_field.py similarity index 100% rename from modoboa/admin/migrations/0007_auto__del_field_alias_full_address__chg_field_alias_address__del_field.py rename to modoboa/extensions/admin/migrations/0007_auto__del_field_alias_full_address__chg_field_alias_address__del_field.py diff --git a/modoboa/admin/migrations/0008_update_mailbox_path.py b/modoboa/extensions/admin/migrations/0008_update_mailbox_path.py similarity index 100% rename from modoboa/admin/migrations/0008_update_mailbox_path.py rename to modoboa/extensions/admin/migrations/0008_update_mailbox_path.py diff --git a/modoboa/admin/migrations/0009_auto__add_field_alias_extmboxes.py b/modoboa/extensions/admin/migrations/0009_auto__add_field_alias_extmboxes.py similarity index 100% rename from modoboa/admin/migrations/0009_auto__add_field_alias_extmboxes.py rename to modoboa/extensions/admin/migrations/0009_auto__add_field_alias_extmboxes.py diff --git a/modoboa/admin/migrations/0010_fill_alias_domain.py b/modoboa/extensions/admin/migrations/0010_fill_alias_domain.py similarity index 100% rename from modoboa/admin/migrations/0010_fill_alias_domain.py rename to modoboa/extensions/admin/migrations/0010_fill_alias_domain.py diff --git a/modoboa/admin/migrations/0011_auto__add_objectdates__add_field_domain_dates__add_field_domainalias_d.py b/modoboa/extensions/admin/migrations/0011_auto__add_objectdates__add_field_domain_dates__add_field_domainalias_d.py similarity index 100% rename from modoboa/admin/migrations/0011_auto__add_objectdates__add_field_domain_dates__add_field_domainalias_d.py rename to modoboa/extensions/admin/migrations/0011_auto__add_objectdates__add_field_domain_dates__add_field_domainalias_d.py diff --git a/modoboa/admin/migrations/0012_fill_object_dates.py b/modoboa/extensions/admin/migrations/0012_fill_object_dates.py similarity index 100% rename from modoboa/admin/migrations/0012_fill_object_dates.py rename to modoboa/extensions/admin/migrations/0012_fill_object_dates.py diff --git a/modoboa/admin/migrations/0013_update_mailbox_path.py b/modoboa/extensions/admin/migrations/0013_update_mailbox_path.py similarity index 100% rename from modoboa/admin/migrations/0013_update_mailbox_path.py rename to modoboa/extensions/admin/migrations/0013_update_mailbox_path.py diff --git a/modoboa/admin/migrations/0014_auto__add_unique_domain_name.py b/modoboa/extensions/admin/migrations/0014_auto__add_unique_domain_name.py similarity index 100% rename from modoboa/admin/migrations/0014_auto__add_unique_domain_name.py rename to modoboa/extensions/admin/migrations/0014_auto__add_unique_domain_name.py diff --git a/modoboa/admin/migrations/0015_move_passwords.py b/modoboa/extensions/admin/migrations/0015_move_passwords.py similarity index 100% rename from modoboa/admin/migrations/0015_move_passwords.py rename to modoboa/extensions/admin/migrations/0015_move_passwords.py diff --git a/modoboa/admin/migrations/0016_auto__add_objectaccess__add_unique_objectaccess_user_content_type_obje.py b/modoboa/extensions/admin/migrations/0016_auto__add_objectaccess__add_unique_objectaccess_user_content_type_obje.py similarity index 100% rename from modoboa/admin/migrations/0016_auto__add_objectaccess__add_unique_objectaccess_user_content_type_obje.py rename to modoboa/extensions/admin/migrations/0016_auto__add_objectaccess__add_unique_objectaccess_user_content_type_obje.py diff --git a/modoboa/admin/migrations/0017_set_permissions.py b/modoboa/extensions/admin/migrations/0017_set_permissions.py similarity index 100% rename from modoboa/admin/migrations/0017_set_permissions.py rename to modoboa/extensions/admin/migrations/0017_set_permissions.py diff --git a/modoboa/admin/migrations/0018_auto__add_unique_alias_domain_address.py b/modoboa/extensions/admin/migrations/0018_auto__add_unique_alias_domain_address.py similarity index 100% rename from modoboa/admin/migrations/0018_auto__add_unique_alias_domain_address.py rename to modoboa/extensions/admin/migrations/0018_auto__add_unique_alias_domain_address.py diff --git a/modoboa/admin/migrations/0019_set_default_group.py b/modoboa/extensions/admin/migrations/0019_set_default_group.py similarity index 100% rename from modoboa/admin/migrations/0019_set_default_group.py rename to modoboa/extensions/admin/migrations/0019_set_default_group.py diff --git a/modoboa/admin/migrations/0020_rename_amavis_ext.py b/modoboa/extensions/admin/migrations/0020_rename_amavis_ext.py similarity index 100% rename from modoboa/admin/migrations/0020_rename_amavis_ext.py rename to modoboa/extensions/admin/migrations/0020_rename_amavis_ext.py diff --git a/modoboa/admin/migrations/0021_default_superadmin_ownership.py b/modoboa/extensions/admin/migrations/0021_default_superadmin_ownership.py similarity index 100% rename from modoboa/admin/migrations/0021_default_superadmin_ownership.py rename to modoboa/extensions/admin/migrations/0021_default_superadmin_ownership.py diff --git a/modoboa/admin/migrations/0022_auto__del_field_mailbox_uid__del_field_mailbox_gid__del_field_mailbox_.py b/modoboa/extensions/admin/migrations/0022_auto__del_field_mailbox_uid__del_field_mailbox_gid__del_field_mailbox_.py similarity index 100% rename from modoboa/admin/migrations/0022_auto__del_field_mailbox_uid__del_field_mailbox_gid__del_field_mailbox_.py rename to modoboa/extensions/admin/migrations/0022_auto__del_field_mailbox_uid__del_field_mailbox_gid__del_field_mailbox_.py diff --git a/modoboa/admin/migrations/0023_auto__add_quota.py b/modoboa/extensions/admin/migrations/0023_auto__add_quota.py similarity index 100% rename from modoboa/admin/migrations/0023_auto__add_quota.py rename to modoboa/extensions/admin/migrations/0023_auto__add_quota.py diff --git a/modoboa/admin/migrations/0024_create_quotas.py b/modoboa/extensions/admin/migrations/0024_create_quotas.py similarity index 100% rename from modoboa/admin/migrations/0024_create_quotas.py rename to modoboa/extensions/admin/migrations/0024_create_quotas.py diff --git a/modoboa/admin/migrations/0025_auto__add_field_quota_mbox.py b/modoboa/extensions/admin/migrations/0025_auto__add_field_quota_mbox.py similarity index 100% rename from modoboa/admin/migrations/0025_auto__add_field_quota_mbox.py rename to modoboa/extensions/admin/migrations/0025_auto__add_field_quota_mbox.py diff --git a/modoboa/admin/migrations/0026_set_quota_mbox.py b/modoboa/extensions/admin/migrations/0026_set_quota_mbox.py similarity index 100% rename from modoboa/admin/migrations/0026_set_quota_mbox.py rename to modoboa/extensions/admin/migrations/0026_set_quota_mbox.py diff --git a/modoboa/admin/migrations/0027_auto__add_field_mailbox_use_domain_quota.py b/modoboa/extensions/admin/migrations/0027_auto__add_field_mailbox_use_domain_quota.py similarity index 100% rename from modoboa/admin/migrations/0027_auto__add_field_mailbox_use_domain_quota.py rename to modoboa/extensions/admin/migrations/0027_auto__add_field_mailbox_use_domain_quota.py diff --git a/modoboa/admin/migrations/0028_auto__chg_field_mailbox_quota.py b/modoboa/extensions/admin/migrations/0028_auto__chg_field_mailbox_quota.py similarity index 100% rename from modoboa/admin/migrations/0028_auto__chg_field_mailbox_quota.py rename to modoboa/extensions/admin/migrations/0028_auto__chg_field_mailbox_quota.py diff --git a/modoboa/admin/migrations/0029_auto__add_user__chg_field_mailbox_user__chg_field_objectaccess_user.py b/modoboa/extensions/admin/migrations/0029_auto__add_user__chg_field_mailbox_user__chg_field_objectaccess_user.py similarity index 100% rename from modoboa/admin/migrations/0029_auto__add_user__chg_field_mailbox_user__chg_field_objectaccess_user.py rename to modoboa/extensions/admin/migrations/0029_auto__add_user__chg_field_mailbox_user__chg_field_objectaccess_user.py diff --git a/modoboa/admin/migrations/0030_update_permissions.py b/modoboa/extensions/admin/migrations/0030_update_permissions.py similarity index 100% rename from modoboa/admin/migrations/0030_update_permissions.py rename to modoboa/extensions/admin/migrations/0030_update_permissions.py diff --git a/modoboa/admin/migrations/0031_auto__add_aliases_to_alias.py b/modoboa/extensions/admin/migrations/0031_auto__add_aliases_to_alias.py similarity index 100% rename from modoboa/admin/migrations/0031_auto__add_aliases_to_alias.py rename to modoboa/extensions/admin/migrations/0031_auto__add_aliases_to_alias.py diff --git a/modoboa/admin/migrations/0032_auto__chg_field_quota_bytes.py b/modoboa/extensions/admin/migrations/0032_auto__chg_field_quota_bytes.py similarity index 100% rename from modoboa/admin/migrations/0032_auto__chg_field_quota_bytes.py rename to modoboa/extensions/admin/migrations/0032_auto__chg_field_quota_bytes.py diff --git a/modoboa/admin/migrations/0033_auto__chg_field_mailbox_address__chg_field_quota_username.py b/modoboa/extensions/admin/migrations/0033_auto__chg_field_mailbox_address__chg_field_quota_username.py similarity index 100% rename from modoboa/admin/migrations/0033_auto__chg_field_mailbox_address__chg_field_quota_username.py rename to modoboa/extensions/admin/migrations/0033_auto__chg_field_mailbox_address__chg_field_quota_username.py diff --git a/modoboa/admin/migrations/0034_auto__add_field_user_is_local.py b/modoboa/extensions/admin/migrations/0034_auto__add_field_user_is_local.py similarity index 100% rename from modoboa/admin/migrations/0034_auto__add_field_user_is_local.py rename to modoboa/extensions/admin/migrations/0034_auto__add_field_user_is_local.py diff --git a/modoboa/admin/migrations/0035_set_local_flag.py b/modoboa/extensions/admin/migrations/0035_set_local_flag.py similarity index 100% rename from modoboa/admin/migrations/0035_set_local_flag.py rename to modoboa/extensions/admin/migrations/0035_set_local_flag.py diff --git a/modoboa/admin/migrations/__init__.py b/modoboa/extensions/admin/migrations/__init__.py similarity index 100% rename from modoboa/admin/migrations/__init__.py rename to modoboa/extensions/admin/migrations/__init__.py diff --git a/modoboa/extensions/admin/models/__init__.py b/modoboa/extensions/admin/models/__init__.py new file mode 100644 index 000000000..8ef79509f --- /dev/null +++ b/modoboa/extensions/admin/models/__init__.py @@ -0,0 +1,8 @@ +from .domain import Domain +from .domain_alias import DomainAlias +from .mailbox import Mailbox, Quota +from .alias import Alias + +__all__ = [ + 'Domain', 'DomainAlias', 'Mailbox', 'Quota', 'Alias' +] diff --git a/modoboa/extensions/admin/models/alias.py b/modoboa/extensions/admin/models/alias.py new file mode 100644 index 000000000..ee1607cd1 --- /dev/null +++ b/modoboa/extensions/admin/models/alias.py @@ -0,0 +1,195 @@ +import reversion +from django.db import models +from django.utils.translation import ugettext as _, ugettext_lazy +from modoboa.lib import events +from modoboa.lib.emailutils import split_mailbox +from modoboa.lib.exceptions import PermDeniedException +from modoboa.extensions.admin.exceptions import AdminError +from .base import DatesAware +from .domain import Domain +from .mailbox import Mailbox + + +class Alias(DatesAware): + address = models.CharField( + ugettext_lazy('address'), max_length=254, + help_text=ugettext_lazy("The alias address (without the domain part). For a 'catch-all' address, just enter an * character.") + ) + domain = models.ForeignKey(Domain) + mboxes = models.ManyToManyField( + Mailbox, verbose_name=ugettext_lazy('mailboxes'), + help_text=ugettext_lazy("The mailboxes this alias points to") + ) + aliases = models.ManyToManyField( + 'Alias', + help_text=ugettext_lazy("The aliases this alias points to") + ) + extmboxes = models.TextField(blank=True) + enabled = models.BooleanField( + ugettext_lazy('enabled'), + help_text=ugettext_lazy("Check to activate this alias") + ) + + class Meta: + permissions = ( + ("view_aliases", "View aliases"), + ) + unique_together = (("address", "domain"),) + ordering = ["domain__name", "address"] + + def __unicode__(self): + return self.full_address + + @property + def full_address(self): + return "%s@%s" % (self.address, self.domain.name) + + @property + def identity(self): + return self.full_address + + @property + def name_or_rcpt(self): + rcpts_count = self.get_recipients_count() + if not rcpts_count: + return "---" + rcpts = self.get_recipients() + if rcpts_count > 1: + return "%s, ..." % rcpts[0] + return rcpts[0] + + @property + def type(self): + cpt = self.get_recipients_count() + if cpt > 1: + return "dlist" + if self.extmboxes != "": + return "forward" + return "alias" + + @property + def tags(self): + labels = { + "dlist": _("distribution list"), + "forward": _("forward"), + "alias": _("alias") + } + altype = self.type + return [{"name": altype, "label": labels[altype], "type": "idt"}] + + def post_create(self, creator): + from modoboa.lib.permissions import grant_access_to_object + grant_access_to_object(creator, self, is_owner=True) + events.raiseEvent("MailboxAliasCreated", creator, self) + if creator.is_superuser: + for admin in self.domain.admins: + grant_access_to_object(admin, self) + + def save(self, int_rcpts, ext_rcpts, *args, **kwargs): + if len(ext_rcpts): + self.extmboxes = ",".join(ext_rcpts) + else: + self.extmboxes = "" + if "creator" in kwargs: + creator = kwargs["creator"] + del kwargs["creator"] + else: + creator = None + super(Alias, self).save(*args, **kwargs) + if creator is not None: + self.post_create(creator) + curaliases = self.aliases.all() + curmboxes = self.mboxes.all() + for t in int_rcpts: + if isinstance(t, Alias): + if not t in curaliases: + self.aliases.add(t) + continue + if not t in curmboxes: + self.mboxes.add(t) + for t in curaliases: + if not t in int_rcpts: + self.aliases.remove(t) + for t in curmboxes: + if not t in int_rcpts: + self.mboxes.remove(t) + + def delete(self): + from modoboa.lib.permissions import ungrant_access_to_object + + events.raiseEvent("MailboxAliasDeleted", self) + ungrant_access_to_object(self) + super(Alias, self).delete() + + def get_recipients(self): + """Return the recipients list + + Internal and external addresses are mixed into a single list. + """ + result = [al.full_address for al in self.aliases.all()] + result += [mb.full_address for mb in self.mboxes.all()] + if self.extmboxes != "": + result += self.extmboxes.split(',') + return result + + def get_recipients_count(self): + total = 0 + if self.extmboxes != "": + total += len(self.extmboxes.split(',')) + return total + self.aliases.count() + self.mboxes.count() + + def ui_disabled(self, user): + if user.is_superuser: + return False + for mb in self.mboxes.all(): + if not user.is_owner(mb.domain): + return True + return False + + def from_csv(self, user, row, expected_elements=5): + """Create a new alias from a CSV file entry + + """ + if len(row) < expected_elements: + raise AdminError(_("Invalid line: %s" % row)) + localpart, domname = split_mailbox(row[1].strip()) + try: + domain = Domain.objects.get(name=domname) + except Domain.DoesNotExist: + raise AdminError(_("Domain '%s' does not exist" % domname)) + if not user.can_access(domain): + raise PermDeniedException + self.address = localpart + self.domain = domain + self.enabled = (row[2].strip() == 'True') + int_rcpts = [] + ext_rcpts = [] + for rcpt in row[3:]: + rcpt = rcpt.strip() + localpart, domname = split_mailbox(rcpt) + try: + Domain.objects.get(name=domname) + except Domain.DoesNotExist: + ext_rcpts += [rcpt] + continue + try: + target = Alias.objects.get(domain__name=domname, address=localpart) + if target.full_address == self.full_address: + target = None + except Alias.DoesNotExist: + target = None + if target is None: + try: + target = Mailbox.objects.get(address=localpart, + domain__name=domname) + except Mailbox.DoesNotExist: + raise AdminError(_("Local recipient %s not found" % rcpt)) + int_rcpts += [target] + self.save(int_rcpts, ext_rcpts, creator=user) + + def to_csv(self, csvwriter): + row = [self.type, self.full_address, self.enabled] + row += self.get_recipients() + csvwriter.writerow(row) + +reversion.register(Alias) diff --git a/modoboa/extensions/admin/models/base.py b/modoboa/extensions/admin/models/base.py new file mode 100644 index 000000000..1f6b0a152 --- /dev/null +++ b/modoboa/extensions/admin/models/base.py @@ -0,0 +1,49 @@ +from django.db import models + + +class ObjectDates(models.Model): + """Dates recording for admin objects + + This table keeps creation and last modification dates for Domains, + domain aliases, mailboxes and aliases objects. + """ + creation = models.DateTimeField(auto_now_add=True) + last_modification = models.DateTimeField(auto_now=True) + + @staticmethod + def set_for_object(obj): + """Initialize or update dates for a given object. + + :param obj: an admin object (Domain, Mailbox, etc) + """ + try: + dates = getattr(obj, "dates") + except ObjectDates.DoesNotExist: + dates = ObjectDates() + dates.save() + obj.dates = dates + + +class DatesAware(models.Model): + """Abstract model to support dates + + Inherit from this model to automatically add the "dates" feature + to another model. It defines the appropriate field and handles + saves. + """ + dates = models.ForeignKey(ObjectDates) + + class Meta: + abstract = True + + def save(self, *args, **kwargs): + ObjectDates.set_for_object(self) + super(DatesAware, self).save(*args, **kwargs) + + @property + def creation(self): + return self.dates.creation + + @property + def last_modification(self): + return self.dates.last_modification diff --git a/modoboa/extensions/admin/models/domain.py b/modoboa/extensions/admin/models/domain.py new file mode 100644 index 000000000..559fc7909 --- /dev/null +++ b/modoboa/extensions/admin/models/domain.py @@ -0,0 +1,133 @@ +import reversion +from django.db import models +from django.utils.translation import ugettext as _, ugettext_lazy +from django.contrib.contenttypes import generic +from modoboa.lib import events, parameters +from modoboa.core.models import ObjectAccess +from .base import DatesAware + + +class Domain(DatesAware): + name = models.CharField(ugettext_lazy('name'), max_length=100, unique=True, + help_text=ugettext_lazy("The domain name")) + quota = models.IntegerField( + help_text=ugettext_lazy("Default quota in MB applied to mailboxes") + ) + enabled = models.BooleanField( + ugettext_lazy('enabled'), + help_text=ugettext_lazy("Check to activate this domain") + ) + owners = generic.GenericRelation(ObjectAccess) + + class Meta: + permissions = ( + ("view_domain", "View domain"), + ("view_domains", "View domains"), + ) + ordering = ["name"] + + @property + def domainalias_count(self): + return self.domainalias_set.count() + + @property + def mailbox_count(self): + return self.mailbox_set.count() + + @property + def mbalias_count(self): + return self.alias_set.count() + + @property + def admins(self): + """Return the domain administrators of this domain + + :return: a list of User objects + """ + return [oa.user for oa in self.owners.filter(user__is_superuser=False)] + + def add_admin(self, account): + """Add a new administrator for this domain + + :param User account: the administrotor to add + """ + from modoboa.lib.permissions import grant_access_to_object + grant_access_to_object(account, self) + for mb in self.mailbox_set.all(): + if mb.user.has_perm("admin.add_domain"): + continue + grant_access_to_object(account, mb) + grant_access_to_object(account, mb.user) + for al in self.alias_set.all(): + grant_access_to_object(account, al) + + def remove_admin(self, account): + """Remove an administrator for this domain + + :param User account: the administrotor to remove + """ + from modoboa.lib.permissions import ungrant_access_to_object + ungrant_access_to_object(self, account) + for mb in self.mailbox_set.all(): + if mb.user.has_perm("admin.add_domain"): + continue + ungrant_access_to_object(mb, account) + ungrant_access_to_object(mb.user, account) + for al in self.alias_set.all(): + ungrant_access_to_object(al, account) + + def delete(self, fromuser, keepdir=False): + from modoboa.lib.permissions import \ + ungrant_access_to_object, ungrant_access_to_objects + + if self.domainalias_set.count(): + events.raiseEvent("DomainAliasDeleted", self.domainalias_set.all()) + ungrant_access_to_objects(self.domainalias_set.all()) + if self.mailbox_set.count(): + Quota.objects.filter(username__contains='@%s' % self.name).delete() + events.raiseEvent("DeleteMailbox", self.mailbox_set.all()) + ungrant_access_to_objects(self.mailbox_set.all()) + hm = parameters.get_admin("HANDLE_MAILBOXES", raise_error=False) + if hm == "yes" and not keepdir: + for mb in self.mailbox_set.all(): + mb.delete_dir() + if self.alias_set.count(): + events.raiseEvent("MailboxAliasDelete", self.alias_set.all()) + ungrant_access_to_objects(self.alias_set.all()) + if parameters.get_admin("AUTO_ACCOUNT_REMOVAL") == "yes": + for account in User.objects.filter(mailbox__domain__name=self.name): + account.delete(fromuser, keepdir) + events.raiseEvent("DeleteDomain", self) + ungrant_access_to_object(self) + super(Domain, self).delete() + + def __str__(self): + return self.name + + def post_create(self, creator): + from modoboa.lib.permissions import grant_access_to_object + grant_access_to_object(creator, self, is_owner=True) + events.raiseEvent("CreateDomain", creator, self) + + def save(self, *args, **kwargs): + if "creator" in kwargs: + creator = kwargs["creator"] + del kwargs["creator"] + else: + creator = None + super(Domain, self).save(*args, **kwargs) + if creator is not None: + self.post_create(creator) + + def from_csv(self, user, row): + if len(row) < 4: + raise AdminError(_("Invalid line")) + self.name = row[1].strip() + self.quota = int(row[2].strip()) + self.enabled = (row[3].strip() == 'True') + self.save(creator=user) + + def to_csv(self, csvwriter): + csvwriter.writerow(["domain", self.name, self.quota, self.enabled]) + +reversion.register(Domain) diff --git a/modoboa/extensions/admin/models/domain_alias.py b/modoboa/extensions/admin/models/domain_alias.py new file mode 100644 index 000000000..0bdf49694 --- /dev/null +++ b/modoboa/extensions/admin/models/domain_alias.py @@ -0,0 +1,78 @@ +import reversion +from django.db import models +from django.utils.translation import ugettext as _, ugettext_lazy +from modoboa.lib import events +from modoboa.extensions.admin.exceptions import AdminError +from .base import DatesAware +from .domain import Domain + + +class DomainAlias(DatesAware): + name = models.CharField(ugettext_lazy("name"), max_length=100, unique=True, + help_text=ugettext_lazy("The alias name")) + target = models.ForeignKey( + Domain, verbose_name=ugettext_lazy('target'), + help_text=ugettext_lazy("The domain this alias points to") + ) + enabled = models.BooleanField( + ugettext_lazy('enabled'), + help_text=ugettext_lazy("Check to activate this alias") + ) + + class Meta: + permissions = ( + ("view_domaliases", "View domain aliases"), + ) + + def __unicode__(self): + return self.name + + def post_create(self, creator): + from modoboa.lib.permissions import grant_access_to_object + grant_access_to_object(creator, self, is_owner=True) + events.raiseEvent("DomainAliasCreated", creator, self) + + def save(self, *args, **kwargs): + if "creator" in kwargs: + creator = kwargs["creator"] + del kwargs["creator"] + else: + creator = None + super(DomainAlias, self).save(*args, **kwargs) + if creator is not None: + self.post_create(creator) + + def delete(self): + from modoboa.lib.permissions import ungrant_access_to_object + events.raiseEvent("DomainAliasDeleted", self) + ungrant_access_to_object(self) + super(DomainAlias, self).delete() + + def from_csv(self, user, row): + """Create a domain alias from a CSV row + + Expected format: ["domainalias", domain alias name, targeted domain, enabled] + + :param user: a ``User`` object + :param row: a list containing the alias definition + """ + if len(row) < 4: + raise AdminError(_("Invalid line")) + self.name = row[1].strip() + domname = row[2].strip() + try: + self.target = Domain.objects.get(name=domname) + except Domain.DoesNotExist: + raise AdminError(_("Unknown domain %s" % domname)) + self.enabled = row[3].strip() == 'True' + self.save(creator=user) + + def to_csv(self, csvwriter): + """Export a domain alias using CSV format + + :param csvwriter: a ``csv.writer`` object + """ + csvwriter.writerow(["domainalias", self.name, + self.target.name, self.enabled]) + +reversion.register(DomainAlias) diff --git a/modoboa/extensions/admin/models/mailbox.py b/modoboa/extensions/admin/models/mailbox.py new file mode 100644 index 000000000..287034216 --- /dev/null +++ b/modoboa/extensions/admin/models/mailbox.py @@ -0,0 +1,213 @@ +import os +import reversion +from django.db import models +from django.utils.translation import ugettext as _, ugettext_lazy +from django.db.models.signals import pre_delete +from django.dispatch import receiver +from modoboa.lib import parameters, events +from modoboa.lib.sysutils import exec_cmd +from modoboa.core.models import User +from modoboa.extensions.admin.exceptions import AdminError +from .base import DatesAware +from .domain import Domain + + +class Mailbox(DatesAware): + address = models.CharField( + ugettext_lazy('address'), max_length=252, + help_text=ugettext_lazy("Mailbox address (without the @domain.tld part)") + ) + quota = models.PositiveIntegerField() + use_domain_quota = models.BooleanField(default=False) + domain = models.ForeignKey(Domain) + user = models.ForeignKey(User) + + class Meta: + permissions = ( + ("view_mailboxes", "View mailboxes"), + ) + + def __init__(self, *args, **kwargs): + super(Mailbox, self).__init__(*args, **kwargs) + self.__mail_home = None + + def __str__(self): + return self.full_address + + def __full_address(self, localpart): + return "%s@%s" % (localpart, self.domain.name) + + @property + def full_address(self): + return self.__full_address(self.address) + + @property + def enabled(self): + return self.user.is_active + + @property + def alias_count(self): + return self.alias_set.count() + + @property + def mail_home(self): + """ + + """ + hm = parameters.get_admin("HANDLE_MAILBOXES", raise_error=False) + if hm is None or hm == "no": + return None + if self.__mail_home is None: + code, output = exec_cmd("doveadm user %s -f home" % self.full_address, + sudo_user=parameters.get_admin("MAILBOXES_OWNER")) + if code: + raise AdminError(_("Failed to retrieve mailbox location (%s)" % output)) + self.__mail_home = output.strip() + return self.__mail_home + + def rename_dir(self, old_mail_home): + hm = parameters.get_admin("HANDLE_MAILBOXES", raise_error=False) + if hm is None or hm == "no": + return + self.__mail_home = None + if not os.path.exists(old_mail_home): + return + code, output = exec_cmd( + "mv %s %s" % (old_mail_home, self.mail_home), + sudo_user=parameters.get_admin("MAILBOXES_OWNER") + ) + if code: + raise AdminError(_("Failed to rename mailbox: %s" % output)) + + def rename(self, address, domain): + """Rename the mailbox + + :param string address: the new mailbox's address (local part) + :param Domain domain: the new mailbox's domain + """ + old_mail_home = self.mail_home + qs = Quota.objects.filter(username=self.full_address) + self.address = address + self.domain = domain + self.rename_dir(old_mail_home) + qs.update(username=self.full_address) + + def delete_dir(self): + hm = parameters.get_admin("HANDLE_MAILBOXES", raise_error=False) + if hm is None or hm == "no": + return + if not os.path.exists(self.mail_home): + return + code, output = exec_cmd( + "rm -r %s" % self.mail_home, + sudo_user=parameters.get_admin("MAILBOXES_OWNER") + ) + if code: + raise AdminError(_("Failed to remove mailbox: %s" % output)) + + def set_quota(self, value=None, override_rules=False): + """Set or update quota's value for this mailbox. + + :param integer value: the quota's value + :param bool override_rules: allow to override defined quota rules + """ + if value is None: + if self.use_domain_quota: + self.quota = self.domain.quota + else: + self.quota = 0 + elif int(value) > self.domain.quota and not override_rules: + raise AdminError( + _("Quota is greater than the allowed domain's limit (%dM)" % self.domain.quota) + ) + else: + self.quota = value + if not self.quota and not override_rules: + raise AdminError(_("A quota is required")) + + def get_quota(self): + q = Quota.objects.get(username=self.full_address) + return int(q.bytes / 1048576) + + def get_quota_in_percent(self): + if not self.quota: + return 0 + q = Quota.objects.get(username=self.full_address) + return int(q.bytes / float(self.quota * 1048576) * 100) + + def post_create(self, creator): + from modoboa.lib.permissions import grant_access_to_object + grant_access_to_object(creator, self, True) + events.raiseEvent("CreateMailbox", creator, self) + if creator.is_superuser and not self.user.has_perm("admin.add_domain"): + # A super user is creating a new mailbox. Give + # access to that mailbox (and the associated + # account) to the appropriate domain admins, + # except if the new account has a more important + # role (SuperAdmin, Reseller) + for admin in self.domain.admins: + grant_access_to_object(admin, self) + grant_access_to_object(admin, self.user) + + def save(self, *args, **kwargs): + if "creator" in kwargs: + creator = kwargs["creator"] + del kwargs["creator"] + else: + creator = None + super(Mailbox, self).save(*args, **kwargs) + if creator is not None: + self.post_create(creator) + try: + q = self.quota_value + except Quota.DoesNotExist: + Quota.objects.create(mbox=self, username=self.full_address) + + def delete(self, keepdir=False): + """Custom delete method + + We try to delete the associated quota in the same time (it may + has already been removed if we're deleting a domain). + + :param bool keepdir: delete the mailbox home dir on the filesystem or not + """ + try: + q = Quota.objects.get(username=self.full_address) + except Quota.DoesNotExist: + pass + else: + q.delete() + if not keepdir: + self.delete_dir() + super(Mailbox, self).delete() + +reversion.register(Mailbox) + + +@receiver(pre_delete, sender=Mailbox) +def mailbox_deleted_handler(sender, **kwargs): + """``Mailbox`` pre_delete signal receiver + + In order to properly handle deletions (ie. we don't want to leave + orphan records into the db), we define this custom receiver. + + It manually removes the mailbox from the aliases it is linked to + and then remove all empty aliases. + """ + from modoboa.lib.permissions import ungrant_access_to_object + + mb = kwargs['instance'] + events.raiseEvent("DeleteMailbox", mb) + ungrant_access_to_object(mb) + for alias in mb.alias_set.all(): + alias.mboxes.remove(mb) + if alias.mboxes.count() == 0: + alias.delete() + + +class Quota(models.Model): + username = models.EmailField(primary_key=True, max_length=254) + bytes = models.BigIntegerField(default=0) + messages = models.IntegerField(default=0) + + mbox = models.OneToOneField(Mailbox, related_name="quota_value", null=True) diff --git a/modoboa/admin/static/admin/css/admin.css b/modoboa/extensions/admin/static/admin/css/admin.css similarity index 100% rename from modoboa/admin/static/admin/css/admin.css rename to modoboa/extensions/admin/static/admin/css/admin.css diff --git a/modoboa/admin/static/admin/css/settings.css b/modoboa/extensions/admin/static/admin/css/settings.css similarity index 100% rename from modoboa/admin/static/admin/css/settings.css rename to modoboa/extensions/admin/static/admin/css/settings.css diff --git a/modoboa/admin/static/admin/js/admin.js b/modoboa/extensions/admin/static/admin/js/admin.js similarity index 100% rename from modoboa/admin/static/admin/js/admin.js rename to modoboa/extensions/admin/static/admin/js/admin.js diff --git a/modoboa/admin/tables.py b/modoboa/extensions/admin/tables.py similarity index 84% rename from modoboa/admin/tables.py rename to modoboa/extensions/admin/tables.py index 3be7b989a..6ab552161 100644 --- a/modoboa/admin/tables.py +++ b/modoboa/extensions/admin/tables.py @@ -1,7 +1,8 @@ # coding: utf-8 from django.utils.translation import ugettext as _, ugettext_lazy from modoboa.lib import tables -from templatetags.admin_extras import * +from templatetags.admin_tags import domain_actions + class DomainsTable(tables.Table): tableid = "objects_table" @@ -9,8 +10,8 @@ class DomainsTable(tables.Table): styles = "table" name = tables.LinkColumn( - "name", label=ugettext_lazy("Name"), - urlpattern="modoboa.admin.views.editdomain", + "name", label=ugettext_lazy("Name"), + urlpattern="modoboa.extensions.admin.views.domain.editdomain", title=_("Edit domain"), modal=True, modalcb="admin.domainform_cb", sortable=True, sort_order="name" ) @@ -18,7 +19,7 @@ class DomainsTable(tables.Table): "domainalias_set", label=ugettext_lazy("Alias(es)"), safe=True, sortable=True, sort_order="domainalias__name" ) - actions = tables.ActionColumn("actions", label=ugettext_lazy("Actions"), + actions = tables.ActionColumn("actions", label=ugettext_lazy("Actions"), defvalue=domain_actions) cols_order = ["name", "domaliases", "actions"] @@ -27,7 +28,6 @@ class DomainsTable(tables.Table): super(DomainsTable, self).__init__(request) self.populate(self._rows_from_model(doms)) - def parse_domainalias_set(self, aliases): if not len(aliases.all()): return "---" @@ -41,11 +41,14 @@ class DomainsTable(tables.Table): return "muted" return "" + class ExtensionsTable(tables.Table): idkey = "id" selection = tables.SelectionColumn("selection", width="4%", header=False) label = tables.Column("label", label=ugettext_lazy("Name"), width="15%") - version = tables.Column("version", label=ugettext_lazy("Version"), width="6%") + version = tables.Column( + "version", label=ugettext_lazy("Version"), width="6%" + ) descr = tables.Column("description", label=ugettext_lazy("Description")) - + cols_order = ["selection", "label", "version", "descr"] diff --git a/modoboa/admin/templates/admin/dlistform.html b/modoboa/extensions/admin/templates/admin/dlistform.html similarity index 100% rename from modoboa/admin/templates/admin/dlistform.html rename to modoboa/extensions/admin/templates/admin/dlistform.html diff --git a/modoboa/admin/templates/admin/domain_general_form.html b/modoboa/extensions/admin/templates/admin/domain_general_form.html similarity index 100% rename from modoboa/admin/templates/admin/domain_general_form.html rename to modoboa/extensions/admin/templates/admin/domain_general_form.html diff --git a/modoboa/admin/templates/admin/domain_options_form.html b/modoboa/extensions/admin/templates/admin/domain_options_form.html similarity index 100% rename from modoboa/admin/templates/admin/domain_options_form.html rename to modoboa/extensions/admin/templates/admin/domain_options_form.html diff --git a/modoboa/admin/templates/admin/domains.html b/modoboa/extensions/admin/templates/admin/domains.html similarity index 79% rename from modoboa/admin/templates/admin/domains.html rename to modoboa/extensions/admin/templates/admin/domains.html index a4b05f1e1..c9c1cd418 100644 --- a/modoboa/admin/templates/admin/domains.html +++ b/modoboa/extensions/admin/templates/admin/domains.html @@ -1,4 +1,4 @@ -{% extends "admin/listing.html" %}{% load i18n admin_extras libextras %} +{% extends "admin/listing.html" %}{% load i18n admin_tags libextras %} {% block pagetitle %}{% trans "Domains" %}{% endblock %} {% block html_head %} {{ block.super }} diff --git a/modoboa/admin/templates/admin/editdomainform.html b/modoboa/extensions/admin/templates/admin/editdomainform.html similarity index 100% rename from modoboa/admin/templates/admin/editdomainform.html rename to modoboa/extensions/admin/templates/admin/editdomainform.html diff --git a/modoboa/admin/templates/admin/extensions.html b/modoboa/extensions/admin/templates/admin/extensions.html similarity index 100% rename from modoboa/admin/templates/admin/extensions.html rename to modoboa/extensions/admin/templates/admin/extensions.html diff --git a/modoboa/admin/templates/admin/header.html b/modoboa/extensions/admin/templates/admin/header.html similarity index 100% rename from modoboa/admin/templates/admin/header.html rename to modoboa/extensions/admin/templates/admin/header.html diff --git a/modoboa/admin/templates/admin/identities.html b/modoboa/extensions/admin/templates/admin/identities.html similarity index 60% rename from modoboa/admin/templates/admin/identities.html rename to modoboa/extensions/admin/templates/admin/identities.html index 3c120f874..e19b57331 100644 --- a/modoboa/admin/templates/admin/identities.html +++ b/modoboa/extensions/admin/templates/admin/identities.html @@ -1,23 +1,23 @@ -{% extends "admin/listing.html" %}{% load admin_extras libextras i18n %}{% load url from future %} +{% extends "admin/listing.html" %}{% load admin_tags libextras i18n %}{% load url from future %} {% block pagetitle %}{% trans "Identities" %}{% endblock %} {% block html_head %} {{ block.super }} - - - - -{% endblock %} -{% block leftcol %}
{% settings_menu left_selection user %}
{% endblock %} -{% block apparea %}
{% endblock %} diff --git a/modoboa/extensions/admin/templatetags/admin_tags.py b/modoboa/extensions/admin/templatetags/admin_tags.py index 3a13c4fe7..2cc789343 100644 --- a/modoboa/extensions/admin/templatetags/admin_tags.py +++ b/modoboa/extensions/admin/templatetags/admin_tags.py @@ -106,19 +106,19 @@ def identities_menu(user): @register.simple_tag def domain_actions(user, domid): - from modoboa.admin.models import Domain + from modoboa.extensions.admin.models import Domain domain = Domain.objects.get(pk=domid) actions = [ {"name": "listidentities", - "url": reverse("modoboa.admin.views.identities") + "#list/?searchquery=@%s" % domain.name, + "url": reverse("modoboa.extensions.admin.views.identity.identities") + "#list/?searchquery=@%s" % domain.name, "title": _("View the domain's identities"), "img": "icon-user"} ] if user.has_perm("admin.delete_domain"): actions.append({ "name": "deldomain", - "url": reverse("modoboa.admin.views.deldomain", args=[domid]), + "url": reverse("modoboa.extensions.admin.views.domain.deldomain", args=[domid]), "title": _("Delete the domain"), "img": "icon-trash" }) @@ -132,72 +132,78 @@ def identity_actions(user, ident): if name == "User": actions = events.raiseQueryEvent("ExtraAccountActions", ident) actions += [ - {"name" : "delaccount", - "url" : reverse("modoboa.admin.views.delaccount", args=[objid]), - "img" : "icon-trash", - "title" : _("Delete this account")}, - ] + {"name": "delaccount", + "url": reverse("modoboa.extensions.admin.views.identity.delaccount", args=[objid]), + "img": "icon-trash", + "title": _("Delete this account")}, + ] else: if ident.get_recipients_count() >= 2: actions = [ - {"name" : "deldlist", - "url" : reverse("modoboa.admin.views.deldlist") + "?selection=%s" % objid, - "img" : "icon-trash", - "title" : _("Delete this distribution list")}, - ] + {"name": "deldlist", + "url": reverse("modoboa.extensions.admin.views.alias.deldlist") + "?selection=%s" % objid, + "img": "icon-trash", + "title": _("Delete this distribution list")}, + ] elif ident.extmboxes != "": actions = [ - {"name" : "delforward", - "url" : reverse("modoboa.admin.views.delforward") + "?selection=%s" % objid, - "img" : "icon-trash", - "title" : _("Delete this forward")}, - ] + {"name": "delforward", + "url": reverse("modoboa.extensions.admin.views.alias.delforward") + "?selection=%s" % objid, + "img": "icon-trash", + "title": _("Delete this forward")}, + ] else: actions = [ - {"name" : "delalias", - "url" : reverse("modoboa.admin.views.delalias") + "?selection=%s" % objid, - "img" : "icon-trash", - "title" : _("Delete this alias")}, - ] + {"name": "delalias", + "url": reverse("modoboa.extensions.admin.views.alias.delalias") + "?selection=%s" % objid, + "img": "icon-trash", + "title": _("Delete this alias")}, + ] return render_actions(actions) @register.simple_tag def identity_modify_link(identity, active_tab='default'): - linkdef = {"label" : identity.identity, "modal" : True} + linkdef = {"label": identity.identity, "modal": True} if identity.__class__.__name__ == "User": - linkdef["url"] = reverse("modoboa.admin.views.editaccount", args=[identity.id]) + linkdef["url"] = reverse( + "modoboa.extensions.admin.views.identity.editaccount", + args=[identity.id] + ) linkdef["url"] += "?active_tab=%s" % active_tab linkdef["modalcb"] = "admin.editaccount_cb" else: - linkdef["url"] = reverse("modoboa.admin.views.editalias", args=[identity.id]) + linkdef["url"] = reverse( + "modoboa.extensions.admin.views.alias.editalias", + args=[identity.id] + ) linkdef["modalcb"] = "admin.aliasform_cb" return render_link(linkdef) @register.simple_tag def domadmin_actions(daid, domid): - actions = [dict( - name="removeperm", - url=reverse("modoboa.admin.views.remove_permission") + "?domid=%s&daid=%s" % (domid, daid), - img="icon-trash", - title=_("Remove this permission") - )] + actions = [{ + "name": "removeperm", + "url": reverse("modoboa.extensions.admin.views.identity.remove_permission") + "?domid=%s&daid=%s" % (domid, daid), + "img": "icon-trash", + "title": _("Remove this permission") + }] return render_actions(actions) @register.simple_tag def loadadminextmenu(user): menu = events.raiseQueryEvent("AdminMenuDisplay", "admin_menu_box", user) - return render_to_string('common/menulist.html', - {"entries" : menu, "user" : user}) + return render_to_string('common/menulist.html', + {"entries": menu, "user": user}) @register.simple_tag def param(app, definition): name = "%s.%s" % (app, definition["name"]) - value = definition.has_key("value") \ - and definition["value"] or definition["deflt"] + value = definition["value"] \ + if "value" in definition else definition["deflt"] if definition["type"] == "separator": return "
%s
" % (unicode(definition["label"])) @@ -211,8 +217,7 @@ def param(app, definition): result = """
""" % (extratags, name, - definition.has_key("label") and _(definition["label"]) - or definition["name"]) + _(definition["label"]) if "label" in definition else definition["name"]) result += "
" if definition["type"] in ["string", "int"]: @@ -222,7 +227,7 @@ def param(app, definition): if definition["type"] == "text": result += "" \ % (name, name, value) - + if definition["type"] == "list_yesno": for idx, v in enumerate([("yes", _("Yes")), ("no", _("No"))]): checked = "checked" if value == v[0] else "" @@ -230,13 +235,14 @@ def param(app, definition): %(label)s -""" % dict(id="%s_%d" % (name, idx), name=name, value=v[0], label=v[1], checked=checked) +""" % dict(id="%s_%d" % (name, idx), name=name, value=v[0], + label=v[1], checked=checked) if definition["type"] == "list": result += """ """ - if definition.has_key("help"): + if "help" in definition: result += """ """ % (unicode(definition["help"]), _("Help")) @@ -264,7 +270,7 @@ def param(app, definition): @register.filter def gender(value, target): - if genders.has_key(value): + if value in genders: trans = target == "m" and genders[value][0] or genders[value][1] if trans.find("_") == -1: return trans @@ -273,5 +279,7 @@ def gender(value, target): @register.simple_tag def get_extra_admin_content(user, target, currentpage): - res = events.raiseQueryEvent("ExtraAdminContent", user, target, currentpage) + res = events.raiseQueryEvent( + "ExtraAdminContent", user, target, currentpage + ) return "".join(res) diff --git a/modoboa/extensions/admin/tests.py b/modoboa/extensions/admin/tests.py index 60d380a20..514a79f30 100644 --- a/modoboa/extensions/admin/tests.py +++ b/modoboa/extensions/admin/tests.py @@ -15,10 +15,10 @@ from django.test.client import Client from django.utils import simplejson from django.core.urlresolvers import reverse from django.core.files.base import ContentFile -from models import * -from modoboa.admin.lib import * from modoboa.lib import parameters from modoboa.lib.tests import ModoTestCase +from modoboa.extensions.admin.lib import * +from modoboa.extensions.admin.models import * class DomainTestCase(ModoTestCase): diff --git a/modoboa/extensions/admin/urls.py b/modoboa/extensions/admin/urls.py index ccb454700..799d270cf 100644 --- a/modoboa/extensions/admin/urls.py +++ b/modoboa/extensions/admin/urls.py @@ -3,6 +3,7 @@ from django.conf.urls import patterns, url urlpatterns = patterns( 'modoboa.extensions.admin.views.domain', + (r'^$', 'index'), url(r'^domains/$', 'domains', name="domains"), (r'^domains/list/$', '_domains'), (r'^domains/flatlist/$', 'domains_list'), diff --git a/modoboa/extensions/admin/views/domain.py b/modoboa/extensions/admin/views/domain.py index 65a4bd6b9..70e6824ee 100644 --- a/modoboa/extensions/admin/views/domain.py +++ b/modoboa/extensions/admin/views/domain.py @@ -22,13 +22,18 @@ from modoboa.extensions.admin.forms import ( ) +@login_required +def index(request): + return HttpResponseRedirect(reverse(domains)) + + @login_required @user_passes_test( lambda u: u.has_perm("admin.view_domains") or u.has_perm("admin.view_mailboxes") ) def _domains(request): sort_order, sort_dir = get_sort_order(request.GET, "name") - domains = request.user.get_domains() + domains = Domain.objects.get_for_admin(request.user) squery = request.GET.get("searchquery", None) if squery is not None: q = Q(name__contains=squery) @@ -60,7 +65,7 @@ def domains(request, tplname="admin/domains.html"): @login_required @permission_required("admin.add_user") def domains_list(request): - doms = [dom.name for dom in request.user.get_domains()] + doms = [dom.name for dom in Domain.objects.get_for_admin(request.user)] return ajax_simple_response(doms) diff --git a/modoboa/extensions/admin/views/export.py b/modoboa/extensions/admin/views/export.py index 6c238f78d..437e48173 100644 --- a/modoboa/extensions/admin/views/export.py +++ b/modoboa/extensions/admin/views/export.py @@ -8,6 +8,8 @@ from django.utils.translation import ugettext as _, ungettext from django.contrib.auth.decorators import ( login_required, permission_required, user_passes_test ) +from modoboa.extensions.admin.lib import get_identities +from modoboa.extensions.admin.models import Domain from modoboa.extensions.admin.forms import ( ExportIdentitiesForm, ExportDomainsForm ) @@ -45,7 +47,7 @@ def export_identities(request): form.is_valid() fp = cStringIO.StringIO() csvwriter = csv.writer(fp, delimiter=form.cleaned_data["sepchar"]) - for ident in request.user.get_identities(): + for ident in get_identities(request.user): ident.to_csv(csvwriter) content = fp.getvalue() fp.close() @@ -71,7 +73,7 @@ def export_domains(request): form.is_valid() fp = cStringIO.StringIO() csvwriter = csv.writer(fp, delimiter=form.cleaned_data["sepchar"]) - for dom in request.user.get_domains(): + for dom in Domain.objects.get_for_admin(request.user): dom.to_csv(csvwriter) for da in dom.domainalias_set.all(): da.to_csv(csvwriter) diff --git a/modoboa/extensions/admin/views/identity.py b/modoboa/extensions/admin/views/identity.py index edd18d570..8a12954f5 100644 --- a/modoboa/extensions/admin/views/identity.py +++ b/modoboa/extensions/admin/views/identity.py @@ -12,7 +12,10 @@ from modoboa.lib.webutils import ajax_simple_response, _render_to_string from modoboa.lib.formutils import CreationWizard from modoboa.lib.templatetags.libextras import pagination_bar from modoboa.core.models import User -from modoboa.extensions.admin.lib import get_sort_order, get_listing_page +from modoboa.extensions.admin.models import Mailbox +from modoboa.extensions.admin.lib import ( + get_sort_order, get_listing_page, get_identities +) from modoboa.extensions.admin.exceptions import AdminError from modoboa.extensions.admin.forms import ( AccountForm, AccountFormGeneral, AccountFormMail @@ -24,7 +27,7 @@ from modoboa.extensions.admin.forms import ( lambda u: u.has_perm("admin.add_user") or u.has_perm("admin.add_alias") ) def _identities(request): - idents_list = request.user.get_identities(request.GET) + idents_list = get_identities(request.user, request.GET) sort_order, sort_dir = get_sort_order(request.GET, "identity", ["identity", "name_or_rcpt", "tags"]) if sort_order in ["identity", "name_or_rcpt"]: @@ -73,7 +76,9 @@ def list_quotas(request, tplname="admin/quotas.html"): from modoboa.lib.dbutils import db_type sort_order, sort_dir = get_sort_order(request.GET, "address") - mboxes = request.user.get_mailboxes(request.GET.get("searchquery", None)) + mboxes = Mailbox.objects.get_for_admin( + request.user, request.GET.get("searchquery", None) + ) mboxes = mboxes.exclude(quota=0) if sort_order in ["address", "quota", "quota_value__bytes"]: mboxes = mboxes.order_by("%s%s" % (sort_dir, sort_order)) @@ -175,7 +180,7 @@ def editaccount(request, accountid, tplname="common/tabforms.html"): if not request.user.can_access(account): raise PermDeniedException mb = None - if account.has_mailbox: + if account.mailbox_set.count(): mb = account.mailbox_set.all()[0] instances = dict(general=account, mail=mb, perms=account) diff --git a/modoboa/extensions/sievefilters/forms.py b/modoboa/extensions/sievefilters/forms.py index 5ee3724bf..41ef3b16a 100644 --- a/modoboa/extensions/sievefilters/forms.py +++ b/modoboa/extensions/sievefilters/forms.py @@ -5,7 +5,7 @@ from django.forms.widgets import RadioFieldRenderer, RadioSelect, RadioInput from django.utils.safestring import mark_safe from django.utils.html import conditional_escape from django.utils.encoding import force_unicode -from modoboa.admin.templatetags.admin_extras import gender +from modoboa.extensions.admin.templatetags.admin_tags import gender class FiltersSetForm(forms.Form): name = forms.CharField() diff --git a/modoboa/extensions/stats/__init__.py b/modoboa/extensions/stats/__init__.py index acaa695ce..61bb62101 100644 --- a/modoboa/extensions/stats/__init__.py +++ b/modoboa/extensions/stats/__init__.py @@ -22,7 +22,7 @@ class Stats(ModoExtension): def load(self): from app_settings import ParametersForm - events.registerEvent("GetGraphSets") + events.declare(["GetGraphSets"]) parameters.register(ParametersForm, ugettext_lazy("Graphical statistics")) def destroy(self): diff --git a/modoboa/lib/events.py b/modoboa/lib/events.py index ee3a81b8d..a296374cc 100644 --- a/modoboa/lib/events.py +++ b/modoboa/lib/events.py @@ -16,47 +16,27 @@ from django.conf import settings events = [ "CanCreate", - "CreateDomain", - "DomainModified", - "DeleteDomain", - - "DomainAliasCreated", - "DomainAliasDeleted", - - "CreateMailbox", - "DeleteMailbox", - "ModifyMailbox", - - "MailboxAliasCreated", - "MailboxAliasDeleted", - "AccountCreated", "AccountModified", "AccountDeleted", + "AccountExported", + "AccountImported", "PasswordUpdated", "ExtraAccountActions", - + "RoleChanged", + "GetExtraRoles", "PasswordChange", - + "UserMenuDisplay", "AdminMenuDisplay", "GetStaticContent", - "ExtraAccountForm", - "CheckExtraAccountForm", - "FillAccountInstances", - - "ExtraDomainForm", - "FillDomainInstances", - - "GetExtraRoles", - "ExtEnabled", "ExtDisabled", "UserLogin", "UserLogout", - + "GetAnnouncement", "TopNotifications", @@ -64,17 +44,20 @@ events = [ "ExtraUprefsRoutes", "ExtraUprefsJS" - ] +] callbacks = {} -def registerEvent(name): - """Register a new event - :param name: the event's name +def declare(nevents): + """Declare new events + + :param list nevents: a list of event names """ - if not name in events: - events.append(name) + for evt in nevents: + if not evt in events: + events.append(evt) + def register(event, callback): """Register a plugin callback for a specific event @@ -90,10 +73,11 @@ def register(event, callback): if not event in callbacks.keys(): callbacks[event] = {} fullname = "%s.%s" % (callback.__module__, callback.__name__) - if not callbacks[event].has_key(fullname): + if not fullname in callbacks[event]: callbacks[event][fullname] = callback return 1 + class observe(object): """Event observing decorator @@ -111,7 +95,7 @@ class observe(object): """ def __init__(self, *evtnames, **kwargs): self.evtnames = evtnames - if kwargs.has_key("extname"): + if "extname" in kwargs: self.extname = kwargs["extname"] def __guess_extension_name(self, modname): @@ -123,7 +107,9 @@ class observe(object): def __call__(self, f): modname = inspect.getmodule(inspect.stack()[1][0]).__name__ - extname = self.extname if hasattr(self, "extname") else self.__guess_extension_name(modname) + extname = self.extname if hasattr(self, "extname") \ + else self.__guess_extension_name(modname) + @wraps(f) def wrapped_f(*args): if extname: @@ -140,12 +126,12 @@ class observe(object): return [] elif not modname in settings.MODOBOA_APPS: return [] - return f(*args) - - map(lambda evt: register(evt, wrapped_f), self.evtnames) + for evt in self.evtnames: + register(evt, wrapped_f) return wrapped_f + def unregister(event, callback): """Unregister a callback for a specific event @@ -154,7 +140,7 @@ def unregister(event, callback): """ if not event in events: return False - if not callbacks.has_key(event): + if not event in callbacks: return False fullname = "%s.%s" % (callback.__module__, callback.__name__) try: @@ -162,6 +148,7 @@ def unregister(event, callback): except KeyError: pass + def raiseEvent(event, *args): """Raise a specific event @@ -172,10 +159,11 @@ def raiseEvent(event, *args): """ if not event in events or not event in callbacks.keys(): return 0 - for name, callback in callbacks[event].iteritems(): + for callback in callbacks[event].values(): callback(*args) return 1 + def raiseQueryEvent(event, *args): """Raise a specific event and wait for answers from callbacks @@ -187,10 +175,11 @@ def raiseQueryEvent(event, *args): result = [] if not event in events or not event in callbacks.keys(): return result - for name, callback in callbacks[event].iteritems(): + for callback in callbacks[event].values(): result += callback(*args) return result + def raiseDictEvent(event, *args): """Raise a specific event and return result as a dictionnary @@ -203,7 +192,7 @@ def raiseDictEvent(event, *args): result = {} if not event in events or not event in callbacks.keys(): return result - for name, callback in callbacks[event].iteritems(): + for callback in callbacks[event].values(): tmp = callback(*args) for k, v in tmp.iteritems(): result[k] = v diff --git a/modoboa/lib/permissions.py b/modoboa/lib/permissions.py index 0133eb49c..90c0eea9a 100644 --- a/modoboa/lib/permissions.py +++ b/modoboa/lib/permissions.py @@ -7,18 +7,10 @@ from modoboa.core.models import ObjectAccess import events from exceptions import ModoboaException -def get_content_type(obj): - """Simple function that use the right method to retrieve a content type - - :param obj: a django model - :return: a ``ContentType`` object - """ - return obj.get_content_type() if hasattr(obj, "get_content_type") \ - else ContentType.objects.get_for_model(obj) def get_account_roles(user): """Return the list of supported account roles - + This list can be extended by extensions which listen to the ``GetExtraRoles`` event. @@ -32,6 +24,7 @@ def get_account_roles(user): std_roles += events.raiseQueryEvent("GetExtraRoles", user) return sorted(std_roles, key=lambda role: role[1]) + def grant_access_to_object(user, obj, is_owner=False): """Grant access to an object for a given user @@ -48,7 +41,7 @@ def grant_access_to_object(user, obj, is_owner=False): :param obj: an admin. object (Domain, Mailbox, ...) :param is_owner: the user is the unique object's owner """ - ct = get_content_type(obj) + ct = ContentType.objects.get_for_model(obj) try: entry = user.objectaccess_set.get(content_type=ct, object_id=obj.id) entry.is_owner = is_owner @@ -62,7 +55,7 @@ def grant_access_to_object(user, obj, is_owner=False): ObjectAccess.objects.create(user=user, content_type=ct, object_id=obj.id, is_owner=is_owner) if is_owner: - from modoboa.admin.models import User + from modoboa.core.models import User for su in User.objects.filter(is_superuser=True): if su == user: continue @@ -74,6 +67,7 @@ def grant_access_to_object(user, obj, is_owner=False): except IntegrityError, e: raise ModoboaException(_("Failed to grant access (%s)" % str(e))) + def grant_access_to_objects(user, objects, ct): """Grant access to a collection of objects @@ -100,7 +94,7 @@ def ungrant_access_to_object(obj, user=None): :param obj: an object inheriting from ``models.Model`` :param user: a ``User`` object """ - ct = get_content_type(obj) + ct = ContentType.objects.get_for_model(obj) if user: try: ObjectAccess.objects.get(user=user, content_type=ct, object_id=obj.id).delete() @@ -109,22 +103,24 @@ def ungrant_access_to_object(obj, user=None): else: ObjectAccess.objects.filter(content_type=ct, object_id=obj.id).delete() + def ungrant_access_to_objects(objects): """Cancel all accesses for a given objects list :param objects: a list of objects inheriting from ``model.Model`` """ for obj in objects: - ct = get_content_type(obj) + ct = ContentType.objects.get_for_model(obj) ObjectAccess.objects.filter(content_type=ct, object_id=obj.id).delete() + def get_object_owner(obj): """Return the unique owner of this object :param obj: an object inheriting from ``model.Model`` :return: a ``User`` object """ - ct = get_content_type(obj) + ct = ContentType.objects.get_for_model(obj) try: entry = ObjectAccess.objects.get(content_type=ct, object_id=obj.id, is_owner=True) except ObjectAccess.DoesNotExist: From eabe53cea04d6a9a38e25fa84de4616aa216d16c Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Tue, 20 Aug 2013 16:32:39 +0200 Subject: [PATCH 05/97] wip: Big refactoring Limits extension OK. --- modoboa/extensions/admin/views/domain.py | 2 +- modoboa/extensions/admin/views/identity.py | 10 +++---- modoboa/extensions/limits/__init__.py | 33 ++++++++++++++-------- modoboa/extensions/limits/controls.py | 32 ++++++++++++++++----- modoboa/extensions/limits/forms.py | 6 ++-- modoboa/extensions/limits/lib.py | 12 ++------ modoboa/extensions/limits/models.py | 6 ++-- modoboa/extensions/limits/tests.py | 16 ++++++----- 8 files changed, 71 insertions(+), 46 deletions(-) diff --git a/modoboa/extensions/admin/views/domain.py b/modoboa/extensions/admin/views/domain.py index 70e6824ee..1fede9a73 100644 --- a/modoboa/extensions/admin/views/domain.py +++ b/modoboa/extensions/admin/views/domain.py @@ -63,7 +63,7 @@ def domains(request, tplname="admin/domains.html"): @login_required -@permission_required("admin.add_user") +@permission_required("core.add_user") def domains_list(request): doms = [dom.name for dom in Domain.objects.get_for_admin(request.user)] return ajax_simple_response(doms) diff --git a/modoboa/extensions/admin/views/identity.py b/modoboa/extensions/admin/views/identity.py index 8a12954f5..6ca1410f9 100644 --- a/modoboa/extensions/admin/views/identity.py +++ b/modoboa/extensions/admin/views/identity.py @@ -24,7 +24,7 @@ from modoboa.extensions.admin.forms import ( @login_required @user_passes_test( - lambda u: u.has_perm("admin.add_user") or u.has_perm("admin.add_alias") + lambda u: u.has_perm("core.add_user") or u.has_perm("admin.add_alias") ) def _identities(request): idents_list = get_identities(request.user, request.GET) @@ -62,7 +62,7 @@ def identities(request, tplname="admin/identities.html"): @login_required -@permission_required("admin.add_user") +@permission_required("core.add_user") def accounts_list(request): accs = User.objects.filter(is_superuser=False) \ .exclude(groups__name='SimpleUsers') @@ -107,7 +107,7 @@ def list_quotas(request, tplname="admin/quotas.html"): @login_required -@permission_required("admin.add_user") +@permission_required("core.add_user") @transaction.commit_on_success def newaccount(request, tplname='common/wizard_forms.html'): def create_account(steps): @@ -173,7 +173,7 @@ def newaccount(request, tplname='common/wizard_forms.html'): @login_required -@permission_required("admin.change_user") +@permission_required("core.change_user") @transaction.commit_on_success def editaccount(request, accountid, tplname="common/tabforms.html"): account = User.objects.get(pk=accountid) @@ -220,7 +220,7 @@ def editaccount(request, accountid, tplname="common/tabforms.html"): @login_required -@permission_required("admin.delete_user") +@permission_required("core.delete_user") @transaction.commit_on_success def delaccount(request, accountid): keepdir = True if request.POST.get("keepdir", "false") == "true" else False diff --git a/modoboa/extensions/limits/__init__.py b/modoboa/extensions/limits/__init__.py index 1b57fd5b7..657e9a43e 100644 --- a/modoboa/extensions/limits/__init__.py +++ b/modoboa/extensions/limits/__init__.py @@ -10,39 +10,42 @@ from django.contrib.contenttypes.models import ContentType 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 -from models import * -from forms import ResourcePoolForm +from modoboa.core.extensions import ModoExtension, exts_pool +from .forms import ResourcePoolForm import controls import views + class Limits(ModoExtension): name = "limits" label = "Limits" version = "1.0" - description = ugettext_lazy("Per administrator resources to limit the number of objects they can create") + description = ugettext_lazy( + "Per administrator resources to limit the number of objects they can create" + ) def init(self): - from modoboa.admin.models import User, Domain - + from modoboa.core.models import User + from modoboa.extensions.admin.models import Domain + ct = ContentType.objects.get(app_label="admin", model="domain") dagrp = Group.objects.get(name="DomainAdmins") - + grp = Group(name="Resellers") grp.save() grp.permissions.add(*dagrp.permissions.all()) - + ct = ContentType.objects.get_for_model(Permission) for pname in ["view_permissions"]: perm = Permission.objects.get(content_type=ct, codename=pname) grp.permissions.add(perm) - + ct = ContentType.objects.get_for_model(Domain) for pname in ["view_domains", "add_domain", "change_domain", "delete_domain"]: perm = Permission.objects.get(content_type=ct, codename=pname) grp.permissions.add(perm) grp.save() - + for user in User.objects.filter(groups__name='DomainAdmins'): try: controls.create_pool(user) @@ -50,7 +53,7 @@ class Limits(ModoExtension): pass def load(self): - from app_settings import ParametersForm + from modoboa.extensions.limits.app_settings import ParametersForm parameters.register(ParametersForm, ugettext_lazy("Limits")) def destroy(self): @@ -59,12 +62,14 @@ class Limits(ModoExtension): exts_pool.register_extension(Limits) + @events.observe("GetExtraRoles") def get_extra_roles(user): if user.is_superuser: - return [("Resellers", _("Reseller")),] + return [("Resellers", _("Reseller")), ] return [] + @events.observe("ExtraAdminContent") def display_pool_usage(user, target, currentpage): from django.template.loader import render_to_string @@ -82,6 +87,7 @@ def display_pool_usage(user, target, currentpage): return [] return [render_to_string("limits/poolusage.html", dict(limits=limits))] + @events.observe("ExtraAccountForm") def extra_account_form(user, account=None): if not user.group in ["SuperAdmins", "Resellers"]: @@ -95,6 +101,7 @@ def extra_account_form(user, account=None): ) ] + @events.observe("CheckExtraAccountForm") def check_form_access(account, form): if form["id"] != "resources": @@ -104,6 +111,7 @@ def check_form_access(account, form): return [False] return [True] + @events.observe("FillAccountInstances") def fill_account_instances(user, account, instances): if not user.is_superuser and not user.belongs_to_group("Resellers"): @@ -113,6 +121,7 @@ def fill_account_instances(user, account, instances): return instances["resources"] = account + @events.observe("GetStaticContent") def get_static_content(user): if user.group == "SimpleUsers": diff --git a/modoboa/extensions/limits/controls.py b/modoboa/extensions/limits/controls.py index 264cb072e..27c624401 100644 --- a/modoboa/extensions/limits/controls.py +++ b/modoboa/extensions/limits/controls.py @@ -5,15 +5,16 @@ """ from modoboa.lib import events -from lib import * -from models import * from modoboa.lib.permissions import get_object_owner +from .lib import LimitReached +from .models import limits_tpl, LimitsPool + def check_limit(user, lname): """Check if a user has reached a defined limit We check if the user will not reach the given limit after this - creation. + creation. Raise a ``LimitReached`` exception if the limit is reached. @@ -25,12 +26,14 @@ def check_limit(user, lname): except LimitsPool.DoesNotExist: pass + def inc_limit(user, lname): try: user.limitspool.inc_curvalue(lname) except LimitsPool.DoesNotExist: pass + def dec_limit(user, lname): if user is None: return @@ -39,6 +42,7 @@ def dec_limit(user, lname): except LimitsPool.DoesNotExist: pass + def move_pool_resource(owner, user): """Move resource from one pool to another @@ -61,10 +65,12 @@ def move_pool_resource(owner, user): user.limitspool.delete() + @events.observe('CreateDomain') def inc_nb_domains(user, domain): inc_limit(user, 'domains_limit') + @events.observe('DeleteDomain') def dec_nb_domains(domain): owner = get_object_owner(domain) @@ -76,13 +82,15 @@ def dec_nb_domains(domain): for mbalias in domain.alias_set.all(): dec_nb_mbaliases(mbalias) + @events.observe('DomainAliasCreated') def inc_nb_domaliases(user, domalias): inc_limit(user, 'domain_aliases_limit') + @events.observe('DomainAliasDeleted') def dec_nb_domaliases(domainaliases): - from modoboa.admin.models import DomainAlias + from modoboa.extensions.admin.models import DomainAlias if isinstance(domainaliases, DomainAlias): domainaliases = [domainaliases] @@ -90,13 +98,15 @@ def dec_nb_domaliases(domainaliases): owner = get_object_owner(domainalias) dec_limit(owner, 'domain_aliases_limit') + @events.observe('CreateMailbox') def inc_nb_mailboxes(user, mailbox): inc_limit(user, 'mailboxes_limit') + @events.observe('DeleteMailbox') def dec_nb_mailboxes(mailboxes): - from modoboa.admin.models import Mailbox + from modoboa.extensions.admin.models import Mailbox if isinstance(mailboxes, Mailbox): mailboxes = [mailboxes] @@ -104,21 +114,26 @@ def dec_nb_mailboxes(mailboxes): owner = get_object_owner(mailbox) dec_limit(owner, 'mailboxes_limit') + @events.observe('MailboxAliasCreated') def inc_nb_mbaliases(user, mailboxalias): inc_limit(user, 'mailbox_aliases_limit') + @events.observe('MailboxAliasDeleted') def dec_nb_mbaliases(mailboxalias): owner = get_object_owner(mailboxalias) dec_limit(owner, 'mailbox_aliases_limit') + @events.observe('CanCreate') def can_create_new_object(user, objtype): check_limit(user, '%s_limit' % objtype) + @events.observe("AccountCreated") def create_pool(user): + print "pouet" owner = get_object_owner(user) if not owner.is_superuser and \ not owner.belongs_to_group("Resellers"): @@ -133,9 +148,10 @@ def create_pool(user): p.save() p.create_limits() + @events.observe("AccountModified") def on_account_modified(old, new): - """Update limits when roles are updated""" + """Update limits when roles are updated""" owner = get_object_owner(old) if owner.group not in ["SuperAdmins", "Resellers"]: # Domain admins can't change the role so nothing to check. @@ -158,13 +174,15 @@ def on_account_modified(old, new): if new.group != "DomainAdmins": dec_limit(owner, 'domain_admins_limit') return - + if new.group == "DomainAdmins": check_limit(owner, 'domain_admins_limit') inc_limit(owner, 'domain_admins_limit') + @events.observe("AccountDeleted") def on_account_deleted(account): + print "del" owner = get_object_owner(account) if not owner.group in ["SuperAdmins", "Resellers"]: return diff --git a/modoboa/extensions/limits/forms.py b/modoboa/extensions/limits/forms.py index 432a5c287..8a5ac4fcf 100644 --- a/modoboa/extensions/limits/forms.py +++ b/modoboa/extensions/limits/forms.py @@ -1,10 +1,10 @@ # coding: utf-8 from django import forms -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import ugettext as _, ugettext_lazy from modoboa.lib import parameters -from models import * -from lib import * +from .models import limits_tpl +from .lib import BadLimitValue, UnsufficientResource class ResourcePoolForm(forms.Form): diff --git a/modoboa/extensions/limits/lib.py b/modoboa/extensions/limits/lib.py index fb71a5706..4fd916cf8 100644 --- a/modoboa/extensions/limits/lib.py +++ b/modoboa/extensions/limits/lib.py @@ -8,6 +8,7 @@ from django.contrib.auth.models import Group from django.utils.translation import ugettext as _ from modoboa.lib.exceptions import ModoboaException + class LimitReached(ModoboaException): def __init__(self, limit): self.limit = limit @@ -15,6 +16,7 @@ class LimitReached(ModoboaException): def __str__(self): return _("%s: limit reached") % self.limit.label + class UnsufficientResource(ModoboaException): def __init__(self, limit): self.limit = limit @@ -22,14 +24,6 @@ class UnsufficientResource(ModoboaException): def __str__(self): return _("Not enough resources") + class BadLimitValue(ModoboaException): pass - -def is_reseller(user): - """Tell if a user is a reseller or not - - :param user: a User object - :return: True if the user is a reseller, False otherwise. - """ - grp = Group.objects.get(name="Resellers") - return grp in user.groups.all() diff --git a/modoboa/extensions/limits/models.py b/modoboa/extensions/limits/models.py index 87b00f999..14b27ef74 100644 --- a/modoboa/extensions/limits/models.py +++ b/modoboa/extensions/limits/models.py @@ -4,7 +4,7 @@ from django.db import models from django.contrib.contenttypes import generic from django.utils.translation import ugettext as _, ugettext_lazy from modoboa.lib import parameters -from modoboa.admin.models import User +from modoboa.core.models import User from django.conf import settings limits_tpl = [ @@ -13,7 +13,8 @@ limits_tpl = [ ("domain_aliases_limit", ugettext_lazy("Domain aliases")), ("mailboxes_limit", ugettext_lazy("Mailboxes")), ("mailbox_aliases_limit", ugettext_lazy("Mailbox aliases")) - ] +] + class LimitsPool(models.Model): user = models.OneToOneField(settings.AUTH_USER_MODEL) @@ -74,6 +75,7 @@ class LimitsPool(models.Model): except Limit.DoesNotExist: return None + class Limit(models.Model): name = models.CharField(max_length=255) curvalue = models.IntegerField(default=0) diff --git a/modoboa/extensions/limits/tests.py b/modoboa/extensions/limits/tests.py index 87fb27c32..0c599de10 100644 --- a/modoboa/extensions/limits/tests.py +++ b/modoboa/extensions/limits/tests.py @@ -1,6 +1,6 @@ from django.core.urlresolvers import reverse from modoboa.lib.tests import ExtTestCase -from modoboa.admin.models import User +from modoboa.core.models import User class PermissionsTestCase(ExtTestCase): @@ -21,9 +21,11 @@ class PermissionsTestCase(ExtTestCase): account = User.objects.get(username="reseller@test.com") self.clt.logout() self.clt.login(username="admin@test.com", password="toto") - self.check_ajax_get(reverse("modoboa.admin.views.delaccount", args=[account.id]), {}, - status="ko", respmsg="Permission denied") - self.check_ajax_get(reverse("modoboa.admin.views.delaccount", args=[4]), {}, - status="ko", respmsg="Permission denied") - - + self.check_ajax_get( + reverse("modoboa.extensions.admin.views.identity.delaccount", args=[account.id]), + {}, status="ko", respmsg="Permission denied" + ) + self.check_ajax_get( + reverse("modoboa.extensions.admin.views.identity.delaccount", args=[4]), + {}, status="ko", respmsg="Permission denied" + ) From 3b3a2017e6866a60761ebd5fe1f451bcf6838828 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Tue, 20 Aug 2013 16:53:40 +0200 Subject: [PATCH 06/97] wip: Big refactoring autoreply extension OK. --- modoboa/extensions/admin/lib.py | 18 ++++++++++++++ .../extensions/postfix_autoreply/__init__.py | 17 ++++++------- modoboa/extensions/postfix_autoreply/forms.py | 13 +++++----- .../management/commands/autoreply.py | 9 +++---- .../extensions/postfix_autoreply/models.py | 24 +++++++++++++------ modoboa/extensions/postfix_autoreply/views.py | 15 +++++------- modoboa/lib/decorators.py | 22 ----------------- modoboa/lib/exceptions.py | 6 ++--- modoboa/urls.py | 8 ++++++- 9 files changed, 71 insertions(+), 61 deletions(-) delete mode 100644 modoboa/lib/decorators.py diff --git a/modoboa/extensions/admin/lib.py b/modoboa/extensions/admin/lib.py index e6c338228..8fbdfd7ca 100644 --- a/modoboa/extensions/admin/lib.py +++ b/modoboa/extensions/admin/lib.py @@ -1,13 +1,31 @@ # coding: utf-8 +from functools import wraps from django.db.models import Q from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger from django.contrib.contenttypes.models import ContentType from modoboa.core.models import User from modoboa.lib import parameters +from modoboa.lib.exceptions import ModoboaException from modoboa.lib.emailutils import split_mailbox from modoboa.extensions.admin.models import Alias +def needs_mailbox(): + """Check if the current user owns at least one mailbox + + Some applications (the webmail for example) need a mailbox to + work. + """ + def decorator(f): + @wraps(f) + def wrapped_f(request, *args, **kwargs): + if request.user.mailbox_set.count(): + return f(request, *args, **kwargs) + raise ModoboaException() + return wrapped_f + return decorator + + def get_sort_order(qdict, default, allowed_values=None): """Return a sort order from a querydict object diff --git a/modoboa/extensions/postfix_autoreply/__init__.py b/modoboa/extensions/postfix_autoreply/__init__.py index 8ef596627..ff8dd915c 100644 --- a/modoboa/extensions/postfix_autoreply/__init__.py +++ b/modoboa/extensions/postfix_autoreply/__init__.py @@ -9,8 +9,8 @@ functionality into Postfix. from django.core.urlresolvers import reverse from django.utils.translation import ugettext as _, ugettext_lazy from modoboa.lib import events, parameters -from modoboa.extensions import ModoExtension, exts_pool -from models import * +from modoboa.core.extensions import ModoExtension, exts_pool +from .models import Transport, Alias class PostfixAutoreply(ModoExtension): @@ -20,7 +20,7 @@ class PostfixAutoreply(ModoExtension): description = ugettext_lazy("Auto-reply (vacation) functionality using Postfix") def init(self): - from modoboa.admin.models import Domain + from modoboa.extensions.admin.models import Domain for dom in Domain.objects.all(): try: @@ -37,7 +37,7 @@ class PostfixAutoreply(ModoExtension): onCreateMailbox(None, mb) def load(self): - from app_settings import ParametersForm + from modoboa.extensions.postfix_autoreply.app_settings import ParametersForm parameters.register(ParametersForm, ugettext_lazy("Automatic replies")) def destroy(self): @@ -54,7 +54,8 @@ exts_pool.register_extension(PostfixAutoreply) @events.observe("ExtraUprefsRoutes") def extra_routes(): - return [(r'^autoreply/$', 'modoboa.extensions.postfix_autoreply.views.autoreply'),] + return [(r'^user/autoreply/$', + 'modoboa.extensions.postfix_autoreply.views.autoreply'), ] @events.observe("ExtraUprefsJS") @@ -62,7 +63,7 @@ def extra_js(user): return ["""function autoreply_cb() { $('#id_untildate').datepicker({format: 'yyyy-mm-dd', language: '%s'}); } -""" % parameters.get_user(user, "LANG", app="general") +""" % parameters.get_user(user, "LANG", app="core") ] @@ -70,7 +71,7 @@ def extra_js(user): def menu(target, user): if target != "uprefs_menu": return [] - if not user.has_mailbox: + if not user.mailbox_set.count(): return [] return [ {"name": "autoreply", @@ -105,7 +106,7 @@ def onCreateMailbox(user, mailbox): @events.observe("DeleteMailbox") def onDeleteMailbox(mailboxes): - from modoboa.admin.models import Mailbox + from modoboa.extensions.admin.models import Mailbox if isinstance(mailboxes, Mailbox): mailboxes = [mailboxes] diff --git a/modoboa/extensions/postfix_autoreply/forms.py b/modoboa/extensions/postfix_autoreply/forms.py index 4c4420a81..baeaa94b9 100644 --- a/modoboa/extensions/postfix_autoreply/forms.py +++ b/modoboa/extensions/postfix_autoreply/forms.py @@ -1,20 +1,21 @@ # coding: utf-8 -from django import forms -from models import ARmessage -from django.utils.translation import ugettext as _, ugettext_lazy import datetime +from django import forms +from django.utils.translation import ugettext as _, ugettext_lazy +from .models import ARmessage + class ARmessageForm(forms.ModelForm): untildate = forms.DateField( - label=ugettext_lazy('Until'), + label=ugettext_lazy('Until'), required=False, help_text=ugettext_lazy("Activate your auto reply until this date") - ) + ) class Meta: model = ARmessage fields = ('subject', 'content', 'enabled') - + def __init__(self, *args, **kwargs): super(ARmessageForm, self).__init__(*args, **kwargs) self.fields.keyOrder = ['subject', 'content', 'untildate', 'enabled'] diff --git a/modoboa/extensions/postfix_autoreply/management/commands/autoreply.py b/modoboa/extensions/postfix_autoreply/management/commands/autoreply.py index ed189fef4..0ef5d35b3 100644 --- a/modoboa/extensions/postfix_autoreply/management/commands/autoreply.py +++ b/modoboa/extensions/postfix_autoreply/management/commands/autoreply.py @@ -6,10 +6,11 @@ from django.core.management.base import BaseCommand, CommandError from django.utils import timezone from modoboa.lib import parameters from modoboa.lib.emailutils import split_mailbox, sendmail_simple -from modoboa.admin.models import Mailbox +from modoboa.extensions.admin.models import Mailbox from modoboa.extensions.postfix_autoreply import PostfixAutoreply from modoboa.extensions.postfix_autoreply.models import ARmessage, ARhistoric + def send_autoreply(sender, mailbox, armessage): if armessage.untildate is not None \ and armessage.untildate < datetime.date.today(): @@ -20,10 +21,10 @@ def send_autoreply(sender, mailbox, armessage): try: lastar = ARhistoric.objects.get(armessage=armessage.id, sender=sender) PostfixAutoreply().load() - timeout = parameters.get_admin("AUTOREPLIES_TIMEOUT", + timeout = parameters.get_admin("AUTOREPLIES_TIMEOUT", app="postfix_autoreply") delta = datetime.timedelta(seconds=int(timeout)) - now = timezone.make_aware(datetime.datetime.now(), + now = timezone.make_aware(datetime.datetime.now(), timezone.get_default_timezone()) if lastar.last_sent + delta > now: sys.exit(0) @@ -34,7 +35,7 @@ def send_autoreply(sender, mailbox, armessage): sendmail_simple(mailbox.user.encoded_address, sender, armessage.subject, armessage.content.encode('utf-8')) - + lastar.last_sent = datetime.datetime.now() lastar.save() diff --git a/modoboa/extensions/postfix_autoreply/models.py b/modoboa/extensions/postfix_autoreply/models.py index 5381f6a19..5eaaf9e31 100644 --- a/modoboa/extensions/postfix_autoreply/models.py +++ b/modoboa/extensions/postfix_autoreply/models.py @@ -1,25 +1,35 @@ from django.db import models from django.utils.translation import ugettext_lazy as _ -from modoboa.admin.models import Domain, Mailbox +from modoboa.extensions.admin.models import Domain, Mailbox + class Transport(models.Model): domain = models.CharField(max_length=300) method = models.CharField(max_length=255) + class Alias(models.Model): full_address = models.CharField(max_length=255) autoreply_address = models.CharField(max_length=255) + class ARmessage(models.Model): mbox = models.ForeignKey(Mailbox) - subject = models.CharField(_('subject'), max_length=255, - help_text=_("The subject that will appear in sent emails")) - content = models.TextField(_('content'), - help_text=_("The content that will appear in sent emails")) - enabled = models.BooleanField(_('enabled'), - help_text=_("Activate/Deactivate your auto reply")) + subject = models.CharField( + _('subject'), max_length=255, + help_text=_("The subject that will appear in sent emails") + ) + content = models.TextField( + _('content'), + help_text=_("The content that will appear in sent emails") + ) + enabled = models.BooleanField( + _('enabled'), + help_text=_("Activate/Deactivate your auto reply") + ) untildate = models.DateField() + class ARhistoric(models.Model): armessage = models.ForeignKey(ARmessage) last_sent = models.DateTimeField(auto_now=True) diff --git a/modoboa/extensions/postfix_autoreply/views.py b/modoboa/extensions/postfix_autoreply/views.py index 8fa347d4b..2766d533e 100644 --- a/modoboa/extensions/postfix_autoreply/views.py +++ b/modoboa/extensions/postfix_autoreply/views.py @@ -1,17 +1,14 @@ # coding: utf-8 from datetime import date -from django.http import HttpResponse -from django.contrib.auth.decorators \ - import login_required -from django.contrib import messages -from django.core.urlresolvers import reverse +from django.contrib.auth.decorators import login_required from django.utils.translation import ugettext as _ from modoboa.lib.webutils import ( - ajax_simple_response, ajax_response, _render_to_string + ajax_simple_response, _render_to_string ) -from modoboa.lib.decorators import needs_mailbox -from forms import * -from models import * +from modoboa.extensions.admin.lib import needs_mailbox +from modoboa.extensions.admin.models import Mailbox +from .forms import ARmessageForm +from .models import ARmessage @login_required diff --git a/modoboa/lib/decorators.py b/modoboa/lib/decorators.py deleted file mode 100644 index 4dba8f235..000000000 --- a/modoboa/lib/decorators.py +++ /dev/null @@ -1,22 +0,0 @@ -# coding: utf-8 -""" -:mod:`decorators` --- common decorators ---------------------------------------- -""" -from functools import wraps -from exceptions import NeedsMailboxException - -def needs_mailbox(): - """Check if the current user owns at least one mailbox - - Some applications (the webmail for example) need a mailbox to - work. - """ - def decorator(f): - @wraps(f) - def wrapped_f(request, *args, **kwargs): - if request.user.has_mailbox: - return f(request, *args, **kwargs) - raise NeedsMailboxException() - return wrapped_f - return decorator diff --git a/modoboa/lib/exceptions.py b/modoboa/lib/exceptions.py index 39505abf0..026b72bd7 100644 --- a/modoboa/lib/exceptions.py +++ b/modoboa/lib/exceptions.py @@ -6,9 +6,11 @@ """ from django.utils.translation import ugettext as _ + class ModoboaException(Exception): pass + class PermDeniedException(ModoboaException): def __init__(self, msg=None): self.msg = msg @@ -17,7 +19,3 @@ class PermDeniedException(ModoboaException): if self.msg: return _("Permission denied: %s" % self.msg) return _("Permission denied") - -class NeedsMailboxException(ModoboaException): - pass - diff --git a/modoboa/urls.py b/modoboa/urls.py index d929f9195..8c85d6060 100644 --- a/modoboa/urls.py +++ b/modoboa/urls.py @@ -1,7 +1,7 @@ from django.conf.urls import patterns, include, url from django.conf import settings from modoboa.core.extensions import exts_pool -from modoboa.lib import parameters +from modoboa.lib import parameters, events from modoboa.core import load_settings load_settings() @@ -25,7 +25,13 @@ urlpatterns = patterns('', (r'^user/$', 'modoboa.core.views.user.index'), (r'^user/preferences/$', 'modoboa.core.views.user.preferences'), (r'^user/profile/$', 'modoboa.core.views.user.profile'), +) +urlpatterns += patterns('', + *events.raiseQueryEvent("ExtraUprefsRoutes") +) + +urlpatterns += patterns('', *exts_pool.load_all() ) From c28f635db2da23c8f9be25e3cd9a93750802915d Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Thu, 22 Aug 2013 16:48:07 +0200 Subject: [PATCH 07/97] wip: big refactoring stats extension OK. --- modoboa/core/models.py | 1 + modoboa/extensions/stats/__init__.py | 10 +-- modoboa/extensions/stats/graph_templates.py | 47 ++++++++------ modoboa/extensions/stats/grapher.py | 57 +++++++++-------- .../stats/management/commands/logparser.py | 35 +++++----- .../stats/templates/stats/index.html | 2 +- modoboa/extensions/stats/views.py | 64 +++++++++++-------- 7 files changed, 119 insertions(+), 97 deletions(-) diff --git a/modoboa/core/models.py b/modoboa/core/models.py index ccfc3624e..d4e4b277d 100644 --- a/modoboa/core/models.py +++ b/modoboa/core/models.py @@ -19,6 +19,7 @@ from django.contrib.auth.models import ( from django.contrib.contenttypes.models import ContentType from modoboa.lib import events, md5crypt, parameters from modoboa.lib.exceptions import PermDeniedException +from modoboa.lib.sysutils import exec_cmd from modoboa.core.extensions import exts_pool from modoboa.core.exceptions import AdminError diff --git a/modoboa/extensions/stats/__init__.py b/modoboa/extensions/stats/__init__.py index 61bb62101..7197cc01c 100644 --- a/modoboa/extensions/stats/__init__.py +++ b/modoboa/extensions/stats/__init__.py @@ -10,7 +10,7 @@ sent, received, bounced, rejected from django.core.urlresolvers import reverse from django.utils.translation import ugettext as _, ugettext_lazy from modoboa.lib import events, parameters -from modoboa.extensions import ModoExtension, exts_pool +from modoboa.core.extensions import ModoExtension, exts_pool class Stats(ModoExtension): @@ -21,9 +21,11 @@ class Stats(ModoExtension): needs_media = True def load(self): - from app_settings import ParametersForm + from modoboa.extensions.stats.app_settings import ParametersForm events.declare(["GetGraphSets"]) - parameters.register(ParametersForm, ugettext_lazy("Graphical statistics")) + parameters.register( + ParametersForm, ugettext_lazy("Graphical statistics") + ) def destroy(self): events.unregister("AdminMenuDisplay", menu) @@ -44,7 +46,7 @@ def menu(target, user): @events.observe("GetGraphSets") def get_default_graph_sets(): - from graph_templates import MailTraffic + from modoboa.extensions.stats.graph_templates import MailTraffic gset = MailTraffic() return {gset.html_id: gset} diff --git a/modoboa/extensions/stats/graph_templates.py b/modoboa/extensions/stats/graph_templates.py index 5350a4c0d..cbe8ab161 100644 --- a/modoboa/extensions/stats/graph_templates.py +++ b/modoboa/extensions/stats/graph_templates.py @@ -2,6 +2,7 @@ from django.utils.translation import ugettext_lazy + class Graph(object): width = 540 height = 120 @@ -16,42 +17,45 @@ class Graph(object): def display_name(self): return self.__class__.__name__.lower() + class AvgTraffic(Graph): title = ugettext_lazy('Average normal traffic') vertlabel = ugettext_lazy('msgs/min') - + def __init__(self): super(AvgTraffic, self).__init__( - sent={'type' : 'AREA', 'color' : '#00FF00', - "legend" : ugettext_lazy("sent messages")}, - recv={"type" : "AREA", "color" : "#0000FF", - "legend" : ugettext_lazy("received messages")} - ) + sent={'type': 'AREA', 'color': '#00FF00', + "legend": ugettext_lazy("sent messages")}, + recv={"type": "AREA", "color": "#0000FF", + "legend": ugettext_lazy("received messages")} + ) + class AvgBadTraffic(Graph): title = ugettext_lazy('Average bad traffic') vertlabel = ugettext_lazy('msgs/min') - + def __init__(self): super(AvgBadTraffic, self).__init__( - bounced={'type' : 'AREA', 'color' : '#FFFF00', - "legend" : ugettext_lazy("bounced messages")}, - reject={"type" : "AREA", "color" : "#FF0000", - "legend" : ugettext_lazy("rejected messages")} - ) + bounced={'type': 'AREA', 'color': '#FFFF00', + "legend": ugettext_lazy("bounced messages")}, + reject={"type": "AREA", "color": "#FF0000", + "legend": ugettext_lazy("rejected messages")} + ) + class AvgTrafficSize(Graph): title = ugettext_lazy('Average normal traffic size') vertlabel = ugettext_lazy('bytes/min') - + def __init__(self): super(AvgTrafficSize, self).__init__( - size_recv={'type' : 'AREA', 'color' : '#FF9900', - "legend" : ugettext_lazy("received size")}, - size_sent={"type" : "AREA", "color" : "#339999", - "legend" : ugettext_lazy("sent size")} - ) - + size_recv={'type': 'AREA', 'color': '#FF9900', + "legend": ugettext_lazy("received size")}, + size_sent={"type": "AREA", "color": "#339999", + "legend": ugettext_lazy("sent size")} + ) + class GraphSet(object): title = None @@ -63,11 +67,12 @@ class GraphSet(object): def get_graphs(self): if not hasattr(self, '__graph_instances'): - self.__graph_instances = map(lambda gc: gc(), self.graphs) + self.__graph_instances = [gc() for gc in self.graphs] return self.__graph_instances def get_graph_names(self): - return map(lambda g: g.display_name, self.get_graphs()) + return [g.display_name for g in self.get_graphs()] + class MailTraffic(GraphSet): title = ugettext_lazy('Mail traffic') diff --git a/modoboa/extensions/stats/grapher.py b/modoboa/extensions/stats/grapher.py index 02f14c67b..e19f42bf6 100644 --- a/modoboa/extensions/stats/grapher.py +++ b/modoboa/extensions/stats/grapher.py @@ -1,15 +1,17 @@ # coding: utf-8 -import sys, os +import sys +import os import time import datetime from django.utils.translation import ugettext as _, ugettext_lazy from modoboa.lib import parameters -periods = [{"name" : "day", "label" : ugettext_lazy("Day")}, - {"name" : "week", "label" : ugettext_lazy("Week")}, - {"name" : "month", "label" : ugettext_lazy("Month")}, - {"name" : "year", "label" : ugettext_lazy("Year")}] +periods = [{"name": "day", "label": ugettext_lazy("Day")}, + {"name": "week", "label": ugettext_lazy("Week")}, + {"name": "month", "label": ugettext_lazy("Month")}, + {"name": "year", "label": ugettext_lazy("Year")}] + def str2Time(y, M, d, h="00", m="00", s="00"): """Date conversion @@ -20,17 +22,18 @@ def str2Time(y, M, d, h="00", m="00", s="00"): """ try: if not M.isdigit(): - local = time.strptime("%s %s %s %s:%s:%s" % (y, M, d, h, m, s), \ - "%Y %b %d %H:%M:%S") + local = time.strptime("%s %s %s %s:%s:%s" % (y, M, d, h, m, s), + "%Y %b %d %H:%M:%S") else: - local = time.strptime("%s %s %s %s:%s:%s" % (y, M, d, h, m, s), \ - "%Y %m %d %H:%M:%S") + local = time.strptime("%s %s %s %s:%s:%s" % (y, M, d, h, m, s), + "%Y %m %d %H:%M:%S") except ValueError: - print >>sys.stderr, "Error: failed to convert date and time" + print >> sys.stderr, "Error: failed to convert date and time" return 0 return int(time.mktime(local)) + class Grapher(object): def __init__(self): self.rrd_rootdir = parameters.get_admin("RRD_ROOTDIR") @@ -53,7 +56,7 @@ class Grapher(object): defs += [str('DEF:%s=%s:%s:%s' % (v, rrdfile, v, graph_tpl.cf)), str('CDEF:%spm=%s,60,*' % (v, v)), str('VDEF:%s_total=%s,TOTAL' % (v, v))] - type = d.has_key("type") and d["type"] or "LINE" + type = d["type"] if "type" in d else "LINE" lines += [str("%s:%spm%s:%s:STACK" % (type, v, d["color"], (d["legend"].encode("utf8")).ljust(20)))] lines.append('GPRINT:%s_total:%s%%7.0lf%%s\\l' % (v, _("Total").encode('utf-8'))) @@ -64,23 +67,25 @@ class Grapher(object): defs.append('GPRINT:%s_first:%s %%c:strftime' % (first_ds, "From")) defs.append('GPRINT:%s_last:%s %%c\\c:strftime' % (first_ds, "to")) defs.append('COMMENT:\\s') - + params = defs + lines - rrdtool.graph(str(path), - "--imgformat", "PNG", - "--width", str(graph_tpl.width), - "--height", str(graph_tpl.height), - "--start", start, - "--end", end, - "--vertical-label", graph_tpl.vertlabel.encode("utf-8"), - "--lower-limit", "0", - "--slope-mode", - "--units-exponent", "0", - "--title", str("%s: %s" % (target, graph_tpl.title.encode("utf-8"))), - *params) + rrdtool.graph( + str(path), + "--imgformat", "PNG", + "--width", str(graph_tpl.width), + "--height", str(graph_tpl.height), + "--start", start, + "--end", end, + "--vertical-label", graph_tpl.vertlabel.encode("utf-8"), + "--lower-limit", "0", + "--slope-mode", + "--units-exponent", "0", + "--title", str("%s: %s" % (target, graph_tpl.title.encode("utf-8"))), + *params + ) if not os.path.exists(path): - print "[graph] Impossible to create %s graph" %path + print "[graph] Impossible to create %s graph" % path def make_defaults(self, target, graph_tpl): end = "%d" % int(time.mktime(time.localtime())) @@ -88,5 +93,3 @@ class Grapher(object): self.process(target, "week", "-1week", end, graph_tpl) self.process(target, "month", "-1month", end, graph_tpl) self.process(target, "year", "-1year", end, graph_tpl) - - diff --git a/modoboa/extensions/stats/management/commands/logparser.py b/modoboa/extensions/stats/management/commands/logparser.py index 49473ae03..cbc5c2151 100644 --- a/modoboa/extensions/stats/management/commands/logparser.py +++ b/modoboa/extensions/stats/management/commands/logparser.py @@ -28,7 +28,7 @@ from optparse import make_option from modoboa.lib import parameters from modoboa.admin.models import Domain from modoboa.extensions.stats import Stats -from modoboa.extensions.stats.grapher import * +from modoboa.extensions.stats.grapher import str2Time, Grapher from modoboa.extensions.stats.graph_templates import MailTraffic rrdstep = 60 @@ -37,6 +37,7 @@ points_per_sample = 3 variables = ["sent", "recv", "bounced", "reject", "spam", "virus", "size_sent", "size_recv"] + class LogParser(object): def __init__(self, options, workdir, year=None): self.logfile = options["logfile"] @@ -94,7 +95,6 @@ class LogParser(object): params += ['DS:%s:%s:%s:0:U' % (v, ds_type, rrdstep * 2)] # Set up RRD to archive data - rras = [] for cf in ['AVERAGE', 'MAX']: for step in [day_steps, week_steps, month_steps, year_steps]: params += ['RRA:%s:0.5:%s:%s' % (cf, step, realrows)] @@ -120,14 +120,14 @@ class LogParser(object): if not os.path.exists(fname): self.lupdates[fname] = self.init_rrd(fname, m) if self.debug: - print "[rrd] create new RRD file %s" %fname + print "[rrd] create new RRD file %s" % fname else: - if not self.lupdates.has_key(fname): + if not fname in self.lupdates: self.lupdates[fname] = rrdtool.last(str(fname)) if m <= self.lupdates[fname]: if self.verbose: - print "[rrd] VERBOSE events at %s already recorded in RRD" %m + print "[rrd] VERBOSE events at %s already recorded in RRD" % m return False tpl = "" @@ -140,7 +140,8 @@ class LogParser(object): if m > self.lupdates[fname] + rrdstep: values = "" for v in variables: - if values != "": values += ":" + if values != "": + values += ":" values += "0" for p in range(self.lupdates[fname] + rrdstep, m, rrdstep): if self.verbose: @@ -165,16 +166,17 @@ class LogParser(object): def initcounters(self, dom, cur_t): init = {} - for v in variables: init[v] = 0 + for v in variables: + init[v] = 0 self.data[dom][cur_t] = init def inc_counter(self, dom, cur_t, counter, val=1): if dom is not None and dom in self.domains: - if not self.data[dom].has_key(cur_t): + if not cur_t in self.data[dom]: self.initcounters(dom, cur_t) self.data[dom][cur_t][counter] += val - if not self.data["global"].has_key(cur_t): + if not cur_t in self.data["global"]: self.initcounters("global", cur_t) self.data["global"][cur_t][counter] += val @@ -211,7 +213,7 @@ class LogParser(object): if not m: continue (mo, da, ho, mi, se, host, prog, pid, log) = m.groups() - se = int(int(se) / rrdstep) # rrd step is one-minute => se = 0 + se = int(int(se) / rrdstep) # rrd step is one-minute => se = 0 if prev_se != se or prev_mi != mi or prev_ho != ho: cur_t = str2Time(self.year(mo), mo, da, ho, mi, se) @@ -225,18 +227,18 @@ class LogParser(object): m = re.search("message-id=<([^>]*)>", line_log) if m: - self.workdict[line_id] = {'from' : m.group(1), 'size' : 0} + self.workdict[line_id] = {'from': m.group(1), 'size': 0} continue m = re.search("from=<([^>]*)>, size=(\d+)", line_log) if m: - self.workdict[line_id] = {'from' : m.group(1), - 'size' : string.atoi(m.group(2))} + self.workdict[line_id] = {'from': m.group(1), + 'size': string.atoi(m.group(2))} continue m = re.search("to=<([^>]*)>.*status=(\S+)", line_log) if m: - if not self.workdict.has_key(line_id): + if not line_id in self.workdict: if self.debug: print "Inconsistent mail (%s: %s), skipping" % (line_id, m.group(1)) continue @@ -276,13 +278,14 @@ class LogParser(object): G = Grapher() for dom, data in self.data.iteritems(): if self.debug: - print "[rrd] dealing with domain %s" %dom + print "[rrd] dealing with domain %s" % dom for t in sorted(data.keys()): self.update_rrd(dom, t) for graph_tpl in MailTraffic().get_graphs(): G.make_defaults(dom, graph_tpl) + class Command(BaseCommand): help = 'Log file parser' @@ -293,7 +296,7 @@ class Command(BaseCommand): dest="verbose", help="Set verbose mode"), make_option("--debug", default=False, action="store_true", help="Set debug mode") - ) + ) def handle(self, *args, **options): Stats().load() diff --git a/modoboa/extensions/stats/templates/stats/index.html b/modoboa/extensions/stats/templates/stats/index.html index 325e7b9da..b70947d06 100644 --- a/modoboa/extensions/stats/templates/stats/index.html +++ b/modoboa/extensions/stats/templates/stats/index.html @@ -7,7 +7,7 @@ diff --git a/modoboa/core/templatetags/core_tags.py b/modoboa/core/templatetags/core_tags.py index 1c7933ed9..53ff25b7d 100644 --- a/modoboa/core/templatetags/core_tags.py +++ b/modoboa/core/templatetags/core_tags.py @@ -135,12 +135,6 @@ def uprefs_menu(selection, user): "url": "preferences/", "label": _("Preferences")}, ] - # if user.has_mailbox: - # entries.insert(0, {"name": "forward", - # "class": "ajaxlink", - # "url": "forward/", - # "label": _("Forward")}) - entries += events.raiseQueryEvent("UserMenuDisplay", "uprefs_menu", user) entries = sorted(entries, key=lambda e: e["label"]) return render_to_string('common/menu.html', { diff --git a/modoboa/core/views/auth.py b/modoboa/core/views/auth.py index 3e2b25561..cb84e6c36 100644 --- a/modoboa/core/views/auth.py +++ b/modoboa/core/views/auth.py @@ -23,6 +23,7 @@ def dologin(request): login(request, user) if not form.cleaned_data["rememberme"]: request.session.set_expiry(0) + events.raiseEvent("UserLoggedIn", request, form) # if request.user.has_mailbox: # request.session["password"] = encrypt(form.cleaned_data["password"]) diff --git a/modoboa/demo/__init__.py b/modoboa/demo/__init__.py index 739076d53..69ccfecc5 100755 --- a/modoboa/demo/__init__.py +++ b/modoboa/demo/__init__.py @@ -6,27 +6,29 @@ from django.template.loader import render_to_string from modoboa.lib import events from modoboa.lib.webutils import static_url + @events.observe("UserMenuDisplay") def menu(target, user): if target != "top_menu_middle": return [] - if not user.has_mailbox: + if not user.mailbox_set.count(): return [] return [ - {"name" : "demo", - "label" : _("Test messages"), - "img" : static_url("pics/demo.png"), - "class" : "topdropdown", - "menu" : [ - {"name" : "sendvirus", - "label" : _("Send virus"), - "url" : reverse("modoboa.demo.views.send_virus")}, - {"name" : "sendspam", - "label" : _("Send spam"), - "url" : reverse("modoboa.demo.views.send_spam")} - ] + {"name": "demo", + "label": _("Test messages"), + "img": static_url("pics/demo.png"), + "class": "topdropdown", + "menu": [ + {"name": "sendvirus", + "label": _("Send virus"), + "url": reverse("modoboa.demo.views.send_virus")}, + {"name": "sendspam", + "label": _("Send spam"), + "url": reverse("modoboa.demo.views.send_spam")} + ] } - ] + ] + @events.observe("GetAnnouncement") def announcement(target): @@ -35,13 +37,15 @@ def announcement(target): return [txt] return "" + @events.observe("PasswordChange") def password_change(user): return [user.id == 1] + @events.observe("GetStaticContent") def get_static_content(user): - if not user.has_mailbox: + if not user.mailbox_set.count(): return [] return """ - - - -{% endblock %} -{% block leftcol %}
{% uprefs_menu left_selection user %}
{% endblock %} -{% block apparea %}
{% endblock %} diff --git a/modoboa/userprefs/templates/userprefs/preferences.html b/modoboa/userprefs/templates/userprefs/preferences.html deleted file mode 100644 index 26a514dd7..000000000 --- a/modoboa/userprefs/templates/userprefs/preferences.html +++ /dev/null @@ -1,9 +0,0 @@ -{% load i18n %}{% load url from future %} -

{% trans "Preferences" %} {% trans "Customize Modoboa" %}

-
-{% csrf_token %} - {% include "common/parameters.html" %} -
- - diff --git a/modoboa/userprefs/templates/userprefs/profile.html b/modoboa/userprefs/templates/userprefs/profile.html deleted file mode 100644 index f5df0b64e..000000000 --- a/modoboa/userprefs/templates/userprefs/profile.html +++ /dev/null @@ -1,10 +0,0 @@ -{% load i18n libextras %}{% load url from future %} -

{% trans "Profile" %} {% trans "Update your personal information" %}

-
-
{% csrf_token %} - {% render_form form %} -
- -
-
diff --git a/modoboa/userprefs/templatetags/__init__.py b/modoboa/userprefs/templatetags/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/modoboa/userprefs/templatetags/uprefs_extras.py b/modoboa/userprefs/templatetags/uprefs_extras.py deleted file mode 100644 index 8a73ad118..000000000 --- a/modoboa/userprefs/templatetags/uprefs_extras.py +++ /dev/null @@ -1,70 +0,0 @@ -# coding: utf-8 -from django import template -from django.template.loader import render_to_string -from django.utils.translation import ugettext as _ -from django.core.urlresolvers import reverse -from modoboa.lib import events - -register = template.Library() - - -@register.simple_tag -def uprefs_menu(selection, user): - entries = [ - {"name": "profile", - "class": "ajaxlink", - "url": "profile/", - "label": _("Profile")}, - {"name": "preferences", - "class": "ajaxlink", - "url": "preferences/", - "label": _("Preferences")}, - ] - if user.has_mailbox: - entries.insert(0, {"name": "forward", - "class": "ajaxlink", - "url": "forward/", - "label": _("Forward")}) - - entries += events.raiseQueryEvent("UserMenuDisplay", "uprefs_menu", user) - entries = sorted(entries, key=lambda e: e["label"]) - return render_to_string('common/menu.html', { - "entries": entries, - "css": "nav nav-list", - "selection": selection, - "user": user - }) - - -@register.simple_tag -def user_menu(user, selection): - entries = [ - {"name": "user", - "img": "icon-user icon-white", - "label": user.fullname, - "menu": [ - {"name": "settings", - "img": "icon-list", - "label": _("Settings"), - "url": reverse("modoboa.userprefs.views.index")} - ]} - ] - - entries[0]["menu"] += \ - events.raiseQueryEvent("UserMenuDisplay", "options_menu", user) \ - + [{"name": "logout", - "url": reverse("modoboa.auth.views.dologout"), - "label": _("Logout"), - "img": "icon-off"}] - - return render_to_string("common/menulist.html", { - "selection": selection, "entries": entries, "user": user - }) - - -@register.simple_tag -def loadextmenu(selection, user): - menu = events.raiseQueryEvent("UserMenuDisplay", "top_menu", user) - return render_to_string('common/menulist.html', { - "selection": selection, "entries": menu, "user": user - }) diff --git a/modoboa/userprefs/urls.py b/modoboa/userprefs/urls.py deleted file mode 100644 index 05e214541..000000000 --- a/modoboa/userprefs/urls.py +++ /dev/null @@ -1,14 +0,0 @@ -# coding: utf-8 -from django.conf.urls import patterns, url -from modoboa.lib import events - -urlpatterns = patterns('modoboa.userprefs.views', - url(r'^$', 'index'), - (r'^preferences/$', 'preferences'), - (r'^profile/$', 'profile'), - (r'^forward/$', 'forward'), -) - -urlpatterns += patterns('', - *events.raiseQueryEvent("ExtraUprefsRoutes") -) diff --git a/modoboa/userprefs/views.py b/modoboa/userprefs/views.py deleted file mode 100644 index be70d1958..000000000 --- a/modoboa/userprefs/views.py +++ /dev/null @@ -1,135 +0,0 @@ -# coding: utf-8 -from django.shortcuts import render -from django.contrib.auth.decorators import login_required, user_passes_test -from django.utils.translation import ugettext as _ -from modoboa.lib import parameters, events -from modoboa.lib.decorators import needs_mailbox -from modoboa.lib.exceptions import ModoboaException -from modoboa.lib.webutils import ( - ajax_response, ajax_simple_response, _render_to_string -) -from modoboa.admin.models import Mailbox, Alias -from modoboa.auth.lib import encrypt -from forms import ForwardForm, BadDestination, ProfileForm - - -@login_required -def index(request, tplname="userprefs/index.html"): - extrajs = events.raiseQueryEvent("ExtraUprefsJS", request.user) - return render(request, tplname, { - "selection": "user", - "extrajs": "".join(extrajs) - }) - - -@login_required -@needs_mailbox() -def forward(request, tplname='userprefs/forward.html'): - try: - mb = request.user.mailbox_set.all()[0] - except IndexError: - raise ModoboaException( - _("You need a mailbox in order to define a forward") - ) - try: - al = Alias.objects.get(address=mb.address, - domain__name=mb.domain.name) - except Alias.DoesNotExist: - al = None - if request.method == "POST": - form = ForwardForm(request.POST) - error = None - if form.is_valid(): - try: - if al is None: - al = Alias() - al.address = mb.address - al.domain = mb.domain - al.enabled = mb.user.is_active - intdests = [] - if form.cleaned_data["keepcopies"]: - intdests += [mb] - form.parse_dest() - al.save(intdests, form.dests) - if request.user.group != "SimpleUsers": - al.post_create(request.user) - return ajax_response(request, respmsg=_("Forward updated")) - except BadDestination, e: - error = str(e) - - return ajax_simple_response(dict( - status="ko", - errors=form.errors, - respmsg=error - )) - - form = ForwardForm() - if al is not None: - form.fields["dest"].initial = al.extmboxes - try: - selfmb = al.mboxes.get(pk=mb.id) - except Mailbox.DoesNotExist: - pass - else: - form.fields["keepcopies"].initial = True - return ajax_simple_response({ - "status": "ok", - "content": _render_to_string(request, tplname, { - "form": form - }) - }) - - -@login_required -def profile(request, tplname='userprefs/profile.html'): - update_password = True - if True in events.raiseQueryEvent("PasswordChange", request.user): - update_password = False - - if request.method == "POST": - form = ProfileForm( - update_password, request.POST, instance=request.user - ) - if form.is_valid(): - form.save() - if update_password and form.cleaned_data["confirmation"] != "": - request.session["password"] = encrypt(form.cleaned_data["confirmation"]) - return ajax_simple_response(dict( - status="ok", respmsg=_("Profile updated") - )) - return ajax_simple_response({ - "status": "ko", - "errors": form.errors - }) - - form = ProfileForm(update_password, instance=request.user) - return ajax_simple_response({ - "status": "ok", - "content": _render_to_string(request, tplname, { - "form": form - }) - }) - - -@login_required -def preferences(request): - if request.method == "POST": - for formdef in parameters.get_user_forms(request.user, request.POST)(): - form = formdef["form"] - if form.is_valid(): - form.save() - continue - return ajax_simple_response({ - "status": "ko", "prefix": form.app, "errors": form.errors - }) - - return ajax_simple_response({ - "status": "ok", "respmsg": _("Preferences saved") - }) - - return ajax_simple_response({ - "status": "ok", - "content": _render_to_string(request, "userprefs/preferences.html", { - "forms": parameters.get_user_forms(request.user) - }) - }) From 271c2530e8b1f0204504ba2104a649756e7eebe5 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Fri, 23 Aug 2013 17:41:13 +0200 Subject: [PATCH 13/97] wip: big refactoring --- doc/extending/events.rst | 5 +++-- modoboa/core/models.py | 10 ++-------- modoboa/core/views/auth.py | 3 --- modoboa/extensions/admin/__init__.py | 19 +++++++++++++++++++ modoboa/extensions/admin/views/identity.py | 2 +- modoboa/extensions/limits/controls.py | 3 +-- 6 files changed, 26 insertions(+), 16 deletions(-) diff --git a/doc/extending/events.rst b/doc/extending/events.rst index 48b0570a7..76bcf0493 100644 --- a/doc/extending/events.rst +++ b/doc/extending/events.rst @@ -65,9 +65,10 @@ Raised when an existing account is deleted. *Callback prototype*:: - def callback(account): pass + def callback(account, byuser, **options): pass -* ``oldaccount`` is the account that is going to be deleted +* ``account`` is the account that is going to be deleted +* ``byuser`` is the adminstrator deleting ``account`` AccountModified =============== diff --git a/modoboa/core/models.py b/modoboa/core/models.py index 2c90a4604..035a09b63 100644 --- a/modoboa/core/models.py +++ b/modoboa/core/models.py @@ -59,7 +59,7 @@ class User(AbstractBaseUser, PermissionsMixin): password_expr = re.compile(r'(\{(\w+)\}|(\$1\$))(.+)') - def delete(self, fromuser, keep_mb_dir, *args, **kwargs): + def delete(self, fromuser, *args, **kwargs): """Custom delete method To check permissions properly, we need to make a distinction @@ -79,18 +79,12 @@ class User(AbstractBaseUser, PermissionsMixin): if not fromuser.can_access(self): raise PermDeniedException - # if self.has_mailbox: - # mb = self.mailbox_set.all()[0] - # if not fromuser.can_access(mb): - # raise PermDeniedException - # mb.delete(keepdir=keep_mb_dir) - owner = get_object_owner(self) for ooentry in self.objectaccess_set.filter(is_owner=True): if ooentry.content_object is not None: grant_access_to_object(owner, ooentry.content_object, True) - events.raiseEvent("AccountDeleted", self) + events.raiseEvent("AccountDeleted", self, fromuser, **kwargs) ungrant_access_to_object(self) super(User, self).delete(*args, **kwargs) diff --git a/modoboa/core/views/auth.py b/modoboa/core/views/auth.py index cb84e6c36..c56b81a69 100644 --- a/modoboa/core/views/auth.py +++ b/modoboa/core/views/auth.py @@ -23,9 +23,6 @@ def dologin(request): login(request, user) if not form.cleaned_data["rememberme"]: request.session.set_expiry(0) - events.raiseEvent("UserLoggedIn", request, form) - # if request.user.has_mailbox: - # request.session["password"] = encrypt(form.cleaned_data["password"]) request.session["django_language"] = \ parameters.get_user(request.user, "LANG") diff --git a/modoboa/extensions/admin/__init__.py b/modoboa/extensions/admin/__init__.py index 793ea13ae..4677515d9 100644 --- a/modoboa/extensions/admin/__init__.py +++ b/modoboa/extensions/admin/__init__.py @@ -154,3 +154,22 @@ def import_account_mailbox(user, account, row): except Domain.DoesNotExist: continue dom.add_admin(account) + + +@events.observe("UserLogin") +def user_logged_in(request, username, password): + from modoboa.lib.cryptutils import encrypt + + if request.user.mailbox_set.count(): + request.session["password"] = encrypt(password) + + +@events.observe("AccountDeleted") +def account_deleted(account, byuser, **kwargs): + if not account.mailbox_set.count(): + return + mb = account.mailbox_set.all()[0] + if not byuser.can_access(mb): + raise PermDeniedException + keep_mb_dir = kwargs.get("keep_mb_dir", True) + mb.delete(keepdir=keep_mb_dir) diff --git a/modoboa/extensions/admin/views/identity.py b/modoboa/extensions/admin/views/identity.py index 6ca1410f9..3ca9a9a8a 100644 --- a/modoboa/extensions/admin/views/identity.py +++ b/modoboa/extensions/admin/views/identity.py @@ -225,7 +225,7 @@ def editaccount(request, accountid, tplname="common/tabforms.html"): def delaccount(request, accountid): keepdir = True if request.POST.get("keepdir", "false") == "true" else False - User.objects.get(pk=accountid).delete(request.user, keepdir) + User.objects.get(pk=accountid).delete(request.user, keep_mb_dir=keepdir) msg = ungettext("Account deleted", "Accounts deleted", 1) return ajax_simple_response({"status": "ok", "respmsg": msg}) diff --git a/modoboa/extensions/limits/controls.py b/modoboa/extensions/limits/controls.py index 27c624401..f8174e666 100644 --- a/modoboa/extensions/limits/controls.py +++ b/modoboa/extensions/limits/controls.py @@ -181,8 +181,7 @@ def on_account_modified(old, new): @events.observe("AccountDeleted") -def on_account_deleted(account): - print "del" +def on_account_deleted(account, byuser, **kwargs): owner = get_object_owner(account) if not owner.group in ["SuperAdmins", "Resellers"]: return From aea3f58bad35b8160f2ac1f4f056ec48ad6cc487 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Fri, 23 Aug 2013 17:44:06 +0200 Subject: [PATCH 14/97] Useless import removed. --- modoboa/core/views/auth.py | 1 - 1 file changed, 1 deletion(-) diff --git a/modoboa/core/views/auth.py b/modoboa/core/views/auth.py index c56b81a69..f4d132d9e 100644 --- a/modoboa/core/views/auth.py +++ b/modoboa/core/views/auth.py @@ -7,7 +7,6 @@ from django.core.urlresolvers import reverse from django.utils.translation import ugettext as _ from modoboa.lib import events, parameters from modoboa.lib.webutils import _render_to_string -from modoboa.lib.cryptutils import encrypt from modoboa.core.forms import LoginForm From c509cb4edec50709a0dd8bf24b696a63488d6e7d Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Mon, 9 Sep 2013 09:29:19 +0200 Subject: [PATCH 15/97] Support only integers for this option. fixes #478 --- .../extensions/webmail/static/webmail/js/webmail.js | 2 +- modoboa/lib/emailutils.py | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/modoboa/extensions/webmail/static/webmail/js/webmail.js b/modoboa/extensions/webmail/static/webmail/js/webmail.js index 8cea472b2..c9c745bea 100644 --- a/modoboa/extensions/webmail/static/webmail/js/webmail.js +++ b/modoboa/extensions/webmail/static/webmail/js/webmail.js @@ -83,7 +83,7 @@ Webmail.prototype = { $(document).on("click", "a[name=forward]", $.proxy(this.reply_loader, this)); $(document).on("click", "a[name=delete]", $.proxy(this.delete_message, this)); $(document).on("click", "a[name=activate_links]", $.proxy(function(e) { this.display_mode(e, "1"); }, this)); - $(document).on("click", "a[name=disable_links]", $.proxy(function(e) { this.disable_mode(e, "0"); }, this)); + $(document).on("click", "a[name=disable_links]", $.proxy(function(e) { this.display_mode(e, "0"); }, this)); $(document).on("click", "a[name=sendmail]", $.proxy(this.sendmail, this)); diff --git a/modoboa/lib/emailutils.py b/modoboa/lib/emailutils.py index bc58ea1b3..66fe831c1 100644 --- a/modoboa/lib/emailutils.py +++ b/modoboa/lib/emailutils.py @@ -23,7 +23,7 @@ class EmailAddress(object): return self.fulladdress class Email(object): - def __init__(self, msg, mformat="plain", dformat="plain", links="0"): + def __init__(self, msg, mformat="plain", dformat="plain", links=0): self.attached_map = {} self.contents = {"html" : "", "plain" : ""} self.headers = [] @@ -78,7 +78,7 @@ class Email(object): sometimes, messages embark inline images, which means they must be displayed and not attached. """ - if self.dformat == "html" and self.links != "0" \ + if self.dformat == "html" and self.links \ and msg.has_key("Content-Disposition"): if msg["Content-Disposition"].startswith("inline"): cid = None @@ -167,9 +167,9 @@ class Email(object): def viewmail_html(self, content, **kwargs): if content is None or content == "": return "" - links = kwargs.has_key("links") and kwargs["links"] or "0" - html = lxml.html.fromstring(content) - if links == "0": + links = kwargs.get("links", 0) + html = lxml.html.fromstring(content) + if not links: html.rewrite_links(lambda x: None) else: html.rewrite_links(self.map_cid) @@ -179,7 +179,6 @@ class Email(object): else: body = lxml.html.tostring(body) body = re.sub("<(/?)body", lambda m: "<%sdiv" % m.group(1), body) - body = Template(body).render(Context({})) return body def split_mailbox(mailbox): From 1036aa31a21d798df70536fe7821a8d6464853f4 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Mon, 9 Sep 2013 21:33:17 +0200 Subject: [PATCH 16/97] Mailboxes manipulation fixed. fixes #479 --- .../extensions/webmail/static/webmail/js/webmail.js | 11 +++++------ .../extensions/webmail/templates/webmail/folder.html | 2 +- modoboa/extensions/webmail/templatetags/webextras.py | 6 +++--- modoboa/extensions/webmail/views.py | 10 ++++++---- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/modoboa/extensions/webmail/static/webmail/js/webmail.js b/modoboa/extensions/webmail/static/webmail/js/webmail.js index c9c745bea..d60e2cfec 100644 --- a/modoboa/extensions/webmail/static/webmail/js/webmail.js +++ b/modoboa/extensions/webmail/static/webmail/js/webmail.js @@ -536,7 +536,7 @@ Webmail.prototype = { return; } $parent = $ul; - mailbox = $parent.attr("name") + this.hdelimiter + mailbox; + mailbox = $parent.attr("name") + this.options.hdelimiter + mailbox; } else { $parent = $("#mboxes_container").children("ul"); } @@ -549,8 +549,8 @@ Webmail.prototype = { * If needed, the mailbox will be moved to its new location. */ rename_mailbox: function(oldname, newname, oldparent, newparent) { - var oldpattern = (oldparent) ? oldparent + this.hdelimiter + oldname : oldname; - var newpattern = (newparent) ? newparent + this.hdelimiter + newparent : newname; + var oldpattern = (oldparent) ? oldparent + this.options.hdelimiter + oldname : oldname; + var newpattern = (newparent) ? newparent + this.options.hdelimiter + newname : newname; var $link = $("#folders").find('a[href="' + oldpattern + '"]'); if (oldname != newname) { @@ -560,14 +560,13 @@ Webmail.prototype = { $link.parent("li").attr("name", newpattern); $link.prepend($i); $link.attr("href", newpattern); - this.navobject.setparam("mbox", newname).update(false, true); + this.navobject.setparam("mbox", newpattern).update(false, true); } if (oldparent != newparent) { - var newlocation = (newparent) ? newparent + this.hdelimiter + newname : newname; this.remove_mbox_from_tree($link.parent("li")); this.add_mailbox_to_tree(newparent, newname); if (this.navobject.getparam("action") == "listmailbox") { - this.navobject.setparam("mbox", newlocation).update(); + this.navobject.setparam("mbox", newpattern).update(); } else { this.select_mailbox("INBOX"); } diff --git a/modoboa/extensions/webmail/templates/webmail/folder.html b/modoboa/extensions/webmail/templates/webmail/folder.html index 717997f59..e0c03b57e 100644 --- a/modoboa/extensions/webmail/templates/webmail/folder.html +++ b/modoboa/extensions/webmail/templates/webmail/folder.html @@ -4,7 +4,7 @@
  • {% trans "Parent mailbox" %}
    • - {% print_mailboxes mboxes selected withunseen selectonly %} + {% print_mailboxes mboxes selected withunseen selectonly hdelimiter %}
{% endblock %} diff --git a/modoboa/extensions/webmail/templatetags/webextras.py b/modoboa/extensions/webmail/templatetags/webextras.py index 7efffbb13..03a85cf2e 100644 --- a/modoboa/extensions/webmail/templatetags/webextras.py +++ b/modoboa/extensions/webmail/templatetags/webextras.py @@ -119,7 +119,7 @@ def listmailbox_menu(selection, folder, user): )) @register.simple_tag -def print_mailboxes(tree, selected=None, withunseen=False, selectonly=False): +def print_mailboxes(tree, selected=None, withunseen=False, selectonly=False, hdelimiter='.'): """Display a tree of mailboxes and sub-mailboxes :param tree: the mailboxes to display @@ -129,7 +129,7 @@ def print_mailboxes(tree, selected=None, withunseen=False, selectonly=False): for mbox in tree: cssclass = "" name = mbox["path"] if mbox.has_key("sub") else mbox["name"] - label = separate_mailbox(mbox["name"])[0] + label = separate_mailbox(mbox["name"], hdelimiter)[0] if selected == name: cssclass = "active" result += "
  • \n" % (name, cssclass) @@ -157,7 +157,7 @@ def print_mailboxes(tree, selected=None, withunseen=False, selectonly=False): 'selectfolder' if selectonly else 'loadfolder', extra_attrs, iclass, label) if mbox.has_key("sub") and len(mbox["sub"]): result += "
      " % (mbox["path"], ul_state) \ - + print_mailboxes(mbox["sub"], selected, withunseen, selectonly) + "
    \n" + + print_mailboxes(mbox["sub"], selected, withunseen, selectonly, hdelimiter) + "\n" result += "
    • \n" return result diff --git a/modoboa/extensions/webmail/views.py b/modoboa/extensions/webmail/views.py index 968ee4436..113b831da 100644 --- a/modoboa/extensions/webmail/views.py +++ b/modoboa/extensions/webmail/views.py @@ -134,7 +134,8 @@ def newfolder(request, tplname="webmail/folder.html"): "action_classes": "submit", "withunseen": False, "selectonly": True, - "mboxes": mbc.getmboxes(request.user)} + "mboxes": mbc.getmboxes(request.user), + "hdelimiter": mbc.hdelimiter} if request.method == "POST": form = FolderForm(request.POST) @@ -164,14 +165,15 @@ def editfolder(request, tplname="webmail/folder.html"): "action_label" : _("Update"), "action_classes" : "submit", "withunseen" : False, - "selectonly" : True} + "selectonly" : True, + "hdelimiter": mbc.hdelimiter} if request.method == "POST": form = FolderForm(request.POST) if form.is_valid(): pf = request.POST.get("parent_folder", None) ctx["selected"] = pf - oldname, oldparent = separate_mailbox(request.POST["oldname"]) + oldname, oldparent = separate_mailbox(request.POST["oldname"], sep=mbc.hdelimiter) res = dict(status="ok", respmsg=_("Mailbox updated")) if form.cleaned_data["name"] != oldname \ or (pf != oldparent): @@ -193,7 +195,7 @@ def editfolder(request, tplname="webmail/folder.html"): name = request.GET.get("name", None) if name is None: raise WebmailError(_("Invalid request")) - shortname, parent = separate_mailbox(name) + shortname, parent = separate_mailbox(name, sep=mbc.hdelimiter) ctx["mboxes"] = mbc.getmboxes(request.user, until_mailbox=parent) ctx["form"] = FolderForm() ctx["form"].fields["oldname"].initial = name From 23eb93b063dce17ffe963da94ca9e8776ce64cff Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Mon, 9 Sep 2013 21:35:31 +0200 Subject: [PATCH 17/97] The gunicorn command line was wrong. --- doc/integration/web_servers.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/integration/web_servers.rst b/doc/integration/web_servers.rst index ff5ca5712..fbe187256 100644 --- a/doc/integration/web_servers.rst +++ b/doc/integration/web_servers.rst @@ -113,7 +113,7 @@ file named *gunicorn.conf.py* inside Modoboa's root dir):: To start gunicorn, execute the following commands:: $ cd - $ gunicorn -c gunicorn.conf.py + $ gunicorn -c gunicorn.conf.py .wsgi:application Now the *nginx* part. Just create a new virtual host and use the following configuration:: From d86733911a11de90064995dc2ee88acf98bfafe3 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Tue, 10 Sep 2013 18:54:58 +0200 Subject: [PATCH 18/97] Missing import added. see #459 --- modoboa/admin/forms.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modoboa/admin/forms.py b/modoboa/admin/forms.py index 18e878c75..8c8cd0daf 100644 --- a/modoboa/admin/forms.py +++ b/modoboa/admin/forms.py @@ -10,7 +10,9 @@ from modoboa.lib.exceptions import PermDeniedException from modoboa.lib.emailutils import split_mailbox from modoboa.lib.permissions import get_account_roles from modoboa.lib.formutils import * -from modoboa.admin.models import User, Domain, DomainAlias, Mailbox, Alias +from modoboa.admin.models import ( + User, Domain, DomainAlias, Mailbox, Alias, Quota +) class DomainFormGeneral(forms.ModelForm, DynamicForm): From a5100880340546d44309923bccfec2a41c071663 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Tue, 10 Sep 2013 22:46:36 +0200 Subject: [PATCH 19/97] Don't forget aliases :p see #459 --- modoboa/admin/forms.py | 37 +++++++++++++++---- .../extensions/postfix_autoreply/__init__.py | 5 +++ 2 files changed, 35 insertions(+), 7 deletions(-) diff --git a/modoboa/admin/forms.py b/modoboa/admin/forms.py index 8c8cd0daf..db716e541 100644 --- a/modoboa/admin/forms.py +++ b/modoboa/admin/forms.py @@ -75,17 +75,40 @@ class DomainFormGeneral(forms.ModelForm, DynamicForm): return cleaned_data + def update_mailbox_quotas(self, domain): + """Update all quota records associated to this domain + + This methid must be called only when a domain gets renamed. As + the primary key used for a quota is an email address, rename a + domain will change all associated email addresses, so it will + change the primary keys used for quotas. The consequence is we + can't issue regular UPDATE queries using the .save() method of + a Quota instance (it will trigger an INSERT as the primary key + has changed). + + So, we use this ugly hack to bypass this behaviour. It is not + perfomant at all as it will generate one query per quota + record to update. + """ + for q in Quota.objects.filter(username__contains="@%s" % self.oldname).values('username'): + username = q['username'].replace('@%s' % self.oldname, '@%s' % domain.name) + Quota.objects.filter(username=q['username']).update(username=username) + def save(self, user, commit=True): + """Custom save method + + Updating a domain may have consequences on other objects + (domain alias, mailbox, quota). The most tricky part concerns + quotas update. + + + """ d = super(DomainFormGeneral, self).save(commit=False) if commit: old_mail_homes = None - hm = parameters.get_admin("HANDLE_MAILBOXES", raise_error=False) - if hm == "yes": - if self.oldname is not None and d.name != self.oldname: - for q in Quota.objects.filter(username__contains="@%s" % self.oldname): - q.username = q.username.replace('@%s' % self.oldname, '@%s' % d.name) - q.save() - old_mail_homes = dict((mb.id, mb.mail_home) for mb in d.mailbox_set.all()) + if self.oldname is not None and d.name != self.oldname: + self.update_mailbox_quotas(d) + old_mail_homes = dict((mb.id, mb.mail_home) for mb in d.mailbox_set.all()) d.save() Mailbox.objects.filter(domain=d, use_domain_quota=True).update(quota=d.quota) if old_mail_homes is not None: diff --git a/modoboa/extensions/postfix_autoreply/__init__.py b/modoboa/extensions/postfix_autoreply/__init__.py index 6434a339e..b86855897 100644 --- a/modoboa/extensions/postfix_autoreply/__init__.py +++ b/modoboa/extensions/postfix_autoreply/__init__.py @@ -94,6 +94,11 @@ def onDomainModified(domain): return Transport.objects.filter(domain="autoreply.%s" % domain.oldname) \ .update(domain="autoreply.%s" % domain.name) + for al in Alias.objects.filter(full_address__contains="@%s" % domain.oldname): + new_address = al.full_address.replace("@%s" % domain.oldname, "@%s" % domain.name) + al.full_address = new_address + al.autoreply_address = "%s@autoreply.%s" % (new_address, domain.name) + al.save() @events.observe("DeleteDomain") From ec8aba2aaa56bc42c6d7d039d95bd41360bb890b Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Sat, 14 Sep 2013 08:36:44 +0200 Subject: [PATCH 20/97] Handle mailbox operations in background. see #482 --- modoboa/admin/forms.py | 21 ++- modoboa/admin/management/__init__.py | 0 modoboa/admin/management/commands/__init__.py | 0 .../commands/handle_mailbox_operations.py | 62 ++++++++ .../0036_auto__add_mailboxoperation.py | 137 ++++++++++++++++++ modoboa/admin/models.py | 33 ++--- modoboa/admin/views.py | 9 +- modoboa/core/templates/settings.py.tpl | 10 ++ 8 files changed, 243 insertions(+), 29 deletions(-) create mode 100644 modoboa/admin/management/__init__.py create mode 100644 modoboa/admin/management/commands/__init__.py create mode 100644 modoboa/admin/management/commands/handle_mailbox_operations.py create mode 100644 modoboa/admin/migrations/0036_auto__add_mailboxoperation.py diff --git a/modoboa/admin/forms.py b/modoboa/admin/forms.py index db716e541..f5e2a217d 100644 --- a/modoboa/admin/forms.py +++ b/modoboa/admin/forms.py @@ -90,6 +90,8 @@ class DomainFormGeneral(forms.ModelForm, DynamicForm): perfomant at all as it will generate one query per quota record to update. """ + Mailbox.objects.filter(domain=domain, use_domain_quota=True) \ + .update(quota=d.quota) for q in Quota.objects.filter(username__contains="@%s" % self.oldname).values('username'): username = q['username'].replace('@%s' % self.oldname, '@%s' % domain.name) Quota.objects.filter(username=q['username']).update(username=username) @@ -99,21 +101,16 @@ class DomainFormGeneral(forms.ModelForm, DynamicForm): Updating a domain may have consequences on other objects (domain alias, mailbox, quota). The most tricky part concerns - quotas update. - + quotas update. """ d = super(DomainFormGeneral, self).save(commit=False) if commit: old_mail_homes = None if self.oldname is not None and d.name != self.oldname: - self.update_mailbox_quotas(d) - old_mail_homes = dict((mb.id, mb.mail_home) for mb in d.mailbox_set.all()) + old_mail_homes = \ + dict((mb.id, mb.mail_home) for mb in d.mailbox_set.all()) d.save() - Mailbox.objects.filter(domain=d, use_domain_quota=True).update(quota=d.quota) - if old_mail_homes is not None: - for mb in d.mailbox_set.all(): - mb.rename_dir(old_mail_homes[mb.id]) for k, v in self.cleaned_data.iteritems(): if not k.startswith("aliases"): continue @@ -133,6 +130,14 @@ class DomainFormGeneral(forms.ModelForm, DynamicForm): if not len(filter(lambda name: self.cleaned_data[name] == dalias.name, self.cleaned_data.keys())): dalias.delete() + + self.update_mailbox_quotas(d) + if old_mail_homes is not None: + for mb in d.mailbox_set.all(): + MailboxOperation.objects.create( + mailbox=mb, type='rename', argument=old_mail_homes[mb.id] + ) + return d diff --git a/modoboa/admin/management/__init__.py b/modoboa/admin/management/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/modoboa/admin/management/commands/__init__.py b/modoboa/admin/management/commands/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/modoboa/admin/management/commands/handle_mailbox_operations.py b/modoboa/admin/management/commands/handle_mailbox_operations.py new file mode 100644 index 000000000..419766023 --- /dev/null +++ b/modoboa/admin/management/commands/handle_mailbox_operations.py @@ -0,0 +1,62 @@ +import os +import logging +from optparse import make_option +from django.core.management.base import BaseCommand +from modoboa.lib import parameters +from modoboa.admin.models import MailboxOperation + + +class OperationError(Exception): + pass + + +class Command(BaseCommand): + args = '' + help = 'Handles rename and delete operations on mailboxes' + + def __init__(self, *args, **kwargs): + super(Command, self).__init__(*args, **kwargs) + self.logger = logging.getLogger('modoboa.cron') + + def rename_mailbox(self, operation): + if not os.path.exists(operation.argument): + return + new_mail_home = operation.mailbox.mail_home.strip(os.sep) + self.logger.info("Renaming %s to %s", operation.argument, new_mail_home) + curpath = '/' + for part in new_mail_home.split(os.sep)[:-1]: + if not part: + continue + curpath = os.path.join(curpath, part) + if not os.path.exists(curpath): + os.mkdir(curpath) + code, output = exec_cmd( + "mv %s %s" % (old_mail_home, new_mail_home) + ) + if code: + raise OperationError(output) + + def delete_mailbox(self, operation): + if not os.path.exists(operation.argument): + return + self.logger.info("Deleting %s", operation.argument) + code, output = exec_cmd( + "rm -r %s" % operation.argument + ) + if code: + raise OperationError(output) + + def handle(self): + if parameters.get_admin("HANDLE_MAILBOXES") == 'no': + return + for ope in MailboxOperation.objects.all(): + try: + f = getattr(self, '%s_mailbox' % ope.optype) + except AttributeError: + continue + try: + f(ope) + except OperationError as e: + self.logger.critical('Operation failed: %s', str(e)) + else: + ope.delete() diff --git a/modoboa/admin/migrations/0036_auto__add_mailboxoperation.py b/modoboa/admin/migrations/0036_auto__add_mailboxoperation.py new file mode 100644 index 000000000..f59c90677 --- /dev/null +++ b/modoboa/admin/migrations/0036_auto__add_mailboxoperation.py @@ -0,0 +1,137 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + # Adding model 'MailboxOperation' + db.create_table(u'admin_mailboxoperation', ( + (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('mailbox', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['admin.Mailbox'], null=True, blank=True)), + ('type', self.gf('django.db.models.fields.CharField')(max_length=20)), + ('argument', self.gf('django.db.models.fields.TextField')()), + )) + db.send_create_signal(u'admin', ['MailboxOperation']) + + + def backwards(self, orm): + # Deleting model 'MailboxOperation' + db.delete_table(u'admin_mailboxoperation') + + + models = { + u'admin.alias': { + 'Meta': {'ordering': "['domain__name', 'address']", 'unique_together': "(('address', 'domain'),)", 'object_name': 'Alias'}, + 'address': ('django.db.models.fields.CharField', [], {'max_length': '254'}), + 'aliases': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['admin.Alias']", 'symmetrical': 'False'}), + 'dates': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['admin.ObjectDates']"}), + 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['admin.Domain']"}), + 'enabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'extmboxes': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'mboxes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['admin.Mailbox']", 'symmetrical': 'False'}) + }, + u'admin.domain': { + 'Meta': {'ordering': "['name']", 'object_name': 'Domain'}, + 'dates': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['admin.ObjectDates']"}), + 'enabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}), + 'quota': ('django.db.models.fields.IntegerField', [], {}) + }, + u'admin.domainalias': { + 'Meta': {'object_name': 'DomainAlias'}, + 'dates': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['admin.ObjectDates']"}), + 'enabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}), + 'target': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['admin.Domain']"}) + }, + u'admin.extension': { + 'Meta': {'object_name': 'Extension'}, + 'enabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}) + }, + u'admin.mailbox': { + 'Meta': {'object_name': 'Mailbox'}, + 'address': ('django.db.models.fields.CharField', [], {'max_length': '252'}), + 'dates': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['admin.ObjectDates']"}), + 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['admin.Domain']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'quota': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'use_domain_quota': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['admin.User']"}) + }, + u'admin.mailboxoperation': { + 'Meta': {'object_name': 'MailboxOperation'}, + 'argument': ('django.db.models.fields.TextField', [], {}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'mailbox': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['admin.Mailbox']", 'null': 'True', 'blank': 'True'}), + 'type': ('django.db.models.fields.CharField', [], {'max_length': '20'}) + }, + u'admin.objectaccess': { + 'Meta': {'unique_together': "(('user', 'content_type', 'object_id'),)", 'object_name': 'ObjectAccess'}, + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_owner': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['admin.User']"}) + }, + u'admin.objectdates': { + 'Meta': {'object_name': 'ObjectDates'}, + 'creation': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'last_modification': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}) + }, + u'admin.quota': { + 'Meta': {'object_name': 'Quota'}, + 'bytes': ('django.db.models.fields.BigIntegerField', [], {'default': '0'}), + 'mbox': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'quota_value'", 'unique': 'True', 'null': 'True', 'to': u"orm['admin.Mailbox']"}), + 'messages': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'username': ('django.db.models.fields.EmailField', [], {'max_length': '254', 'primary_key': 'True'}) + }, + u'admin.user': { + 'Meta': {'ordering': "['username']", 'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '254', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_local': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '254'}) + }, + u'auth.group': { + 'Meta': {'object_name': 'Group'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + u'auth.permission': { + 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + u'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + } + } + + complete_apps = ['admin'] \ No newline at end of file diff --git a/modoboa/admin/models.py b/modoboa/admin/models.py index 8b395d800..8619781b4 100644 --- a/modoboa/admin/models.py +++ b/modoboa/admin/models.py @@ -702,7 +702,9 @@ class Domain(DatesAware): hm = parameters.get_admin("HANDLE_MAILBOXES", raise_error=False) if hm == "yes" and not keepdir: for mb in self.mailbox_set.all(): - mb.delete_dir() + MailboxOperation.objects.create( + type='delete', argument=mb.mail_home + ) if self.alias_set.count(): events.raiseEvent("MailboxAliasDelete", self.alias_set.all()) ungrant_access_to_objects(self.alias_set.all()) @@ -873,15 +875,9 @@ class Mailbox(DatesAware): hm = parameters.get_admin("HANDLE_MAILBOXES", raise_error=False) if hm is None or hm == "no": return - self.__mail_home = None - if not os.path.exists(old_mail_home): - return - code, output = exec_cmd( - "mv %s %s" % (old_mail_home, self.mail_home), - sudo_user=parameters.get_admin("MAILBOXES_OWNER") + MailboxOperation.objects.create( + mailbox=self, type='rename', argument=old_mail_home ) - if code: - raise AdminError(_("Failed to rename mailbox: %s" % output)) def rename(self, address, domain): """Rename the mailbox @@ -893,21 +889,14 @@ class Mailbox(DatesAware): qs = Quota.objects.filter(username=self.full_address) self.address = address self.domain = domain - self.rename_dir(old_mail_home) qs.update(username=self.full_address) + self.rename_dir(old_mail_home) def delete_dir(self): hm = parameters.get_admin("HANDLE_MAILBOXES", raise_error=False) if hm is None or hm == "no": return - if not os.path.exists(self.mail_home): - return - code, output = exec_cmd( - "rm -r %s" % self.mail_home, - sudo_user=parameters.get_admin("MAILBOXES_OWNER") - ) - if code: - raise AdminError(_("Failed to remove mailbox: %s" % output)) + MailboxOperation.objects.create(type='delete', argument=self.mail_home) def set_quota(self, value=None, override_rules=False): """Set or update quota's value for this mailbox. @@ -1017,6 +1006,14 @@ class Quota(models.Model): mbox = models.OneToOneField(Mailbox, related_name="quota_value", null=True) +class MailboxOperation(models.Model): + mailbox = models.ForeignKey(Mailbox, blank=True, null=True) + type = models.CharField( + max_length=20, choices=(('rename', 'rename'), ('delete', 'delete')) + ) + argument = models.TextField() + + class Alias(DatesAware): address = models.CharField( ugettext_lazy('address'), max_length=254, diff --git a/modoboa/admin/views.py b/modoboa/admin/views.py index b34136387..3582e9b33 100644 --- a/modoboa/admin/views.py +++ b/modoboa/admin/views.py @@ -125,6 +125,7 @@ def newdomain(request, tplname="common/wizard_forms.html"): @login_required @permission_required("admin.view_domains") +@transaction.commit_on_success def editdomain(request, dom_id, tplname="admin/editdomainform.html"): domain = Domain.objects.get(pk=dom_id) if not request.user.can_access(domain): @@ -157,11 +158,13 @@ def editdomain(request, dom_id, tplname="admin/editdomainform.html"): error = str(e) else: events.raiseEvent("DomainModified", domain) - return ajax_simple_response({"status": "ok", "respmsg": _("Domain modified")}) + return ajax_simple_response({"status": "ok", "respmsg": _("Domain modified")}) commonctx["tabs"] = form - commonctx["error"] = error - return ajax_response(request, status="ko", template=tplname, **commonctx) + return ajax_simple_response({ + "status": "ko", "respmsg": error, + "content": _render_to_string(request, tplname, commonctx) + }) commonctx["tabs"] = DomainForm(request.user, instances=instances) commonctx["domadmins"] = domadmins diff --git a/modoboa/core/templates/settings.py.tpl b/modoboa/core/templates/settings.py.tpl index 4f926f712..67aa8c691 100644 --- a/modoboa/core/templates/settings.py.tpl +++ b/modoboa/core/templates/settings.py.tpl @@ -208,6 +208,11 @@ LOGGING = { 'facility': SysLogHandler.LOG_AUTH, 'formatter': 'syslog' }, + 'syslog-cron': { + 'class': 'logging.handlers.SysLogHandler', + 'facility': SysLogHandler.LOG_CRON, + 'formatter': 'syslog' + } 'modoboa': { 'class': 'modoboa.lib.logutils.SQLHandler', } @@ -227,6 +232,11 @@ LOGGING = { 'handlers': ['modoboa'], 'level': 'INFO', 'propagate': False + }, + 'modoboa.cron': { + 'handlers': ['syslog-cron'], + 'level': 'INFO', + 'propagate': False } } } From 08b0fd0e5c187eed525c04276a9fdb241b35e5cf Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Sat, 14 Sep 2013 16:46:28 +0200 Subject: [PATCH 21/97] Log results into the database. see #482 --- modoboa/admin/app_settings.py | 4 +-- modoboa/admin/forms.py | 14 ++++----- .../commands/handle_mailbox_operations.py | 29 +++++++++---------- modoboa/admin/models.py | 5 ++++ 4 files changed, 28 insertions(+), 24 deletions(-) diff --git a/modoboa/admin/app_settings.py b/modoboa/admin/app_settings.py index 1f02db899..7b183b15c 100644 --- a/modoboa/admin/app_settings.py +++ b/modoboa/admin/app_settings.py @@ -197,11 +197,11 @@ class GeneralParametersForm(parameters.AdminParametersForm): self.fields["default_top_redirection"].choices = enabled_applications() hide_fields = False try: - code, version = exec_cmd("dovecot --version") + code, output = exec_cmd("which doveadm") except OSError, e: hide_fields = True else: - if code or not version.strip().startswith("2"): + if code: hide_fields = True if hide_fields: del self.fields["handle_mailboxes"] diff --git a/modoboa/admin/forms.py b/modoboa/admin/forms.py index f5e2a217d..75ec95f28 100644 --- a/modoboa/admin/forms.py +++ b/modoboa/admin/forms.py @@ -78,7 +78,7 @@ class DomainFormGeneral(forms.ModelForm, DynamicForm): def update_mailbox_quotas(self, domain): """Update all quota records associated to this domain - This methid must be called only when a domain gets renamed. As + This method must be called only when a domain gets renamed. As the primary key used for a quota is an email address, rename a domain will change all associated email addresses, so it will change the primary keys used for quotas. The consequence is we @@ -90,8 +90,6 @@ class DomainFormGeneral(forms.ModelForm, DynamicForm): perfomant at all as it will generate one query per quota record to update. """ - Mailbox.objects.filter(domain=domain, use_domain_quota=True) \ - .update(quota=d.quota) for q in Quota.objects.filter(username__contains="@%s" % self.oldname).values('username'): username = q['username'].replace('@%s' % self.oldname, '@%s' % domain.name) Quota.objects.filter(username=q['username']).update(username=username) @@ -108,9 +106,13 @@ class DomainFormGeneral(forms.ModelForm, DynamicForm): if commit: old_mail_homes = None if self.oldname is not None and d.name != self.oldname: + d.name = self.oldname old_mail_homes = \ dict((mb.id, mb.mail_home) for mb in d.mailbox_set.all()) + d.name = self.cleaned_data['name'] d.save() + Mailbox.objects.filter(domain=d, use_domain_quota=True) \ + .update(quota=d.quota) for k, v in self.cleaned_data.iteritems(): if not k.startswith("aliases"): continue @@ -131,12 +133,10 @@ class DomainFormGeneral(forms.ModelForm, DynamicForm): self.cleaned_data.keys())): dalias.delete() - self.update_mailbox_quotas(d) if old_mail_homes is not None: + self.update_mailbox_quotas(d) for mb in d.mailbox_set.all(): - MailboxOperation.objects.create( - mailbox=mb, type='rename', argument=old_mail_homes[mb.id] - ) + mb.rename_dir() return d diff --git a/modoboa/admin/management/commands/handle_mailbox_operations.py b/modoboa/admin/management/commands/handle_mailbox_operations.py index 419766023..e606be97d 100644 --- a/modoboa/admin/management/commands/handle_mailbox_operations.py +++ b/modoboa/admin/management/commands/handle_mailbox_operations.py @@ -3,6 +3,8 @@ import logging from optparse import make_option from django.core.management.base import BaseCommand from modoboa.lib import parameters +from modoboa.lib.sysutils import exec_cmd +from modoboa.admin import AdminConsole from modoboa.admin.models import MailboxOperation @@ -16,22 +18,18 @@ class Command(BaseCommand): def __init__(self, *args, **kwargs): super(Command, self).__init__(*args, **kwargs) - self.logger = logging.getLogger('modoboa.cron') + self.logger = logging.getLogger('modoboa.admin') def rename_mailbox(self, operation): if not os.path.exists(operation.argument): return - new_mail_home = operation.mailbox.mail_home.strip(os.sep) - self.logger.info("Renaming %s to %s", operation.argument, new_mail_home) - curpath = '/' - for part in new_mail_home.split(os.sep)[:-1]: - if not part: - continue - curpath = os.path.join(curpath, part) - if not os.path.exists(curpath): - os.mkdir(curpath) + new_mail_home = operation.mailbox.mail_home + try: + os.makedirs(os.path.dirname(new_mail_home)) + except os.error as e: + raise OperationError(str(e)) code, output = exec_cmd( - "mv %s %s" % (old_mail_home, new_mail_home) + "mv %s %s" % (ope.argument, new_mail_home) ) if code: raise OperationError(output) @@ -39,24 +37,25 @@ class Command(BaseCommand): def delete_mailbox(self, operation): if not os.path.exists(operation.argument): return - self.logger.info("Deleting %s", operation.argument) code, output = exec_cmd( "rm -r %s" % operation.argument ) if code: raise OperationError(output) - def handle(self): + def handle(self, *args, **options): + AdminConsole().load() if parameters.get_admin("HANDLE_MAILBOXES") == 'no': return for ope in MailboxOperation.objects.all(): try: - f = getattr(self, '%s_mailbox' % ope.optype) + f = getattr(self, '%s_mailbox' % ope.type) except AttributeError: continue try: f(ope) except OperationError as e: - self.logger.critical('Operation failed: %s', str(e)) + self.logger.critical('Operation failed: %s. Reason: %s', ope, str(e)) else: + self.logger.info('Operation succeed: %s', ope) ope.delete() diff --git a/modoboa/admin/models.py b/modoboa/admin/models.py index 8619781b4..8c03ee7e9 100644 --- a/modoboa/admin/models.py +++ b/modoboa/admin/models.py @@ -1013,6 +1013,11 @@ class MailboxOperation(models.Model): ) argument = models.TextField() + def __str__(self): + if self.type == 'rename': + return 'Rename %s -> %s' % (self.argument, self.mailbox.full_address) + return 'Delete %s' % self.argument + class Alias(DatesAware): address = models.CharField( From 40e37389ad511f1f37850fa0028ef58fbc5234cd Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Sat, 14 Sep 2013 16:48:37 +0200 Subject: [PATCH 22/97] Fixed wrong call. see #482 --- modoboa/admin/forms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modoboa/admin/forms.py b/modoboa/admin/forms.py index 75ec95f28..d1da8c872 100644 --- a/modoboa/admin/forms.py +++ b/modoboa/admin/forms.py @@ -136,7 +136,7 @@ class DomainFormGeneral(forms.ModelForm, DynamicForm): if old_mail_homes is not None: self.update_mailbox_quotas(d) for mb in d.mailbox_set.all(): - mb.rename_dir() + mb.rename_dir(old_mail_homes[mb.id]) return d From 71856df2dabd09396a26a115982d25e0c48198f6 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Sat, 14 Sep 2013 17:00:54 +0200 Subject: [PATCH 23/97] Check if sudo is needed before executing the command. see #482 --- .../commands/handle_mailbox_operations.py | 3 ++- modoboa/admin/models.py | 19 ++++++++++++++++--- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/modoboa/admin/management/commands/handle_mailbox_operations.py b/modoboa/admin/management/commands/handle_mailbox_operations.py index e606be97d..b6332d9ac 100644 --- a/modoboa/admin/management/commands/handle_mailbox_operations.py +++ b/modoboa/admin/management/commands/handle_mailbox_operations.py @@ -5,6 +5,7 @@ from django.core.management.base import BaseCommand from modoboa.lib import parameters from modoboa.lib.sysutils import exec_cmd from modoboa.admin import AdminConsole +from modoboa.admin.exceptions import AdminError from modoboa.admin.models import MailboxOperation @@ -54,7 +55,7 @@ class Command(BaseCommand): continue try: f(ope) - except OperationError as e: + except (OperationError, AdminError) as e: self.logger.critical('Operation failed: %s. Reason: %s', ope, str(e)) else: self.logger.info('Operation succeed: %s', ope) diff --git a/modoboa/admin/models.py b/modoboa/admin/models.py index 8c03ee7e9..5b6a111ef 100644 --- a/modoboa/admin/models.py +++ b/modoboa/admin/models.py @@ -24,6 +24,7 @@ import sys import pwd import re import crypt, hashlib, string, base64 +import pwd from random import Random try: @@ -857,15 +858,27 @@ class Mailbox(DatesAware): @property def mail_home(self): - """ + """Retrieve the home directory of this mailbox. + The home directory refers to the place on the file system + where the mailbox data is stored. + + We ask dovecot to give us this information because there are + several patterns to understand and we don't want to implement + them. """ hm = parameters.get_admin("HANDLE_MAILBOXES", raise_error=False) if hm is None or hm == "no": return None if self.__mail_home is None: - code, output = exec_cmd("doveadm user %s -f home" % self.full_address, - sudo_user=parameters.get_admin("MAILBOXES_OWNER")) + curuser = pwd.getpwuid(os.getuid()).pw_name + mbowner = parameters.get_admin("MAILBOXES_OWNER") + options = {} + if curuser != mbowner: + options['sudo_user'] = mbowner + code, output = exec_cmd( + "doveadm user %s -f home" % self.full_address, **options + ) if code: raise AdminError(_("Failed to retrieve mailbox location (%s)" % output)) self.__mail_home = output.strip() From f2f4e243aea69657cc9bb40cd2c4102d1cdd7298 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Sat, 14 Sep 2013 17:05:35 +0200 Subject: [PATCH 24/97] Check if path exists before trying to create it. see #482 --- .../commands/handle_mailbox_operations.py | 13 +++++++------ modoboa/admin/models.py | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/modoboa/admin/management/commands/handle_mailbox_operations.py b/modoboa/admin/management/commands/handle_mailbox_operations.py index b6332d9ac..e4da2cb36 100644 --- a/modoboa/admin/management/commands/handle_mailbox_operations.py +++ b/modoboa/admin/management/commands/handle_mailbox_operations.py @@ -25,10 +25,11 @@ class Command(BaseCommand): if not os.path.exists(operation.argument): return new_mail_home = operation.mailbox.mail_home - try: - os.makedirs(os.path.dirname(new_mail_home)) - except os.error as e: - raise OperationError(str(e)) + if not os.path.exists(new_mail_home): + try: + os.makedirs(os.path.dirname(new_mail_home)) + except os.error as e: + raise OperationError(str(e)) code, output = exec_cmd( "mv %s %s" % (ope.argument, new_mail_home) ) @@ -56,7 +57,7 @@ class Command(BaseCommand): try: f(ope) except (OperationError, AdminError) as e: - self.logger.critical('Operation failed: %s. Reason: %s', ope, str(e)) + self.logger.critical('%s failed (reason: %s)', ope, e) else: - self.logger.info('Operation succeed: %s', ope) + self.logger.info('%s succeed', ope) ope.delete() diff --git a/modoboa/admin/models.py b/modoboa/admin/models.py index 5b6a111ef..2e2084857 100644 --- a/modoboa/admin/models.py +++ b/modoboa/admin/models.py @@ -1028,7 +1028,7 @@ class MailboxOperation(models.Model): def __str__(self): if self.type == 'rename': - return 'Rename %s -> %s' % (self.argument, self.mailbox.full_address) + return 'Rename %s -> %s' % (self.argument, self.mailbox.mail_home) return 'Delete %s' % self.argument From 8ea423173cba143f68a94d65ad5f3b5ce650d434 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Sat, 14 Sep 2013 17:09:01 +0200 Subject: [PATCH 25/97] Check the container, not the leaf :p see #482 --- .../admin/management/commands/handle_mailbox_operations.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modoboa/admin/management/commands/handle_mailbox_operations.py b/modoboa/admin/management/commands/handle_mailbox_operations.py index e4da2cb36..663bf3919 100644 --- a/modoboa/admin/management/commands/handle_mailbox_operations.py +++ b/modoboa/admin/management/commands/handle_mailbox_operations.py @@ -25,9 +25,10 @@ class Command(BaseCommand): if not os.path.exists(operation.argument): return new_mail_home = operation.mailbox.mail_home - if not os.path.exists(new_mail_home): + dirname = os.path.dirname(new_mail_home) + if not os.path.exists(dirname): try: - os.makedirs(os.path.dirname(new_mail_home)) + os.makedirs(dirname) except os.error as e: raise OperationError(str(e)) code, output = exec_cmd( From 21d6aaecd9657c50c03fb4d1f6666964eba5717e Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Sat, 14 Sep 2013 17:57:08 +0200 Subject: [PATCH 26/97] Prevent multiple executions. see #482 --- .../commands/handle_mailbox_operations.py | 34 +++++++++++++++++-- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/modoboa/admin/management/commands/handle_mailbox_operations.py b/modoboa/admin/management/commands/handle_mailbox_operations.py index 663bf3919..03b899e37 100644 --- a/modoboa/admin/management/commands/handle_mailbox_operations.py +++ b/modoboa/admin/management/commands/handle_mailbox_operations.py @@ -14,9 +14,15 @@ class OperationError(Exception): class Command(BaseCommand): - args = '' help = 'Handles rename and delete operations on mailboxes' + option_list = BaseCommand.option_list + ( + make_option( + '--pidfile', default='/tmp/handle_mailbox_operations.pid', + help='Path to the file that will contain the PID of this process' + ), + ) + def __init__(self, *args, **kwargs): super(Command, self).__init__(*args, **kwargs) self.logger = logging.getLogger('modoboa.admin') @@ -32,7 +38,7 @@ class Command(BaseCommand): except os.error as e: raise OperationError(str(e)) code, output = exec_cmd( - "mv %s %s" % (ope.argument, new_mail_home) + "mv %s %s" % (operation.argument, new_mail_home) ) if code: raise OperationError(output) @@ -46,10 +52,30 @@ class Command(BaseCommand): if code: raise OperationError(output) + def check_pidfile(self, path): + """Check if this command is already running + + :param str path: path to the file containing the PID + :return: a boolean, True means we can go further + """ + if os.path.exists(path): + with open(path) as fp: + pid = fp.read().strip() + code, output = exec_cmd( + "grep handle_mailbox_operations /proc/%s/cmdline" % pid + ) + if not code: + return False + with open(path, 'w') as fp: + print >> fp, os.getpid() + return True + def handle(self, *args, **options): AdminConsole().load() if parameters.get_admin("HANDLE_MAILBOXES") == 'no': return + if not self.check_pidfile(options['pidfile']): + return for ope in MailboxOperation.objects.all(): try: f = getattr(self, '%s_mailbox' % ope.type) @@ -58,7 +84,9 @@ class Command(BaseCommand): try: f(ope) except (OperationError, AdminError) as e: - self.logger.critical('%s failed (reason: %s)', ope, e) + self.logger.critical('%s failed (reason: %s)', + ope, str(e).encode('utf-8')) else: self.logger.info('%s succeed', ope) ope.delete() + os.unlink(options['pidfile']) From 524a585444ff8a69bad8e38b275b8968734d648d Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Sat, 14 Sep 2013 18:27:57 +0200 Subject: [PATCH 27/97] New SQL map file to use with check_recipient_access. see #482 --- modoboa/core/commands/postfix_maps.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modoboa/core/commands/postfix_maps.py b/modoboa/core/commands/postfix_maps.py index f697db4e2..73358fab5 100644 --- a/modoboa/core/commands/postfix_maps.py +++ b/modoboa/core/commands/postfix_maps.py @@ -65,6 +65,12 @@ class CatchallAliasesMap(MapFile): postgres = "(SELECT mb.address || '@' || dom.name FROM admin_mailbox mb INNER JOIN admin_domain dom ON mb.domain_id=dom.id WHERE mb.id IN (SELECT al_mb.mailbox_id FROM admin_alias al INNER JOIN admin_domain dom ON al.domain_id=dom.id INNER JOIN admin_alias_mboxes al_mb ON al.id=al_mb.alias_id WHERE al.enabled AND al.address='*' AND dom.name='%d' AND dom.enabled)) UNION (SELECT al.extmboxes FROM admin_alias al INNER JOIN admin_domain dom ON al.domain_id=dom.id WHERE al.enabled AND al.extmboxes<>'' AND al.address='*' AND dom.name='%d' AND dom.enabled)" +class MaintainMap(MapFile): + filename = 'sql-maintain.cf' + mysql = "SELECT '450 Requested mail action not taken: mailbox unavailable' FROM admin_mailbox mb INNER JOIN admin_domain dom ON mb.domain_id=dom.id INNER JOIN admin_mailboxoperation mbop ON mbop.mailbox_id=mb.id WHERE dom.name='%d' AND mb.address='%u' LIMIT 1" + postgres = "SELECT '450 Requested mail action not taken: mailbox unavailable' FROM admin_mailbox mb INNER JOIN admin_domain dom ON mb.domain_id=dom.id INNER JOIN admin_mailboxoperation mbop ON mbop.mailbox_id=mb.id WHERE dom.name='%d' AND mb.address='%u' LIMIT 1" + + class TransportMap(MapFile): category = "autoreply" filename = 'sql-transport.cf' From 00fab59c94e0cecc220b853c64e441f30f65b494 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Sat, 14 Sep 2013 19:07:21 +0200 Subject: [PATCH 28/97] Documentation updated. fixes #482 --- doc/integration/imap_and_smtp.rst | 49 +++++++++++++++++++++++++++++-- 1 file changed, 47 insertions(+), 2 deletions(-) diff --git a/doc/integration/imap_and_smtp.rst b/doc/integration/imap_and_smtp.rst index bbcab775e..d035c6627 100644 --- a/doc/integration/imap_and_smtp.rst +++ b/doc/integration/imap_and_smtp.rst @@ -45,9 +45,46 @@ Then, edit the ``inbox`` namespace and add the following lines:: It ensures all the special mailboxes will be automaticaly created for new accounts. -.. note:: +Operations on the file system +----------------------------- + +Three operation types are considered: + +#. Mailbox creation +#. Mailbox renaming +#. Mailbox deletion + +The first one is managed by Dovecot. The last two ones may be managed +by Modoboa if it can access the file system where the mailboxes are +stored (see :ref:`admin-params` to activate this feature). + +Those operations are treated asynchronously by a cron script. For +example, when you rename an e-mail address through the web UI, the +associated mailbox on the file system is not modified +directly. Instead of that, a 'rename' order is created for this +mailbox. The mailbox will be considered unavailable until the order is +not executed (see :ref:`Postfix configuration `). + +Edit the crontab of the user who owns the mailboxes on the file system:: + + $ crontab -u -e + +And add the following line inside:: + + * * * * * python /var/www/mail_koalabs_org/manage.py handle_mailbox_operations + +.. warning:: + + The cron script must be executed by the system user owning the mailboxes. + +.. warning:: + + The user running the cron script must have access to the + *settings.py* file of the modoboa instance. + +The result of each order is recorded into Modoboa's log. Go to +*Modoboa > Logs* to consult them. - Modoboa is not responsible for mailboxes creation, Dovecot is. Authentication ============== @@ -369,6 +406,8 @@ directory, run the following command:: ``mapfiles`` is the directory where the files will be stored. Answer the few questions and you're done. +.. _postfix_config: + Configuration ============= @@ -393,6 +432,12 @@ Use the following configuration in the */etc/postfix/main.cf* file mysql:/etc/postfix/sql-email2email.cf, mysql:/etc/postfix/sql-catchall-aliases.cf + smtpd_recipient_restrictions = + ... + check_recipient_access mysql:/etc/postfix/maps/sql-maintain.cf + permit_mynetworks + ... + # Stuff after Then, edit the */etc/postfix/master.cf* file and add the following From db17f923fe36c1cf846c6cd29e131085d7a1b364 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Sat, 14 Sep 2013 19:12:08 +0200 Subject: [PATCH 29/97] Release note for 1.0.1 added. --- doc/getting_started/upgrade.rst | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/doc/getting_started/upgrade.rst b/doc/getting_started/upgrade.rst index b9ac53826..fcf7fc452 100644 --- a/doc/getting_started/upgrade.rst +++ b/doc/getting_started/upgrade.rst @@ -43,6 +43,13 @@ Finally, follow the common procedure:: $ python manage.py syncdb --migrate $ python manage.py collectstatic +1.0.1: operations on mailboxes +============================== + +The way Modoboa handles **rename** and **delete** operations on mailboxes has +been improved. Make sure to consult :ref:`fs_operations`. + + 1.0.0: production ready, at last ================================ From 3e2bb6683a86d9c141796aab10762eb13b7f85f4 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Sat, 14 Sep 2013 19:13:10 +0200 Subject: [PATCH 30/97] Label added. --- doc/integration/imap_and_smtp.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/integration/imap_and_smtp.rst b/doc/integration/imap_and_smtp.rst index d035c6627..3280b5af2 100644 --- a/doc/integration/imap_and_smtp.rst +++ b/doc/integration/imap_and_smtp.rst @@ -45,6 +45,8 @@ Then, edit the ``inbox`` namespace and add the following lines:: It ensures all the special mailboxes will be automaticaly created for new accounts. +.. _fs_operations: + Operations on the file system ----------------------------- From 0faf4caa733008cfd26758ba01c9e1a69b320fb6 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Mon, 16 Sep 2013 17:38:02 +0200 Subject: [PATCH 31/97] Don't forget to load the delete handler when the list is reloaded. --- modoboa/extensions/sievefilters/static/sievefilters/js/lib.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modoboa/extensions/sievefilters/static/sievefilters/js/lib.js b/modoboa/extensions/sievefilters/static/sievefilters/js/lib.js index e38092166..7854c0c13 100644 --- a/modoboa/extensions/sievefilters/static/sievefilters/js/lib.js +++ b/modoboa/extensions/sievefilters/static/sievefilters/js/lib.js @@ -44,6 +44,7 @@ function changefs(evt) { function init_filters_list() { $("a[name=togglestate]").click(toggle_filter_state); $("a[name*=movefilter_]").click(move_filter); + $("a[name=removefilter]").click(removefilter); } /* @@ -63,7 +64,6 @@ function loadfs(response) { $("#fsetmenu").remove(); } $("#menu").after($(response.menu)); - $("a[name=removefilter]").click(removefilter); $("a[name=activatefs]").click(activatefs); $("a[name=savefs]").click(savefs); $("a[name=removefs]").click(removefs); From 5e87fc764c4599d24929b500c242619aa5a2a803 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Tue, 17 Sep 2013 08:43:23 +0200 Subject: [PATCH 32/97] Properly encode filenames using RFC6266. see #473 fixes #481 --- modoboa/admin/views.py | 2 +- modoboa/extensions/sievefilters/views.py | 3 ++- modoboa/extensions/webmail/lib.py | 19 ++++++++++++------- modoboa/extensions/webmail/views.py | 7 ++++--- modoboa/lib/emailutils.py | 6 +++--- requirements.txt | 1 + 6 files changed, 23 insertions(+), 15 deletions(-) diff --git a/modoboa/admin/views.py b/modoboa/admin/views.py index 3582e9b33..fac30eb03 100644 --- a/modoboa/admin/views.py +++ b/modoboa/admin/views.py @@ -804,7 +804,7 @@ def _export(content, filename): resp = HttpResponse(content) resp["Content-Type"] = "text/csv" resp["Content-Length"] = len(content) - resp["Content-Disposition"] = 'attachment; filename="%s"' % filename + resp["Content-Disposition"] = build_header(filename) return resp diff --git a/modoboa/extensions/sievefilters/views.py b/modoboa/extensions/sievefilters/views.py index d730eff2b..9cae88c11 100644 --- a/modoboa/extensions/sievefilters/views.py +++ b/modoboa/extensions/sievefilters/views.py @@ -1,5 +1,6 @@ # coding: utf-8 from sievelib.managesieve import Error +from rfc6266 import build_header from django.http import HttpResponse from django.template.loader import render_to_string from django.contrib.auth.decorators import login_required @@ -263,7 +264,7 @@ def download_filters_set(request, name): resp = HttpResponse(script) resp["Content-Type"] = "text/plain; charset=utf-8" resp["Content-Length"] = len(script) - resp["Content-Disposition"] = 'attachment; filename="%s.txt"' % name + resp["Content-Disposition"] = build_header('%s.txt' % name) return resp @login_required diff --git a/modoboa/extensions/webmail/lib.py b/modoboa/extensions/webmail/lib.py index 8d39667cb..b8011d852 100644 --- a/modoboa/extensions/webmail/lib.py +++ b/modoboa/extensions/webmail/lib.py @@ -4,6 +4,7 @@ from datetime import datetime, timedelta import email import lxml import chardet +from rfc6266 import build_header, parse_headers from django.core.files.uploadhandler import FileUploadHandler, SkipFile from django.utils.translation import ugettext as _, ugettext_lazy @@ -277,20 +278,24 @@ class ImapEmail(Email): attname = "part_%s" % att["pnum"] params = None key = None - if att.has_key("params") and att["params"] != "NIL": + if "params" in att and att["params"] != "NIL": params = att["params"] key = "name" - if key is None and \ - att.has_key("disposition") and len(att["disposition"]) > 1: + if key is None and "disposition" in att and len(att["disposition"]) > 1: params = att["disposition"][1] key = "filename" if key and params: for pos, value in enumerate(params): - if value == key: + if not value.startswith(key): + continue + header = "%s; %s=%s" % (att['disposition'][0], value, + u2u_decode.u2u_decode(params[pos + 1]).strip("\r\t\n")) + attname = parse_headers(header).filename_unsafe + if attname is None: attname = u2u_decode.u2u_decode(params[pos + 1]).strip("\r\t\n") - break + break self.attachments[att["pnum"]] = attname def _fetch_inlines(self): @@ -302,7 +307,7 @@ class ImapEmail(Email): params["fname"] = os.path.join(settings.MEDIA_URL, fname) if os.path.exists(path): continue - + pdef, content = self.imapc.fetchpart(self.mailid, self.mbox, params["pnum"]) fp = open(path, "wb") fp.write(decode_payload(params["encoding"], content)) @@ -613,7 +618,7 @@ def create_mail_attachment(attdef): res.set_payload(fp.read()) fp.close() Encoders.encode_base64(res) - res.add_header("Content-Disposition", 'attachment', filename=attdef["fname"]) + res['Content-Disposition'] = build_header(attdef['fname'].decode('utf-8')) return res diff --git a/modoboa/extensions/webmail/views.py b/modoboa/extensions/webmail/views.py index 113b831da..06234f912 100644 --- a/modoboa/extensions/webmail/views.py +++ b/modoboa/extensions/webmail/views.py @@ -43,16 +43,17 @@ def getattachment(request): resp = HttpResponse(decode_payload(partdef["encoding"], payload)) resp["Content-Type"] = partdef["Content-Type"] resp["Content-Transfer-Encoding"] = partdef["encoding"] + print partdef if partdef["disposition"] != 'NIL': disp = partdef["disposition"] # FIXME : ugly hack, see fetch_parser.py for more explanation # :p if type(disp[1][0]) != dict: - cd = '%s; %s="%s"' % (disp[0], disp[1][0], disp[1][1]) + cd = '%s; %s=%s' % (disp[0], disp[1][0], disp[1][1]) else: - cd = '%s; %s="%s"' % (disp[0], disp[1][0]['struct'][0], disp[1][0]['struct'][1]) + cd = '%s; %s=%s' % (disp[0], disp[1][0]['struct'][0], disp[1][0]['struct'][1]) else: - cd = 'attachment; filename="%s"' % request.GET["fname"] + cd = build_header(request.GET["fname"]) resp["Content-Disposition"] = cd resp["Content-Length"] = partdef["size"] return resp diff --git a/modoboa/lib/emailutils.py b/modoboa/lib/emailutils.py index 66fe831c1..a10381ffe 100644 --- a/modoboa/lib/emailutils.py +++ b/modoboa/lib/emailutils.py @@ -79,15 +79,15 @@ class Email(object): must be displayed and not attached. """ if self.dformat == "html" and self.links \ - and msg.has_key("Content-Disposition"): + and "Content-Disposition" in msg: if msg["Content-Disposition"].startswith("inline"): cid = None - if msg.has_key("Content-ID"): + if "Content-ID" in msg: m = re.match("<(.+)>", msg["Content-ID"]) cid = m is not None and m.group(1) or msg["Content-ID"] fname = msg.get_filename() if fname is None: - if msg.has_key("Content-Location"): + if "Content-Location" in msg: fname = msg["Content-Location"] elif cid is not None: fname = cid diff --git a/requirements.txt b/requirements.txt index 195f44718..33a9fecab 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,3 +6,4 @@ pycrypto sievelib chardet argparse +rfc6266 From 88d755431aa30f74e0c870ae1caea209adaa8780 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Tue, 17 Sep 2013 15:03:26 +0200 Subject: [PATCH 33/97] Compress attachments before the HTTP proxy does. fix #480 --- modoboa/extensions/webmail/views.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/modoboa/extensions/webmail/views.py b/modoboa/extensions/webmail/views.py index 06234f912..57eebb635 100644 --- a/modoboa/extensions/webmail/views.py +++ b/modoboa/extensions/webmail/views.py @@ -1,12 +1,14 @@ # coding: utf-8 -from django.conf import settings import os +from rfc6266 import build_header +from django.conf import settings from django.http import HttpResponse from django.template import Template, Context from django.utils.translation import ugettext as _, ungettext from django.core.urlresolvers import reverse from django.contrib.auth.decorators import login_required from django.views.decorators.csrf import csrf_exempt +from django.views.decorators.gzip import gzip_page from modoboa.lib import parameters from modoboa.lib.webutils import _render, _render_to_string, \ ajax_response, ajax_simple_response @@ -20,8 +22,10 @@ from lib import decode_payload, AttachmentUploadHandler, \ ImapEmail, ReplyModifier, ForwardModifier from templatetags import webextras + @login_required @needs_mailbox() +@gzip_page def getattachment(request): """Fetch a message attachment @@ -36,14 +40,11 @@ def getattachment(request): if not mbox or not mailid or not pnum: raise WebmailError(_("Invalid request")) - headers = {"Content-Type": "text/plain", - "Content-Transfer-Encoding": None} imapc = get_imapconnector(request) partdef, payload = imapc.fetchpart(mailid, mbox, pnum) resp = HttpResponse(decode_payload(partdef["encoding"], payload)) resp["Content-Type"] = partdef["Content-Type"] resp["Content-Transfer-Encoding"] = partdef["encoding"] - print partdef if partdef["disposition"] != 'NIL': disp = partdef["disposition"] # FIXME : ugly hack, see fetch_parser.py for more explanation @@ -58,6 +59,7 @@ def getattachment(request): resp["Content-Length"] = partdef["size"] return resp + @login_required @needs_mailbox() def move(request): From 69cf92647c158003cd7d99132521bfd966e88d17 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Tue, 17 Sep 2013 15:05:04 +0200 Subject: [PATCH 34/97] Few fixes. --- modoboa/extensions/webmail/static/webmail/js/webmail.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modoboa/extensions/webmail/static/webmail/js/webmail.js b/modoboa/extensions/webmail/static/webmail/js/webmail.js index d60e2cfec..8ddd4c5b8 100644 --- a/modoboa/extensions/webmail/static/webmail/js/webmail.js +++ b/modoboa/extensions/webmail/static/webmail/js/webmail.js @@ -709,14 +709,14 @@ Webmail.prototype = { * is clicked) */ compose_loader: function(e) { - var $link = $(e.target); + var $link = get_target(e, 'a'); e.preventDefault(); this.navobject.reset().setparam("action", $link.attr("href")).update(); }, reply_loader: function(e) { - var $link = $(e.target); + var $link = get_target(e, "a"); e.preventDefault(); this.navobject.reset().updateparams($link.attr("href")).update(); }, From b96706c98d9392b5bac668cd06630552c689b78c Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Tue, 17 Sep 2013 19:47:05 +0200 Subject: [PATCH 35/97] Few fixes. --- modoboa/admin/static/admin/css/admin.css | 4 ++++ modoboa/admin/views.py | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/modoboa/admin/static/admin/css/admin.css b/modoboa/admin/static/admin/css/admin.css index a28919dd9..2768bf843 100644 --- a/modoboa/admin/static/admin/css/admin.css +++ b/modoboa/admin/static/admin/css/admin.css @@ -22,6 +22,10 @@ table .progress { margin-bottom: 0 !important; } +table tbody tr:hover { + background-color: #F9F9F9; +} + .search { width: 85%; -webkit-border-radius:14px;-moz-border-radius:14px;border-radius:14px; diff --git a/modoboa/admin/views.py b/modoboa/admin/views.py index fac30eb03..1dbcef8e1 100644 --- a/modoboa/admin/views.py +++ b/modoboa/admin/views.py @@ -1,4 +1,7 @@ # coding: utf-8 +import cStringIO +import csv +from rfc6266 import build_header from django.http import HttpResponse, HttpResponseRedirect from django.utils.translation import ugettext as _, ungettext from django.core.urlresolvers import reverse @@ -9,8 +12,6 @@ from django.shortcuts import render from django.template.loader import render_to_string from django.db import transaction, IntegrityError from django.views.decorators.csrf import ensure_csrf_cookie -import cStringIO -import csv from lib import get_sort_order, get_listing_page from forms import * From 4510897020474ba435ef75a1a91c8ebdd6eb6b6b Mon Sep 17 00:00:00 2001 From: Louis-Dominique Dubeau Date: Tue, 17 Sep 2013 18:44:20 -0400 Subject: [PATCH 36/97] Added documentation on uwsgi. --- doc/integration/web_servers.rst | 206 +++++++++++++++++++++++++++++--- 1 file changed, 192 insertions(+), 14 deletions(-) diff --git a/doc/integration/web_servers.rst b/doc/integration/web_servers.rst index fbe187256..639aba65b 100644 --- a/doc/integration/web_servers.rst +++ b/doc/integration/web_servers.rst @@ -10,6 +10,14 @@ Web servers Apache2 ******* +.. note:: The following instructions are meant to help you get your + site up and running quickly. However it is not possible for + the people contributing documentation to Modoboa to test + every single combination of web server, wsgi server, + distribution, etc. So it is possible that **your** + installation of uwsgi or nginx or Apache or what-have-you + works differently. Keep this in mind. + mod_wgsi ======== @@ -37,13 +45,13 @@ following content inside:: WSGIScriptAlias / /wsgi.py -This is just one possible configuration. +This is just one possible configuration. .. note:: *Django* 1.3 users, please consult this `page `_, it contains an example *wsgi.py* file. -.. note:: +.. note:: You will certainly need more configuration in order to launch Apache. @@ -77,9 +85,9 @@ following content inside:: -This is just one possible configuration. +This is just one possible configuration. -.. note:: +.. note:: You will certainly need more configuration in order to launch Apache. @@ -89,17 +97,27 @@ This is just one possible configuration. Nginx ***** +.. note:: The following instructions are meant to help you get your + site up and running quickly. However it is not possible for + the people contributing documentation to Modoboa to test + every single combination of web server, wsgi server, + distribution, etc. So it is possible that **your** + installation of uwsgi or nginx or Apache or what-have-you + works differently. Keep this in mind. + +Green Unicorn +============= + `Nginx `_ is a really fast HTTP server. Associated with `Green Unicorn `_, it gives you one of the -best setup to serve python/Django applications. Modoboa's -performances are really good with this configuration. +best setups to serve python/Django applications. Modoboa's +performance is really good with this configuration. -To use this setup, first download and install those softwares -(`Install gunicorn `_ and `install -nginx `_). - -Then, use the following sample *gunicorn* configuration (create a new -file named *gunicorn.conf.py* inside Modoboa's root dir):: +To use this setup, first download and install `nginx +`__ and `gunicorn +`_. Then, use the following sample +*gunicorn* configuration (create a new file named *gunicorn.conf.py* +inside Modoboa's root dir):: backlog = 2048 bind = "unix:/var/run/gunicorn/modoboa.sock" @@ -123,13 +141,19 @@ following configuration:: } server { - listen 443; + listen 443 ssl; + ssl on; + keepalive_timeout 70; + server_name ; root ; access_log /var/log/nginx/.access.log; error_log /var/log/nginx/.error.log; + ssl_certificate ; + ssl_certificate_key ; + location /sitestatic/ { autoindex on; } @@ -143,10 +167,164 @@ following configuration:: proxy_set_header Host $http_host; proxy_redirect off; proxy_set_header X-Forwarded-Protocol ssl; - proxy_pass http://modoboa; + proxy_pass http://modoboa; } } +If you do not plan to use SSL then change the listen directive to +``listen 80;`` and delete each of the following directives:: + + ssl on; + keepalive_timeout 70; + ssl_certificate ; + ssl_certificate_key ; + proxy_set_header X-Forwarded-Protocol ssl; + +If you do plan to use SSL, you'll have to generate a certificate and a +key. `This article +`__ +contains information about how to do it. + Paste this content to your configuration (replace values between ``<>`` with yours), restart *nginx* and enjoy a really fast application! + +uwsgi +===== + +The following setup is meant to get you started quickly. You should +read the documentation of both nginx and uwsgi to understand how to +optimize their configuration for your site. + +The Django documentation includes the following warning regarding +uwsgi: + +.. warning:: Some distributions, including Debian and Ubuntu, ship an + outdated version of uWSGI that does not conform to the + WSGI specification. Versions prior to 1.2.6 do not call + close on the response object after handling a request. In + those cases the request_finished signal isn’t sent. This + can result in idle connections to database and memcache + servers. + +Use uwsgi 1.2.6 or newer. If you do not, you *will* run into +problems. Modoboa will fail in obscure ways. + +To use this setup, first download and install `nginx +`__ and `uwsgi +`_. + +Here is a sample nginx configuration:: + + server { + listen 443 ssl; + ssl on; + keepalive_timeout 70; + + server_name ; + root ; + + ssl_certificate ; + ssl_certificate_key ; + + access_log /var/log/nginx/.access.log; + error_log /var/log/nginx/.error.log; + + location /sitestatic/ { + autoindex on; + alias ; + } + + # Whether or not Modoboa uses a media directory depends on how + # you configured Modoboa. It does not hurt to have this. + location /media/ { + autoindex on; + alias ; + } + + # This denies access to any file that begins with + # ".ht". Apache's .htaccess and .htpasswd are such files. A + # Modoboa installed from scratch would not contain any such + # files, but you never know what the future holds. + location ~ /\.ht { + deny all; + } + + location / { + include uwsgi_params; + uwsgi_pass ; + uwsgi_param UWSGI_SCRIPT modoboa_server.wsgi:application + uwsgi_param UWSGI_SCHEME https; + } + } + +If you do not plan to use SSL then change the listen directive to +``listen 80;`` and delete each of the following directives:: + + ssl on; + keepalive_timeout 70; + ssl_certificate ; + ssl_certificate_key ; + uwsgi_param UWSGI_SCHEME https; + +If you do plan to use SSL, you'll have to generate a certificate and a +key. `This article +`__ +contains information about how to do it. + +Make sure to replace the ``<...>`` in the sample configuration with +appropriate values. Here are some explanations for the cases that may +not be completely self-explanatory: + +```` + Where Modoboa's :file:`settings.py` resides. This is also where the + :file:`sitestatic` and :file:`media` directories reside. + +```` + This is the URL which will be the root of your Modoboa site at your + domain. For instance, if your Modoboa installation is reachable at + at ``https://foo/modoboa`` then ```` is + ``/modoboa``. In this case you probably also have to set the + ``alias`` directives to point to where Modoboa's sitestatic and + media directories are because otherwise nginx won't be able to find + them. + + If Modoboa is at the root of your domain, then ```` is an empty string and can be deleted from the configuration + above. In this case, you probably do not need the ``alias`` + directives. + +```` + The location where uwsig is listening. It could be a unix domain + socket or an address:port combination. Ubuntu configures uwsgi so + that the port is:: + + unix:/run/uwsgi/app//socket + + where ```` is the name of the application. + +Your uwsgi configuration should be:: + + [uwsgi] + # Not needed when using uwsgi from pip + # plugins = python + chdir = + module = .wsgi:application + master = true + harakiri = 30 + sharedarea = 4 + processes = 4 + vhost = true + no-default-app = true + +The plugins directive should be turned on if you use a uwsgi +installation that requires it. If uwsgi was installed from pip, it +does not require it. In the configuration above: + +```` + The directory where :file:`manage.py` resides. This directory is the + parent of ```` + +```` + The name that you passed to ``modoboa-admin.py deploy`` when you + created your Modoboa instance. From dc00f7d2fd27c8709f0ad07f8fa32d144a34bcbf Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Wed, 18 Sep 2013 09:46:28 +0200 Subject: [PATCH 37/97] Properly decode URI components before use them. see #481 --- modoboa/static/js/history.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modoboa/static/js/history.js b/modoboa/static/js/history.js index 72cd2c069..d582219a1 100644 --- a/modoboa/static/js/history.js +++ b/modoboa/static/js/history.js @@ -179,7 +179,7 @@ History.prototype = { }, getbaseurl: function() { - return this.base.substr(0, this.base.length - 1); + return decodeURIComponent(this.base.substr(0, this.base.length - 1)); }, delparam: function(name) { From 6738cecb4446ed2e306597e785eb7d3d11c59c89 Mon Sep 17 00:00:00 2001 From: ricardopadilha Date: Wed, 18 Sep 2013 16:04:47 +0200 Subject: [PATCH 38/97] Added missing comma in settings.py.tpl A missing comma in settings.py.tpl breaks new deployments. --- modoboa/core/templates/settings.py.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modoboa/core/templates/settings.py.tpl b/modoboa/core/templates/settings.py.tpl index 67aa8c691..a80b25769 100644 --- a/modoboa/core/templates/settings.py.tpl +++ b/modoboa/core/templates/settings.py.tpl @@ -212,7 +212,7 @@ LOGGING = { 'class': 'logging.handlers.SysLogHandler', 'facility': SysLogHandler.LOG_CRON, 'formatter': 'syslog' - } + }, 'modoboa': { 'class': 'modoboa.lib.logutils.SQLHandler', } From c207b96a7420785f1e984f08dbfef9ddf01f1e4b Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Wed, 18 Sep 2013 21:11:06 +0200 Subject: [PATCH 39/97] Useless configuration removed. --- modoboa/core/templates/settings.py.tpl | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/modoboa/core/templates/settings.py.tpl b/modoboa/core/templates/settings.py.tpl index a80b25769..4f926f712 100644 --- a/modoboa/core/templates/settings.py.tpl +++ b/modoboa/core/templates/settings.py.tpl @@ -208,11 +208,6 @@ LOGGING = { 'facility': SysLogHandler.LOG_AUTH, 'formatter': 'syslog' }, - 'syslog-cron': { - 'class': 'logging.handlers.SysLogHandler', - 'facility': SysLogHandler.LOG_CRON, - 'formatter': 'syslog' - }, 'modoboa': { 'class': 'modoboa.lib.logutils.SQLHandler', } @@ -232,11 +227,6 @@ LOGGING = { 'handlers': ['modoboa'], 'level': 'INFO', 'propagate': False - }, - 'modoboa.cron': { - 'handlers': ['syslog-cron'], - 'level': 'INFO', - 'propagate': False } } } From 98f3bbda0fa0ff16a5b39183917c9a5ec65dfc95 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Wed, 18 Sep 2013 22:14:36 +0200 Subject: [PATCH 40/97] Consistency. --- doc/additional/migrating.rst | 4 +- doc/additional/virtualmachine.rst | 11 ++--- doc/extending/plugin_api.rst | 6 +-- doc/getting_started/configuration.rst | 16 +++---- doc/getting_started/install.rst | 12 ++--- doc/getting_started/plugins.rst | 28 +++++------ doc/getting_started/upgrade.rst | 58 +++++++++++----------- doc/integration/imap_and_smtp.rst | 69 ++++++++++++++------------- doc/integration/web_servers.rst | 61 ++++++++++++----------- 9 files changed, 134 insertions(+), 131 deletions(-) diff --git a/doc/additional/migrating.rst b/doc/additional/migrating.rst index beaaa66c1..448e7fdd1 100644 --- a/doc/additional/migrating.rst +++ b/doc/additional/migrating.rst @@ -16,7 +16,7 @@ existing `PostfixAdmin (version 2.3.3+) First, you must follow the :ref:`installation` step to create a fresh Modoboa database. -Once done, edit the *setting.py* file. First, add a new database +Once done, edit the :file:`settings.py` file. First, add a new database connection named ``pfxadmin`` into the ``DATABASES`` variable corresponding to your PostfixAdmin setup:: @@ -56,7 +56,7 @@ used by PostfixAdmin, check its configuration file if you're not sure) Click on the *Save* button. -The procedure is over, edit the *settings.py* file and: +The procedure is over, edit the :file:`settings.py` file and: * remove the ``pfxadmin`` database connection from the ``DATABASES`` variable diff --git a/doc/additional/virtualmachine.rst b/doc/additional/virtualmachine.rst index 942da5a10..471c2c418 100644 --- a/doc/additional/virtualmachine.rst +++ b/doc/additional/virtualmachine.rst @@ -4,9 +4,9 @@ Using the virtual machine Introduction ============ -A virtual machine with a ready-to-use *Modoboa* setup is available -`here `_. It is composed -of the following components: +A virtual machine with a ready-to-use Modoboa setup is available `here +`_. It is composed of +the following components: * Debian 6.0 (squeeze) * Modoboa and its prerequisites @@ -32,7 +32,7 @@ If you can't use the vmdk format, you can use `qemu Then, just use your prefered virtualization software (qemu, kvm, virtualbox, etc.) to start the machine. You'll need to configure at least one bridged network interface if you want to be able to play -with *Modoboa*, ie. your machine must be visible from your network. +with Modoboa, ie. your machine must be visible from your network. The default network interface of the machine (``eth0``) is configured to use the DHCP protocol. @@ -49,7 +49,7 @@ root demo the root user demo demo an unpriviliged user ===== ======== ==================== -To connect to *Modoboa*, first connect to the system and retrieve its +To connect to Modoboa, first connect to the system and retrieve its current network address like this:: $ /sbin/ifconfig eth0 @@ -72,4 +72,3 @@ admin@demo.local admin Administrator of the domain *demo.local*. user@demo.local user Simple user. Can access to applications. ================ ======== ============================================ - diff --git a/doc/extending/plugin_api.rst b/doc/extending/plugin_api.rst index b6d2e5f27..a96381405 100644 --- a/doc/extending/plugin_api.rst +++ b/doc/extending/plugin_api.rst @@ -33,12 +33,12 @@ The required glue ***************** To create a new plugin, just start a new django application like -this (into modoboa's directory):: +this (into Modoboa's directory):: $ python manage.py startapp Then, you need to register this application using the provided -API. Just copy/paste the following example into the *__init__.py* file +API. Just copy/paste the following example into the :file:`__init__.py` file of the future extension:: from modoboa.extensions import ModoExtension, exts_pool @@ -72,7 +72,7 @@ of the future extension:: exts_pool.register_extension(MyExtension) Once done, simply add your plugin's module name to the -``INSTALLED_APPS`` variable located inside *settings.py*. Optionaly, +``INSTALLED_APPS`` variable located inside :file:`settings.py`. Optionaly, run ``python manage.py syncdb`` if your plugin provides custom tables and ``python manage.py collectstatic`` to update static files. diff --git a/doc/getting_started/configuration.rst b/doc/getting_started/configuration.rst index cad72e254..efcf39658 100644 --- a/doc/getting_started/configuration.rst +++ b/doc/getting_started/configuration.rst @@ -86,7 +86,7 @@ Custom logo You have the possibility to use a custom logo instead of the default one on the login page. -To do so, open the *settings.py* file and add a +To do so, open the :file:`settings.py` file and add a ``MODOBOA_CUSTOM_LOGO`` variable. This variable must contain the relative URL of your logo under ``MEDIA_URL``. For example:: @@ -107,7 +107,7 @@ Host configuration To manipulate mailboxes on the filesystem, you must allow the user who runs Modoboa to execute commands as the user who owns mailboxes. -To do so, edit the */etc/sudoers* file and add the following inside:: +To do so, edit the :file:`/etc/sudoers` file and add the following inside:: ALL=() NOPASSWD: ALL @@ -121,7 +121,7 @@ Time zone and language Modoboa is available in many languages. -To specify the default language to use, edit the *settings.py* file +To specify the default language to use, edit the :file:`settings.py` file and modify the ``LANGUAGE_CODE`` variable:: LANGUAGE_CODE = 'fr' # or 'en' for english, etc. @@ -143,7 +143,7 @@ Modoboa uses `Django's session framework `_ to store per-user information. -Few parameters need to be set in the *settings.py* configuration +Few parameters need to be set in the :file:`settings.py` configuration file to make Modoboa behave as expected:: SESSION_EXPIRE_AT_BROWSER_CLOSE = False # Default value @@ -151,7 +151,7 @@ file to make Modoboa behave as expected:: This parameter is optional but you must ensure it is set to ``False`` (the default value). -The default configuration file provided by the *modoboa-admin.py* +The default configuration file provided by the ``modoboa-admin.py`` command is properly configured. **** @@ -163,7 +163,7 @@ LDAP Authentication ============== -*Modoboa* supports external LDAP authentication using the following extra components: +Modoboa supports external LDAP authentication using the following extra components: * `Python LDAP client `_ * `Django LDAP authentication backend `_ @@ -172,7 +172,7 @@ If you want to use this feature, you must first install those components:: $ pip install python-ldap django-auth-ldap -Then, all you have to do is to modify the *settings.py* file. Add a +Then, all you have to do is to modify the :file:`settings.py` file. Add a new authentication backend to the `AUTHENTICATION_BACKENDS` variable, like this:: @@ -247,7 +247,7 @@ If you need additional parameters, you will find a detailled documentation `here `_. Once the authentication is properly configured, the users defined in -your LDAP directory will be able to connect to *Modoboa*, the associated +your LDAP directory will be able to connect to Modoboa, the associated domain and mailboxes will be automatically created if needed. .. note:: diff --git a/doc/getting_started/install.rst b/doc/getting_started/install.rst index 426f6b89d..1c4f21d6e 100644 --- a/doc/getting_started/install.rst +++ b/doc/getting_started/install.rst @@ -30,8 +30,8 @@ You can choose between two options: * Use the Python package available on the `PyPI `_ * Download the sources tarball -The easiest one is to install it from the *PyPI*. Just run the -following command and you're done:: +The easiest one is to install it from PyPI. Just run the following +command and you're done:: $ pip install modoboa @@ -56,8 +56,8 @@ package. On Debian/Ubuntu:: `virtualenv `_ users ========================================================== -When you deploy an application using *virtualenv*, you may have to -compile some dependencies. For example, *modoboa* relies on *lxml*, +When you deploy an application using virtualenv, you may have to +compile some dependencies. For example, modoboa relies on lxml, which is a C python module. In order to install it, you will need to install the following requirements: @@ -65,7 +65,7 @@ install the following requirements: * libxslt development files * libxml2 development files -On a *Debian* like system, just run the following command:: +On a Debian like system, just run the following command:: $ apt-get install python-dev libxml2-dev libxslt-dev @@ -75,7 +75,7 @@ On a *Debian* like system, just run the following command:: Database ******** -Thanks to *django*, Modoboa supports several databases. Depending on +Thanks to Django, Modoboa supports several databases. Depending on the one you will use, you must install the appropriate python package: * `mysqldb `_ for `MySQL `_ diff --git a/doc/getting_started/plugins.rst b/doc/getting_started/plugins.rst index 5fcfcffb6..cb47c879f 100644 --- a/doc/getting_started/plugins.rst +++ b/doc/getting_started/plugins.rst @@ -50,11 +50,11 @@ This plugin provides a simple management frontend for `amavisd-new The per-domain policies feature only works for new installations. Currently, you can't use modoboa with an existing - database (ie. with data in *users* and *policies* tables). + database (ie. with data in ``users`` and ``policies`` tables). .. note:: - This plugin requires *amavisd-new* version **2.7.0** or higher. If + This plugin requires amavisd-new version **2.7.0** or higher. If you're planning to use the :ref:`selfservice`, you'll need version **2.8.0**. @@ -62,7 +62,7 @@ Database ======== You must tell to Modoboa where it can find the amavis -database. Inside *settings.py*, add a new connection to the +database. Inside :file:`settings.py`, add a new connection to the ``DATABASES`` variable like this:: DATABASES = { @@ -81,7 +81,7 @@ Replace values between ``<>`` with yours. .. note:: - Modoboa doesn't create *amavis* tables. You need to install them + Modoboa doesn't create amavis tables. You need to install them following the `official documentation `_. @@ -106,7 +106,7 @@ Release messages To release messages, first take a look at `this page `_. It -explains how to configure *amavisd-new* to listen somewhere for the +explains how to configure amavisd-new to listen somewhere for the AM.PDP protocol. This protocol is used to send requests. Below is an example of a working configuration:: @@ -126,7 +126,7 @@ Below is an example of a working configuration:: Don't forget to update the ``inet_acl`` list if you plan to release from the network. -Once *amavisd-new* is configured, just tell Modoboa where it can find +Once amavisd-new is configured, just tell Modoboa where it can find the *release server* by modifying the following parameters in the online panel: @@ -212,7 +212,7 @@ the required identifiers. To activate this feature, go the administration panel and set the **Enable self-service mode** parameter to yes. -The last step is to customize the notification messages *amavis* +The last step is to customize the notification messages amavis sends. The most important is to embark a direct link. Take a look at the `README.customize `_ file to learn what you're allowed to do. @@ -229,7 +229,7 @@ Graphical statistics This plugin collects various statistics about emails traffic on your server. It parses a log file to collect information, store it into RRD -files (see `rrdtool `_)and then +files (see `rrdtool `_) and then generates graphics in PNG format. To use it, go to the online parameters panel and adapt the following @@ -273,15 +273,15 @@ Postifx auto-reply messages *************************** This plugin let users define an auto-reply message (*vacation*). It is -based on *postfix* capabilities. +based on Postfix capabilities. The user that executes the autoreply script needs to access -*settings.py*. You must apply proper permissions on this file. For -example, if *settings.py* belongs to *www-data:www-data*, you can add -the *vmail* user to the *www-data* group and set the read permission +:file:`settings.py`. You must apply proper permissions on this file. For +example, if :file:`settings.py` belongs to ``www-data:www-data``, you can add +the ``vmail`` user to the ``www-data`` group and set the read permission for the group. -To make *postfix* use this feature, you need to update your +To make Postfix use this feature, you need to update your configuration files as follows: ``/etc/postfix/main.cf``:: @@ -334,7 +334,7 @@ Two working modes are available: To use this plugin, your hosting setup must include a *ManageSieve* server and your local delivery agent must understand the *Sieve* -language. Don't panic, *Dovecot* supports both :-) (refer to +language. Don't panic, Dovecot supports both :-) (refer to :ref:`dovecot` to know how to enable those features). .. note:: diff --git a/doc/getting_started/upgrade.rst b/doc/getting_started/upgrade.rst index fcf7fc452..9015d9e0a 100644 --- a/doc/getting_started/upgrade.rst +++ b/doc/getting_started/upgrade.rst @@ -56,7 +56,7 @@ been improved. Make sure to consult :ref:`fs_operations`. Configuration file update ------------------------- -Several modifications need to be done into *settings.py*. +Several modifications need to be done into :file:`settings.py`. #. Add the following import statement:: @@ -190,7 +190,7 @@ It is necessary to update the queries used to retrieve users and mailboxes: #. Run ``modoboa-admin.py postfix_maps --dbtype `` and compare the files with those that postfix currently use. Make necessary updates in light of the differences -#. Into *dovecot-sql.conf*, update the ``user_query`` query, refer to +#. Into :file:`dovecot-sql.conf`, update the ``user_query`` query, refer to :ref:`dovecot_mysql_queries` or :ref:`dovecot_pg_queries` #. Update dovecot's configuration to activate the new :ref:`quota related features ` @@ -207,7 +207,7 @@ may encounter the following issues: #. South fails to migrate ``reversion`` - Due to the admin user model change, the script *0001_initial.py* + Due to the admin user model change, the script :file:`0001_initial.py` may fail. Just deactivate ``reversion`` from ``INSTALLED_APPS`` and run the command again. Once done, reactivate ``reversion`` and run the command one last time. @@ -216,7 +216,7 @@ may encounter the following issues: 0.9.4: administrative panel performance improved ================================================ -#. Edit the *settings.py* file and remove +#. Edit the :file:`settings.py` file and remove ``'django.contrib.auth.backends.ModelBackend'`` from the ``AUTHENTICATION_BACKENDS`` variable @@ -229,10 +229,10 @@ For this version, we recommend to install a new instance (see Then, copy the following content from the old installation to the new one: -* The ``media`` directory +* The :file:`media` directory * The directory containing RRD files if you use the :ref:`stats` plugin -Don't copy the old *settings.py* file, just keep the new one and +Don't copy the old :file:`settings.py` file, just keep the new one and modify it (see :ref:`database` and :ref:`timezone_lang`). Migrate your database (see :ref:`latestversion`). @@ -260,16 +260,16 @@ requires a migration. .. note:: Many files have been renamed/removed for this version. I recommend that you backup important files (*settings.py*, etc.) elsewhere - (ie. */tmp* for example). Then, remove the *modoboa* directory, + (ie. :file:`/tmp` for example). Then, remove the :file:`modoboa` directory, extract the new tarball at the same place, rename the new directory - to *modoboa* and copy the files you've just backup into it. + to :file:`modoboa` and copy the files you've just backup into it. .. note:: If the first super administrator you created is named ``admin``, its password will be changed to ``password`` at the end of this upgrade. Don't forget to modify it! -#. Edit the *settings.py* file and update the following variables +#. Edit the :file:`settings.py` file and update the following variables (just copy/paste their new content):: MIDDLEWARE_CLASSES = ( @@ -326,10 +326,10 @@ requires a migration. $ ./manage.py collectstatic #. If you are using the *stats* extension, please rename the - */static/stats* directory to */media/stats* + :file:`/static/stats` directory to :file:`/media/stats` and change the value of the ``IMG_ROOTDIR`` parameter (go to the adminstration panel) -#. Restart the python instance(s) that serve *Modoboa* +#. Restart the python instance(s) that serve Modoboa #. Log into Modoboa, go to *Modoboa > Extensions*, uncheck all extensions, save. Then, check the extensions you want to use and @@ -339,7 +339,7 @@ requires a migration. (see :ref:`webservers`) #. **For Dovecot users only**, you need to modify the - ``password_query`` (file */etc/dovecot/dovecot-sql.conf* by default + ``password_query`` (file :file:`/etc/dovecot/dovecot-sql.conf` by default on a Debian system) like this:: password_query = SELECT email AS user, password FROM auth_user WHERE email='%u' @@ -347,7 +347,7 @@ requires a migration. 0.8.8: CSV import feature and minor fixes ========================================= -#. Edit the *settings.py* file and add +#. Edit the :file:`settings.py` file and add ``'modoboa.lib.middleware.AjaxLoginRedirect'`` to the ``MIDDLEWARE_CLASSES`` variable like this:: @@ -362,7 +362,7 @@ requires a migration. 'modoboa.extensions.webmail.middleware.WebmailErrorMiddleware', ) -#. Still inside *settings.py*, modify the ``DATABASE_ROUTERS`` +#. Still inside :file:`settings.py`, modify the ``DATABASE_ROUTERS`` variable like this:: DATABASE_ROUTERS = ["modoboa.extensions.amavis_quarantine.dbrouter.AmavisRouter"] @@ -371,7 +371,7 @@ requires a migration. 0.8.7: per-user language selection ================================== -#. Edit the *settings.py* file and add the +#. Edit the :file:`settings.py` file and add the ``'django.middleware.locale.LocaleMiddleware'`` middleware to the ``MIDDLEWARE_CLASSES`` variable like this:: @@ -404,7 +404,7 @@ requires a migration. ========================================================= #. Just update your configuration if you are using the quarantine - plugin. Open *settings.py*, move the database configuration from + plugin. Open :file:`settings.py`, move the database configuration from the ``DB_CONNECTIONS`` variable to the ``DATABASES`` variable, like this:: @@ -426,7 +426,7 @@ requires a migration. DATABASE_ROUTERS = ["modoboa.extensions.amavis_quarantine.dbrouter.AmavisRouter"] -#. Remove the deprecated ``DB_CONNECTIONS`` variable from *settings.py*. +#. Remove the deprecated ``DB_CONNECTIONS`` variable from :file:`settings.py`. 0.8.5: new "Sieve filters" plugin, improved admin app ===================================================== @@ -437,7 +437,7 @@ requires a migration. $ python manage.py migrate admin #. Add ``modoboa.auth`` and ``modoboa.extensions.sievefilters`` to the - ``INSTALLED_APPS`` variable in *settings.py*. + ``INSTALLED_APPS`` variable in :file:`settings.py`. #. Go the *Settings/Extensions* panel, deactivate and activate your extensions, it will update all the symbolic links. @@ -445,7 +445,7 @@ requires a migration. 0.8.4: folders manipulation support (webmail) and bugfixes ========================================================== -#. Update the ``MIDDLEWARE_CLASSES`` variable in *settings.py*:: +#. Update the ``MIDDLEWARE_CLASSES`` variable in :file:`settings.py`:: MIDDLEWARE_CLASSES = ( 'django.middleware.common.CommonMiddleware', @@ -460,7 +460,7 @@ requires a migration. extensions, it will update all the symbolic links to the new format. #. Optional: update the ``DATABASES`` and ``TEMPLATE_LOADERS`` - variables in *settings.py* to remove warning messages (appearing with + variables in :file:`settings.py` to remove warning messages (appearing with Django 1.3):: DATABASES = { @@ -482,14 +482,14 @@ requires a migration. 0.8.3: admin application refactoring and more ============================================= -#. Migrate the *admin* application:: +#. Migrate the ``admin`` application:: $ python manage.py migrate admin #. Update SQL queries used in your environnement (see :ref:`postfix` or :ref:`dovecot`). -#. Update *postfix* configuration so that it can handle domain aliases +#. Update Postfix configuration so that it can handle domain aliases (see :ref:`postfix`). @@ -502,9 +502,9 @@ requires a migration. #. Update your config file and add all extensions to ``INSTALLED_APPS`` (even those you are not going to use). -#. Inside the */templates/* directory, remove all symbolic links. -#. Download the latest release of ckeditor and extract it into */static/js/*. It should create a new directory named *ckeditor*. -#. Update the following variables inside *settings.py*:: +#. Inside the :file:`/templates/` directory, remove all symbolic links. +#. Download the latest release of ckeditor and extract it into :file:`/static/js/`. It should create a new directory named ``ckeditor``. +#. Update the following variables inside :file:`settings.py`:: MEDIA_ROOT = os.path.join(MODOBOA_DIR, 'static') MEDIA_URL = '/static/' @@ -518,9 +518,9 @@ requires a migration. 0.8.1 : project renamed ======================= -#. First, rename the *mailng* directory to *modoboa* and copy all the - content from *modoboa-0.8.1* to *modoboa*. -#. Edit *settings.py* and replace all occurences of mailng by +#. First, rename the ``mailng`` directory to ``modoboa`` and copy all the + content from ``modoboa-0.8.1`` to ``modoboa``. +#. Edit :file:`settings.py` and replace all occurences of mailng by modoboa. Make sure you don't modify the ``DATABASE`` section as you're not going to rename your database. #. Rename the ``MAILNG_DIR`` variable to ``MODOBOA_DIR``. @@ -554,7 +554,7 @@ Before you start the migration, make sure you have updated your 'mailng.userprefs', ) -Starting with 0.8, mailng.main doesn't exist anymore. You must remove +Starting with 0.8, ``mailng.main`` doesn't exist anymore. You must remove it from your ``INSTALLED_APPS``. Finally, run the following commands:: diff --git a/doc/integration/imap_and_smtp.rst b/doc/integration/imap_and_smtp.rst index 3280b5af2..50d396112 100644 --- a/doc/integration/imap_and_smtp.rst +++ b/doc/integration/imap_and_smtp.rst @@ -12,12 +12,12 @@ Modoboa works better with Dovecot 2.0 so the following documentation is suitable for this combination. In this section, we assume dovecot's configuration resides in -*/etc/dovecot*, all pathes will be relative to this directory. +:file:`/etc/dovecot`, all pathes will be relative to this directory. Mailboxes ========= -First, edit the *conf.d/10-mail.conf* and set the ``mail_location`` +First, edit the :file:`conf.d/10-mail.conf` and set the ``mail_location`` variable:: # maildir @@ -63,7 +63,7 @@ stored (see :ref:`admin-params` to activate this feature). Those operations are treated asynchronously by a cron script. For example, when you rename an e-mail address through the web UI, the associated mailbox on the file system is not modified -directly. Instead of that, a 'rename' order is created for this +directly. Instead of that, a *rename* order is created for this mailbox. The mailbox will be considered unavailable until the order is not executed (see :ref:`Postfix configuration `). @@ -82,7 +82,7 @@ And add the following line inside:: .. warning:: The user running the cron script must have access to the - *settings.py* file of the modoboa instance. + :file:`settings.py` file of the modoboa instance. The result of each order is recorded into Modoboa's log. Go to *Modoboa > Logs* to consult them. @@ -91,7 +91,7 @@ The result of each order is recorded into Modoboa's log. Go to Authentication ============== -To make the authentication work, edit the *conf.d/10-auth.conf* and +To make the authentication work, edit the :file:`conf.d/10-auth.conf` and uncomment the following line at the end:: #!include auth-system.conf.ext @@ -103,7 +103,7 @@ uncomment the following line at the end:: #!include auth-static.conf.ext -Then, edit the *conf.d/auth-sql.conf.ext* file and add the following +Then, edit the :file:`conf.d/auth-sql.conf.ext` file and add the following content inside:: passdb sql { @@ -120,13 +120,13 @@ content inside:: Make sure to activate only one backend (per type) inside your configuration (just comment the other ones). -Edit the *dovecot-sql.conf.ext* and modify the configuration according +Edit the :file:`dovecot-sql.conf.ext` and modify the configuration according to your database engine. .. _dovecot_mysql_queries: -*MySQL* users -------------- +MySQL users +----------- :: @@ -144,8 +144,8 @@ to your database engine. .. _dovecot_pg_queries: -*PostgreSQL* users ------------------- +PostgreSQL users +---------------- :: @@ -169,7 +169,7 @@ LDA === The LDA is activated by default but you must define a *postmaster* -address. Open the *conf.d/15-lda.conf* file modify the following line:: +address. Open the :file:`conf.d/15-lda.conf` file modify the following line:: postmaster_address = postmaster@ @@ -182,12 +182,12 @@ Modoboa lets adminstrators define per-domain and/or per-account limits (quota). It also lists the current quota usage of each account. Those features require Dovecot to be configured in a specific way. -Inside *conf.d/10-mail.conf*, add the ``quota`` plugin to the default +Inside :file:`conf.d/10-mail.conf`, add the ``quota`` plugin to the default activated ones:: mail_plugins = quota -Inside *conf.d/10-master.conf*, update the *dict* service to set +Inside :file:`conf.d/10-master.conf`, update the ``dict`` service to set proper permissions:: service dict { @@ -200,7 +200,7 @@ proper permissions:: } } -Inside *conf.d/20-imap.conf*, activate the ``imap_quota`` plugin:: +Inside :file:`conf.d/20-imap.conf`, activate the ``imap_quota`` plugin:: protocol imap { # ... @@ -210,13 +210,13 @@ Inside *conf.d/20-imap.conf*, activate the ``imap_quota`` plugin:: # ... } -Inside *dovecot.conf*, activate the quota SQL dictionary backend:: +Inside :file:`dovecot.conf`, activate the quota SQL dictionary backend:: dict { quota = :/etc/dovecot/dovecot-dict-sql.conf.ext } -Inside *conf.d/90-quota.conf*, activate the *quota dictionary* backend:: +Inside :file:`conf.d/90-quota.conf`, activate the *quota dictionary* backend:: plugin { quota = dict:User quota::proxy::quota @@ -224,7 +224,8 @@ Inside *conf.d/90-quota.conf*, activate the *quota dictionary* backend:: It will tell Dovecot to keep quota usage in the SQL dictionary. -Finally, edit the *dovecot-dict-sql.conf.ext* file and put the following content inside:: +Finally, edit the :file:`dovecot-dict-sql.conf.ext` file and put the +following content inside:: connect = host= dbname= user= password= @@ -247,9 +248,9 @@ Finally, edit the *dovecot-dict-sql.conf.ext* file and put the following content Database schema update ^^^^^^^^^^^^^^^^^^^^^^ -The `admin_quota` table is created by *Django* but unfortunately it -doesn't support `DEFAULT` constraints (it only simulates them when the -ORM is used). As *PostgreSQL* is a bit strict about constraint +The ``admin_quota`` table is created by Django but unfortunately it +doesn't support ``DEFAULT`` constraints (it only simulates them when the +ORM is used). As PostgreSQL is a bit strict about constraint violations, you must execute the following query manually:: db=> ALTER TABLE admin_quota ALTER COLUMN bytes SET DEFAULT 0; @@ -318,8 +319,8 @@ work for Modoboa. You should use the following one instead: CREATE TRIGGER setmboxid AFTER INSERT ON admin_quota FOR EACH ROW EXECUTE PROCEDURE set_mboxid(); -Copy this example into a file (for example: *quota-trigger.sql*) on -server running *postgres* and execute the following commands:: +Copy this example into a file (for example: :file:`quota-trigger.sql`) on +server running postgres and execute the following commands:: $ su - postgres $ psql < /path/to/quota-trigger.sql @@ -332,7 +333,7 @@ For existing installations, *Dovecot* (> 2) offers a command to recalculate the current quota usages. For example, if you want to update all usages, run the following command:: - $ doveadmin quota recalc -A + $ doveadm quota recalc -A Be carefull, it can take a while to execute. @@ -342,7 +343,7 @@ ManageSieve/Sieve Modoboa lets users define filtering rules from the web interface. To do so, it requires *ManageSieve* to be activated on your server. -Inside *conf.d/20-managesieve.conf*, make sure the following lines are +Inside :file:`conf.d/20-managesieve.conf`, make sure the following lines are uncommented:: protocols = $protocols sieve @@ -361,7 +362,7 @@ uncommented:: Messages filtering using Sieve is done by the LDA. -Inside *conf.d/15-lda.conf*, activate the ``sieve`` plugin like this:: +Inside :file:`conf.d/15-lda.conf`, activate the ``sieve`` plugin like this:: protocol lda { # Space separated list of plugins to load (default is global mail_plugins). @@ -369,7 +370,7 @@ Inside *conf.d/15-lda.conf*, activate the ``sieve`` plugin like this:: } Finally, configure the ``sieve`` plugin by editing the -*conf.d/90-sieve.conf* file. Put the follwing content inside:: +:file:`conf.d/90-sieve.conf` file. Put the follwing caontent inside:: plugin { # Location of the active script. When ManageSieve is used this is actually @@ -382,7 +383,7 @@ Finally, configure the ``sieve`` plugin by editing the sieve_dir = ~/sieve } -Restart *Dovecot*. +Restart Dovecot. .. _postfix: @@ -398,22 +399,22 @@ Map files ========= You first need to create configuration files (or map files) that will -be used by *postfix* to lookup into Modoboa tables. +be used by Postfix to lookup into Modoboa tables. To automaticaly generate the requested map files and store them in a directory, run the following command:: $ modoboa-admin.py postfix_maps --dbtype mapfiles -``mapfiles`` is the directory where the files will be stored. Answer the -few questions and you're done. +:file:`mapfiles` is the directory where the files will be +stored. Answer the few questions and you're done. .. _postfix_config: Configuration ============= -Use the following configuration in the */etc/postfix/main.cf* file +Use the following configuration in the :file:`/etc/postfix/main.cf` file (this is just one possible configuration):: # Stuff before @@ -442,10 +443,10 @@ Use the following configuration in the */etc/postfix/main.cf* file # Stuff after -Then, edit the */etc/postfix/master.cf* file and add the following +Then, edit the :file:`/etc/postfix/master.cf` file and add the following definition at the end:: dovecot unix - n n - - pipe flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${recipient} -Restart *Postfix*. +Restart Postfix. diff --git a/doc/integration/web_servers.rst b/doc/integration/web_servers.rst index 639aba65b..2c2d11185 100644 --- a/doc/integration/web_servers.rst +++ b/doc/integration/web_servers.rst @@ -10,18 +10,19 @@ Web servers Apache2 ******* -.. note:: The following instructions are meant to help you get your - site up and running quickly. However it is not possible for - the people contributing documentation to Modoboa to test - every single combination of web server, wsgi server, - distribution, etc. So it is possible that **your** - installation of uwsgi or nginx or Apache or what-have-you - works differently. Keep this in mind. +.. note:: + + The following instructions are meant to help you get your site up + and running quickly. However it is not possible for the people + contributing documentation to Modoboa to test every single + combination of web server, wsgi server, distribution, etc. So it is + possible that **your** installation of uwsgi or nginx or Apache or + what-have-you works differently. Keep this in mind. mod_wgsi ======== -First, make sure that *mod_wsgi* is installed on your server. +First, make sure that mod_wsgi is installed on your server. Create a new virtualhost in your Apache configuration and put the following content inside:: @@ -48,8 +49,8 @@ following content inside:: This is just one possible configuration. .. note:: - *Django* 1.3 users, please consult this `page `_, - it contains an example *wsgi.py* file. + Django 1.3 users, please consult this `page `_, + it contains an example :file:`wsgi.py` file. .. note:: You will certainly need more configuration in order to launch @@ -58,7 +59,7 @@ This is just one possible configuration. mod_python ========== -First, make sure that *mod_python* is installed on your server. +First, make sure that mod_python is installed on your server. Create a new virtualhost in your Apache configuration and put the following content inside:: @@ -97,13 +98,14 @@ This is just one possible configuration. Nginx ***** -.. note:: The following instructions are meant to help you get your - site up and running quickly. However it is not possible for - the people contributing documentation to Modoboa to test - every single combination of web server, wsgi server, - distribution, etc. So it is possible that **your** - installation of uwsgi or nginx or Apache or what-have-you - works differently. Keep this in mind. +.. note:: + + The following instructions are meant to help you get your site up + and running quickly. However it is not possible for the people + contributing documentation to Modoboa to test every single + combination of web server, wsgi server, distribution, etc. So it is + possible that **your** installation of uwsgi or nginx or Apache or + what-have-you works differently. Keep this in mind. Green Unicorn ============= @@ -116,7 +118,7 @@ performance is really good with this configuration. To use this setup, first download and install `nginx `__ and `gunicorn `_. Then, use the following sample -*gunicorn* configuration (create a new file named *gunicorn.conf.py* +gunicorn configuration (create a new file named :file:`gunicorn.conf.py` inside Modoboa's root dir):: backlog = 2048 @@ -133,7 +135,7 @@ To start gunicorn, execute the following commands:: $ cd $ gunicorn -c gunicorn.conf.py .wsgi:application -Now the *nginx* part. Just create a new virtual host and use the +Now the nginx part. Just create a new virtual host and use the following configuration:: upstream modoboa { @@ -167,7 +169,7 @@ following configuration:: proxy_set_header Host $http_host; proxy_redirect off; proxy_set_header X-Forwarded-Protocol ssl; - proxy_pass http://modoboa; + proxy_pass http://modoboa; } } @@ -186,7 +188,7 @@ key. `This article contains information about how to do it. Paste this content to your configuration (replace values between -``<>`` with yours), restart *nginx* and enjoy a really fast +``<>`` with yours), restart nginx and enjoy a really fast application! uwsgi @@ -199,13 +201,14 @@ optimize their configuration for your site. The Django documentation includes the following warning regarding uwsgi: -.. warning:: Some distributions, including Debian and Ubuntu, ship an - outdated version of uWSGI that does not conform to the - WSGI specification. Versions prior to 1.2.6 do not call - close on the response object after handling a request. In - those cases the request_finished signal isn’t sent. This - can result in idle connections to database and memcache - servers. +.. warning:: + + Some distributions, including Debian and Ubuntu, ship an outdated + version of uWSGI that does not conform to the WSGI + specification. Versions prior to 1.2.6 do not call close on the + response object after handling a request. In those cases the + request_finished signal isn’t sent. This can result in idle + connections to database and memcache servers. Use uwsgi 1.2.6 or newer. If you do not, you *will* run into problems. Modoboa will fail in obscure ways. From f5626ecaa6fd4a5d2c46744be30a1fb9a995b217 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Thu, 19 Sep 2013 21:12:50 +0200 Subject: [PATCH 41/97] Display the name of the object about to be deleted. fixes #483 --- modoboa/admin/static/admin/js/admin.js | 16 ++-------- modoboa/admin/templatetags/admin_extras.py | 31 +++++-------------- modoboa/admin/tests.py | 4 +-- modoboa/admin/urls.py | 3 -- modoboa/admin/views.py | 36 ++++++++-------------- modoboa/static/js/confirmation.js | 4 ++- 6 files changed, 29 insertions(+), 65 deletions(-) diff --git a/modoboa/admin/static/admin/js/admin.js b/modoboa/admin/static/admin/js/admin.js index 825d645aa..835ea339d 100644 --- a/modoboa/admin/static/admin/js/admin.js +++ b/modoboa/admin/static/admin/js/admin.js @@ -114,7 +114,7 @@ Domains.prototype = { : gettext("This operation will remove all data associated to this domain, excepting accounts."); $("a[name=deldomain]").confirm({ - question: gettext("Delete this domain?"), + question: function() { return this.$element.attr('title'); }, method: "POST", warning: warnmsg, checkboxes: deloptions, @@ -240,23 +240,13 @@ Identities.prototype = { $("a.filter").click($.proxy(this.filter_by_tag, this)); $("a[name=delaccount]").confirm({ - question: gettext("Delete this account?"), + question: function() { return this.$element.attr('title'); }, method: "POST", checkboxes: deloptions, success_cb: $.proxy(this.reload_listing, this) }); - $("a[name=deldlist]").confirm({ - question: gettext("Delete this list?"), - method: "DELETE", - success_cb: $.proxy(this.reload_listing, this) - }); - $("a[name=delforward]").confirm({ - question: gettext("Delete this forward?"), - method: "DELETE", - success_cb: $.proxy(this.reload_listing, this) - }); $("a[name=delalias]").confirm({ - question: gettext("Delete this alias?"), + question: function() { return this.$element.attr('title'); }, method: "DELETE", success_cb: $.proxy(this.reload_listing, this) }); diff --git a/modoboa/admin/templatetags/admin_extras.py b/modoboa/admin/templatetags/admin_extras.py index 5cdf8b245..504a75295 100644 --- a/modoboa/admin/templatetags/admin_extras.py +++ b/modoboa/admin/templatetags/admin_extras.py @@ -175,7 +175,7 @@ def domain_actions(user, domid): actions.append({ "name": "deldomain", "url": reverse("modoboa.admin.views.deldomain", args=[domid]), - "title": _("Delete the domain"), + "title": _("Delete %s?" % domain.name), "img": "icon-trash" }) return render_actions(actions) @@ -191,30 +191,15 @@ def identity_actions(user, ident): {"name" : "delaccount", "url" : reverse("modoboa.admin.views.delaccount", args=[objid]), "img" : "icon-trash", - "title" : _("Delete this account")}, + "title" : _("Delete %s?" % ident.username)}, ] else: - if ident.get_recipients_count() >= 2: - actions = [ - {"name" : "deldlist", - "url" : reverse("modoboa.admin.views.deldlist") + "?selection=%s" % objid, - "img" : "icon-trash", - "title" : _("Delete this distribution list")}, - ] - elif ident.extmboxes != "": - actions = [ - {"name" : "delforward", - "url" : reverse("modoboa.admin.views.delforward") + "?selection=%s" % objid, - "img" : "icon-trash", - "title" : _("Delete this forward")}, - ] - else: - actions = [ - {"name" : "delalias", - "url" : reverse("modoboa.admin.views.delalias") + "?selection=%s" % objid, - "img" : "icon-trash", - "title" : _("Delete this alias")}, - ] + actions = [ + {"name" : "delalias", + "url" : reverse("modoboa.admin.views.delalias") + "?selection=%s" % objid, + "img" : "icon-trash", + "title" : _("Delete %s?" % ident.full_address)}, + ] return render_actions(actions) @register.simple_tag diff --git a/modoboa/admin/tests.py b/modoboa/admin/tests.py index 60d380a20..18e5a7f4e 100644 --- a/modoboa/admin/tests.py +++ b/modoboa/admin/tests.py @@ -208,7 +208,7 @@ class AliasTestCase(ModoTestCase): values) self.assertEqual(dlist.get_recipients_count(), 2) - self.check_ajax_get(reverse("modoboa.admin.views.deldlist") + "?selection=%d" \ + self.check_ajax_get(reverse("modoboa.admin.views.delalias") + "?selection=%d" \ % dlist.id, {}) self.assertRaises(Alias.DoesNotExist, Alias.objects.get, address="all", domain__name="test.com") @@ -224,7 +224,7 @@ class AliasTestCase(ModoTestCase): values) self.assertEqual(fwd.get_recipients_count(), 1) - self.check_ajax_get(reverse("modoboa.admin.views.delforward") + "?selection=%d" \ + self.check_ajax_get(reverse("modoboa.admin.views.delalias") + "?selection=%d" \ % fwd.id, {}) self.assertRaises(Alias.DoesNotExist, Alias.objects.get, address="forward", domain__name="test.com") diff --git a/modoboa/admin/urls.py b/modoboa/admin/urls.py index 048d1b859..edf49f22c 100644 --- a/modoboa/admin/urls.py +++ b/modoboa/admin/urls.py @@ -35,10 +35,7 @@ urlpatterns = patterns( (r'^accounts/delete/(?P\d+)/$', 'delaccount'), (r'^distriblists/new/$', 'newdlist'), - (r'^distriblists/delete/$', 'deldlist'), - (r'^forwards/new/$', 'newforward'), - (r'^forwards/delete/$', 'delforward'), (r'^aliases/new/$', 'newalias'), (r'^aliases/edit/(?P\d+)/$', 'editalias'), diff --git a/modoboa/admin/views.py b/modoboa/admin/views.py index 1dbcef8e1..7d142c41c 100644 --- a/modoboa/admin/views.py +++ b/modoboa/admin/views.py @@ -300,40 +300,30 @@ def editalias(request, alid, tplname="common/generic_modal_form.html"): return render(request, tplname, ctx) -def _del_alias(request, msg, msgs): +@login_required +@permission_required("admin.delete_alias") +@transaction.commit_on_success +def delalias(request): selection = request.GET["selection"].split(",") for alid in selection: alias = Alias.objects.get(pk=alid) if not request.user.can_access(alias): raise PermDeniedException + if alias.type == 'dlist': + msg = "Distribution list deleted" + msgs = "Distribution lists deleted" + elif alias.type == 'forward': + msg = "Forward deleted" + msgs = "Forwards deleted" + else: + msg = "Alias deleted" + msgs = "Aliases deleted" alias.delete() msg = ungettext(msg, msgs, len(selection)) return ajax_simple_response({"status": "ok", "respmsg": msg}) -@login_required -@permission_required("admin.delete_alias") -@transaction.commit_on_success -def delalias(request): - return _del_alias(request, "Alias deleted", "Aliases deleted") - - -@login_required -@permission_required("admin.delete_alias") -@transaction.commit_on_success -def deldlist(request): - return _del_alias(request, "Distribution list deleted", - "Distribution lists deleted") - - -@login_required -@permission_required("admin.delete_alias") -@transaction.commit_on_success -def delforward(request): - return _del_alias(request, "Forward deleted", "Forwards deleted") - - @login_required @user_passes_test(lambda u: u.has_perm("admin.add_user") or u.has_perm("admin.add_alias")) def _identities(request): diff --git a/modoboa/static/js/confirmation.js b/modoboa/static/js/confirmation.js index e360eba04..59bd9314d 100644 --- a/modoboa/static/js/confirmation.js +++ b/modoboa/static/js/confirmation.js @@ -36,9 +36,11 @@ id: "confirmbox", 'class': "modal" }); + var question = (typeof this.options.question == 'function') + ? this.options.question.apply(this) : this.options.question; box.append($('
    ' - + '

    ' + this.options.question + '

    ')); + + '

    ' + question + '

    ')); var $container = $("
    ", {"class" : "container-fluid"}); box.append($container); if (this.options.warning) { From c404058ba8b2007aff13e8c2cda4190ce08d7cf3 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Fri, 20 Sep 2013 22:26:49 +0200 Subject: [PATCH 42/97] Prevent a double delete order. see #482 --- modoboa/admin/models.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/modoboa/admin/models.py b/modoboa/admin/models.py index 2e2084857..a82275460 100644 --- a/modoboa/admin/models.py +++ b/modoboa/admin/models.py @@ -700,12 +700,6 @@ class Domain(DatesAware): Quota.objects.filter(username__contains='@%s' % self.name).delete() events.raiseEvent("DeleteMailbox", self.mailbox_set.all()) ungrant_access_to_objects(self.mailbox_set.all()) - hm = parameters.get_admin("HANDLE_MAILBOXES", raise_error=False) - if hm == "yes" and not keepdir: - for mb in self.mailbox_set.all(): - MailboxOperation.objects.create( - type='delete', argument=mb.mail_home - ) if self.alias_set.count(): events.raiseEvent("MailboxAliasDelete", self.alias_set.all()) ungrant_access_to_objects(self.alias_set.all()) From a6c9119c1bc6230f6c60a5762f48cba8e4fb35b1 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Fri, 20 Sep 2013 22:37:54 +0200 Subject: [PATCH 43/97] Translation files updated. --- modoboa/locale/de/LC_MESSAGES/django.po | 502 ++++++++------- modoboa/locale/en/LC_MESSAGES/django.po | 470 +++++++------- modoboa/locale/es/LC_MESSAGES/django.po | 693 ++++++++++++--------- modoboa/locale/fr/LC_MESSAGES/django.po | 474 +++++++------- modoboa/locale/it/LC_MESSAGES/django.po | 614 ++++++++++-------- modoboa/locale/pt_PT/LC_MESSAGES/django.po | 689 +++++++++++--------- modoboa/locale/sv/LC_MESSAGES/django.po | 502 ++++++++------- 7 files changed, 2153 insertions(+), 1791 deletions(-) diff --git a/modoboa/locale/de/LC_MESSAGES/django.po b/modoboa/locale/de/LC_MESSAGES/django.po index 588099c21..2a5e03aa8 100644 --- a/modoboa/locale/de/LC_MESSAGES/django.po +++ b/modoboa/locale/de/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Modoboa-0.9\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-01 16:35+0200\n" +"POT-Creation-Date: 2013-09-20 22:30+0200\n" "PO-Revision-Date: 2013-05-24 22:37+0100\n" "Last-Translator: Patrick Ben Koetter \n" "Language-Team: DE \n" @@ -28,8 +28,8 @@ msgstr "Verwaltungskonsole" msgid "Web based console to manage domains, accounts and aliases" msgstr "Webinterface zur Verwaltung von Domains, Mailkonten und -aliasen" -#: admin/__init__.py:16 admin/forms.py:179 admin/forms.py:614 -#: admin/views.py:93 admin/views.py:441 +#: admin/__init__.py:16 admin/forms.py:211 admin/forms.py:652 +#: admin/views.py:94 admin/views.py:447 #: extensions/postfix_autoreply/app_settings.py:11 #: extensions/sievefilters/app_settings.py:50 #: extensions/stats/app_settings.py:11 extensions/webmail/app_settings.py:11 @@ -248,15 +248,24 @@ msgstr "Standard Top-Redirect" msgid "The default redirection used when no application is specified" msgstr "Die Standardumleitung wenn kein Programm angegeben wurde" -#: admin/app_settings.py:230 +#: admin/app_settings.py:213 +msgid "Key must be either 16, 24, or 32 bytes long" +msgstr "" + +#: admin/app_settings.py:222 +#, fuzzy +msgid "Invalid syntax" +msgstr "Ungültige Zeile" + +#: admin/app_settings.py:245 msgid "This field is required" msgstr "Dieses Feld ist erforderlich" -#: admin/forms.py:16 admin/forms.py:459 admin/tables.py:18 +#: admin/forms.py:20 admin/forms.py:497 admin/tables.py:18 msgid "Alias(es)" msgstr "Aliase" -#: admin/forms.py:18 +#: admin/forms.py:22 msgid "" "Alias(es) of this domain. Indicate only one name per input, press ENTER to " "add a new input." @@ -265,23 +274,23 @@ msgstr "" "Eingabefeld an. Bestätigen Sie mit ENTER, um ein neues Eingabefeld zu " "erhalten." -#: admin/forms.py:55 +#: admin/forms.py:59 msgid "An alias with this name already exists" msgstr "Ein Alias mit diesem Namen existiert bereits" -#: admin/forms.py:69 +#: admin/forms.py:73 msgid "A domain with this name already exists" msgstr "Eine Domäne mit diesem Namen existiert bereits" -#: admin/forms.py:114 +#: admin/forms.py:146 msgid "Create a domain administrator" msgstr "Domänen-Administrator erstellen" -#: admin/forms.py:116 +#: admin/forms.py:148 msgid "Automatically create an administrator for this domain" msgstr "Automatisch Administrator für diese Domain anlegen" -#: admin/forms.py:120 admin/tables.py:12 admin/tables.py:47 +#: admin/forms.py:152 admin/tables.py:12 admin/tables.py:47 #: admin/templates/admin/editdomainform.html:13 #: admin/templates/admin/identities_table.html:5 #: admin/templates/admin/information.html:8 @@ -290,7 +299,7 @@ msgstr "Automatisch Administrator für diese Domain anlegen" msgid "Name" msgstr "Name" -#: admin/forms.py:122 +#: admin/forms.py:154 msgid "" "The administrator's name. Don't include the domain's name here, it will be " "automatically appended." @@ -298,28 +307,28 @@ msgstr "" "Name des Administrators. Geben Sie nicht den Domainnamen mit an. Er wird " "automatisch hinzugefügt." -#: admin/forms.py:128 +#: admin/forms.py:160 msgid "Create aliases" msgstr "Aliase erstellen" -#: admin/forms.py:130 +#: admin/forms.py:162 msgid "Automatically create standard aliases for this domain" msgstr "Automatisch Standard-Aliase für Domain anlegen" -#: admin/forms.py:143 +#: admin/forms.py:175 msgid "Invalid format" msgstr "Ungültiges Format" -#: admin/forms.py:155 +#: admin/forms.py:187 #, python-format msgid "User '%s' already exists" msgstr "Identität %s existiert bereits" -#: admin/forms.py:203 +#: admin/forms.py:235 msgid "Email address" msgstr "E-Mail Adresse" -#: admin/forms.py:204 +#: admin/forms.py:236 msgid "" "The distribution list address. Use the '*' character to create a 'catchall' " "address (ex: *@domain.tld)." @@ -327,11 +336,11 @@ msgstr "" "Adresse einer Verteilerliste. Geben Sie '*' an, um einen 'catchall'-Alias " "(Bsp: *@example.com) zu erstellen." -#: admin/forms.py:207 +#: admin/forms.py:239 msgid "Recipients" msgstr "Empfänger" -#: admin/forms.py:208 +#: admin/forms.py:240 msgid "" "Mailbox(es) this alias will point to. Indicate only one address per input, " "press ENTER to add a new input." @@ -339,111 +348,110 @@ msgstr "" "Mailboxen auf die der Alias verweist. Geben Sie jeweils nur eine Adresse ein " "und bestätigen Sie mit ENTER." -#: admin/forms.py:246 admin/forms.py:504 admin/forms.py:530 -#: admin/models.py:1147 +#: admin/forms.py:278 admin/forms.py:542 admin/forms.py:568 msgid "Domain does not exist" msgstr "Domain existiert nicht" -#: admin/forms.py:248 +#: admin/forms.py:280 msgid "You don't have access to this domain" msgstr "Der Zugriff auf diese Domain ist ihnen nicht gestattet" -#: admin/forms.py:268 +#: admin/forms.py:300 msgid "Invalid mailbox" msgstr "Ungültige Mailbox" -#: admin/forms.py:284 +#: admin/forms.py:316 admin/models.py:1202 #, python-format msgid "Local recipient %s not found" msgstr "Lokaler Empfänger %s nicht gefunden" -#: admin/forms.py:286 admin/forms.py:292 +#: admin/forms.py:318 admin/forms.py:324 #, python-format msgid "Recipient %s already present" msgstr "Empfänger %s existiert bereits" -#: admin/forms.py:297 +#: admin/forms.py:329 msgid "No recipient defined" msgstr "Keine Empfänger angegeben" -#: admin/forms.py:311 extensions/webmail/forms.py:19 +#: admin/forms.py:343 extensions/webmail/forms.py:19 msgid "Select a file" msgstr "Wählen Sie eine Datei" -#: admin/forms.py:313 admin/forms.py:341 +#: admin/forms.py:345 admin/forms.py:373 msgid "Separator" msgstr "Separator" -#: admin/forms.py:316 +#: admin/forms.py:348 msgid "Continue on error" msgstr "Bei Fehler fortfahren" -#: admin/forms.py:317 +#: admin/forms.py:349 msgid "Don't treat duplicated objects as error" msgstr "Doppelte Objekte nicht als Fehler behandeln" -#: admin/forms.py:332 +#: admin/forms.py:364 msgid "Crypt passwords" msgstr "Passworte verschlüsseln" -#: admin/forms.py:333 +#: admin/forms.py:365 msgid "Check this option if passwords contained in your file are not crypted" msgstr "Auswählen wenn Kennwörter in Datei nicht verschlüsselt sind" -#: admin/forms.py:339 +#: admin/forms.py:371 msgid "File name" msgstr "Dateiname" -#: admin/forms.py:371 admin/templates/admin/editdomainform.html:13 +#: admin/forms.py:403 admin/templates/admin/editdomainform.html:13 #: auth/forms.py:7 msgid "Username" msgstr "Benutzername" -#: admin/forms.py:373 +#: admin/forms.py:405 msgid "Role" msgstr "Rolle" -#: admin/forms.py:374 admin/forms.py:401 +#: admin/forms.py:406 admin/forms.py:433 msgid "Choose" msgstr "Auswählen" -#: admin/forms.py:375 +#: admin/forms.py:407 msgid "What level of permission this user will have" msgstr "Rechte, die der Benutzer haben wird" -#: admin/forms.py:377 auth/forms.py:11 +#: admin/forms.py:409 auth/forms.py:11 msgid "Password" msgstr "Passwort" -#: admin/forms.py:379 userprefs/forms.py:18 +#: admin/forms.py:411 userprefs/forms.py:18 msgid "Confirmation" msgstr "Bestätigung" -#: admin/forms.py:381 +#: admin/forms.py:413 msgid "Enter the same password as above, for verification." msgstr "Kennwort bestätigen" -#: admin/forms.py:392 +#: admin/forms.py:424 msgid "Enabled" msgstr "Aktiviert" -#: admin/forms.py:434 +#: admin/forms.py:471 msgid "The two password fields didn't match." msgstr "Die angegebenen Kennworte stimmen nicht überein" -#: admin/forms.py:440 +#: admin/forms.py:477 msgid "You can't disable your own account" msgstr "Sie können Ihr eigenes Konto nicht deaktivieren" -#: admin/forms.py:450 +#: admin/forms.py:488 msgid "E-mail" msgstr "E-Mail" -#: admin/forms.py:452 +#: admin/forms.py:490 msgid "Quota" msgstr "Quota" -#: admin/forms.py:454 +#: admin/forms.py:492 msgid "" "Quota in MB for this mailbox. Define a custom value or use domain's default " "one. Leave empty to define an unlimited value (not allowed for domain " @@ -453,7 +461,7 @@ msgstr "" "Sie den Standardwert der Domain. Lassen Sie das Feld leer für unbegrenztes " "Quota - Domänen-Administratoren ist dies nicht gestattet." -#: admin/forms.py:461 +#: admin/forms.py:499 msgid "" "Alias(es) of this mailbox. Indicate only one address per input, press ENTER " "to add a new input. Use the '*' character to create a 'catchall' alias (ex: " @@ -463,132 +471,132 @@ msgstr "" "an. Bestätigen Sie mit ENTER um die Eingabe zu bestätigen. Geben Sie '*' an, " "um einen 'catchall'-Alias (Bsp: *@example.com) zu erstellen." -#: admin/forms.py:512 +#: admin/forms.py:550 #, python-format msgid "Mailbox %s already exists" msgstr "Mailbox %s existiert bereits" -#: admin/forms.py:572 +#: admin/forms.py:610 msgid "Domain(s)" msgstr "Domain(s)" -#: admin/forms.py:574 +#: admin/forms.py:612 msgid "Domain(s) that user administrates" msgstr "Domänen, die dieser Anwender administriert" -#: admin/forms.py:616 admin/views.py:444 +#: admin/forms.py:654 admin/views.py:450 msgid "Mail" msgstr "E-Mail" -#: admin/forms.py:618 +#: admin/forms.py:656 msgid "Permissions" msgstr "Berechtigungen" -#: admin/models.py:78 +#: admin/models.py:80 msgid "You can't delete your own account" msgstr "Sie können Ihr eigenes Konto nicht entfernen" -#: admin/models.py:159 +#: admin/models.py:161 msgid "Failed to update password: LDAP module not installed" msgstr "Konnte Kennwort nicht aktualisieren: LDAP-Modul nicht installiert" -#: admin/models.py:165 +#: admin/models.py:167 #, python-format msgid "Failed to update password: %s" msgstr "Konnte Kennwort nicht aktualisieren: %s" -#: admin/models.py:192 +#: admin/models.py:194 msgid "account" msgstr "Konto" -#: admin/models.py:494 admin/models.py:720 admin/models.py:782 +#: admin/models.py:496 admin/models.py:733 admin/models.py:795 msgid "Invalid line" msgstr "Ungültige Zeile" -#: admin/models.py:498 +#: admin/models.py:500 msgid "You can't import an account with a role greater than yours" msgstr "Sie können kein Konto einer höheren Rolle importieren" -#: admin/models.py:518 +#: admin/models.py:506 +#, python-format +msgid "The simple user '%s' must have a valid email address" +msgstr "" + +#: admin/models.py:510 +#, python-format +msgid "username and email fields must not differ for '%s'" +msgstr "" + +#: admin/models.py:534 #, python-format msgid "Account import failed (%s): domain does not exist" msgstr "Kann Konto nicht importieren (%s): Die Domain existiert nicht" -#: admin/models.py:607 admin/models.py:733 +#: admin/models.py:624 admin/models.py:746 msgid "name" msgstr "Name" -#: admin/models.py:608 +#: admin/models.py:625 msgid "The domain name" msgstr "Name der Domäne" -#: admin/models.py:610 +#: admin/models.py:627 msgid "Default quota in MB applied to mailboxes" msgstr "Standard-Quota für Mailboxen (in MB)" -#: admin/models.py:613 admin/models.py:740 admin/models.py:1020 -#: admin/models.py:1181 extensions/postfix_autoreply/models.py:19 +#: admin/models.py:630 admin/models.py:753 admin/models.py:1045 +#: admin/models.py:1217 extensions/postfix_autoreply/models.py:27 msgid "enabled" msgstr "aktiviert" -#: admin/models.py:614 +#: admin/models.py:631 msgid "Check to activate this domain" msgstr "Auswählen, um diese Domäne zu aktivieren" -#: admin/models.py:734 +#: admin/models.py:747 msgid "The alias name" msgstr "Der Alias-Name" -#: admin/models.py:736 +#: admin/models.py:749 msgid "target" msgstr "Ziel" -#: admin/models.py:737 +#: admin/models.py:750 msgid "The domain this alias points to" msgstr "Domäne auf die dieser Alias verweist" -#: admin/models.py:741 admin/models.py:1021 +#: admin/models.py:754 admin/models.py:1046 msgid "Check to activate this alias" msgstr "Auswählen um den Alias zu aktivieren" -#: admin/models.py:788 +#: admin/models.py:801 #, python-format msgid "Unknown domain %s" msgstr "Unbekannte Domain %s" -#: admin/models.py:805 admin/models.py:1006 +#: admin/models.py:818 admin/models.py:1031 msgid "address" msgstr "Adresse" -#: admin/models.py:806 +#: admin/models.py:819 msgid "Mailbox address (without the @domain.tld part)" msgstr "Mailbox-Adresse (ohne den @domain.tld-Anteil)" -#: admin/models.py:852 +#: admin/models.py:877 #, python-format msgid "Failed to retrieve mailbox location (%s)" msgstr "Konnte Speicherort der Mailbox (%s) nicht bestimmen" -#: admin/models.py:868 -#, python-format -msgid "Failed to rename mailbox: %s" -msgstr "Mailbox konnte nicht umbenannt werden: %s" - -#: admin/models.py:894 -#, python-format -msgid "Failed to remove mailbox: %s" -msgstr "Konnte Mailbox nicht entfernen: %s" - -#: admin/models.py:909 +#: admin/models.py:921 #, python-format msgid "Quota is greater than the allowed domain's limit (%dM)" msgstr "Das Quota ist größer als das maximale Quota der Domain (%dM)" -#: admin/models.py:914 +#: admin/models.py:926 msgid "A quota is required" msgstr "Ein Quota ist erforderlich" -#: admin/models.py:1007 +#: admin/models.py:1032 msgid "" "The alias address (without the domain part). For a 'catch-all' address, just " "enter an * character." @@ -596,57 +604,57 @@ msgstr "" "Die Alias-Adresse (ohne den Domain-Anteil). Geben sie für eine Adresse an, " "die alles annimmt, * an." -#: admin/models.py:1011 +#: admin/models.py:1036 msgid "mailboxes" msgstr "Mailboxen" -#: admin/models.py:1012 +#: admin/models.py:1037 msgid "The mailboxes this alias points to" msgstr "Mailbox auf den dieser Alias verweist" -#: admin/models.py:1016 +#: admin/models.py:1041 msgid "The aliases this alias points to" msgstr "Aliase auf die dieser Alias verweist" -#: admin/models.py:1064 +#: admin/models.py:1089 msgid "distribution list" msgstr "Verteilerliste" -#: admin/models.py:1065 +#: admin/models.py:1090 msgid "forward" msgstr "Weiterleitung" -#: admin/models.py:1066 +#: admin/models.py:1091 msgid "alias" msgstr "Alias" -#: admin/models.py:1142 +#: admin/models.py:1170 #, python-format msgid "Invalid line: %s" msgstr "Ungültige Zeile: %s" -#: admin/models.py:1167 -#, python-format -msgid "Mailbox %s does not exist" -msgstr "Mailbox %s existiert nicht" +#: admin/models.py:1175 +#, fuzzy, python-format +msgid "Domain '%s' does not exist" +msgstr "Domain existiert nicht" -#: admin/models.py:1182 +#: admin/models.py:1218 msgid "Check to enable this extension" msgstr "Auswählen, um diese Erweiterung zu aktivieren" -#: admin/models.py:1282 +#: admin/models.py:1318 msgid "added" msgstr "hinzugefügt" -#: admin/models.py:1285 +#: admin/models.py:1321 msgid "modified" msgstr "verändert" -#: admin/models.py:1288 +#: admin/models.py:1324 msgid "deleted" msgstr "entfernt" -#: admin/models.py:1290 +#: admin/models.py:1326 #, python-format msgid "%(object)s '%(name)s' %(action)s by user %(user)s" msgstr "%(object)s '%(name)s' %(action)s der Identität %(user)s" @@ -656,7 +664,7 @@ msgid "Edit domain" msgstr "Domäne bearbeiten" #: admin/tables.py:21 admin/templates/admin/identities_table.html:8 -#: admin/templates/admin/listing.html:17 extensions/sievefilters/views.py:79 +#: admin/templates/admin/listing.html:17 extensions/sievefilters/views.py:83 #: extensions/sievefilters/templates/sievefilters/filter.html:17 #: extensions/sievefilters/templates/sievefilters/guieditor.html:5 #: extensions/webmail/templatetags/webextras.py:97 @@ -671,143 +679,143 @@ msgstr "Version" msgid "Description" msgstr "Beschreibung" -#: admin/views.py:87 +#: admin/views.py:88 msgid "New domain" msgstr "Neue Domäne" -#: admin/views.py:88 admin/views.py:97 admin/views.py:225 admin/views.py:438 -#: admin/views.py:445 extensions/sievefilters/views.py:120 -#: extensions/sievefilters/views.py:187 extensions/webmail/views.py:131 +#: admin/views.py:89 admin/views.py:98 admin/views.py:228 admin/views.py:444 +#: admin/views.py:451 extensions/sievefilters/views.py:129 +#: extensions/sievefilters/views.py:198 extensions/webmail/views.py:136 msgid "Create" msgstr "Erstellen" -#: admin/views.py:94 admin/views.py:442 +#: admin/views.py:95 admin/views.py:448 msgid "Next" msgstr "Nächstes" -#: admin/views.py:96 +#: admin/views.py:97 msgid "Options" msgstr "optionen" -#: admin/views.py:98 admin/views.py:446 +#: admin/views.py:99 admin/views.py:452 msgid "Previous" msgstr "Vorheriges" -#: admin/views.py:111 +#: admin/views.py:112 msgid "Domain created" msgstr "Domäne erstellt." -#: admin/views.py:144 admin/views.py:282 admin/views.py:492 +#: admin/views.py:146 admin/views.py:285 admin/views.py:498 #: extensions/postfix_autoreply/templates/postfix_autoreply/autoreply.html:9 -#: extensions/sievefilters/views.py:139 extensions/webmail/views.py:162 +#: extensions/sievefilters/views.py:148 extensions/webmail/views.py:168 #: userprefs/templates/userprefs/forward.html:8 #: userprefs/templates/userprefs/profile.html:8 msgid "Update" msgstr "Aktualisieren" -#: admin/views.py:160 +#: admin/views.py:162 msgid "Domain modified" msgstr "Domäne verändert" -#: admin/views.py:186 +#: admin/views.py:189 msgid "You can't delete your own domain" msgstr "Sie können Ihre eigene Domäne nicht löschen" -#: admin/views.py:189 +#: admin/views.py:192 msgid "Domain deleted" msgid_plural "Domains deleted" msgstr[0] "Domäne gelöscht" msgstr[1] "Domänen gelöscht" -#: admin/views.py:204 +#: admin/views.py:207 msgid "Alias with this name already exists" msgstr "Ein Alias mit diesem Namen existiert bereits" -#: admin/views.py:247 +#: admin/views.py:250 msgid "New distribution list" msgstr "Neue Verteilerliste" -#: admin/views.py:248 +#: admin/views.py:251 msgid "Distribution list created" msgstr "Verteilerliste erstellt" -#: admin/views.py:257 +#: admin/views.py:260 msgid "New alias" msgstr "Neuer Alias" -#: admin/views.py:258 +#: admin/views.py:261 msgid "Alias created" msgstr "Alias erstellt" -#: admin/views.py:267 +#: admin/views.py:270 msgid "New forward" msgstr "Neue Weiterleitung" -#: admin/views.py:268 +#: admin/views.py:271 msgid "Forward created" msgstr "Weiterleitung erstellt" -#: admin/views.py:286 +#: admin/views.py:289 msgid "Distribution list modified" msgstr "Verteilerliste verändert" -#: admin/views.py:288 +#: admin/views.py:291 msgid "Forward modified" msgstr "Weiterleitung verändert" -#: admin/views.py:290 +#: admin/views.py:293 msgid "Alias modified" msgstr "Alias verändert" -#: admin/views.py:403 admin/views.py:541 admin/views.py:546 -#: extensions/amavis/views.py:195 extensions/amavis/views.py:201 -#: extensions/amavis/views.py:234 extensions/amavis/views.py:238 -#: extensions/amavis/views.py:240 extensions/webmail/views.py:36 -#: extensions/webmail/views.py:64 extensions/webmail/views.py:77 -#: extensions/webmail/views.py:93 extensions/webmail/views.py:109 -#: extensions/webmail/views.py:193 extensions/webmail/views.py:419 -#: extensions/webmail/views.py:430 extensions/webmail/views.py:457 +#: admin/views.py:402 admin/views.py:545 admin/views.py:550 +#: extensions/amavis/views.py:204 extensions/amavis/views.py:210 +#: extensions/amavis/views.py:243 extensions/amavis/views.py:247 +#: extensions/amavis/views.py:249 extensions/webmail/views.py:41 +#: extensions/webmail/views.py:68 extensions/webmail/views.py:81 +#: extensions/webmail/views.py:98 extensions/webmail/views.py:114 +#: extensions/webmail/views.py:200 extensions/webmail/views.py:427 +#: extensions/webmail/views.py:438 extensions/webmail/views.py:465 #: lib/formutils.py:32 lib/formutils.py:37 msgid "Invalid request" msgstr "Ungültige Anfrage" -#: admin/views.py:435 +#: admin/views.py:441 msgid "New account" msgstr "Neues Konto" -#: admin/views.py:459 +#: admin/views.py:465 msgid "Account created" msgstr "Konto erstellt" -#: admin/views.py:507 +#: admin/views.py:513 msgid "Account updated" msgstr "Konto aktualisiert" -#: admin/views.py:531 +#: admin/views.py:535 msgid "Account deleted" msgid_plural "Accounts deleted" msgstr[0] "Konto gelöscht" msgstr[1] "Konten gelöscht" -#: admin/views.py:586 +#: admin/views.py:590 msgid "Parameters saved" msgstr "Parameter gespeichert" -#: admin/views.py:632 +#: admin/views.py:636 msgid "Modifications applied." msgstr "Änderungen übernommen." -#: admin/views.py:740 +#: admin/views.py:743 #, python-format msgid "Object already exists: %s" msgstr "Objekt existiert bereits: %s" -#: admin/views.py:742 +#: admin/views.py:745 #, python-format msgid "%d objects imported successfully" msgstr "%d Objekte erfolgreich importiert" -#: admin/views.py:760 +#: admin/views.py:763 msgid "" "Provide a CSV file where lines respect one of the following formats:\n" "
      \n" @@ -835,25 +843,25 @@ msgstr "" "\n" "

      Ein anderes Zeichen als Separator ist gestattet.

      \n" -#: admin/views.py:772 +#: admin/views.py:775 msgid "Import identities" msgstr "Identitäten importieren" -#: admin/views.py:773 admin/views.py:843 admin/templatetags/admin_extras.py:87 +#: admin/views.py:776 admin/views.py:846 admin/templatetags/admin_extras.py:87 #: admin/templatetags/admin_extras.py:144 msgid "Import" msgstr "Importiere" -#: admin/views.py:803 +#: admin/views.py:806 msgid "Export identities" msgstr "Identitäten exportieren" -#: admin/views.py:804 admin/views.py:860 admin/templatetags/admin_extras.py:93 +#: admin/views.py:807 admin/views.py:863 admin/templatetags/admin_extras.py:93 #: admin/templatetags/admin_extras.py:150 msgid "Export" msgstr "Exportiere" -#: admin/views.py:832 +#: admin/views.py:835 msgid "" "Provide a CSV file where lines respect one of the following formats:\n" "
        \n" @@ -873,11 +881,11 @@ msgstr "" "vorhergehenden sein.

        \n" "

        Ein anderes Zeichen als Trenner ist gestattet.

        \n" -#: admin/views.py:842 +#: admin/views.py:845 msgid "Import domains" msgstr "Domains importieren" -#: admin/views.py:859 +#: admin/views.py:862 msgid "Export domains" msgstr "Domains exportieren" @@ -950,7 +958,7 @@ msgid "Tags" msgstr "Tags" #: admin/templates/admin/importform.html:5 -#: admin/templatetags/admin_extras.py:305 +#: admin/templatetags/admin_extras.py:290 msgid "Help" msgstr "Hilfe" @@ -997,7 +1005,7 @@ msgid "Previously on Modoboa..." msgstr "Vorher auf Modoboa…" #: admin/templates/admin/logs.html:6 extensions/amavis/sql_listing.py:25 -#: extensions/webmail/lib.py:37 extensions/webmail/lib.py:406 +#: extensions/webmail/lib.py:38 extensions/webmail/lib.py:411 msgid "Date" msgstr "Datum" @@ -1100,34 +1108,21 @@ msgid "View the domain's identities" msgstr "Domain-Identitäten anzeigen" #: admin/templatetags/admin_extras.py:178 -msgid "Delete the domain" -msgstr "Domain entfernen" - #: admin/templatetags/admin_extras.py:194 -msgid "Delete this account" -msgstr "Dieses Konto löschen" +#: admin/templatetags/admin_extras.py:201 +#, fuzzy, python-format +msgid "Delete %s?" +msgstr "Löschen" -#: admin/templatetags/admin_extras.py:202 -msgid "Delete this distribution list" -msgstr "Diese Verteilerliste löschen" - -#: admin/templatetags/admin_extras.py:209 -msgid "Delete this forward" -msgstr "Weiterleitung entfernen" - -#: admin/templatetags/admin_extras.py:216 -msgid "Delete this alias" -msgstr " Alias entfernen" - -#: admin/templatetags/admin_extras.py:238 +#: admin/templatetags/admin_extras.py:223 msgid "Remove this permission" msgstr "Berechtigung entfernen" -#: admin/templatetags/admin_extras.py:279 lib/formutils.py:206 +#: admin/templatetags/admin_extras.py:264 lib/formutils.py:206 msgid "Yes" msgstr "Ja" -#: admin/templatetags/admin_extras.py:279 lib/formutils.py:206 +#: admin/templatetags/admin_extras.py:264 lib/formutils.py:206 msgid "No" msgstr "Nein" @@ -1136,13 +1131,13 @@ msgstr "Nein" msgid "User '%s' successfully logged in" msgstr "Identität '%s' hat sich erfolgreich angemeldet" -#: auth/views.py:41 +#: auth/views.py:44 msgid "Your username and password didn't match. Please try again." msgstr "" "Ihr Benutzername und Passwort stimmen nicht überein. Bitte versuchen Sie es " "noch einmal." -#: auth/views.py:64 +#: auth/views.py:67 #, python-format msgid "User '%s' logged out" msgstr "Identität '%s' hat sich abgemeldet" @@ -1202,16 +1197,16 @@ msgstr "Einfache amavis Management Oberfläche" msgid "Quarantine" msgstr "Quarantäne" -#: extensions/amavis/__init__.py:127 +#: extensions/amavis/__init__.py:129 msgid "pending requests" msgstr "Offene Anfragen" -#: extensions/amavis/__init__.py:144 +#: extensions/amavis/__init__.py:149 #, python-format msgid "%d pending requests" msgstr "%d offene Anfragen" -#: extensions/amavis/__init__.py:156 +#: extensions/amavis/__init__.py:161 msgid "Content filter" msgstr "Inhaltsfilter" @@ -1331,12 +1326,12 @@ msgid "Virus filter" msgstr "Virusfilter" #: extensions/amavis/models.py:94 extensions/amavis/models.py:102 -#: extensions/amavis/models.py:110 extensions/sievefilters/views.py:268 +#: extensions/amavis/models.py:110 extensions/sievefilters/views.py:281 msgid "yes" msgstr "Ja" #: extensions/amavis/models.py:95 extensions/amavis/models.py:103 -#: extensions/amavis/models.py:111 extensions/sievefilters/views.py:272 +#: extensions/amavis/models.py:111 extensions/sievefilters/views.py:285 msgid "no" msgstr "Nein" @@ -1384,13 +1379,13 @@ msgstr "" "Betreff:-Zeile einer Spam-Nachricht mit dem angegebenen Text ergänzen. " "Wählen Sie 'Standard' für den systemweiten Standard." -#: extensions/amavis/sql_listing.py:23 extensions/webmail/lib.py:36 +#: extensions/amavis/sql_listing.py:23 extensions/webmail/lib.py:37 msgid "From" msgstr "Von" #: extensions/amavis/sql_listing.py:24 extensions/sievefilters/forms.py:68 -#: extensions/webmail/forms.py:10 extensions/webmail/lib.py:35 -#: extensions/webmail/lib.py:404 templates/common/email_searchbar.html:6 +#: extensions/webmail/forms.py:10 extensions/webmail/lib.py:36 +#: extensions/webmail/lib.py:409 templates/common/email_searchbar.html:6 msgid "Subject" msgstr "Betreff" @@ -1400,37 +1395,37 @@ msgstr "Betreff" msgid "To" msgstr "An" -#: extensions/amavis/views.py:34 +#: extensions/amavis/views.py:43 msgid "Empty quarantine" msgstr "Quarantäne leeren" -#: extensions/amavis/views.py:202 +#: extensions/amavis/views.py:211 msgid "Message deleted" msgstr "Nachricht gelöscht" -#: extensions/amavis/views.py:223 +#: extensions/amavis/views.py:232 #, python-format msgid "%(count)d message deleted successfully" msgid_plural "%(count)d messages deleted successfully" msgstr[0] "%(count)d Nachricht erfolgreich gelöscht" msgstr[1] "%(count)d Nachrichten erfolgreich gelöscht" -#: extensions/amavis/views.py:243 +#: extensions/amavis/views.py:252 msgid "Request sent" msgstr "Anfrage gesendet" -#: extensions/amavis/views.py:249 +#: extensions/amavis/views.py:258 msgid "Message released" msgstr "Nachricht freigegeben" -#: extensions/amavis/views.py:271 +#: extensions/amavis/views.py:280 #, python-format msgid "%(count)d request sent" msgid_plural "%(count)d requests sent" msgstr[0] "%(count)d Anfrage gesendet" msgstr[1] "%(count)d Anfragen gesendet" -#: extensions/amavis/views.py:295 +#: extensions/amavis/views.py:304 #, python-format msgid "%(count)d message released successfully" msgid_plural "%(count)d messages released successfully" @@ -1557,7 +1552,7 @@ msgstr "Grenzwerte" msgid "Reseller" msgstr "Reseller" -#: extensions/limits/__init__.py:96 +#: extensions/limits/__init__.py:94 msgid "Resources" msgstr "Ressourcen" @@ -1683,23 +1678,23 @@ msgstr "Aktivieren Sie ihre automatisierte Antwort bis zu diesem Datum" msgid "This date is over" msgstr "Das Datum ist vorbei" -#: extensions/postfix_autoreply/models.py:15 +#: extensions/postfix_autoreply/models.py:19 msgid "subject" msgstr "Betreff" -#: extensions/postfix_autoreply/models.py:16 +#: extensions/postfix_autoreply/models.py:20 msgid "The subject that will appear in sent emails" msgstr "Der Betreff, der in den versendeten Nachrichten verwendet wird" -#: extensions/postfix_autoreply/models.py:17 +#: extensions/postfix_autoreply/models.py:23 msgid "content" msgstr "Inhalt" -#: extensions/postfix_autoreply/models.py:18 +#: extensions/postfix_autoreply/models.py:24 msgid "The content that will appear in sent emails" msgstr "Der Inhalt, der in den versendeten Nachrichten verwendet wird" -#: extensions/postfix_autoreply/models.py:20 +#: extensions/postfix_autoreply/models.py:28 msgid "Activate/Deactivate your auto reply" msgstr "Aktivieren/Deaktivieren Sie die automatisierte Antwort" @@ -1837,53 +1832,53 @@ msgstr "" msgid "Not enough space on server" msgstr "Kein weiterer Platz auf Server verfügbar" -#: extensions/sievefilters/views.py:64 +#: extensions/sievefilters/views.py:68 msgid "Failed to retrieve filters set" msgstr "Konnte Filter-Satz nicht laden" -#: extensions/sievefilters/views.py:117 +#: extensions/sievefilters/views.py:126 #: extensions/sievefilters/templatetags/sfilters_tags.py:33 msgid "New filter" msgstr "Neuer Filter" -#: extensions/sievefilters/views.py:124 +#: extensions/sievefilters/views.py:133 msgid "Filter created" msgstr "Filter erstellt" -#: extensions/sievefilters/views.py:136 +#: extensions/sievefilters/views.py:145 #: extensions/sievefilters/templatetags/sfilters_tags.py:77 msgid "Edit filter" msgstr "Filter bearbeiten" -#: extensions/sievefilters/views.py:145 +#: extensions/sievefilters/views.py:154 msgid "Filter modified" msgstr "Filter verändert" -#: extensions/sievefilters/views.py:165 +#: extensions/sievefilters/views.py:176 msgid "Filter removed" msgstr "Filter entfernt" -#: extensions/sievefilters/views.py:166 +#: extensions/sievefilters/views.py:177 msgid "Failed to remove filter" msgstr "Konnte Filter nicht entfernen" -#: extensions/sievefilters/views.py:180 +#: extensions/sievefilters/views.py:191 msgid "Filters set saved" msgstr "Filter-Satz gespeichert" -#: extensions/sievefilters/views.py:185 +#: extensions/sievefilters/views.py:196 msgid "Create a new filters set" msgstr "Neuen Filter-Satz erstellen" -#: extensions/sievefilters/views.py:208 +#: extensions/sievefilters/views.py:219 msgid "Filters set created" msgstr "Filter erstellt" -#: extensions/sievefilters/views.py:229 +#: extensions/sievefilters/views.py:240 msgid "Filters set deleted" msgstr "Filter entfernt" -#: extensions/sievefilters/views.py:241 +#: extensions/sievefilters/views.py:252 msgid "Filters set activated" msgstr "Filter-Satz aktiviert" @@ -1899,15 +1894,15 @@ msgstr "Aktiv" msgid "No filter defined yet" msgstr "Noch keine Filter definiert" -#: extensions/sievefilters/templates/sievefilters/index.html:55 +#: extensions/sievefilters/templates/sievefilters/index.html:56 msgid "Filter sets" msgstr "Filter-Sätze" -#: extensions/sievefilters/templates/sievefilters/index.html:59 +#: extensions/sievefilters/templates/sievefilters/index.html:60 msgid "active" msgstr "aktiv" -#: extensions/sievefilters/templates/sievefilters/index.html:73 +#: extensions/sievefilters/templates/sievefilters/index.html:74 msgid "" "No filters set defined yet. You must create one in order to define filters." msgstr "" @@ -2226,84 +2221,89 @@ msgstr "Server-Antwort" msgid "Cci" msgstr "Cci" -#: extensions/webmail/imaputils.py:259 +#: extensions/webmail/imaputils.py:237 +#, fuzzy +msgid "Failed to retrieve hierarchy delimiter" +msgstr "Konnte Filter-Satz nicht laden" + +#: extensions/webmail/imaputils.py:278 #, python-format msgid "Connection to IMAP server failed: %s" msgstr "Verbindung zu IMAP-Server fehlgeschlagen: %s" -#: extensions/webmail/lib.py:353 +#: extensions/webmail/lib.py:358 msgid "wrote:" msgstr "schrieb:" -#: extensions/webmail/lib.py:418 extensions/webmail/lib.py:422 +#: extensions/webmail/lib.py:423 extensions/webmail/lib.py:427 msgid "Original message" msgstr "Gesendete Nachrichten" -#: extensions/webmail/views.py:81 +#: extensions/webmail/views.py:86 #, python-format msgid "%(count)d message deleted" msgid_plural "%(count)d messages deleted" msgstr[0] "%(count)d Nachricht gelöscht" msgstr[1] "%(count)d Nachrichten gelöscht" -#: extensions/webmail/views.py:98 +#: extensions/webmail/views.py:103 msgid "Unknown action" msgstr "Unbekannte Aktion" -#: extensions/webmail/views.py:111 lib/email_listing.py:137 +#: extensions/webmail/views.py:116 lib/email_listing.py:137 msgid "Empty mailbox" msgstr "Mailbox leer" -#: extensions/webmail/views.py:128 -#: extensions/webmail/templatetags/webextras.py:169 +#: extensions/webmail/views.py:133 +#: extensions/webmail/templatetags/webextras.py:170 msgid "Create a new mailbox" msgstr "Neue Mailbox erstellen" -#: extensions/webmail/views.py:143 +#: extensions/webmail/views.py:149 msgid "Mailbox created" msgstr "Mailbox erstellt." -#: extensions/webmail/views.py:159 +#: extensions/webmail/views.py:165 msgid "Edit mailbox" msgstr "Mailbox bearbeiten" -#: extensions/webmail/views.py:173 +#: extensions/webmail/views.py:180 msgid "Mailbox updated" msgstr "Mailbox aktualisiert" -#: extensions/webmail/views.py:207 extensions/webmail/views.py:388 -#: extensions/webmail/views.py:497 +#: extensions/webmail/views.py:214 extensions/webmail/views.py:396 +#: extensions/webmail/views.py:505 msgid "Bad request" msgstr "Fehlerhafte Anfrage" -#: extensions/webmail/views.py:238 +#: extensions/webmail/views.py:246 msgid "Failed to save attachment: " msgstr "Konnte Anhang nicht speichern" -#: extensions/webmail/views.py:241 +#: extensions/webmail/views.py:249 #, python-format msgid "Attachment is too big (limit: %s)" msgstr "Anhang ist zu groß (Limit: %s)" -#: extensions/webmail/views.py:247 +#: extensions/webmail/views.py:255 #: extensions/webmail/templates/webmail/compose.html:15 #: extensions/webmail/templates/webmail/headers.html:4 msgid "Attachments" msgstr "Dateianhänge" -#: extensions/webmail/views.py:263 +#: extensions/webmail/views.py:271 msgid "Bad query" msgstr "Fehlerhafte Anfrage" -#: extensions/webmail/views.py:273 +#: extensions/webmail/views.py:281 msgid "Failed to remove attachment: " msgstr "Konnte Anhang nicht entfernen:" -#: extensions/webmail/views.py:278 +#: extensions/webmail/views.py:286 msgid "Unknown attachment" msgstr "Unbekannter Anhang" -#: extensions/webmail/views.py:493 +#: extensions/webmail/views.py:501 msgid "Undefined action" msgstr "Undefinierte Aktion" @@ -2334,7 +2334,7 @@ msgstr[1] "%(counter)s Dateien" msgid "Parent mailbox" msgstr "Eltern-Mailbox" -#: extensions/webmail/templates/webmail/index.html:36 +#: extensions/webmail/templates/webmail/index.html:38 msgid "Mailbox quota" msgstr "Mailbox Quota" @@ -2396,15 +2396,15 @@ msgstr "Als ungelesen" msgid "Compress folder" msgstr "Ordner komprimieren" -#: extensions/webmail/templatetags/webextras.py:109 +#: extensions/webmail/templatetags/webextras.py:110 msgid "Empty folder" msgstr "Leerer Ordner" -#: extensions/webmail/templatetags/webextras.py:177 +#: extensions/webmail/templatetags/webextras.py:178 msgid "Edit the selected mailbox" msgstr "Ausgewählte Mailbox bearbeiten" -#: extensions/webmail/templatetags/webextras.py:182 +#: extensions/webmail/templatetags/webextras.py:183 msgid "Remove the selected mailbox" msgstr "Markierte Mailbox entfernen" @@ -2458,7 +2458,7 @@ msgstr "Die angeforderte Seite existiert nicht" msgid "An internal error occured." msgstr "Ein interne Fehler ist aufgetreten" -#: templates/nlayout.html:56 +#: templates/nlayout.html:62 msgid "Powered by Modoboa" msgstr "Powered by Modoboa" @@ -2492,11 +2492,11 @@ msgstr "Schliessen" msgid "Welcome to Modoboa" msgstr "Willkommen zu Modoboa" -#: templates/registration/login.html:33 +#: templates/registration/login.html:34 msgid "Remember me" msgstr "Erinnere mich" -#: templates/registration/login.html:35 +#: templates/registration/login.html:36 msgid "Log in" msgstr "Anmelden" @@ -2512,7 +2512,7 @@ msgstr "Anwenderspezifische Einstellungen" msgid "Prefered language" msgstr "Bevorzugte Sprache" -#: userprefs/app_settings.py:26 +#: userprefs/app_settings.py:27 msgid "Prefered language to display pages" msgstr "Bevorzugte Sprache für Seitendarstellung" @@ -2603,6 +2603,30 @@ msgstr "Aktualisieren sie ihre persönlichen Daten" msgid "Logout" msgstr "Logout" +#~ msgid "Failed to rename mailbox: %s" +#~ msgstr "Mailbox konnte nicht umbenannt werden: %s" + +#~ msgid "Failed to remove mailbox: %s" +#~ msgstr "Konnte Mailbox nicht entfernen: %s" + +#~ msgid "Mailbox %s does not exist" +#~ msgstr "Mailbox %s existiert nicht" + +#~ msgid "Delete the domain" +#~ msgstr "Domain entfernen" + +#~ msgid "Delete this account" +#~ msgstr "Dieses Konto löschen" + +#~ msgid "Delete this distribution list" +#~ msgstr "Diese Verteilerliste löschen" + +#~ msgid "Delete this forward" +#~ msgstr "Weiterleitung entfernen" + +#~ msgid "Delete this alias" +#~ msgstr " Alias entfernen" + #~ msgid "Path to the root directory where messages are stored" #~ msgstr "Pfad zum root-Verzeichnis unterhalb dessen E-Mails abgelegt werden" diff --git a/modoboa/locale/en/LC_MESSAGES/django.po b/modoboa/locale/en/LC_MESSAGES/django.po index 1fb68f940..30fda01ce 100644 --- a/modoboa/locale/en/LC_MESSAGES/django.po +++ b/modoboa/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-01 16:35+0200\n" +"POT-Creation-Date: 2013-09-20 22:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -25,8 +25,8 @@ msgstr "" msgid "Web based console to manage domains, accounts and aliases" msgstr "" -#: admin/__init__.py:16 admin/forms.py:179 admin/forms.py:614 -#: admin/views.py:93 admin/views.py:441 +#: admin/__init__.py:16 admin/forms.py:211 admin/forms.py:652 +#: admin/views.py:94 admin/views.py:447 #: extensions/postfix_autoreply/app_settings.py:11 #: extensions/sievefilters/app_settings.py:50 #: extensions/stats/app_settings.py:11 extensions/webmail/app_settings.py:11 @@ -236,37 +236,45 @@ msgstr "" msgid "The default redirection used when no application is specified" msgstr "" -#: admin/app_settings.py:230 +#: admin/app_settings.py:213 +msgid "Key must be either 16, 24, or 32 bytes long" +msgstr "" + +#: admin/app_settings.py:222 +msgid "Invalid syntax" +msgstr "" + +#: admin/app_settings.py:245 msgid "This field is required" msgstr "" -#: admin/forms.py:16 admin/forms.py:459 admin/tables.py:18 +#: admin/forms.py:20 admin/forms.py:497 admin/tables.py:18 msgid "Alias(es)" msgstr "" -#: admin/forms.py:18 +#: admin/forms.py:22 msgid "" "Alias(es) of this domain. Indicate only one name per input, press ENTER to " "add a new input." msgstr "" -#: admin/forms.py:55 +#: admin/forms.py:59 msgid "An alias with this name already exists" msgstr "" -#: admin/forms.py:69 +#: admin/forms.py:73 msgid "A domain with this name already exists" msgstr "" -#: admin/forms.py:114 +#: admin/forms.py:146 msgid "Create a domain administrator" msgstr "" -#: admin/forms.py:116 +#: admin/forms.py:148 msgid "Automatically create an administrator for this domain" msgstr "" -#: admin/forms.py:120 admin/tables.py:12 admin/tables.py:47 +#: admin/forms.py:152 admin/tables.py:12 admin/tables.py:47 #: admin/templates/admin/editdomainform.html:13 #: admin/templates/admin/identities_table.html:5 #: admin/templates/admin/information.html:8 @@ -275,349 +283,348 @@ msgstr "" msgid "Name" msgstr "" -#: admin/forms.py:122 +#: admin/forms.py:154 msgid "" "The administrator's name. Don't include the domain's name here, it will be " "automatically appended." msgstr "" -#: admin/forms.py:128 +#: admin/forms.py:160 msgid "Create aliases" msgstr "" -#: admin/forms.py:130 +#: admin/forms.py:162 msgid "Automatically create standard aliases for this domain" msgstr "" -#: admin/forms.py:143 +#: admin/forms.py:175 msgid "Invalid format" msgstr "" -#: admin/forms.py:155 +#: admin/forms.py:187 #, python-format msgid "User '%s' already exists" msgstr "" -#: admin/forms.py:203 +#: admin/forms.py:235 msgid "Email address" msgstr "" -#: admin/forms.py:204 +#: admin/forms.py:236 msgid "" "The distribution list address. Use the '*' character to create a 'catchall' " "address (ex: *@domain.tld)." msgstr "" -#: admin/forms.py:207 +#: admin/forms.py:239 msgid "Recipients" msgstr "" -#: admin/forms.py:208 +#: admin/forms.py:240 msgid "" "Mailbox(es) this alias will point to. Indicate only one address per input, " "press ENTER to add a new input." msgstr "" -#: admin/forms.py:246 admin/forms.py:504 admin/forms.py:530 -#: admin/models.py:1147 +#: admin/forms.py:278 admin/forms.py:542 admin/forms.py:568 msgid "Domain does not exist" msgstr "" -#: admin/forms.py:248 +#: admin/forms.py:280 msgid "You don't have access to this domain" msgstr "" -#: admin/forms.py:268 +#: admin/forms.py:300 msgid "Invalid mailbox" msgstr "" -#: admin/forms.py:284 +#: admin/forms.py:316 admin/models.py:1202 #, python-format msgid "Local recipient %s not found" msgstr "" -#: admin/forms.py:286 admin/forms.py:292 +#: admin/forms.py:318 admin/forms.py:324 #, python-format msgid "Recipient %s already present" msgstr "" -#: admin/forms.py:297 +#: admin/forms.py:329 msgid "No recipient defined" msgstr "" -#: admin/forms.py:311 extensions/webmail/forms.py:19 +#: admin/forms.py:343 extensions/webmail/forms.py:19 msgid "Select a file" msgstr "" -#: admin/forms.py:313 admin/forms.py:341 +#: admin/forms.py:345 admin/forms.py:373 msgid "Separator" msgstr "" -#: admin/forms.py:316 +#: admin/forms.py:348 msgid "Continue on error" msgstr "" -#: admin/forms.py:317 +#: admin/forms.py:349 msgid "Don't treat duplicated objects as error" msgstr "" -#: admin/forms.py:332 +#: admin/forms.py:364 msgid "Crypt passwords" msgstr "" -#: admin/forms.py:333 +#: admin/forms.py:365 msgid "Check this option if passwords contained in your file are not crypted" msgstr "" -#: admin/forms.py:339 +#: admin/forms.py:371 msgid "File name" msgstr "" -#: admin/forms.py:371 admin/templates/admin/editdomainform.html:13 +#: admin/forms.py:403 admin/templates/admin/editdomainform.html:13 #: auth/forms.py:7 msgid "Username" msgstr "" -#: admin/forms.py:373 +#: admin/forms.py:405 msgid "Role" msgstr "" -#: admin/forms.py:374 admin/forms.py:401 +#: admin/forms.py:406 admin/forms.py:433 msgid "Choose" msgstr "" -#: admin/forms.py:375 +#: admin/forms.py:407 msgid "What level of permission this user will have" msgstr "" -#: admin/forms.py:377 auth/forms.py:11 +#: admin/forms.py:409 auth/forms.py:11 msgid "Password" msgstr "" -#: admin/forms.py:379 userprefs/forms.py:18 +#: admin/forms.py:411 userprefs/forms.py:18 msgid "Confirmation" msgstr "" -#: admin/forms.py:381 +#: admin/forms.py:413 msgid "Enter the same password as above, for verification." msgstr "" -#: admin/forms.py:392 +#: admin/forms.py:424 msgid "Enabled" msgstr "" -#: admin/forms.py:434 +#: admin/forms.py:471 msgid "The two password fields didn't match." msgstr "" -#: admin/forms.py:440 +#: admin/forms.py:477 msgid "You can't disable your own account" msgstr "" -#: admin/forms.py:450 +#: admin/forms.py:488 msgid "E-mail" msgstr "" -#: admin/forms.py:452 +#: admin/forms.py:490 msgid "Quota" msgstr "" -#: admin/forms.py:454 +#: admin/forms.py:492 msgid "" "Quota in MB for this mailbox. Define a custom value or use domain's default " "one. Leave empty to define an unlimited value (not allowed for domain " "administrators)." msgstr "" -#: admin/forms.py:461 +#: admin/forms.py:499 msgid "" "Alias(es) of this mailbox. Indicate only one address per input, press ENTER " "to add a new input. Use the '*' character to create a 'catchall' alias (ex: " "*@domain.tld)." msgstr "" -#: admin/forms.py:512 +#: admin/forms.py:550 #, python-format msgid "Mailbox %s already exists" msgstr "" -#: admin/forms.py:572 +#: admin/forms.py:610 msgid "Domain(s)" msgstr "" -#: admin/forms.py:574 +#: admin/forms.py:612 msgid "Domain(s) that user administrates" msgstr "" -#: admin/forms.py:616 admin/views.py:444 +#: admin/forms.py:654 admin/views.py:450 msgid "Mail" msgstr "" -#: admin/forms.py:618 +#: admin/forms.py:656 msgid "Permissions" msgstr "" -#: admin/models.py:78 +#: admin/models.py:80 msgid "You can't delete your own account" msgstr "" -#: admin/models.py:159 +#: admin/models.py:161 msgid "Failed to update password: LDAP module not installed" msgstr "" -#: admin/models.py:165 +#: admin/models.py:167 #, python-format msgid "Failed to update password: %s" msgstr "" -#: admin/models.py:192 +#: admin/models.py:194 msgid "account" msgstr "" -#: admin/models.py:494 admin/models.py:720 admin/models.py:782 +#: admin/models.py:496 admin/models.py:733 admin/models.py:795 msgid "Invalid line" msgstr "" -#: admin/models.py:498 +#: admin/models.py:500 msgid "You can't import an account with a role greater than yours" msgstr "" -#: admin/models.py:518 +#: admin/models.py:506 +#, python-format +msgid "The simple user '%s' must have a valid email address" +msgstr "" + +#: admin/models.py:510 +#, python-format +msgid "username and email fields must not differ for '%s'" +msgstr "" + +#: admin/models.py:534 #, python-format msgid "Account import failed (%s): domain does not exist" msgstr "" -#: admin/models.py:607 admin/models.py:733 +#: admin/models.py:624 admin/models.py:746 msgid "name" msgstr "" -#: admin/models.py:608 +#: admin/models.py:625 msgid "The domain name" msgstr "" -#: admin/models.py:610 +#: admin/models.py:627 msgid "Default quota in MB applied to mailboxes" msgstr "" -#: admin/models.py:613 admin/models.py:740 admin/models.py:1020 -#: admin/models.py:1181 extensions/postfix_autoreply/models.py:19 +#: admin/models.py:630 admin/models.py:753 admin/models.py:1045 +#: admin/models.py:1217 extensions/postfix_autoreply/models.py:27 msgid "enabled" msgstr "" -#: admin/models.py:614 +#: admin/models.py:631 msgid "Check to activate this domain" msgstr "" -#: admin/models.py:734 +#: admin/models.py:747 msgid "The alias name" msgstr "" -#: admin/models.py:736 +#: admin/models.py:749 msgid "target" msgstr "" -#: admin/models.py:737 +#: admin/models.py:750 msgid "The domain this alias points to" msgstr "" -#: admin/models.py:741 admin/models.py:1021 +#: admin/models.py:754 admin/models.py:1046 msgid "Check to activate this alias" msgstr "" -#: admin/models.py:788 +#: admin/models.py:801 #, python-format msgid "Unknown domain %s" msgstr "" -#: admin/models.py:805 admin/models.py:1006 +#: admin/models.py:818 admin/models.py:1031 msgid "address" msgstr "" -#: admin/models.py:806 +#: admin/models.py:819 msgid "Mailbox address (without the @domain.tld part)" msgstr "" -#: admin/models.py:852 +#: admin/models.py:877 #, python-format msgid "Failed to retrieve mailbox location (%s)" msgstr "" -#: admin/models.py:868 -#, python-format -msgid "Failed to rename mailbox: %s" -msgstr "" - -#: admin/models.py:894 -#, python-format -msgid "Failed to remove mailbox: %s" -msgstr "" - -#: admin/models.py:909 +#: admin/models.py:921 #, python-format msgid "Quota is greater than the allowed domain's limit (%dM)" msgstr "" -#: admin/models.py:914 +#: admin/models.py:926 msgid "A quota is required" msgstr "" -#: admin/models.py:1007 +#: admin/models.py:1032 msgid "" "The alias address (without the domain part). For a 'catch-all' address, just " "enter an * character." msgstr "" -#: admin/models.py:1011 +#: admin/models.py:1036 msgid "mailboxes" msgstr "" -#: admin/models.py:1012 +#: admin/models.py:1037 msgid "The mailboxes this alias points to" msgstr "" -#: admin/models.py:1016 +#: admin/models.py:1041 msgid "The aliases this alias points to" msgstr "" -#: admin/models.py:1064 +#: admin/models.py:1089 msgid "distribution list" msgstr "" -#: admin/models.py:1065 +#: admin/models.py:1090 msgid "forward" msgstr "" -#: admin/models.py:1066 +#: admin/models.py:1091 msgid "alias" msgstr "" -#: admin/models.py:1142 +#: admin/models.py:1170 #, python-format msgid "Invalid line: %s" msgstr "" -#: admin/models.py:1167 +#: admin/models.py:1175 #, python-format -msgid "Mailbox %s does not exist" +msgid "Domain '%s' does not exist" msgstr "" -#: admin/models.py:1182 +#: admin/models.py:1218 msgid "Check to enable this extension" msgstr "" -#: admin/models.py:1282 +#: admin/models.py:1318 msgid "added" msgstr "" -#: admin/models.py:1285 +#: admin/models.py:1321 msgid "modified" msgstr "" -#: admin/models.py:1288 +#: admin/models.py:1324 msgid "deleted" msgstr "" -#: admin/models.py:1290 +#: admin/models.py:1326 #, python-format msgid "%(object)s '%(name)s' %(action)s by user %(user)s" msgstr "" @@ -627,7 +634,7 @@ msgid "Edit domain" msgstr "" #: admin/tables.py:21 admin/templates/admin/identities_table.html:8 -#: admin/templates/admin/listing.html:17 extensions/sievefilters/views.py:79 +#: admin/templates/admin/listing.html:17 extensions/sievefilters/views.py:83 #: extensions/sievefilters/templates/sievefilters/filter.html:17 #: extensions/sievefilters/templates/sievefilters/guieditor.html:5 #: extensions/webmail/templatetags/webextras.py:97 @@ -642,143 +649,143 @@ msgstr "" msgid "Description" msgstr "" -#: admin/views.py:87 +#: admin/views.py:88 msgid "New domain" msgstr "" -#: admin/views.py:88 admin/views.py:97 admin/views.py:225 admin/views.py:438 -#: admin/views.py:445 extensions/sievefilters/views.py:120 -#: extensions/sievefilters/views.py:187 extensions/webmail/views.py:131 +#: admin/views.py:89 admin/views.py:98 admin/views.py:228 admin/views.py:444 +#: admin/views.py:451 extensions/sievefilters/views.py:129 +#: extensions/sievefilters/views.py:198 extensions/webmail/views.py:136 msgid "Create" msgstr "" -#: admin/views.py:94 admin/views.py:442 +#: admin/views.py:95 admin/views.py:448 msgid "Next" msgstr "" -#: admin/views.py:96 +#: admin/views.py:97 msgid "Options" msgstr "" -#: admin/views.py:98 admin/views.py:446 +#: admin/views.py:99 admin/views.py:452 msgid "Previous" msgstr "" -#: admin/views.py:111 +#: admin/views.py:112 msgid "Domain created" msgstr "" -#: admin/views.py:144 admin/views.py:282 admin/views.py:492 +#: admin/views.py:146 admin/views.py:285 admin/views.py:498 #: extensions/postfix_autoreply/templates/postfix_autoreply/autoreply.html:9 -#: extensions/sievefilters/views.py:139 extensions/webmail/views.py:162 +#: extensions/sievefilters/views.py:148 extensions/webmail/views.py:168 #: userprefs/templates/userprefs/forward.html:8 #: userprefs/templates/userprefs/profile.html:8 msgid "Update" msgstr "" -#: admin/views.py:160 +#: admin/views.py:162 msgid "Domain modified" msgstr "" -#: admin/views.py:186 +#: admin/views.py:189 msgid "You can't delete your own domain" msgstr "" -#: admin/views.py:189 +#: admin/views.py:192 msgid "Domain deleted" msgid_plural "Domains deleted" msgstr[0] "" msgstr[1] "" -#: admin/views.py:204 +#: admin/views.py:207 msgid "Alias with this name already exists" msgstr "" -#: admin/views.py:247 +#: admin/views.py:250 msgid "New distribution list" msgstr "" -#: admin/views.py:248 +#: admin/views.py:251 msgid "Distribution list created" msgstr "" -#: admin/views.py:257 +#: admin/views.py:260 msgid "New alias" msgstr "" -#: admin/views.py:258 +#: admin/views.py:261 msgid "Alias created" msgstr "" -#: admin/views.py:267 +#: admin/views.py:270 msgid "New forward" msgstr "" -#: admin/views.py:268 +#: admin/views.py:271 msgid "Forward created" msgstr "" -#: admin/views.py:286 +#: admin/views.py:289 msgid "Distribution list modified" msgstr "" -#: admin/views.py:288 +#: admin/views.py:291 msgid "Forward modified" msgstr "" -#: admin/views.py:290 +#: admin/views.py:293 msgid "Alias modified" msgstr "" -#: admin/views.py:403 admin/views.py:541 admin/views.py:546 -#: extensions/amavis/views.py:195 extensions/amavis/views.py:201 -#: extensions/amavis/views.py:234 extensions/amavis/views.py:238 -#: extensions/amavis/views.py:240 extensions/webmail/views.py:36 -#: extensions/webmail/views.py:64 extensions/webmail/views.py:77 -#: extensions/webmail/views.py:93 extensions/webmail/views.py:109 -#: extensions/webmail/views.py:193 extensions/webmail/views.py:419 -#: extensions/webmail/views.py:430 extensions/webmail/views.py:457 +#: admin/views.py:402 admin/views.py:545 admin/views.py:550 +#: extensions/amavis/views.py:204 extensions/amavis/views.py:210 +#: extensions/amavis/views.py:243 extensions/amavis/views.py:247 +#: extensions/amavis/views.py:249 extensions/webmail/views.py:41 +#: extensions/webmail/views.py:68 extensions/webmail/views.py:81 +#: extensions/webmail/views.py:98 extensions/webmail/views.py:114 +#: extensions/webmail/views.py:200 extensions/webmail/views.py:427 +#: extensions/webmail/views.py:438 extensions/webmail/views.py:465 #: lib/formutils.py:32 lib/formutils.py:37 msgid "Invalid request" msgstr "" -#: admin/views.py:435 +#: admin/views.py:441 msgid "New account" msgstr "" -#: admin/views.py:459 +#: admin/views.py:465 msgid "Account created" msgstr "" -#: admin/views.py:507 +#: admin/views.py:513 msgid "Account updated" msgstr "" -#: admin/views.py:531 +#: admin/views.py:535 msgid "Account deleted" msgid_plural "Accounts deleted" msgstr[0] "" msgstr[1] "" -#: admin/views.py:586 +#: admin/views.py:590 msgid "Parameters saved" msgstr "" -#: admin/views.py:632 +#: admin/views.py:636 msgid "Modifications applied." msgstr "" -#: admin/views.py:740 +#: admin/views.py:743 #, python-format msgid "Object already exists: %s" msgstr "" -#: admin/views.py:742 +#: admin/views.py:745 #, python-format msgid "%d objects imported successfully" msgstr "" -#: admin/views.py:760 +#: admin/views.py:763 msgid "" "Provide a CSV file where lines respect one of the following formats:\n" "
          \n" @@ -794,25 +801,25 @@ msgid "" "

          You can use a different character as separator.

          \n" msgstr "" -#: admin/views.py:772 +#: admin/views.py:775 msgid "Import identities" msgstr "" -#: admin/views.py:773 admin/views.py:843 admin/templatetags/admin_extras.py:87 +#: admin/views.py:776 admin/views.py:846 admin/templatetags/admin_extras.py:87 #: admin/templatetags/admin_extras.py:144 msgid "Import" msgstr "" -#: admin/views.py:803 +#: admin/views.py:806 msgid "Export identities" msgstr "" -#: admin/views.py:804 admin/views.py:860 admin/templatetags/admin_extras.py:93 +#: admin/views.py:807 admin/views.py:863 admin/templatetags/admin_extras.py:93 #: admin/templatetags/admin_extras.py:150 msgid "Export" msgstr "" -#: admin/views.py:832 +#: admin/views.py:835 msgid "" "Provide a CSV file where lines respect one of the following formats:\n" "
            \n" @@ -824,11 +831,11 @@ msgid "" "

            You can use a different character as separator.

            \n" msgstr "" -#: admin/views.py:842 +#: admin/views.py:845 msgid "Import domains" msgstr "" -#: admin/views.py:859 +#: admin/views.py:862 msgid "Export domains" msgstr "" @@ -901,7 +908,7 @@ msgid "Tags" msgstr "" #: admin/templates/admin/importform.html:5 -#: admin/templatetags/admin_extras.py:305 +#: admin/templatetags/admin_extras.py:290 msgid "Help" msgstr "" @@ -948,7 +955,7 @@ msgid "Previously on Modoboa..." msgstr "" #: admin/templates/admin/logs.html:6 extensions/amavis/sql_listing.py:25 -#: extensions/webmail/lib.py:37 extensions/webmail/lib.py:406 +#: extensions/webmail/lib.py:38 extensions/webmail/lib.py:411 msgid "Date" msgstr "" @@ -1051,34 +1058,21 @@ msgid "View the domain's identities" msgstr "" #: admin/templatetags/admin_extras.py:178 -msgid "Delete the domain" -msgstr "" - #: admin/templatetags/admin_extras.py:194 -msgid "Delete this account" +#: admin/templatetags/admin_extras.py:201 +#, python-format +msgid "Delete %s?" msgstr "" -#: admin/templatetags/admin_extras.py:202 -msgid "Delete this distribution list" -msgstr "" - -#: admin/templatetags/admin_extras.py:209 -msgid "Delete this forward" -msgstr "" - -#: admin/templatetags/admin_extras.py:216 -msgid "Delete this alias" -msgstr "" - -#: admin/templatetags/admin_extras.py:238 +#: admin/templatetags/admin_extras.py:223 msgid "Remove this permission" msgstr "" -#: admin/templatetags/admin_extras.py:279 lib/formutils.py:206 +#: admin/templatetags/admin_extras.py:264 lib/formutils.py:206 msgid "Yes" msgstr "" -#: admin/templatetags/admin_extras.py:279 lib/formutils.py:206 +#: admin/templatetags/admin_extras.py:264 lib/formutils.py:206 msgid "No" msgstr "" @@ -1087,11 +1081,11 @@ msgstr "" msgid "User '%s' successfully logged in" msgstr "" -#: auth/views.py:41 +#: auth/views.py:44 msgid "Your username and password didn't match. Please try again." msgstr "" -#: auth/views.py:64 +#: auth/views.py:67 #, python-format msgid "User '%s' logged out" msgstr "" @@ -1137,16 +1131,16 @@ msgstr "" msgid "Quarantine" msgstr "" -#: extensions/amavis/__init__.py:127 +#: extensions/amavis/__init__.py:129 msgid "pending requests" msgstr "" -#: extensions/amavis/__init__.py:144 +#: extensions/amavis/__init__.py:149 #, python-format msgid "%d pending requests" msgstr "" -#: extensions/amavis/__init__.py:156 +#: extensions/amavis/__init__.py:161 msgid "Content filter" msgstr "" @@ -1261,12 +1255,12 @@ msgid "Virus filter" msgstr "" #: extensions/amavis/models.py:94 extensions/amavis/models.py:102 -#: extensions/amavis/models.py:110 extensions/sievefilters/views.py:268 +#: extensions/amavis/models.py:110 extensions/sievefilters/views.py:281 msgid "yes" msgstr "" #: extensions/amavis/models.py:95 extensions/amavis/models.py:103 -#: extensions/amavis/models.py:111 extensions/sievefilters/views.py:272 +#: extensions/amavis/models.py:111 extensions/sievefilters/views.py:285 msgid "no" msgstr "" @@ -1306,13 +1300,13 @@ msgid "" "settings." msgstr "" -#: extensions/amavis/sql_listing.py:23 extensions/webmail/lib.py:36 +#: extensions/amavis/sql_listing.py:23 extensions/webmail/lib.py:37 msgid "From" msgstr "" #: extensions/amavis/sql_listing.py:24 extensions/sievefilters/forms.py:68 -#: extensions/webmail/forms.py:10 extensions/webmail/lib.py:35 -#: extensions/webmail/lib.py:404 templates/common/email_searchbar.html:6 +#: extensions/webmail/forms.py:10 extensions/webmail/lib.py:36 +#: extensions/webmail/lib.py:409 templates/common/email_searchbar.html:6 msgid "Subject" msgstr "" @@ -1322,37 +1316,37 @@ msgstr "" msgid "To" msgstr "" -#: extensions/amavis/views.py:34 +#: extensions/amavis/views.py:43 msgid "Empty quarantine" msgstr "" -#: extensions/amavis/views.py:202 +#: extensions/amavis/views.py:211 msgid "Message deleted" msgstr "" -#: extensions/amavis/views.py:223 +#: extensions/amavis/views.py:232 #, python-format msgid "%(count)d message deleted successfully" msgid_plural "%(count)d messages deleted successfully" msgstr[0] "" msgstr[1] "" -#: extensions/amavis/views.py:243 +#: extensions/amavis/views.py:252 msgid "Request sent" msgstr "" -#: extensions/amavis/views.py:249 +#: extensions/amavis/views.py:258 msgid "Message released" msgstr "" -#: extensions/amavis/views.py:271 +#: extensions/amavis/views.py:280 #, python-format msgid "%(count)d request sent" msgid_plural "%(count)d requests sent" msgstr[0] "" msgstr[1] "" -#: extensions/amavis/views.py:295 +#: extensions/amavis/views.py:304 #, python-format msgid "%(count)d message released successfully" msgid_plural "%(count)d messages released successfully" @@ -1473,7 +1467,7 @@ msgstr "" msgid "Reseller" msgstr "" -#: extensions/limits/__init__.py:96 +#: extensions/limits/__init__.py:94 msgid "Resources" msgstr "" @@ -1592,23 +1586,23 @@ msgstr "" msgid "This date is over" msgstr "" -#: extensions/postfix_autoreply/models.py:15 +#: extensions/postfix_autoreply/models.py:19 msgid "subject" msgstr "" -#: extensions/postfix_autoreply/models.py:16 +#: extensions/postfix_autoreply/models.py:20 msgid "The subject that will appear in sent emails" msgstr "" -#: extensions/postfix_autoreply/models.py:17 +#: extensions/postfix_autoreply/models.py:23 msgid "content" msgstr "" -#: extensions/postfix_autoreply/models.py:18 +#: extensions/postfix_autoreply/models.py:24 msgid "The content that will appear in sent emails" msgstr "" -#: extensions/postfix_autoreply/models.py:20 +#: extensions/postfix_autoreply/models.py:28 msgid "Activate/Deactivate your auto reply" msgstr "" @@ -1742,53 +1736,53 @@ msgstr "" msgid "Not enough space on server" msgstr "" -#: extensions/sievefilters/views.py:64 +#: extensions/sievefilters/views.py:68 msgid "Failed to retrieve filters set" msgstr "" -#: extensions/sievefilters/views.py:117 +#: extensions/sievefilters/views.py:126 #: extensions/sievefilters/templatetags/sfilters_tags.py:33 msgid "New filter" msgstr "" -#: extensions/sievefilters/views.py:124 +#: extensions/sievefilters/views.py:133 msgid "Filter created" msgstr "" -#: extensions/sievefilters/views.py:136 +#: extensions/sievefilters/views.py:145 #: extensions/sievefilters/templatetags/sfilters_tags.py:77 msgid "Edit filter" msgstr "" -#: extensions/sievefilters/views.py:145 +#: extensions/sievefilters/views.py:154 msgid "Filter modified" msgstr "" -#: extensions/sievefilters/views.py:165 +#: extensions/sievefilters/views.py:176 msgid "Filter removed" msgstr "" -#: extensions/sievefilters/views.py:166 +#: extensions/sievefilters/views.py:177 msgid "Failed to remove filter" msgstr "" -#: extensions/sievefilters/views.py:180 +#: extensions/sievefilters/views.py:191 msgid "Filters set saved" msgstr "" -#: extensions/sievefilters/views.py:185 +#: extensions/sievefilters/views.py:196 msgid "Create a new filters set" msgstr "" -#: extensions/sievefilters/views.py:208 +#: extensions/sievefilters/views.py:219 msgid "Filters set created" msgstr "" -#: extensions/sievefilters/views.py:229 +#: extensions/sievefilters/views.py:240 msgid "Filters set deleted" msgstr "" -#: extensions/sievefilters/views.py:241 +#: extensions/sievefilters/views.py:252 msgid "Filters set activated" msgstr "" @@ -1804,15 +1798,15 @@ msgstr "" msgid "No filter defined yet" msgstr "" -#: extensions/sievefilters/templates/sievefilters/index.html:55 +#: extensions/sievefilters/templates/sievefilters/index.html:56 msgid "Filter sets" msgstr "" -#: extensions/sievefilters/templates/sievefilters/index.html:59 +#: extensions/sievefilters/templates/sievefilters/index.html:60 msgid "active" msgstr "" -#: extensions/sievefilters/templates/sievefilters/index.html:73 +#: extensions/sievefilters/templates/sievefilters/index.html:74 msgid "" "No filters set defined yet. You must create one in order to define filters." msgstr "" @@ -2127,84 +2121,88 @@ msgstr "" msgid "Cci" msgstr "" -#: extensions/webmail/imaputils.py:259 +#: extensions/webmail/imaputils.py:237 +msgid "Failed to retrieve hierarchy delimiter" +msgstr "" + +#: extensions/webmail/imaputils.py:278 #, python-format msgid "Connection to IMAP server failed: %s" msgstr "" -#: extensions/webmail/lib.py:353 +#: extensions/webmail/lib.py:358 msgid "wrote:" msgstr "" -#: extensions/webmail/lib.py:418 extensions/webmail/lib.py:422 +#: extensions/webmail/lib.py:423 extensions/webmail/lib.py:427 msgid "Original message" msgstr "" -#: extensions/webmail/views.py:81 +#: extensions/webmail/views.py:86 #, python-format msgid "%(count)d message deleted" msgid_plural "%(count)d messages deleted" msgstr[0] "" msgstr[1] "" -#: extensions/webmail/views.py:98 +#: extensions/webmail/views.py:103 msgid "Unknown action" msgstr "" -#: extensions/webmail/views.py:111 lib/email_listing.py:137 +#: extensions/webmail/views.py:116 lib/email_listing.py:137 msgid "Empty mailbox" msgstr "" -#: extensions/webmail/views.py:128 -#: extensions/webmail/templatetags/webextras.py:169 +#: extensions/webmail/views.py:133 +#: extensions/webmail/templatetags/webextras.py:170 msgid "Create a new mailbox" msgstr "" -#: extensions/webmail/views.py:143 +#: extensions/webmail/views.py:149 msgid "Mailbox created" msgstr "" -#: extensions/webmail/views.py:159 +#: extensions/webmail/views.py:165 msgid "Edit mailbox" msgstr "" -#: extensions/webmail/views.py:173 +#: extensions/webmail/views.py:180 msgid "Mailbox updated" msgstr "" -#: extensions/webmail/views.py:207 extensions/webmail/views.py:388 -#: extensions/webmail/views.py:497 +#: extensions/webmail/views.py:214 extensions/webmail/views.py:396 +#: extensions/webmail/views.py:505 msgid "Bad request" msgstr "" -#: extensions/webmail/views.py:238 +#: extensions/webmail/views.py:246 msgid "Failed to save attachment: " msgstr "" -#: extensions/webmail/views.py:241 +#: extensions/webmail/views.py:249 #, python-format msgid "Attachment is too big (limit: %s)" msgstr "" -#: extensions/webmail/views.py:247 +#: extensions/webmail/views.py:255 #: extensions/webmail/templates/webmail/compose.html:15 #: extensions/webmail/templates/webmail/headers.html:4 msgid "Attachments" msgstr "" -#: extensions/webmail/views.py:263 +#: extensions/webmail/views.py:271 msgid "Bad query" msgstr "" -#: extensions/webmail/views.py:273 +#: extensions/webmail/views.py:281 msgid "Failed to remove attachment: " msgstr "" -#: extensions/webmail/views.py:278 +#: extensions/webmail/views.py:286 msgid "Unknown attachment" msgstr "" -#: extensions/webmail/views.py:493 +#: extensions/webmail/views.py:501 msgid "Undefined action" msgstr "" @@ -2235,7 +2233,7 @@ msgstr[1] "" msgid "Parent mailbox" msgstr "" -#: extensions/webmail/templates/webmail/index.html:36 +#: extensions/webmail/templates/webmail/index.html:38 msgid "Mailbox quota" msgstr "" @@ -2297,15 +2295,15 @@ msgstr "" msgid "Compress folder" msgstr "" -#: extensions/webmail/templatetags/webextras.py:109 +#: extensions/webmail/templatetags/webextras.py:110 msgid "Empty folder" msgstr "" -#: extensions/webmail/templatetags/webextras.py:177 +#: extensions/webmail/templatetags/webextras.py:178 msgid "Edit the selected mailbox" msgstr "" -#: extensions/webmail/templatetags/webextras.py:182 +#: extensions/webmail/templatetags/webextras.py:183 msgid "Remove the selected mailbox" msgstr "" @@ -2359,7 +2357,7 @@ msgstr "" msgid "An internal error occured." msgstr "" -#: templates/nlayout.html:56 +#: templates/nlayout.html:62 msgid "Powered by Modoboa" msgstr "" @@ -2393,11 +2391,11 @@ msgstr "" msgid "Welcome to Modoboa" msgstr "" -#: templates/registration/login.html:33 +#: templates/registration/login.html:34 msgid "Remember me" msgstr "" -#: templates/registration/login.html:35 +#: templates/registration/login.html:36 msgid "Log in" msgstr "" @@ -2413,7 +2411,7 @@ msgstr "" msgid "Prefered language" msgstr "" -#: userprefs/app_settings.py:26 +#: userprefs/app_settings.py:27 msgid "Prefered language to display pages" msgstr "" diff --git a/modoboa/locale/es/LC_MESSAGES/django.po b/modoboa/locale/es/LC_MESSAGES/django.po index eac45d1bf..3457ecc93 100644 --- a/modoboa/locale/es/LC_MESSAGES/django.po +++ b/modoboa/locale/es/LC_MESSAGES/django.po @@ -1,22 +1,23 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Pedro Gracia , 2011-2013 # Pedro Gracia , 2010-2011 msgid "" msgstr "" "Project-Id-Version: Modoboa\n" -"Report-Msgid-Bugs-To: http://dev.modoboa.org/\n" -"POT-Creation-Date: 2013-06-01 16:35+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-09-20 22:30+0200\n" "PO-Revision-Date: 2013-06-03 16:33+0000\n" "Last-Translator: Pedro Gracia \n" -"Language-Team: Spanish (http://www.transifex.com/projects/p/modoboa/language/es/)\n" +"Language-Team: Spanish (http://www.transifex.com/projects/p/modoboa/language/" +"es/)\n" +"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: admin/__init__.py:9 @@ -27,8 +28,8 @@ msgstr "Consola de administración" msgid "Web based console to manage domains, accounts and aliases" msgstr "Consola web para administrar dominios, cuentas y alias" -#: admin/__init__.py:16 admin/forms.py:179 admin/forms.py:614 -#: admin/views.py:93 admin/views.py:441 +#: admin/__init__.py:16 admin/forms.py:211 admin/forms.py:652 +#: admin/views.py:94 admin/views.py:447 #: extensions/postfix_autoreply/app_settings.py:11 #: extensions/sievefilters/app_settings.py:50 #: extensions/stats/app_settings.py:11 extensions/webmail/app_settings.py:11 @@ -122,7 +123,9 @@ msgstr "Unir a DN" msgid "" "The distinguished name to use when binding to the LDAP server. Leave empty " "for an anonymous bind" -msgstr "El nombre distinguido a usar cuando nos unimos al servidor LDAP. Dejar vació para una unión anónima" +msgstr "" +"El nombre distinguido a usar cuando nos unimos al servidor LDAP. Dejar vació " +"para una unión anónima" #: admin/app_settings.py:97 msgid "Bind password" @@ -130,7 +133,8 @@ msgstr "Unir contraseña" #: admin/app_settings.py:99 msgid "The password to use when binding to the LDAP server (with 'Bind DN')" -msgstr "La contraseña a usar cuando nos unimos al servidor LDAP (con 'Unir a DN')" +msgstr "" +"La contraseña a usar cuando nos unimos al servidor LDAP (con 'Unir a DN')" #: admin/app_settings.py:105 msgid "Search base" @@ -148,7 +152,9 @@ msgstr "Filtro de búsqueda" msgid "" "An optional filter string (e.g. '(objectClass=person)'). In order to be " "valid, it must be enclosed in parentheses." -msgstr "Una cadena de filtro opcional (p.e. '(objectClass=person)'). Para que sea válido tiene que ser encerrado entre paréntesis." +msgstr "" +"Una cadena de filtro opcional (p.e. '(objectClass=person)'). Para que sea " +"válido tiene que ser encerrado entre paréntesis." #: admin/app_settings.py:119 msgid "User DN template" @@ -159,7 +165,9 @@ msgstr "Plantilla DN del usuario" msgid "" "The template used to construct a user's DN. It should contain one " "placeholder (ie. %(user)s)" -msgstr "La plantilla usada para contriunr un DN de usuario. Debería contener una cadena reemplazables (p.e. %(user)s)" +msgstr "" +"La plantilla usada para contriunr un DN de usuario. Debería contener una " +"cadena reemplazables (p.e. %(user)s)" #: admin/app_settings.py:126 msgid "Password attribute" @@ -192,7 +200,9 @@ msgstr "Manejar mailboxes en el sistema de fichero" msgid "" "Rename or remove mailboxes on the filesystem when they get renamed or " "removed within Modoboa" -msgstr "Renombrar o eliminar mailboxes en el sistema de ficheros cuando sean renombrados o eliminados dentro de Modoboa" +msgstr "" +"Renombrar o eliminar mailboxes en el sistema de ficheros cuando sean " +"renombrados o eliminados dentro de Modoboa" #: admin/app_settings.py:146 msgid "Mailboxes ower" @@ -236,39 +246,51 @@ msgstr "Redirección principal por defecto" #: admin/app_settings.py:175 msgid "The default redirection used when no application is specified" -msgstr "La redirección que será usada cuando ninguna aplicación sea especificada." +msgstr "" +"La redirección que será usada cuando ninguna aplicación sea especificada." -#: admin/app_settings.py:230 +#: admin/app_settings.py:213 +msgid "Key must be either 16, 24, or 32 bytes long" +msgstr "" + +#: admin/app_settings.py:222 +#, fuzzy +msgid "Invalid syntax" +msgstr "Línea inválida" + +#: admin/app_settings.py:245 msgid "This field is required" msgstr "Este campo es obligatorio" -#: admin/forms.py:16 admin/forms.py:459 admin/tables.py:18 +#: admin/forms.py:20 admin/forms.py:497 admin/tables.py:18 msgid "Alias(es)" msgstr "Alias" -#: admin/forms.py:18 +#: admin/forms.py:22 msgid "" "Alias(es) of this domain. Indicate only one name per input, press ENTER to " "add a new input." -msgstr "Alia(s) de este dominio. Indique únicamente un nombre por entrada, presione ENTER para añadir una nueva entrada." +msgstr "" +"Alia(s) de este dominio. Indique únicamente un nombre por entrada, presione " +"ENTER para añadir una nueva entrada." -#: admin/forms.py:55 +#: admin/forms.py:59 msgid "An alias with this name already exists" msgstr "Ya existe un alias con este nombre" -#: admin/forms.py:69 +#: admin/forms.py:73 msgid "A domain with this name already exists" msgstr "Ya existe un dominio con este nombre" -#: admin/forms.py:114 +#: admin/forms.py:146 msgid "Create a domain administrator" msgstr "Crear un administrador del dominio" -#: admin/forms.py:116 +#: admin/forms.py:148 msgid "Automatically create an administrator for this domain" msgstr "Automáticamente crear una administrador para este dominio" -#: admin/forms.py:120 admin/tables.py:12 admin/tables.py:47 +#: admin/forms.py:152 admin/tables.py:12 admin/tables.py:47 #: admin/templates/admin/editdomainform.html:13 #: admin/templates/admin/identities_table.html:5 #: admin/templates/admin/information.html:8 @@ -277,349 +299,364 @@ msgstr "Automáticamente crear una administrador para este dominio" msgid "Name" msgstr "Nombre" -#: admin/forms.py:122 +#: admin/forms.py:154 msgid "" "The administrator's name. Don't include the domain's name here, it will be " "automatically appended." -msgstr "El nombre del administrador. No incluya el nombre del dominio aquí, será añadido automáticamente." +msgstr "" +"El nombre del administrador. No incluya el nombre del dominio aquí, será " +"añadido automáticamente." -#: admin/forms.py:128 +#: admin/forms.py:160 msgid "Create aliases" msgstr "Crear alias" -#: admin/forms.py:130 +#: admin/forms.py:162 msgid "Automatically create standard aliases for this domain" msgstr "Automáticamente crear alias estándar para este dominio" -#: admin/forms.py:143 +#: admin/forms.py:175 msgid "Invalid format" msgstr "Formato inválido" -#: admin/forms.py:155 +#: admin/forms.py:187 #, python-format msgid "User '%s' already exists" msgstr "El usuario '%s' ya existe" -#: admin/forms.py:203 +#: admin/forms.py:235 msgid "Email address" msgstr "Dirección de email" -#: admin/forms.py:204 +#: admin/forms.py:236 msgid "" "The distribution list address. Use the '*' character to create a 'catchall' " "address (ex: *@domain.tld)." -msgstr "La dirección de la lista de distribución. Use el carácter '*' para crear una dirección 'catchall' (recogerlos todos, ej. *@domain.tld)" +msgstr "" +"La dirección de la lista de distribución. Use el carácter '*' para crear una " +"dirección 'catchall' (recogerlos todos, ej. *@domain.tld)" -#: admin/forms.py:207 +#: admin/forms.py:239 msgid "Recipients" msgstr "Destinatarios" -#: admin/forms.py:208 +#: admin/forms.py:240 msgid "" "Mailbox(es) this alias will point to. Indicate only one address per input, " "press ENTER to add a new input." -msgstr "Mailbox(es) a los que apuntará este alias. Indique únicamente una dirección por entrada, presione ENTER para añadir una nueva entrada." +msgstr "" +"Mailbox(es) a los que apuntará este alias. Indique únicamente una dirección " +"por entrada, presione ENTER para añadir una nueva entrada." -#: admin/forms.py:246 admin/forms.py:504 admin/forms.py:530 -#: admin/models.py:1147 +#: admin/forms.py:278 admin/forms.py:542 admin/forms.py:568 msgid "Domain does not exist" msgstr "El dominio no existe" -#: admin/forms.py:248 +#: admin/forms.py:280 msgid "You don't have access to this domain" msgstr "No tienes acceso a este dominio" -#: admin/forms.py:268 +#: admin/forms.py:300 msgid "Invalid mailbox" msgstr "mailbox inválido" -#: admin/forms.py:284 +#: admin/forms.py:316 admin/models.py:1202 #, python-format msgid "Local recipient %s not found" msgstr "Destinatario local %s no encontrado" -#: admin/forms.py:286 admin/forms.py:292 +#: admin/forms.py:318 admin/forms.py:324 #, python-format msgid "Recipient %s already present" msgstr "EL destinatario %s ya existe" -#: admin/forms.py:297 +#: admin/forms.py:329 msgid "No recipient defined" msgstr "No ha puesto destinatario" -#: admin/forms.py:311 extensions/webmail/forms.py:19 +#: admin/forms.py:343 extensions/webmail/forms.py:19 msgid "Select a file" msgstr "Seleccione un fichero" -#: admin/forms.py:313 admin/forms.py:341 +#: admin/forms.py:345 admin/forms.py:373 msgid "Separator" msgstr "Separador" -#: admin/forms.py:316 +#: admin/forms.py:348 msgid "Continue on error" msgstr "Continúe en error." -#: admin/forms.py:317 +#: admin/forms.py:349 msgid "Don't treat duplicated objects as error" msgstr "No tratar objetos duplicados como error" -#: admin/forms.py:332 +#: admin/forms.py:364 msgid "Crypt passwords" msgstr "Contraseñas cifradas" -#: admin/forms.py:333 +#: admin/forms.py:365 msgid "Check this option if passwords contained in your file are not crypted" -msgstr "Marque esta opción si las contraseñas que contiene su fichero no están cifradas" +msgstr "" +"Marque esta opción si las contraseñas que contiene su fichero no están " +"cifradas" -#: admin/forms.py:339 +#: admin/forms.py:371 msgid "File name" msgstr "Nombre del fichero" -#: admin/forms.py:371 admin/templates/admin/editdomainform.html:13 +#: admin/forms.py:403 admin/templates/admin/editdomainform.html:13 #: auth/forms.py:7 msgid "Username" msgstr "Nombre de usuario" -#: admin/forms.py:373 +#: admin/forms.py:405 msgid "Role" msgstr "Rol" -#: admin/forms.py:374 admin/forms.py:401 +#: admin/forms.py:406 admin/forms.py:433 msgid "Choose" msgstr "Elija" -#: admin/forms.py:375 +#: admin/forms.py:407 msgid "What level of permission this user will have" msgstr "Qué nivel de permiso tendrá este usuario" -#: admin/forms.py:377 auth/forms.py:11 +#: admin/forms.py:409 auth/forms.py:11 msgid "Password" msgstr "Contraseña" -#: admin/forms.py:379 userprefs/forms.py:18 +#: admin/forms.py:411 userprefs/forms.py:18 msgid "Confirmation" msgstr "Confirmación" -#: admin/forms.py:381 +#: admin/forms.py:413 msgid "Enter the same password as above, for verification." msgstr "Introduzca la misma contraseña que arriba, para verificación." -#: admin/forms.py:392 +#: admin/forms.py:424 msgid "Enabled" msgstr "Activado" -#: admin/forms.py:434 +#: admin/forms.py:471 msgid "The two password fields didn't match." msgstr "Las contraseñas no concuerdan" -#: admin/forms.py:440 +#: admin/forms.py:477 msgid "You can't disable your own account" msgstr "No puede deshabilitar su propia cuenta" -#: admin/forms.py:450 +#: admin/forms.py:488 msgid "E-mail" msgstr "Email" -#: admin/forms.py:452 +#: admin/forms.py:490 msgid "Quota" msgstr "Cuota" -#: admin/forms.py:454 +#: admin/forms.py:492 msgid "" "Quota in MB for this mailbox. Define a custom value or use domain's default " "one. Leave empty to define an unlimited value (not allowed for domain " "administrators)." -msgstr "Cuota en MB para este mailbox. Defina un valor por defecto o use el del dominio por defecto. Déjelo vacío para definir un valor ilimitado (no permitido para los administradores del dominio)" +msgstr "" +"Cuota en MB para este mailbox. Defina un valor por defecto o use el del " +"dominio por defecto. Déjelo vacío para definir un valor ilimitado (no " +"permitido para los administradores del dominio)" -#: admin/forms.py:461 +#: admin/forms.py:499 msgid "" "Alias(es) of this mailbox. Indicate only one address per input, press ENTER " "to add a new input. Use the '*' character to create a 'catchall' alias (ex: " "*@domain.tld)." -msgstr "Alias de este mailbox. Indique sólo una dirección por entrada, presione ENTER para añadir una nueva entrada. Use el carácter '*' para crear una dirección 'catchall' (recogerlos todos, ej. *@domain.tld)" +msgstr "" +"Alias de este mailbox. Indique sólo una dirección por entrada, presione " +"ENTER para añadir una nueva entrada. Use el carácter '*' para crear una " +"dirección 'catchall' (recogerlos todos, ej. *@domain.tld)" -#: admin/forms.py:512 +#: admin/forms.py:550 #, python-format msgid "Mailbox %s already exists" msgstr "El mailbox %s ya existe" -#: admin/forms.py:572 +#: admin/forms.py:610 msgid "Domain(s)" msgstr "Dominio(s)" -#: admin/forms.py:574 +#: admin/forms.py:612 msgid "Domain(s) that user administrates" msgstr "Dominio(s) que el usuario administra" -#: admin/forms.py:616 admin/views.py:444 +#: admin/forms.py:654 admin/views.py:450 msgid "Mail" msgstr "Correo" -#: admin/forms.py:618 +#: admin/forms.py:656 msgid "Permissions" msgstr "Permisos" -#: admin/models.py:78 +#: admin/models.py:80 msgid "You can't delete your own account" msgstr "No puede eliminar su propia cuenta" -#: admin/models.py:159 +#: admin/models.py:161 msgid "Failed to update password: LDAP module not installed" msgstr "Falló al actualizar la contraseña: módulo LDAP no instalado" -#: admin/models.py:165 +#: admin/models.py:167 #, python-format msgid "Failed to update password: %s" msgstr "Falló la actualización de la contraseña: %s" -#: admin/models.py:192 +#: admin/models.py:194 msgid "account" msgstr "cuenta" -#: admin/models.py:494 admin/models.py:720 admin/models.py:782 +#: admin/models.py:496 admin/models.py:733 admin/models.py:795 msgid "Invalid line" msgstr "Línea inválida" -#: admin/models.py:498 +#: admin/models.py:500 msgid "You can't import an account with a role greater than yours" msgstr "No puede importar una cuenta con un rol mayor que el suyo" -#: admin/models.py:518 +#: admin/models.py:506 +#, python-format +msgid "The simple user '%s' must have a valid email address" +msgstr "" + +#: admin/models.py:510 +#, python-format +msgid "username and email fields must not differ for '%s'" +msgstr "" + +#: admin/models.py:534 #, python-format msgid "Account import failed (%s): domain does not exist" msgstr "Falló la importación de la cuenta (%s): el dominio no existe" -#: admin/models.py:607 admin/models.py:733 +#: admin/models.py:624 admin/models.py:746 msgid "name" msgstr "nombre" -#: admin/models.py:608 +#: admin/models.py:625 msgid "The domain name" msgstr "Nombre del dominio" -#: admin/models.py:610 +#: admin/models.py:627 msgid "Default quota in MB applied to mailboxes" msgstr "Cuota por defecto en MB que se aplicará a los mailboxes" -#: admin/models.py:613 admin/models.py:740 admin/models.py:1020 -#: admin/models.py:1181 extensions/postfix_autoreply/models.py:19 +#: admin/models.py:630 admin/models.py:753 admin/models.py:1045 +#: admin/models.py:1217 extensions/postfix_autoreply/models.py:27 msgid "enabled" msgstr "activado" -#: admin/models.py:614 +#: admin/models.py:631 msgid "Check to activate this domain" msgstr "Marcar para activar este dominio" -#: admin/models.py:734 +#: admin/models.py:747 msgid "The alias name" msgstr "Nombre del alias" -#: admin/models.py:736 +#: admin/models.py:749 msgid "target" msgstr "objetivo" -#: admin/models.py:737 +#: admin/models.py:750 msgid "The domain this alias points to" msgstr "El dominio al que este alias apunta" -#: admin/models.py:741 admin/models.py:1021 +#: admin/models.py:754 admin/models.py:1046 msgid "Check to activate this alias" msgstr "Marcar para activar este alias" -#: admin/models.py:788 +#: admin/models.py:801 #, python-format msgid "Unknown domain %s" msgstr "Dominio desconocido %s" -#: admin/models.py:805 admin/models.py:1006 +#: admin/models.py:818 admin/models.py:1031 msgid "address" msgstr "dirección" -#: admin/models.py:806 +#: admin/models.py:819 msgid "Mailbox address (without the @domain.tld part)" msgstr "Dirección del mailbox (sin la parte @dominio.tld)" -#: admin/models.py:852 +#: admin/models.py:877 #, python-format msgid "Failed to retrieve mailbox location (%s)" msgstr "Fallo al recuperar la localización del mailbox (%s)" -#: admin/models.py:868 -#, python-format -msgid "Failed to rename mailbox: %s" -msgstr "Fallo al renombrar el mailbox: %s" - -#: admin/models.py:894 -#, python-format -msgid "Failed to remove mailbox: %s" -msgstr "Fallo al eliminar el mailbox: %s" - -#: admin/models.py:909 +#: admin/models.py:921 #, python-format msgid "Quota is greater than the allowed domain's limit (%dM)" msgstr "La cuota es mayor que el límite permitido para el dominio (%dM)" -#: admin/models.py:914 +#: admin/models.py:926 msgid "A quota is required" msgstr "Una cuota es obligatoria" -#: admin/models.py:1007 +#: admin/models.py:1032 msgid "" -"The alias address (without the domain part). For a 'catch-all' address, just" -" enter an * character." -msgstr "La dirección del alias (sin la parte del dominio). Para una dirección que lo recoja todo, ponga un asterisco (*)." +"The alias address (without the domain part). For a 'catch-all' address, just " +"enter an * character." +msgstr "" +"La dirección del alias (sin la parte del dominio). Para una dirección que lo " +"recoja todo, ponga un asterisco (*)." -#: admin/models.py:1011 +#: admin/models.py:1036 msgid "mailboxes" msgstr "mailboxes" -#: admin/models.py:1012 +#: admin/models.py:1037 msgid "The mailboxes this alias points to" msgstr "Los 'mailboxes' de este alias apuntan a" -#: admin/models.py:1016 +#: admin/models.py:1041 msgid "The aliases this alias points to" msgstr "Los alias de este alias apuntan a" -#: admin/models.py:1064 +#: admin/models.py:1089 msgid "distribution list" msgstr "Lista de distribución" -#: admin/models.py:1065 +#: admin/models.py:1090 msgid "forward" msgstr "reenvío" -#: admin/models.py:1066 +#: admin/models.py:1091 msgid "alias" msgstr "alias" -#: admin/models.py:1142 +#: admin/models.py:1170 #, python-format msgid "Invalid line: %s" msgstr "Línea inválida: %s" -#: admin/models.py:1167 -#, python-format -msgid "Mailbox %s does not exist" -msgstr "El mailbox %s no existe" +#: admin/models.py:1175 +#, fuzzy, python-format +msgid "Domain '%s' does not exist" +msgstr "El dominio no existe" -#: admin/models.py:1182 +#: admin/models.py:1218 msgid "Check to enable this extension" msgstr "Marcar para activar esta extensión" -#: admin/models.py:1282 +#: admin/models.py:1318 msgid "added" msgstr "añadido" -#: admin/models.py:1285 +#: admin/models.py:1321 msgid "modified" msgstr "modificado" -#: admin/models.py:1288 +#: admin/models.py:1324 msgid "deleted" msgstr "eliminado" -#: admin/models.py:1290 +#: admin/models.py:1326 #, python-format msgid "%(object)s '%(name)s' %(action)s by user %(user)s" msgstr "%(object)s '%(name)s' %(action)s por el usuario %(user)s" @@ -629,7 +666,7 @@ msgid "Edit domain" msgstr "Editar el dominio" #: admin/tables.py:21 admin/templates/admin/identities_table.html:8 -#: admin/templates/admin/listing.html:17 extensions/sievefilters/views.py:79 +#: admin/templates/admin/listing.html:17 extensions/sievefilters/views.py:83 #: extensions/sievefilters/templates/sievefilters/filter.html:17 #: extensions/sievefilters/templates/sievefilters/guieditor.html:5 #: extensions/webmail/templatetags/webextras.py:97 @@ -644,190 +681,212 @@ msgstr "Versión" msgid "Description" msgstr "Descripción" -#: admin/views.py:87 +#: admin/views.py:88 msgid "New domain" msgstr "Nuevo dominio" -#: admin/views.py:88 admin/views.py:97 admin/views.py:225 admin/views.py:438 -#: admin/views.py:445 extensions/sievefilters/views.py:120 -#: extensions/sievefilters/views.py:187 extensions/webmail/views.py:131 +#: admin/views.py:89 admin/views.py:98 admin/views.py:228 admin/views.py:444 +#: admin/views.py:451 extensions/sievefilters/views.py:129 +#: extensions/sievefilters/views.py:198 extensions/webmail/views.py:136 msgid "Create" msgstr "Crear" -#: admin/views.py:94 admin/views.py:442 +#: admin/views.py:95 admin/views.py:448 msgid "Next" msgstr "Siguiente" -#: admin/views.py:96 +#: admin/views.py:97 msgid "Options" msgstr "Opciones" -#: admin/views.py:98 admin/views.py:446 +#: admin/views.py:99 admin/views.py:452 msgid "Previous" msgstr "Anterior" -#: admin/views.py:111 +#: admin/views.py:112 msgid "Domain created" msgstr "Dominio creado" -#: admin/views.py:144 admin/views.py:282 admin/views.py:492 +#: admin/views.py:146 admin/views.py:285 admin/views.py:498 #: extensions/postfix_autoreply/templates/postfix_autoreply/autoreply.html:9 -#: extensions/sievefilters/views.py:139 extensions/webmail/views.py:162 +#: extensions/sievefilters/views.py:148 extensions/webmail/views.py:168 #: userprefs/templates/userprefs/forward.html:8 #: userprefs/templates/userprefs/profile.html:8 msgid "Update" msgstr "Actualizar" -#: admin/views.py:160 +#: admin/views.py:162 msgid "Domain modified" msgstr "Dominio modificado" -#: admin/views.py:186 +#: admin/views.py:189 msgid "You can't delete your own domain" msgstr "No puedo eliminar su propio dominio" -#: admin/views.py:189 +#: admin/views.py:192 msgid "Domain deleted" msgid_plural "Domains deleted" msgstr[0] "Dominio eliminado" msgstr[1] "Dominios eliminados" -#: admin/views.py:204 +#: admin/views.py:207 msgid "Alias with this name already exists" msgstr "Ya existe un alias con este nombre" -#: admin/views.py:247 +#: admin/views.py:250 msgid "New distribution list" msgstr "Nueva lista de distribución" -#: admin/views.py:248 +#: admin/views.py:251 msgid "Distribution list created" msgstr "Lista de distribución creada" -#: admin/views.py:257 +#: admin/views.py:260 msgid "New alias" msgstr "Nuevo alias" -#: admin/views.py:258 +#: admin/views.py:261 msgid "Alias created" msgstr "Alias creado" -#: admin/views.py:267 +#: admin/views.py:270 msgid "New forward" msgstr "Nuevo reenvío" -#: admin/views.py:268 +#: admin/views.py:271 msgid "Forward created" msgstr "Reenvío creado" -#: admin/views.py:286 +#: admin/views.py:289 msgid "Distribution list modified" msgstr "Lista de distribución modificada" -#: admin/views.py:288 +#: admin/views.py:291 msgid "Forward modified" msgstr "Reenvío modificado" -#: admin/views.py:290 +#: admin/views.py:293 msgid "Alias modified" msgstr "Alias modificado" -#: admin/views.py:403 admin/views.py:541 admin/views.py:546 -#: extensions/amavis/views.py:195 extensions/amavis/views.py:201 -#: extensions/amavis/views.py:234 extensions/amavis/views.py:238 -#: extensions/amavis/views.py:240 extensions/webmail/views.py:36 -#: extensions/webmail/views.py:64 extensions/webmail/views.py:77 -#: extensions/webmail/views.py:93 extensions/webmail/views.py:109 -#: extensions/webmail/views.py:193 extensions/webmail/views.py:419 -#: extensions/webmail/views.py:430 extensions/webmail/views.py:457 +#: admin/views.py:402 admin/views.py:545 admin/views.py:550 +#: extensions/amavis/views.py:204 extensions/amavis/views.py:210 +#: extensions/amavis/views.py:243 extensions/amavis/views.py:247 +#: extensions/amavis/views.py:249 extensions/webmail/views.py:41 +#: extensions/webmail/views.py:68 extensions/webmail/views.py:81 +#: extensions/webmail/views.py:98 extensions/webmail/views.py:114 +#: extensions/webmail/views.py:200 extensions/webmail/views.py:427 +#: extensions/webmail/views.py:438 extensions/webmail/views.py:465 #: lib/formutils.py:32 lib/formutils.py:37 msgid "Invalid request" msgstr "Petición inválida" -#: admin/views.py:435 +#: admin/views.py:441 msgid "New account" msgstr "Nueva cuenta" -#: admin/views.py:459 +#: admin/views.py:465 msgid "Account created" msgstr "Cuenta creada" -#: admin/views.py:507 +#: admin/views.py:513 msgid "Account updated" msgstr "Cuenta actualizada" -#: admin/views.py:531 +#: admin/views.py:535 msgid "Account deleted" msgid_plural "Accounts deleted" msgstr[0] "Cuenta eliminada" msgstr[1] "Cuentas eliminadas" -#: admin/views.py:586 +#: admin/views.py:590 msgid "Parameters saved" msgstr "Parámetros guardados" -#: admin/views.py:632 +#: admin/views.py:636 msgid "Modifications applied." msgstr "Modificaciones aplicadas." -#: admin/views.py:740 +#: admin/views.py:743 #, python-format msgid "Object already exists: %s" msgstr "El objeto ya existe: %s" -#: admin/views.py:742 +#: admin/views.py:745 #, python-format msgid "%d objects imported successfully" msgstr "%d objetos importados con éxito" -#: admin/views.py:760 +#: admin/views.py:763 msgid "" "Provide a CSV file where lines respect one of the following formats:\n" "
              \n" -"
            • account; loginname; password; first name; last name; enabled; group; address[, domain, ...]
              • \n" +"
            • account; loginname; password; first name; last name; enabled; group; " +"address[, domain, ...]
              • \n" "
            • alias; address; enabled; internal recipient
              • \n" "
            • forward; address; enabled; external recipient
              • \n" "
            • dlist; address; enabled; recipient; recipient; ...
              • \n" "
            \n" -"

            The first element of each line is mandatory and must be equal to one of the previous values.

            \n" +"

            The first element of each line is mandatory and must be equal to one of " +"the previous values.

            \n" "\n" "

            You can use a different character as separator.

            \n" -msgstr "Importe un fichero CSV dónde las líneas respetan uno de los siguientes formatos:\n
              \n
            • account; loginname; password; first name; last name; enabled; group; address[, domain, ...]
              • ⏎\n
            • alias; address; enabled; internal recipient
              • ⏎\n
            • forward; address; enabled; external recipient
              • ⏎\n
            • dlist; address; enabled; recipient; recipient; ...
              • ⏎\n
            ⏎\n

            El primer elemento de cada línea es obligatorio y debe ser igual al de los valores previos.

            \n\n

            Puede usar un carácter diferente como separador.

            \n" +msgstr "" +"Importe un fichero CSV dónde las líneas respetan uno de los siguientes " +"formatos:\n" +"
              \n" +"
            • account; loginname; password; first name; last name; enabled; group; " +"address[, domain, ...]
              • ⏎\n" +"
            • alias; address; enabled; internal recipient
              • ⏎\n" +"
            • forward; address; enabled; external recipient
              • ⏎\n" +"
            • dlist; address; enabled; recipient; recipient; ...
              • ⏎\n" +"
            ⏎\n" +"

            El primer elemento de cada línea es obligatorio y debe ser igual al de " +"los valores previos.

            \n" +"\n" +"

            Puede usar un carácter diferente como separador.

            \n" -#: admin/views.py:772 +#: admin/views.py:775 msgid "Import identities" msgstr "Importar identidades" -#: admin/views.py:773 admin/views.py:843 admin/templatetags/admin_extras.py:87 +#: admin/views.py:776 admin/views.py:846 admin/templatetags/admin_extras.py:87 #: admin/templatetags/admin_extras.py:144 msgid "Import" msgstr "Importar" -#: admin/views.py:803 +#: admin/views.py:806 msgid "Export identities" msgstr "Exportar identidades" -#: admin/views.py:804 admin/views.py:860 admin/templatetags/admin_extras.py:93 +#: admin/views.py:807 admin/views.py:863 admin/templatetags/admin_extras.py:93 #: admin/templatetags/admin_extras.py:150 msgid "Export" msgstr "Exportar" -#: admin/views.py:832 +#: admin/views.py:835 msgid "" "Provide a CSV file where lines respect one of the following formats:\n" "
              \n" "
            • domain; name; quota; enabled
              • \n" "
            • domainalias; name; targeted domain; enabled
              • \n" "
            \n" -"

            The first element of each line is mandatory and must be equal to one of the previous values.

            \n" +"

            The first element of each line is mandatory and must be equal to one of " +"the previous values.

            \n" "

            You can use a different character as separator.

            \n" -msgstr "Provea un fichero CSV dónde las líneas respetan uno de los siguientes formatos:⏎
              ⏎
            • dominio; nombre; cuota; activado
              • ⏎
            • aliasdeldominio; nombre; dominio objetivo; activado
              • ⏎
            ⏎

            El primer elemento de cada línea es obligatorio y debe ser igual a uno de los valores anteriores.

            ⏎

            Puede usar un carácter diferente como separador.

            ⏎\n" +msgstr "" +"Provea un fichero CSV dónde las líneas respetan uno de los siguientes " +"formatos:⏎
              ⏎
            • dominio; nombre; cuota; activado
              • ⏎ " +"
            • aliasdeldominio; nombre; dominio objetivo; activado
              • ⏎ ⏎

              El primer elemento de cada línea es obligatorio y debe ser igual a " +"uno de los valores anteriores.

              ⏎

              Puede usar un carácter diferente como " +"separador.

              ⏎\n" -#: admin/views.py:842 +#: admin/views.py:845 msgid "Import domains" msgstr "Importar dominios" -#: admin/views.py:859 +#: admin/views.py:862 msgid "Export domains" msgstr "Exportar dominios" @@ -900,7 +959,7 @@ msgid "Tags" msgstr "Tags" #: admin/templates/admin/importform.html:5 -#: admin/templatetags/admin_extras.py:305 +#: admin/templatetags/admin_extras.py:290 msgid "Help" msgstr "Ayuda" @@ -947,7 +1006,7 @@ msgid "Previously on Modoboa..." msgstr "Anteriormente en Modoboa..." #: admin/templates/admin/logs.html:6 extensions/amavis/sql_listing.py:25 -#: extensions/webmail/lib.py:37 extensions/webmail/lib.py:406 +#: extensions/webmail/lib.py:38 extensions/webmail/lib.py:411 msgid "Date" msgstr "Fecha" @@ -1050,34 +1109,21 @@ msgid "View the domain's identities" msgstr "Ver las identidades del dominio" #: admin/templatetags/admin_extras.py:178 -msgid "Delete the domain" -msgstr "Eliminar el dominio" - #: admin/templatetags/admin_extras.py:194 -msgid "Delete this account" -msgstr "Eliminar esta cuenta" +#: admin/templatetags/admin_extras.py:201 +#, fuzzy, python-format +msgid "Delete %s?" +msgstr "Eliminar" -#: admin/templatetags/admin_extras.py:202 -msgid "Delete this distribution list" -msgstr "Eliminar esta lista de distribución" - -#: admin/templatetags/admin_extras.py:209 -msgid "Delete this forward" -msgstr "Eliminar este reenvío" - -#: admin/templatetags/admin_extras.py:216 -msgid "Delete this alias" -msgstr "Eliminar este alias" - -#: admin/templatetags/admin_extras.py:238 +#: admin/templatetags/admin_extras.py:223 msgid "Remove this permission" msgstr "Eliminar este permiso" -#: admin/templatetags/admin_extras.py:279 lib/formutils.py:206 +#: admin/templatetags/admin_extras.py:264 lib/formutils.py:206 msgid "Yes" msgstr "Sí" -#: admin/templatetags/admin_extras.py:279 lib/formutils.py:206 +#: admin/templatetags/admin_extras.py:264 lib/formutils.py:206 msgid "No" msgstr "No " @@ -1086,11 +1132,13 @@ msgstr "No " msgid "User '%s' successfully logged in" msgstr "Usuario '%s' ha entrado con éxito" -#: auth/views.py:41 +#: auth/views.py:44 msgid "Your username and password didn't match. Please try again." -msgstr "Su nombre de usuario y contraseña no concuerdan. Por favor, inténtelo de nuevo." +msgstr "" +"Su nombre de usuario y contraseña no concuerdan. Por favor, inténtelo de " +"nuevo." -#: auth/views.py:64 +#: auth/views.py:67 #, python-format msgid "User '%s' logged out" msgstr "Usuario '%s' ha salido" @@ -1116,15 +1164,32 @@ msgid "" "\n" "

              Welcome to the online demo!

              \n" "

              Warning: the demo's concent is resetted every two hours.

              \n" -"

              To try the demo, the following users are available (username/password):

              \n" +"

              To try the demo, the following users are available (username/password):

              \n" "
                \n" "
              • A super administrator : admin/password
                • \n" "
              • A domain administrator : admin@demo.local/admin
                • \n" "
              • A simple user : user@demo.local/user
                • \n" "
              \n" "

              Please report any issue or give any suggestion to \n" -" the mailing list.

              \n" -msgstr "\n

              ¡Bienvendio a la demo!

              \n

              Aviso: el contenido de la demo será inicializado cada dos horas.

              \n

              Para probar la demo están disponibles los siguientes usuarios (usuario/contraseña):

              \n
                \n
              • Un super administrador : admin/password
                • \n
              • Un administrador de dominio : admin@demo.local/admin
                • \n
              • Un usuario normal : user@demo.local/user
                • \n
              \n

              Por favor, informe de cualquier incidencia o denos cualquier sugerencia a \n la lista de correo.

              \n" +" the " +"mailing list.

              \n" +msgstr "" +"\n" +"

              ¡Bienvendio a la demo!

              \n" +"

              Aviso: el contenido de la demo será inicializado cada dos horas.\n" +"

              Para probar la demo están disponibles los siguientes usuarios (usuario/" +"contraseña):

              \n" +"
                \n" +"
              • Un super administrador : admin/password
                • \n" +"
              • Un administrador de dominio : admin@demo.local/admin
                • \n" +"
              • Un usuario normal : user@demo.local/user
                • \n" +"
              \n" +"

              Por favor, informe de cualquier incidencia o denos cualquier sugerencia " +"a \n" +" la lista " +"de correo.

              \n" #: extensions/amavis/__init__.py:22 msgid "Simple amavis management frontend" @@ -1134,16 +1199,16 @@ msgstr "Panel de gestión sencilla para amavis" msgid "Quarantine" msgstr "Cuarentena" -#: extensions/amavis/__init__.py:127 +#: extensions/amavis/__init__.py:129 msgid "pending requests" msgstr "Peticiones pendientes" -#: extensions/amavis/__init__.py:144 +#: extensions/amavis/__init__.py:149 #, python-format msgid "%d pending requests" msgstr "%d peticiones pendientes" -#: extensions/amavis/__init__.py:156 +#: extensions/amavis/__init__.py:161 msgid "Content filter" msgstr "Filtro de contenido" @@ -1157,7 +1222,9 @@ msgstr "Tiempo máximo del mensaje" #: extensions/amavis/app_settings.py:16 msgid "Quarantine messages maximum age (in days) before deletion" -msgstr "Máxima edad (en días) de los mensajes de cuarentena antes de proceder a su eliminación" +msgstr "" +"Máxima edad (en días) de los mensajes de cuarentena antes de proceder a su " +"eliminación" #: extensions/amavis/app_settings.py:19 msgid "Messages releasing" @@ -1169,7 +1236,9 @@ msgstr "Eliminar mensajes publicados" #: extensions/amavis/app_settings.py:24 msgid "Remove messages marked as released while cleaning up the database" -msgstr "Eliminar los mensajes marcados como publicados cuando se haga limpieza de la base de datos" +msgstr "" +"Eliminar los mensajes marcados como publicados cuando se haga limpieza de la " +"base de datos" #: extensions/amavis/app_settings.py:28 msgid "Amavis connection mode" @@ -1258,12 +1327,12 @@ msgid "Virus filter" msgstr "Filtro de virus" #: extensions/amavis/models.py:94 extensions/amavis/models.py:102 -#: extensions/amavis/models.py:110 extensions/sievefilters/views.py:268 +#: extensions/amavis/models.py:110 extensions/sievefilters/views.py:281 msgid "yes" msgstr "sí" #: extensions/amavis/models.py:95 extensions/amavis/models.py:103 -#: extensions/amavis/models.py:111 extensions/sievefilters/views.py:272 +#: extensions/amavis/models.py:111 extensions/sievefilters/views.py:285 msgid "no" msgstr "no" @@ -1275,7 +1344,9 @@ msgstr "Por defecto" #: extensions/amavis/models.py:98 msgid "Bypass virus checks or not. Choose 'default' to use global settings." -msgstr "Saltarse la comprobación de virus o no. Elija 'Por defecto' para usar la configuración global." +msgstr "" +"Saltarse la comprobación de virus o no. Elija 'Por defecto' para usar la " +"configuración global." #: extensions/amavis/models.py:101 msgid "Spam filter" @@ -1283,7 +1354,9 @@ msgstr "Filtro de spam" #: extensions/amavis/models.py:106 msgid "Bypass spam checks or not. Choose 'default' to use global settings." -msgstr "Saltarse la comprobación de spam o no. Elija 'Por defecto' para usar la configuración global." +msgstr "" +"Saltarse la comprobación de spam o no. Elija 'Por defecto' para usar la " +"configuración global." #: extensions/amavis/models.py:109 msgid "Banned filter" @@ -1291,7 +1364,9 @@ msgstr "Filtro de expulsados" #: extensions/amavis/models.py:114 msgid "Bypass banned checks or not. Choose 'default' to use global settings." -msgstr "Saltarse la comprobación de expulsados o no. Elija 'Por defecto' para usar la configuración global." +msgstr "" +"Saltarse la comprobación de expulsados o no. Elija 'Por defecto' para usar " +"la configuración global." #: extensions/amavis/models.py:144 msgid "Spam marker" @@ -1299,17 +1374,19 @@ msgstr "Marcador de spam" #: extensions/amavis/models.py:146 msgid "" -"Modify spam subject using the specified text. Choose 'default' to use global" -" settings." -msgstr "Modificar el asunto del spam usando el texto especificado. Elija 'por defecto' para usar la configuración global." +"Modify spam subject using the specified text. Choose 'default' to use global " +"settings." +msgstr "" +"Modificar el asunto del spam usando el texto especificado. Elija 'por " +"defecto' para usar la configuración global." -#: extensions/amavis/sql_listing.py:23 extensions/webmail/lib.py:36 +#: extensions/amavis/sql_listing.py:23 extensions/webmail/lib.py:37 msgid "From" msgstr "Desde" #: extensions/amavis/sql_listing.py:24 extensions/sievefilters/forms.py:68 -#: extensions/webmail/forms.py:10 extensions/webmail/lib.py:35 -#: extensions/webmail/lib.py:404 templates/common/email_searchbar.html:6 +#: extensions/webmail/forms.py:10 extensions/webmail/lib.py:36 +#: extensions/webmail/lib.py:409 templates/common/email_searchbar.html:6 msgid "Subject" msgstr "Tema" @@ -1319,37 +1396,37 @@ msgstr "Tema" msgid "To" msgstr "A" -#: extensions/amavis/views.py:34 +#: extensions/amavis/views.py:43 msgid "Empty quarantine" msgstr "Vaciar cuarentena" -#: extensions/amavis/views.py:202 +#: extensions/amavis/views.py:211 msgid "Message deleted" msgstr "Mensaje eliminado" -#: extensions/amavis/views.py:223 +#: extensions/amavis/views.py:232 #, python-format msgid "%(count)d message deleted successfully" msgid_plural "%(count)d messages deleted successfully" msgstr[0] "%(count)d mensaje eliminado correctamente" msgstr[1] "%(count)d mensajes eliminados correctamente" -#: extensions/amavis/views.py:243 +#: extensions/amavis/views.py:252 msgid "Request sent" msgstr "Petición enviada" -#: extensions/amavis/views.py:249 +#: extensions/amavis/views.py:258 msgid "Message released" msgstr "Mensaje publicado" -#: extensions/amavis/views.py:271 +#: extensions/amavis/views.py:280 #, python-format msgid "%(count)d request sent" msgid_plural "%(count)d requests sent" msgstr[0] "%(count)d petición enviada" msgstr[1] "%(count)d peticiones enviadas" -#: extensions/amavis/views.py:295 +#: extensions/amavis/views.py:304 #, python-format msgid "%(count)d message released successfully" msgid_plural "%(count)d messages released successfully" @@ -1384,8 +1461,12 @@ msgid "" msgid_plural "" "\n" "%(counter)s release requests are pending for action.\n" -msgstr[0] "\n%(counter)s petición de publicación está pendiente de acción.\n" -msgstr[1] "\n%(counter)s peticiones de publicación están pendiente de acción.\n" +msgstr[0] "" +"\n" +"%(counter)s petición de publicación está pendiente de acción.\n" +msgstr[1] "" +"\n" +"%(counter)s peticiones de publicación están pendiente de acción.\n" #: extensions/amavis/templates/amavis/notifications/pending_requests.html:6 msgid "Sketch:" @@ -1460,7 +1541,8 @@ msgstr "Mal MIME" #: extensions/limits/__init__.py:23 msgid "" "Per administrator resources to limit the number of objects they can create" -msgstr "Recursos por administrador para limitar el número de objetos que pueden crear" +msgstr "" +"Recursos por administrador para limitar el número de objetos que pueden crear" #: extensions/limits/__init__.py:54 msgid "Limits" @@ -1470,7 +1552,7 @@ msgstr "Límites" msgid "Reseller" msgstr "Revendedor" -#: extensions/limits/__init__.py:96 +#: extensions/limits/__init__.py:94 msgid "Resources" msgstr "Recursos" @@ -1484,9 +1566,10 @@ msgid "Domain admins" msgstr "Administradores del dominio" #: extensions/limits/app_settings.py:15 -msgid "" -"Maximum number of allowed domain administrators for a new administrator" -msgstr "Número máximo de dominios permitido de administradores para un nuevo administrador" +msgid "Maximum number of allowed domain administrators for a new administrator" +msgstr "" +"Número máximo de dominios permitido de administradores para un nuevo " +"administrador" #: extensions/limits/app_settings.py:21 msgid "Maximum number of allowed domains for a new administrator" @@ -1494,7 +1577,8 @@ msgstr "Número máximo de dominios permitidos para un nuevo administrador" #: extensions/limits/app_settings.py:27 msgid "Maximum number of allowed domain aliases for a new administrator" -msgstr "Número máximo permitido de alias de dominio para un nuevo administrador" +msgstr "" +"Número máximo permitido de alias de dominio para un nuevo administrador" #: extensions/limits/app_settings.py:33 msgid "Maximum number of allowed mailboxes for a new administrator" @@ -1506,7 +1590,8 @@ msgstr "Número máxido de alias permitidos para un nuevo administrador" #: extensions/limits/forms.py:13 msgid "Maximum number of domain administrators this user can create" -msgstr "Número máximo de administradores de dominio que este usuario puede crear" +msgstr "" +"Número máximo de administradores de dominio que este usuario puede crear" #: extensions/limits/forms.py:17 msgid "Maximum number of domains this user can create" @@ -1590,23 +1675,23 @@ msgstr "Activar su autorespuesta hasta esta fecha" msgid "This date is over" msgstr "Esta fecha ha pasado" -#: extensions/postfix_autoreply/models.py:15 +#: extensions/postfix_autoreply/models.py:19 msgid "subject" msgstr "asunto" -#: extensions/postfix_autoreply/models.py:16 +#: extensions/postfix_autoreply/models.py:20 msgid "The subject that will appear in sent emails" msgstr "El asunto que aparecerán en los correos enviados" -#: extensions/postfix_autoreply/models.py:17 +#: extensions/postfix_autoreply/models.py:23 msgid "content" msgstr "contenido" -#: extensions/postfix_autoreply/models.py:18 +#: extensions/postfix_autoreply/models.py:24 msgid "The content that will appear in sent emails" msgstr "El contenido que aparecerá en los emails enviados" -#: extensions/postfix_autoreply/models.py:20 +#: extensions/postfix_autoreply/models.py:28 msgid "Activate/Deactivate your auto reply" msgstr "Activar/desactivar su autorespuesta" @@ -1616,7 +1701,8 @@ msgstr "El mensaje de autorespuesta se ha actualizado correctamente." #: extensions/postfix_autoreply/templates/postfix_autoreply/autoreply.html:2 msgid "Define a message to automatically send when you are off" -msgstr "Defina el mensaje que automáticamente se enviará cuando esté desconectado" +msgstr "" +"Defina el mensaje que automáticamente se enviará cuando esté desconectado" #: extensions/sievefilters/__init__.py:12 msgid "Plugin to easily create server-side filters" @@ -1740,53 +1826,53 @@ msgstr "La conexión al servidor MANAGESIEVE falló, verifique su configuración msgid "Not enough space on server" msgstr "No hay suficiente espacio en el servidor" -#: extensions/sievefilters/views.py:64 +#: extensions/sievefilters/views.py:68 msgid "Failed to retrieve filters set" msgstr "Fallo en la recuperación de un conjunto de filtros" -#: extensions/sievefilters/views.py:117 +#: extensions/sievefilters/views.py:126 #: extensions/sievefilters/templatetags/sfilters_tags.py:33 msgid "New filter" msgstr "Nuevo filtro" -#: extensions/sievefilters/views.py:124 +#: extensions/sievefilters/views.py:133 msgid "Filter created" msgstr "Filtro creado" -#: extensions/sievefilters/views.py:136 +#: extensions/sievefilters/views.py:145 #: extensions/sievefilters/templatetags/sfilters_tags.py:77 msgid "Edit filter" msgstr "Editar filtro" -#: extensions/sievefilters/views.py:145 +#: extensions/sievefilters/views.py:154 msgid "Filter modified" msgstr "Filtro modificado" -#: extensions/sievefilters/views.py:165 +#: extensions/sievefilters/views.py:176 msgid "Filter removed" msgstr "Filtro eliminado" -#: extensions/sievefilters/views.py:166 +#: extensions/sievefilters/views.py:177 msgid "Failed to remove filter" msgstr "La eliminación del filtro falló" -#: extensions/sievefilters/views.py:180 +#: extensions/sievefilters/views.py:191 msgid "Filters set saved" msgstr "Filtros guardados" -#: extensions/sievefilters/views.py:185 +#: extensions/sievefilters/views.py:196 msgid "Create a new filters set" msgstr "Crear un nuevo conjunto de filtros" -#: extensions/sievefilters/views.py:208 +#: extensions/sievefilters/views.py:219 msgid "Filters set created" msgstr "Conjunto de filtros creado" -#: extensions/sievefilters/views.py:229 +#: extensions/sievefilters/views.py:240 msgid "Filters set deleted" msgstr "Conjunto de filtros eliminado" -#: extensions/sievefilters/views.py:241 +#: extensions/sievefilters/views.py:252 msgid "Filters set activated" msgstr "Conjunto de filtros activado" @@ -1802,18 +1888,20 @@ msgstr "Activo" msgid "No filter defined yet" msgstr "No hay un filtro definido aún" -#: extensions/sievefilters/templates/sievefilters/index.html:55 +#: extensions/sievefilters/templates/sievefilters/index.html:56 msgid "Filter sets" msgstr "Conjunto de filtros" -#: extensions/sievefilters/templates/sievefilters/index.html:59 +#: extensions/sievefilters/templates/sievefilters/index.html:60 msgid "active" msgstr "activo" -#: extensions/sievefilters/templates/sievefilters/index.html:73 +#: extensions/sievefilters/templates/sievefilters/index.html:74 msgid "" "No filters set defined yet. You must create one in order to define filters." -msgstr "No hay un conjunto de filtros definido aún. Debe crear uno para poder definir filtros." +msgstr "" +"No hay un conjunto de filtros definido aún. Debe crear uno para poder " +"definir filtros." #: extensions/sievefilters/templatetags/sfilters_tags.py:16 msgid "New filters set" @@ -2125,84 +2213,89 @@ msgstr "Respuesta del servidor" msgid "Cci" msgstr "Cco" -#: extensions/webmail/imaputils.py:259 +#: extensions/webmail/imaputils.py:237 +#, fuzzy +msgid "Failed to retrieve hierarchy delimiter" +msgstr "Fallo en la recuperación de un conjunto de filtros" + +#: extensions/webmail/imaputils.py:278 #, python-format msgid "Connection to IMAP server failed: %s" msgstr "Falló la conexión con el servidor IMAP: %s" -#: extensions/webmail/lib.py:353 +#: extensions/webmail/lib.py:358 msgid "wrote:" msgstr "escribió:" -#: extensions/webmail/lib.py:418 extensions/webmail/lib.py:422 +#: extensions/webmail/lib.py:423 extensions/webmail/lib.py:427 msgid "Original message" msgstr "Mensaje original" -#: extensions/webmail/views.py:81 +#: extensions/webmail/views.py:86 #, python-format msgid "%(count)d message deleted" msgid_plural "%(count)d messages deleted" msgstr[0] "%(count)d mensaje eliminado" msgstr[1] "%(count)d mensajes eliminados" -#: extensions/webmail/views.py:98 +#: extensions/webmail/views.py:103 msgid "Unknown action" msgstr "Acción desconocida" -#: extensions/webmail/views.py:111 lib/email_listing.py:137 +#: extensions/webmail/views.py:116 lib/email_listing.py:137 msgid "Empty mailbox" msgstr "Mailbox vacío" -#: extensions/webmail/views.py:128 -#: extensions/webmail/templatetags/webextras.py:169 +#: extensions/webmail/views.py:133 +#: extensions/webmail/templatetags/webextras.py:170 msgid "Create a new mailbox" msgstr "Crear un nuevo mailbox" -#: extensions/webmail/views.py:143 +#: extensions/webmail/views.py:149 msgid "Mailbox created" msgstr "Mailbox creado." -#: extensions/webmail/views.py:159 +#: extensions/webmail/views.py:165 msgid "Edit mailbox" msgstr "Editar el mailbox" -#: extensions/webmail/views.py:173 +#: extensions/webmail/views.py:180 msgid "Mailbox updated" msgstr "Mailbox actualizado" -#: extensions/webmail/views.py:207 extensions/webmail/views.py:388 -#: extensions/webmail/views.py:497 +#: extensions/webmail/views.py:214 extensions/webmail/views.py:396 +#: extensions/webmail/views.py:505 msgid "Bad request" msgstr "Petición incorrecta" -#: extensions/webmail/views.py:238 +#: extensions/webmail/views.py:246 msgid "Failed to save attachment: " msgstr "Fallo al guardar el adjunto:" -#: extensions/webmail/views.py:241 +#: extensions/webmail/views.py:249 #, python-format msgid "Attachment is too big (limit: %s)" msgstr "EL adjunto es demasiado grande (límite: %s)" -#: extensions/webmail/views.py:247 +#: extensions/webmail/views.py:255 #: extensions/webmail/templates/webmail/compose.html:15 #: extensions/webmail/templates/webmail/headers.html:4 msgid "Attachments" msgstr "Adjuntos" -#: extensions/webmail/views.py:263 +#: extensions/webmail/views.py:271 msgid "Bad query" msgstr "Consulta errónea" -#: extensions/webmail/views.py:273 +#: extensions/webmail/views.py:281 msgid "Failed to remove attachment: " msgstr "Fallo al eliminar el adjunto:" -#: extensions/webmail/views.py:278 +#: extensions/webmail/views.py:286 msgid "Unknown attachment" msgstr "Adjunto desconocido" -#: extensions/webmail/views.py:493 +#: extensions/webmail/views.py:501 msgid "Undefined action" msgstr "Acción no definida" @@ -2233,7 +2326,7 @@ msgstr[1] "%(counter)s ficheros" msgid "Parent mailbox" msgstr "Mailbox padre" -#: extensions/webmail/templates/webmail/index.html:36 +#: extensions/webmail/templates/webmail/index.html:38 msgid "Mailbox quota" msgstr "Cuota del mailbox" @@ -2295,15 +2388,15 @@ msgstr "Como no leído" msgid "Compress folder" msgstr "Comprimir la carpeta" -#: extensions/webmail/templatetags/webextras.py:109 +#: extensions/webmail/templatetags/webextras.py:110 msgid "Empty folder" msgstr "Vaciar la carpeta" -#: extensions/webmail/templatetags/webextras.py:177 +#: extensions/webmail/templatetags/webextras.py:178 msgid "Edit the selected mailbox" msgstr "Editar el mailbox seleccionado" -#: extensions/webmail/templatetags/webextras.py:182 +#: extensions/webmail/templatetags/webextras.py:183 msgid "Remove the selected mailbox" msgstr "Eliminar el mailbox seleccionado" @@ -2357,7 +2450,7 @@ msgstr "La página pedida no existe." msgid "An internal error occured." msgstr "Ocurrió un error interno." -#: templates/nlayout.html:56 +#: templates/nlayout.html:62 msgid "Powered by Modoboa" msgstr "Tecnología Modoboa" @@ -2391,11 +2484,11 @@ msgstr "Cerrar" msgid "Welcome to Modoboa" msgstr "Bienvenido a Modoboa" -#: templates/registration/login.html:33 +#: templates/registration/login.html:34 msgid "Remember me" msgstr "Recuerdame" -#: templates/registration/login.html:35 +#: templates/registration/login.html:36 msgid "Log in" msgstr "Entrar" @@ -2411,7 +2504,7 @@ msgstr "Configuración por usuario" msgid "Prefered language" msgstr "Idioma preferido" -#: userprefs/app_settings.py:26 +#: userprefs/app_settings.py:27 msgid "Prefered language to display pages" msgstr "Idioma preferido para mostrar las páginas" @@ -2451,7 +2544,9 @@ msgstr "Reenvía mensajes y guarda copias en su mailbox local" msgid "" "You can't define a forward to a local destination. Please ask your " "administrator to create an alias instead." -msgstr "No puede definir un reenvío a un destino local. Por favor, pregunte a su administrador para crear un alias en su lugar." +msgstr "" +"No puede definir un reenvío a un destino local. Por favor, pregunte a su " +"administrador para crear un alias en su lugar." #: userprefs/views.py:32 msgid "You need a mailbox in order to define a forward" @@ -2499,3 +2594,27 @@ msgstr "Actualizar su información personal" #: userprefs/templatetags/uprefs_extras.py:57 msgid "Logout" msgstr "Salir" + +#~ msgid "Failed to rename mailbox: %s" +#~ msgstr "Fallo al renombrar el mailbox: %s" + +#~ msgid "Failed to remove mailbox: %s" +#~ msgstr "Fallo al eliminar el mailbox: %s" + +#~ msgid "Mailbox %s does not exist" +#~ msgstr "El mailbox %s no existe" + +#~ msgid "Delete the domain" +#~ msgstr "Eliminar el dominio" + +#~ msgid "Delete this account" +#~ msgstr "Eliminar esta cuenta" + +#~ msgid "Delete this distribution list" +#~ msgstr "Eliminar esta lista de distribución" + +#~ msgid "Delete this forward" +#~ msgstr "Eliminar este reenvío" + +#~ msgid "Delete this alias" +#~ msgstr "Eliminar este alias" diff --git a/modoboa/locale/fr/LC_MESSAGES/django.po b/modoboa/locale/fr/LC_MESSAGES/django.po index 40f10043d..d874fc916 100644 --- a/modoboa/locale/fr/LC_MESSAGES/django.po +++ b/modoboa/locale/fr/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: modoboa-1.0.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-01 16:35+0200\n" +"POT-Creation-Date: 2013-09-20 22:30+0200\n" "PO-Revision-Date: 2011-01-07 10:00+100\n" "Last-Translator: Antoine Nguyen \n" "Language-Team: FR \n" @@ -25,8 +25,8 @@ msgstr "Console d'administration" msgid "Web based console to manage domains, accounts and aliases" msgstr "Console web pour gérer les domains, comptes et alias" -#: admin/__init__.py:16 admin/forms.py:179 admin/forms.py:614 -#: admin/views.py:93 admin/views.py:441 +#: admin/__init__.py:16 admin/forms.py:211 admin/forms.py:652 +#: admin/views.py:94 admin/views.py:447 #: extensions/postfix_autoreply/app_settings.py:11 #: extensions/sievefilters/app_settings.py:50 #: extensions/stats/app_settings.py:11 extensions/webmail/app_settings.py:11 @@ -250,15 +250,23 @@ msgid "The default redirection used when no application is specified" msgstr "" "La redirection appliquée par défaut quand aucune application n'est spécifiée" -#: admin/app_settings.py:230 +#: admin/app_settings.py:213 +msgid "Key must be either 16, 24, or 32 bytes long" +msgstr "" + +#: admin/app_settings.py:222 +msgid "Invalid syntax" +msgstr "Syntaxe invalide" + +#: admin/app_settings.py:245 msgid "This field is required" msgstr "Ce champ est requis" -#: admin/forms.py:16 admin/forms.py:459 admin/tables.py:18 +#: admin/forms.py:20 admin/forms.py:497 admin/tables.py:18 msgid "Alias(es)" msgstr "Alias" -#: admin/forms.py:18 +#: admin/forms.py:22 msgid "" "Alias(es) of this domain. Indicate only one name per input, press ENTER to " "add a new input." @@ -266,23 +274,23 @@ msgstr "" "Alias de ce domaine. Indiquer seulement un nom par champ, appuyer sur ENTREE " "pour ajouter un nouveau champ." -#: admin/forms.py:55 +#: admin/forms.py:59 msgid "An alias with this name already exists" msgstr "Un alias de ce nom existe déjà" -#: admin/forms.py:69 +#: admin/forms.py:73 msgid "A domain with this name already exists" msgstr "Un domaine de ce nom existe déjà" -#: admin/forms.py:114 +#: admin/forms.py:146 msgid "Create a domain administrator" msgstr "Créer un administrateur de domaine" -#: admin/forms.py:116 +#: admin/forms.py:148 msgid "Automatically create an administrator for this domain" msgstr "Créer automatiquement un administrateur pour ce domaine" -#: admin/forms.py:120 admin/tables.py:12 admin/tables.py:47 +#: admin/forms.py:152 admin/tables.py:12 admin/tables.py:47 #: admin/templates/admin/editdomainform.html:13 #: admin/templates/admin/identities_table.html:5 #: admin/templates/admin/information.html:8 @@ -291,7 +299,7 @@ msgstr "Créer automatiquement un administrateur pour ce domaine" msgid "Name" msgstr "Nom" -#: admin/forms.py:122 +#: admin/forms.py:154 msgid "" "The administrator's name. Don't include the domain's name here, it will be " "automatically appended." @@ -299,28 +307,28 @@ msgstr "" "Le nom de l'administrateur. Ne pas include un nom de domaine ici, il sera " "ajouté automatiquement." -#: admin/forms.py:128 +#: admin/forms.py:160 msgid "Create aliases" msgstr "Créer des alias" -#: admin/forms.py:130 +#: admin/forms.py:162 msgid "Automatically create standard aliases for this domain" msgstr "Créer automatiquement des alias standard pour ce domaine" -#: admin/forms.py:143 +#: admin/forms.py:175 msgid "Invalid format" msgstr "Format invalide" -#: admin/forms.py:155 +#: admin/forms.py:187 #, python-format msgid "User '%s' already exists" msgstr "L'utilisateur '%s' existe déjà" -#: admin/forms.py:203 +#: admin/forms.py:235 msgid "Email address" msgstr "Adresse email" -#: admin/forms.py:204 +#: admin/forms.py:236 msgid "" "The distribution list address. Use the '*' character to create a 'catchall' " "address (ex: *@domain.tld)." @@ -328,11 +336,11 @@ msgstr "" "L'adresse de la liste de distribution. Utiliser le caractère '*' pour créer " "une adresse 'attrape tout' (ex: *@domain.tld)." -#: admin/forms.py:207 +#: admin/forms.py:239 msgid "Recipients" msgstr "Destinataires" -#: admin/forms.py:208 +#: admin/forms.py:240 msgid "" "Mailbox(es) this alias will point to. Indicate only one address per input, " "press ENTER to add a new input." @@ -340,113 +348,112 @@ msgstr "" "Destinataire(s) de cet alias. Indiquer seulement une adresse par champ, " "appuyer sur ENTREE pour ajouter un nouveau champ." -#: admin/forms.py:246 admin/forms.py:504 admin/forms.py:530 -#: admin/models.py:1147 +#: admin/forms.py:278 admin/forms.py:542 admin/forms.py:568 msgid "Domain does not exist" msgstr "Domain inexistant" -#: admin/forms.py:248 +#: admin/forms.py:280 msgid "You don't have access to this domain" msgstr "Vous n'avez pas accès à ce domaine" -#: admin/forms.py:268 +#: admin/forms.py:300 msgid "Invalid mailbox" msgstr "Boite aux lettres invalide" -#: admin/forms.py:284 +#: admin/forms.py:316 admin/models.py:1202 #, python-format msgid "Local recipient %s not found" msgstr "Destinataire local %s introuvable" -#: admin/forms.py:286 admin/forms.py:292 +#: admin/forms.py:318 admin/forms.py:324 #, python-format msgid "Recipient %s already present" msgstr "Destinataire %s déjà présent" -#: admin/forms.py:297 +#: admin/forms.py:329 msgid "No recipient defined" msgstr "Aucune destinataire défini" -#: admin/forms.py:311 extensions/webmail/forms.py:19 +#: admin/forms.py:343 extensions/webmail/forms.py:19 msgid "Select a file" msgstr "Sélectionner un fichier" -#: admin/forms.py:313 admin/forms.py:341 +#: admin/forms.py:345 admin/forms.py:373 msgid "Separator" msgstr "Séparateur" -#: admin/forms.py:316 +#: admin/forms.py:348 msgid "Continue on error" msgstr "Continuer en cas d'erreur" -#: admin/forms.py:317 +#: admin/forms.py:349 msgid "Don't treat duplicated objects as error" msgstr "Ne pas traiter les objets dupliqués comme des erreurs" -#: admin/forms.py:332 +#: admin/forms.py:364 msgid "Crypt passwords" msgstr "Chiffrer les mots de passe" -#: admin/forms.py:333 +#: admin/forms.py:365 msgid "Check this option if passwords contained in your file are not crypted" msgstr "" "Cocher cette option si les mots de passe contenus dans votre fichier ne sont " "pas chiffrés" -#: admin/forms.py:339 +#: admin/forms.py:371 msgid "File name" msgstr "Nom du fichier" -#: admin/forms.py:371 admin/templates/admin/editdomainform.html:13 +#: admin/forms.py:403 admin/templates/admin/editdomainform.html:13 #: auth/forms.py:7 msgid "Username" msgstr "Nom d'utilisateur" -#: admin/forms.py:373 +#: admin/forms.py:405 msgid "Role" msgstr "Rôle" -#: admin/forms.py:374 admin/forms.py:401 +#: admin/forms.py:406 admin/forms.py:433 msgid "Choose" msgstr "Choisir" -#: admin/forms.py:375 +#: admin/forms.py:407 msgid "What level of permission this user will have" msgstr "Quel niveau de permission cet utilisateur aura" -#: admin/forms.py:377 auth/forms.py:11 +#: admin/forms.py:409 auth/forms.py:11 msgid "Password" msgstr "Mot de passe" -#: admin/forms.py:379 userprefs/forms.py:18 +#: admin/forms.py:411 userprefs/forms.py:18 msgid "Confirmation" msgstr "Confirmation" -#: admin/forms.py:381 +#: admin/forms.py:413 msgid "Enter the same password as above, for verification." msgstr "Entrer le même mot de passe, pour vérification." -#: admin/forms.py:392 +#: admin/forms.py:424 msgid "Enabled" msgstr "Activé" -#: admin/forms.py:434 +#: admin/forms.py:471 msgid "The two password fields didn't match." msgstr "Les deux mots de passe ne correspondent pas." -#: admin/forms.py:440 +#: admin/forms.py:477 msgid "You can't disable your own account" msgstr "Vous ne pouvez pas désactiver votre propre compte" -#: admin/forms.py:450 +#: admin/forms.py:488 msgid "E-mail" msgstr "E-mail" -#: admin/forms.py:452 +#: admin/forms.py:490 msgid "Quota" msgstr "Quota" -#: admin/forms.py:454 +#: admin/forms.py:492 msgid "" "Quota in MB for this mailbox. Define a custom value or use domain's default " "one. Leave empty to define an unlimited value (not allowed for domain " @@ -456,7 +463,7 @@ msgstr "" "valeur par défaut du domaine. Laisser vide pour définir une valeur illimitée " "(interdit pour les admins. de domaine)." -#: admin/forms.py:461 +#: admin/forms.py:499 msgid "" "Alias(es) of this mailbox. Indicate only one address per input, press ENTER " "to add a new input. Use the '*' character to create a 'catchall' alias (ex: " @@ -466,133 +473,133 @@ msgstr "" "ENTREE pour ajouter un nouveau champ. Utiliser le caractère '*' pour créer " "une adresse 'attrape tout' (ex: *@domain.tld)." -#: admin/forms.py:512 +#: admin/forms.py:550 #, python-format msgid "Mailbox %s already exists" msgstr "La boite %s existe déjà" -#: admin/forms.py:572 +#: admin/forms.py:610 msgid "Domain(s)" msgstr "Domaine(s)" -#: admin/forms.py:574 +#: admin/forms.py:612 msgid "Domain(s) that user administrates" msgstr "Domaine(s) que cet utilisateur administre" -#: admin/forms.py:616 admin/views.py:444 +#: admin/forms.py:654 admin/views.py:450 msgid "Mail" msgstr "Courrier" -#: admin/forms.py:618 +#: admin/forms.py:656 msgid "Permissions" msgstr "Permissions" -#: admin/models.py:78 +#: admin/models.py:80 msgid "You can't delete your own account" msgstr "Vous ne pouvez pas supprimer votre propre compte" -#: admin/models.py:159 +#: admin/models.py:161 msgid "Failed to update password: LDAP module not installed" msgstr "" "Echec de la mise à jour du mot de passe : le module LDAP n'est pas installé" -#: admin/models.py:165 +#: admin/models.py:167 #, python-format msgid "Failed to update password: %s" msgstr "Echec de la mise à jour du mot de passe : %s" -#: admin/models.py:192 +#: admin/models.py:194 msgid "account" msgstr "compte" -#: admin/models.py:494 admin/models.py:720 admin/models.py:782 +#: admin/models.py:496 admin/models.py:733 admin/models.py:795 msgid "Invalid line" msgstr "Ligne invalide" -#: admin/models.py:498 +#: admin/models.py:500 msgid "You can't import an account with a role greater than yours" msgstr "Vous ne pouvez pas importer un compte avec un rôle supérieur au votre" -#: admin/models.py:518 +#: admin/models.py:506 +#, python-format +msgid "The simple user '%s' must have a valid email address" +msgstr "" + +#: admin/models.py:510 +#, python-format +msgid "username and email fields must not differ for '%s'" +msgstr "" + +#: admin/models.py:534 #, python-format msgid "Account import failed (%s): domain does not exist" msgstr "L'import du compte a échoué (%s): le domaine n'existe pas" -#: admin/models.py:607 admin/models.py:733 +#: admin/models.py:624 admin/models.py:746 msgid "name" msgstr "Nom" -#: admin/models.py:608 +#: admin/models.py:625 msgid "The domain name" msgstr "Le nom du domaine" -#: admin/models.py:610 +#: admin/models.py:627 msgid "Default quota in MB applied to mailboxes" msgstr "Quota par défaut en Mo appliqué aux boites aux lettres" -#: admin/models.py:613 admin/models.py:740 admin/models.py:1020 -#: admin/models.py:1181 extensions/postfix_autoreply/models.py:19 +#: admin/models.py:630 admin/models.py:753 admin/models.py:1045 +#: admin/models.py:1217 extensions/postfix_autoreply/models.py:27 msgid "enabled" msgstr "Activé" -#: admin/models.py:614 +#: admin/models.py:631 msgid "Check to activate this domain" msgstr "Cocher pour activer ce domaine" -#: admin/models.py:734 +#: admin/models.py:747 msgid "The alias name" msgstr "Le nom de l'alias" -#: admin/models.py:736 +#: admin/models.py:749 msgid "target" msgstr "cible" -#: admin/models.py:737 +#: admin/models.py:750 msgid "The domain this alias points to" msgstr "Le domaine vers lequel cet alias pointe" -#: admin/models.py:741 admin/models.py:1021 +#: admin/models.py:754 admin/models.py:1046 msgid "Check to activate this alias" msgstr "Cocher pour activer cet alias" -#: admin/models.py:788 +#: admin/models.py:801 #, python-format msgid "Unknown domain %s" msgstr "Domain %s inconnu" -#: admin/models.py:805 admin/models.py:1006 +#: admin/models.py:818 admin/models.py:1031 msgid "address" msgstr "Adresse" -#: admin/models.py:806 +#: admin/models.py:819 msgid "Mailbox address (without the @domain.tld part)" msgstr "Adresse de la boite aux lettres (sans la partie @domain.tld)" -#: admin/models.py:852 +#: admin/models.py:877 #, python-format msgid "Failed to retrieve mailbox location (%s)" msgstr "Impossible de récuperer l'emplacement de la boite (%s)" -#: admin/models.py:868 -#, python-format -msgid "Failed to rename mailbox: %s" -msgstr "Impossible de renommer la boite : %s" - -#: admin/models.py:894 -#, python-format -msgid "Failed to remove mailbox: %s" -msgstr "Impossible de supprimer la boite : %s" - -#: admin/models.py:909 +#: admin/models.py:921 #, python-format msgid "Quota is greater than the allowed domain's limit (%dM)" msgstr "Le quota est supérieur à la limité autorisée pour le domaine (%dM)" -#: admin/models.py:914 +#: admin/models.py:926 msgid "A quota is required" msgstr "Un quota est requis" -#: admin/models.py:1007 +#: admin/models.py:1032 msgid "" "The alias address (without the domain part). For a 'catch-all' address, just " "enter an * character." @@ -600,57 +607,57 @@ msgstr "" "L'adresse de l'alias (sans la partie domaine). Pour une adresse 'attrape-" "tout', entrer juste un caractère *." -#: admin/models.py:1011 +#: admin/models.py:1036 msgid "mailboxes" msgstr "Boites aux lettres" -#: admin/models.py:1012 +#: admin/models.py:1037 msgid "The mailboxes this alias points to" msgstr "Les boites aux lettres sur lesquelles pointe cet alias" -#: admin/models.py:1016 +#: admin/models.py:1041 msgid "The aliases this alias points to" msgstr "Les alias vers lesquels pointe cet alias" -#: admin/models.py:1064 +#: admin/models.py:1089 msgid "distribution list" msgstr "liste de distribution" -#: admin/models.py:1065 +#: admin/models.py:1090 msgid "forward" msgstr "transfert" -#: admin/models.py:1066 +#: admin/models.py:1091 msgid "alias" msgstr "alias" -#: admin/models.py:1142 +#: admin/models.py:1170 #, python-format msgid "Invalid line: %s" msgstr "Ligne invalide : %s" -#: admin/models.py:1167 +#: admin/models.py:1175 #, python-format -msgid "Mailbox %s does not exist" -msgstr "La boite %s n'existe pas" +msgid "Domain '%s' does not exist" +msgstr "Domain '%s' inexistant" -#: admin/models.py:1182 +#: admin/models.py:1218 msgid "Check to enable this extension" msgstr "Cocher pour activer cette extension" -#: admin/models.py:1282 +#: admin/models.py:1318 msgid "added" msgstr "ajouté" -#: admin/models.py:1285 +#: admin/models.py:1321 msgid "modified" msgstr "modifié" -#: admin/models.py:1288 +#: admin/models.py:1324 msgid "deleted" msgstr "Supprimé" -#: admin/models.py:1290 +#: admin/models.py:1326 #, python-format msgid "%(object)s '%(name)s' %(action)s by user %(user)s" msgstr "%(object)s '%(name)s' %(action)s par l'utilisateur %(user)s" @@ -660,7 +667,7 @@ msgid "Edit domain" msgstr "Editer le domaine" #: admin/tables.py:21 admin/templates/admin/identities_table.html:8 -#: admin/templates/admin/listing.html:17 extensions/sievefilters/views.py:79 +#: admin/templates/admin/listing.html:17 extensions/sievefilters/views.py:83 #: extensions/sievefilters/templates/sievefilters/filter.html:17 #: extensions/sievefilters/templates/sievefilters/guieditor.html:5 #: extensions/webmail/templatetags/webextras.py:97 @@ -675,143 +682,143 @@ msgstr "Version" msgid "Description" msgstr "Description" -#: admin/views.py:87 +#: admin/views.py:88 msgid "New domain" msgstr "Nouveau domaine" -#: admin/views.py:88 admin/views.py:97 admin/views.py:225 admin/views.py:438 -#: admin/views.py:445 extensions/sievefilters/views.py:120 -#: extensions/sievefilters/views.py:187 extensions/webmail/views.py:131 +#: admin/views.py:89 admin/views.py:98 admin/views.py:228 admin/views.py:444 +#: admin/views.py:451 extensions/sievefilters/views.py:129 +#: extensions/sievefilters/views.py:198 extensions/webmail/views.py:136 msgid "Create" msgstr "Créer" -#: admin/views.py:94 admin/views.py:442 +#: admin/views.py:95 admin/views.py:448 msgid "Next" msgstr "Suivante" -#: admin/views.py:96 +#: admin/views.py:97 msgid "Options" msgstr "Options" -#: admin/views.py:98 admin/views.py:446 +#: admin/views.py:99 admin/views.py:452 msgid "Previous" msgstr "Précédente" -#: admin/views.py:111 +#: admin/views.py:112 msgid "Domain created" msgstr "Domaine créé" -#: admin/views.py:144 admin/views.py:282 admin/views.py:492 +#: admin/views.py:146 admin/views.py:285 admin/views.py:498 #: extensions/postfix_autoreply/templates/postfix_autoreply/autoreply.html:9 -#: extensions/sievefilters/views.py:139 extensions/webmail/views.py:162 +#: extensions/sievefilters/views.py:148 extensions/webmail/views.py:168 #: userprefs/templates/userprefs/forward.html:8 #: userprefs/templates/userprefs/profile.html:8 msgid "Update" msgstr "Mettre à jour" -#: admin/views.py:160 +#: admin/views.py:162 msgid "Domain modified" msgstr "Domaine modifié" -#: admin/views.py:186 +#: admin/views.py:189 msgid "You can't delete your own domain" msgstr "Vous ne pouvez pas supprimer votre propre domaine" -#: admin/views.py:189 +#: admin/views.py:192 msgid "Domain deleted" msgid_plural "Domains deleted" msgstr[0] "Domaine supprimé" msgstr[1] "Domaines supprimés" -#: admin/views.py:204 +#: admin/views.py:207 msgid "Alias with this name already exists" msgstr "Un alias de ce nom existe déjà" -#: admin/views.py:247 +#: admin/views.py:250 msgid "New distribution list" msgstr "Nouvelle liste de distribution" -#: admin/views.py:248 +#: admin/views.py:251 msgid "Distribution list created" msgstr "Liste de distribution créée" -#: admin/views.py:257 +#: admin/views.py:260 msgid "New alias" msgstr "Nouvel alias" -#: admin/views.py:258 +#: admin/views.py:261 msgid "Alias created" msgstr "Alias créé" -#: admin/views.py:267 +#: admin/views.py:270 msgid "New forward" msgstr "Nouveau transfert" -#: admin/views.py:268 +#: admin/views.py:271 msgid "Forward created" msgstr "Transfert créé" -#: admin/views.py:286 +#: admin/views.py:289 msgid "Distribution list modified" msgstr "Liste de distribution modifiée" -#: admin/views.py:288 +#: admin/views.py:291 msgid "Forward modified" msgstr "Transfert modifié" -#: admin/views.py:290 +#: admin/views.py:293 msgid "Alias modified" msgstr "Alias modifié" -#: admin/views.py:403 admin/views.py:541 admin/views.py:546 -#: extensions/amavis/views.py:195 extensions/amavis/views.py:201 -#: extensions/amavis/views.py:234 extensions/amavis/views.py:238 -#: extensions/amavis/views.py:240 extensions/webmail/views.py:36 -#: extensions/webmail/views.py:64 extensions/webmail/views.py:77 -#: extensions/webmail/views.py:93 extensions/webmail/views.py:109 -#: extensions/webmail/views.py:193 extensions/webmail/views.py:419 -#: extensions/webmail/views.py:430 extensions/webmail/views.py:457 +#: admin/views.py:402 admin/views.py:545 admin/views.py:550 +#: extensions/amavis/views.py:204 extensions/amavis/views.py:210 +#: extensions/amavis/views.py:243 extensions/amavis/views.py:247 +#: extensions/amavis/views.py:249 extensions/webmail/views.py:41 +#: extensions/webmail/views.py:68 extensions/webmail/views.py:81 +#: extensions/webmail/views.py:98 extensions/webmail/views.py:114 +#: extensions/webmail/views.py:200 extensions/webmail/views.py:427 +#: extensions/webmail/views.py:438 extensions/webmail/views.py:465 #: lib/formutils.py:32 lib/formutils.py:37 msgid "Invalid request" msgstr "Requête invalide" -#: admin/views.py:435 +#: admin/views.py:441 msgid "New account" msgstr "Nouveau compte" -#: admin/views.py:459 +#: admin/views.py:465 msgid "Account created" msgstr "Compte créé" -#: admin/views.py:507 +#: admin/views.py:513 msgid "Account updated" msgstr "Compte mis à jour" -#: admin/views.py:531 +#: admin/views.py:535 msgid "Account deleted" msgid_plural "Accounts deleted" msgstr[0] "Compte supprimé" msgstr[1] "Comptes supprimés" -#: admin/views.py:586 +#: admin/views.py:590 msgid "Parameters saved" msgstr "Paramètres enregistrés" -#: admin/views.py:632 +#: admin/views.py:636 msgid "Modifications applied." msgstr "Modifications appliquées." -#: admin/views.py:740 +#: admin/views.py:743 #, python-format msgid "Object already exists: %s" msgstr "L'objet existe déjà : %s" -#: admin/views.py:742 +#: admin/views.py:745 #, python-format msgid "%d objects imported successfully" msgstr "%d objets importés avec succès" -#: admin/views.py:760 +#: admin/views.py:763 msgid "" "Provide a CSV file where lines respect one of the following formats:\n" "
                \n" @@ -839,25 +846,25 @@ msgstr "" "\n" "

                Vous pouvez utiliser un caractère différent comme séparateur.

                \n" -#: admin/views.py:772 +#: admin/views.py:775 msgid "Import identities" msgstr "Importer des identités" -#: admin/views.py:773 admin/views.py:843 admin/templatetags/admin_extras.py:87 +#: admin/views.py:776 admin/views.py:846 admin/templatetags/admin_extras.py:87 #: admin/templatetags/admin_extras.py:144 msgid "Import" msgstr "Importer" -#: admin/views.py:803 +#: admin/views.py:806 msgid "Export identities" msgstr "Export d'identités" -#: admin/views.py:804 admin/views.py:860 admin/templatetags/admin_extras.py:93 +#: admin/views.py:807 admin/views.py:863 admin/templatetags/admin_extras.py:93 #: admin/templatetags/admin_extras.py:150 msgid "Export" msgstr "Exporter" -#: admin/views.py:832 +#: admin/views.py:835 msgid "" "Provide a CSV file where lines respect one of the following formats:\n" "
                  \n" @@ -877,11 +884,11 @@ msgstr "" "l'une des valeurs précédentes.

                  \n" "

                  Vous pouvez utiliser un caractère différent comme séparateur.

                  \n" -#: admin/views.py:842 +#: admin/views.py:845 msgid "Import domains" msgstr "Importer des domaines" -#: admin/views.py:859 +#: admin/views.py:862 msgid "Export domains" msgstr "Export de domaines" @@ -954,7 +961,7 @@ msgid "Tags" msgstr "Tags" #: admin/templates/admin/importform.html:5 -#: admin/templatetags/admin_extras.py:305 +#: admin/templatetags/admin_extras.py:290 msgid "Help" msgstr "Aide" @@ -1001,7 +1008,7 @@ msgid "Previously on Modoboa..." msgstr "Précédemment dans Modoboa..." #: admin/templates/admin/logs.html:6 extensions/amavis/sql_listing.py:25 -#: extensions/webmail/lib.py:37 extensions/webmail/lib.py:406 +#: extensions/webmail/lib.py:38 extensions/webmail/lib.py:411 msgid "Date" msgstr "Date" @@ -1104,34 +1111,21 @@ msgid "View the domain's identities" msgstr "Voir les identités du domaine" #: admin/templatetags/admin_extras.py:178 -msgid "Delete the domain" -msgstr "Supprimer ce domaine" - #: admin/templatetags/admin_extras.py:194 -msgid "Delete this account" -msgstr "Supprimer ce compte" +#: admin/templatetags/admin_extras.py:201 +#, python-format +msgid "Delete %s?" +msgstr "Supprimer %s ?" -#: admin/templatetags/admin_extras.py:202 -msgid "Delete this distribution list" -msgstr "Supprimer cette liste de distribution" - -#: admin/templatetags/admin_extras.py:209 -msgid "Delete this forward" -msgstr "Supprimer ce transfert" - -#: admin/templatetags/admin_extras.py:216 -msgid "Delete this alias" -msgstr "Supprimer cet alias" - -#: admin/templatetags/admin_extras.py:238 +#: admin/templatetags/admin_extras.py:223 msgid "Remove this permission" msgstr "Supprimer cette permission" -#: admin/templatetags/admin_extras.py:279 lib/formutils.py:206 +#: admin/templatetags/admin_extras.py:264 lib/formutils.py:206 msgid "Yes" msgstr "Oui" -#: admin/templatetags/admin_extras.py:279 lib/formutils.py:206 +#: admin/templatetags/admin_extras.py:264 lib/formutils.py:206 msgid "No" msgstr "Non" @@ -1140,13 +1134,13 @@ msgstr "Non" msgid "User '%s' successfully logged in" msgstr "Utiliseur '%s' connecté avec succès" -#: auth/views.py:41 +#: auth/views.py:44 msgid "Your username and password didn't match. Please try again." msgstr "" "Votre nom d'utilisateur et mot de passe ne correspondent pas. Veuillez " "réessayer." -#: auth/views.py:64 +#: auth/views.py:67 #, python-format msgid "User '%s' logged out" msgstr "Utilisateur '%s' déconnecté" @@ -1206,16 +1200,16 @@ msgstr "Interface simplifiée pour la gestion d'amavis" msgid "Quarantine" msgstr "Quarantaine" -#: extensions/amavis/__init__.py:127 +#: extensions/amavis/__init__.py:129 msgid "pending requests" msgstr "requêtes en attente" -#: extensions/amavis/__init__.py:144 +#: extensions/amavis/__init__.py:149 #, python-format msgid "%d pending requests" msgstr "%d requêtes en attente" -#: extensions/amavis/__init__.py:156 +#: extensions/amavis/__init__.py:161 msgid "Content filter" msgstr "Filtrage de contenu" @@ -1332,12 +1326,12 @@ msgid "Virus filter" msgstr "Filtrage des virus" #: extensions/amavis/models.py:94 extensions/amavis/models.py:102 -#: extensions/amavis/models.py:110 extensions/sievefilters/views.py:268 +#: extensions/amavis/models.py:110 extensions/sievefilters/views.py:281 msgid "yes" msgstr "oui" #: extensions/amavis/models.py:95 extensions/amavis/models.py:103 -#: extensions/amavis/models.py:111 extensions/sievefilters/views.py:272 +#: extensions/amavis/models.py:111 extensions/sievefilters/views.py:285 msgid "no" msgstr "non" @@ -1385,13 +1379,13 @@ msgstr "" "Modifier le sujet du spam en utilisant le texte spécifié. Choisir 'défaut' " "pour utiliser les paramètres globaux." -#: extensions/amavis/sql_listing.py:23 extensions/webmail/lib.py:36 +#: extensions/amavis/sql_listing.py:23 extensions/webmail/lib.py:37 msgid "From" msgstr "De" #: extensions/amavis/sql_listing.py:24 extensions/sievefilters/forms.py:68 -#: extensions/webmail/forms.py:10 extensions/webmail/lib.py:35 -#: extensions/webmail/lib.py:404 templates/common/email_searchbar.html:6 +#: extensions/webmail/forms.py:10 extensions/webmail/lib.py:36 +#: extensions/webmail/lib.py:409 templates/common/email_searchbar.html:6 msgid "Subject" msgstr "Sujet" @@ -1401,37 +1395,37 @@ msgstr "Sujet" msgid "To" msgstr "A" -#: extensions/amavis/views.py:34 +#: extensions/amavis/views.py:43 msgid "Empty quarantine" msgstr "Quarantaine vide" -#: extensions/amavis/views.py:202 +#: extensions/amavis/views.py:211 msgid "Message deleted" msgstr "Message supprimé" -#: extensions/amavis/views.py:223 +#: extensions/amavis/views.py:232 #, python-format msgid "%(count)d message deleted successfully" msgid_plural "%(count)d messages deleted successfully" msgstr[0] "%(count)d message supprimé correctement" msgstr[1] "%(count)d messages supprimés correctement" -#: extensions/amavis/views.py:243 +#: extensions/amavis/views.py:252 msgid "Request sent" msgstr "Requête envoyée" -#: extensions/amavis/views.py:249 +#: extensions/amavis/views.py:258 msgid "Message released" msgstr "Message relâché" -#: extensions/amavis/views.py:271 +#: extensions/amavis/views.py:280 #, python-format msgid "%(count)d request sent" msgid_plural "%(count)d requests sent" msgstr[0] "%(count)d requête envoyée" msgstr[1] "%(count)d requêtes envoyées" -#: extensions/amavis/views.py:295 +#: extensions/amavis/views.py:304 #, python-format msgid "%(count)d message released successfully" msgid_plural "%(count)d messages released successfully" @@ -1558,7 +1552,7 @@ msgstr "Limites" msgid "Reseller" msgstr "Revendeur" -#: extensions/limits/__init__.py:96 +#: extensions/limits/__init__.py:94 msgid "Resources" msgstr "Ressources" @@ -1679,23 +1673,23 @@ msgstr "Activer votre réponse automatique jusqu'à cette date" msgid "This date is over" msgstr "Cette date est dépassée" -#: extensions/postfix_autoreply/models.py:15 +#: extensions/postfix_autoreply/models.py:19 msgid "subject" msgstr "sujet" -#: extensions/postfix_autoreply/models.py:16 +#: extensions/postfix_autoreply/models.py:20 msgid "The subject that will appear in sent emails" msgstr "Le sujet qui apparaitra dans les emails envoyés" -#: extensions/postfix_autoreply/models.py:17 +#: extensions/postfix_autoreply/models.py:23 msgid "content" msgstr "contenu" -#: extensions/postfix_autoreply/models.py:18 +#: extensions/postfix_autoreply/models.py:24 msgid "The content that will appear in sent emails" msgstr "Le contenu qui apparaitra dans les emails envoyés" -#: extensions/postfix_autoreply/models.py:20 +#: extensions/postfix_autoreply/models.py:28 msgid "Activate/Deactivate your auto reply" msgstr "Activer/Désactiver votre réponse automatique" @@ -1830,53 +1824,53 @@ msgstr "" msgid "Not enough space on server" msgstr "Pas assez d'espace sur le serveur" -#: extensions/sievefilters/views.py:64 +#: extensions/sievefilters/views.py:68 msgid "Failed to retrieve filters set" msgstr "Impossible de récuperer le jeu de filtres" -#: extensions/sievefilters/views.py:117 +#: extensions/sievefilters/views.py:126 #: extensions/sievefilters/templatetags/sfilters_tags.py:33 msgid "New filter" msgstr "Nouveau filtre" -#: extensions/sievefilters/views.py:124 +#: extensions/sievefilters/views.py:133 msgid "Filter created" msgstr "Filtre créé" -#: extensions/sievefilters/views.py:136 +#: extensions/sievefilters/views.py:145 #: extensions/sievefilters/templatetags/sfilters_tags.py:77 msgid "Edit filter" msgstr "Editer le filtre" -#: extensions/sievefilters/views.py:145 +#: extensions/sievefilters/views.py:154 msgid "Filter modified" msgstr "Filtre modifié" -#: extensions/sievefilters/views.py:165 +#: extensions/sievefilters/views.py:176 msgid "Filter removed" msgstr "Filtre supprimé" -#: extensions/sievefilters/views.py:166 +#: extensions/sievefilters/views.py:177 msgid "Failed to remove filter" msgstr "Impossible de supprimer le filtre" -#: extensions/sievefilters/views.py:180 +#: extensions/sievefilters/views.py:191 msgid "Filters set saved" msgstr "Jeu de filtres sauvegardé" -#: extensions/sievefilters/views.py:185 +#: extensions/sievefilters/views.py:196 msgid "Create a new filters set" msgstr "Créer un nouveau jeu de filtres" -#: extensions/sievefilters/views.py:208 +#: extensions/sievefilters/views.py:219 msgid "Filters set created" msgstr "Jeu de filtres créé" -#: extensions/sievefilters/views.py:229 +#: extensions/sievefilters/views.py:240 msgid "Filters set deleted" msgstr "Jeu de filtres supprimé" -#: extensions/sievefilters/views.py:241 +#: extensions/sievefilters/views.py:252 msgid "Filters set activated" msgstr "Jeu de filtres activé" @@ -1892,15 +1886,15 @@ msgstr "Actif" msgid "No filter defined yet" msgstr "Aucun filtre défini." -#: extensions/sievefilters/templates/sievefilters/index.html:55 +#: extensions/sievefilters/templates/sievefilters/index.html:56 msgid "Filter sets" msgstr "Jeux de filtres" -#: extensions/sievefilters/templates/sievefilters/index.html:59 +#: extensions/sievefilters/templates/sievefilters/index.html:60 msgid "active" msgstr "actif" -#: extensions/sievefilters/templates/sievefilters/index.html:73 +#: extensions/sievefilters/templates/sievefilters/index.html:74 msgid "" "No filters set defined yet. You must create one in order to define filters." msgstr "" @@ -2218,84 +2212,88 @@ msgstr "Réponse du serveur" msgid "Cci" msgstr "Cci" -#: extensions/webmail/imaputils.py:259 +#: extensions/webmail/imaputils.py:237 +msgid "Failed to retrieve hierarchy delimiter" +msgstr "Impossible de récuperer le séparateur de hiérarchie" + +#: extensions/webmail/imaputils.py:278 #, python-format msgid "Connection to IMAP server failed: %s" msgstr "La connexion au serveur IMAP a échoué : %s" -#: extensions/webmail/lib.py:353 +#: extensions/webmail/lib.py:358 msgid "wrote:" msgstr "a écrit :" -#: extensions/webmail/lib.py:418 extensions/webmail/lib.py:422 +#: extensions/webmail/lib.py:423 extensions/webmail/lib.py:427 msgid "Original message" msgstr "Message original" -#: extensions/webmail/views.py:81 +#: extensions/webmail/views.py:86 #, python-format msgid "%(count)d message deleted" msgid_plural "%(count)d messages deleted" msgstr[0] "%(count)d message supprimé" msgstr[1] "%(count)d messages supprimés" -#: extensions/webmail/views.py:98 +#: extensions/webmail/views.py:103 msgid "Unknown action" msgstr "Action inconnue" -#: extensions/webmail/views.py:111 lib/email_listing.py:137 +#: extensions/webmail/views.py:116 lib/email_listing.py:137 msgid "Empty mailbox" msgstr "Boite aux lettre vide" -#: extensions/webmail/views.py:128 -#: extensions/webmail/templatetags/webextras.py:169 +#: extensions/webmail/views.py:133 +#: extensions/webmail/templatetags/webextras.py:170 msgid "Create a new mailbox" msgstr "Créer une nouvelle boite aux lettres" -#: extensions/webmail/views.py:143 +#: extensions/webmail/views.py:149 msgid "Mailbox created" msgstr "Boite aux lettres créée" -#: extensions/webmail/views.py:159 +#: extensions/webmail/views.py:165 msgid "Edit mailbox" msgstr "Editer la boite aux lettres" -#: extensions/webmail/views.py:173 +#: extensions/webmail/views.py:180 msgid "Mailbox updated" msgstr "Boite aux lettres mise à jour" -#: extensions/webmail/views.py:207 extensions/webmail/views.py:388 -#: extensions/webmail/views.py:497 +#: extensions/webmail/views.py:214 extensions/webmail/views.py:396 +#: extensions/webmail/views.py:505 msgid "Bad request" msgstr "Mauvaise requête" -#: extensions/webmail/views.py:238 +#: extensions/webmail/views.py:246 msgid "Failed to save attachment: " msgstr "Impossible d'enregistrer la pièce jointe : " -#: extensions/webmail/views.py:241 +#: extensions/webmail/views.py:249 #, python-format msgid "Attachment is too big (limit: %s)" msgstr "Pièce jointe trop grosse (limite : %s)" -#: extensions/webmail/views.py:247 +#: extensions/webmail/views.py:255 #: extensions/webmail/templates/webmail/compose.html:15 #: extensions/webmail/templates/webmail/headers.html:4 msgid "Attachments" msgstr "Pièces jointes" -#: extensions/webmail/views.py:263 +#: extensions/webmail/views.py:271 msgid "Bad query" msgstr "Mauvaise requête" -#: extensions/webmail/views.py:273 +#: extensions/webmail/views.py:281 msgid "Failed to remove attachment: " msgstr "Impossible de supprimer la pièce jointe :" -#: extensions/webmail/views.py:278 +#: extensions/webmail/views.py:286 msgid "Unknown attachment" msgstr "Pièce jointe inconnue" -#: extensions/webmail/views.py:493 +#: extensions/webmail/views.py:501 msgid "Undefined action" msgstr "Action indéfinie" @@ -2326,7 +2324,7 @@ msgstr[1] "%(counter)s fichiers" msgid "Parent mailbox" msgstr "Boite aux lettres parente" -#: extensions/webmail/templates/webmail/index.html:36 +#: extensions/webmail/templates/webmail/index.html:38 msgid "Mailbox quota" msgstr "Quota de la boite aux lettres" @@ -2388,15 +2386,15 @@ msgstr "Comme non lus" msgid "Compress folder" msgstr "Compresser ce dossier" -#: extensions/webmail/templatetags/webextras.py:109 +#: extensions/webmail/templatetags/webextras.py:110 msgid "Empty folder" msgstr "Vider ce dossier" -#: extensions/webmail/templatetags/webextras.py:177 +#: extensions/webmail/templatetags/webextras.py:178 msgid "Edit the selected mailbox" msgstr "Editer la boite aux lettres sélectionnée" -#: extensions/webmail/templatetags/webextras.py:182 +#: extensions/webmail/templatetags/webextras.py:183 msgid "Remove the selected mailbox" msgstr "Supprimer la boite aux lettres sélectionnée" @@ -2450,7 +2448,7 @@ msgstr "La page demandée n'existe pas." msgid "An internal error occured." msgstr "Une erreur interne est survenue" -#: templates/nlayout.html:56 +#: templates/nlayout.html:62 msgid "Powered by Modoboa" msgstr "Propulsé par Modoboa" @@ -2484,11 +2482,11 @@ msgstr "Fermer" msgid "Welcome to Modoboa" msgstr "Bienvenue dans Modoboa" -#: templates/registration/login.html:33 +#: templates/registration/login.html:34 msgid "Remember me" msgstr "Se souvenir de moi" -#: templates/registration/login.html:35 +#: templates/registration/login.html:36 msgid "Log in" msgstr "Se connecter" @@ -2504,7 +2502,7 @@ msgstr "Paramètres par utilisateur" msgid "Prefered language" msgstr "Langage préféré" -#: userprefs/app_settings.py:26 +#: userprefs/app_settings.py:27 msgid "Prefered language to display pages" msgstr "Langage préféré pour afficher les pages" diff --git a/modoboa/locale/it/LC_MESSAGES/django.po b/modoboa/locale/it/LC_MESSAGES/django.po index f7bc75730..36373ed17 100644 --- a/modoboa/locale/it/LC_MESSAGES/django.po +++ b/modoboa/locale/it/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-27 17:24+0200\n" +"POT-Creation-Date: 2013-09-20 22:30+0200\n" "PO-Revision-Date: 2013-06-28 17:03+0200\n" "Last-Translator: Giancarlo Gaifas \n" "Language-Team: ITALIANO \n" @@ -25,8 +25,8 @@ msgstr "Interfaccia amministrativa" msgid "Web based console to manage domains, accounts and aliases" msgstr "Interfaccia web per l'amministrazione di domini, account e alias" -#: admin/__init__.py:16 admin/forms.py:180 admin/forms.py:615 -#: admin/views.py:93 admin/views.py:453 +#: admin/__init__.py:16 admin/forms.py:211 admin/forms.py:652 +#: admin/views.py:94 admin/views.py:447 #: extensions/postfix_autoreply/app_settings.py:11 #: extensions/sievefilters/app_settings.py:50 #: extensions/stats/app_settings.py:11 extensions/webmail/app_settings.py:11 @@ -56,7 +56,8 @@ msgstr "Schema password predefinito" #: admin/app_settings.py:50 msgid "Scheme used to crypt mailbox passwords" -msgstr "Schema utilizzato per la criptazione delle password delle caselle di posta" +msgstr "" +"Schema utilizzato per la criptazione delle password delle caselle di posta" #: admin/app_settings.py:54 msgid "Secret key" @@ -120,7 +121,9 @@ msgstr "collega DN" msgid "" "The distinguished name to use when binding to the LDAP server. Leave empty " "for an anonymous bind" -msgstr "Nome particolare da usare quando ci si collega al server LDAP. Lasciare vuoto per un collegamento anonimo" +msgstr "" +"Nome particolare da usare quando ci si collega al server LDAP. Lasciare " +"vuoto per un collegamento anonimo" #: admin/app_settings.py:97 msgid "Bind password" @@ -128,7 +131,9 @@ msgstr "Password del collegamento" #: admin/app_settings.py:99 msgid "The password to use when binding to the LDAP server (with 'Bind DN')" -msgstr "La password da utilizzare quando ci si collega al server LDAP (con 'Collega DN')" +msgstr "" +"La password da utilizzare quando ci si collega al server LDAP (con 'Collega " +"DN')" #: admin/app_settings.py:105 msgid "Search base" @@ -146,7 +151,9 @@ msgstr "Filtro ricerca" msgid "" "An optional filter string (e.g. '(objectClass=person)'). In order to be " "valid, it must be enclosed in parentheses." -msgstr "Stringa di filtraggio opzionale (p.es '(objectClass=person)'). Per essere valida deve essere racchiusa tra parentesi." +msgstr "" +"Stringa di filtraggio opzionale (p.es '(objectClass=person)'). Per essere " +"valida deve essere racchiusa tra parentesi." #: admin/app_settings.py:119 msgid "User DN template" @@ -157,7 +164,9 @@ msgstr "Modello DN dell'utente" msgid "" "The template used to construct a user's DN. It should contain one " "placeholder (ie. %(user)s)" -msgstr "Il modello utilizzato per comporre un DN dell'utente. Deve contenere un segnaposto (p.es. %(user)s)" +msgstr "" +"Il modello utilizzato per comporre un DN dell'utente. Deve contenere un " +"segnaposto (p.es. %(user)s)" #: admin/app_settings.py:126 msgid "Password attribute" @@ -190,7 +199,9 @@ msgstr "Gestione delle caselle di posta nel filsystem" msgid "" "Rename or remove mailboxes on the filesystem when they get renamed or " "removed within Modoboa" -msgstr "Rinomina o rimuovi le caselle di posta nel filsystem quando sono rinominate o rimosse in Modoboa" +msgstr "" +"Rinomina o rimuovi le caselle di posta nel filsystem quando sono rinominate " +"o rimosse in Modoboa" #: admin/app_settings.py:146 msgid "Mailboxes ower" @@ -206,7 +217,8 @@ msgstr "Rimozione automatica dell'account" #: admin/app_settings.py:154 msgid "When a mailbox is removed, also remove the associated account" -msgstr "Quando una casella postale viene rimossa rimuovi anche l'account associato" +msgstr "" +"Quando una casella postale viene rimossa rimuovi anche l'account associato" #: admin/app_settings.py:157 admin/templates/admin/editdomainform.html:7 msgid "Miscellaneous" @@ -234,43 +246,51 @@ msgstr "Reindirizzamento principale predefinito" #: admin/app_settings.py:175 msgid "The default redirection used when no application is specified" -msgstr "Redirezione predefinita utilizzata quando non è specificata alcuna applicazione" +msgstr "" +"Redirezione predefinita utilizzata quando non è specificata alcuna " +"applicazione" -#: admin/app_settings.py:215 +#: admin/app_settings.py:213 +msgid "Key must be either 16, 24, or 32 bytes long" +msgstr "" + +#: admin/app_settings.py:222 msgid "Invalid syntax" msgstr "Sintassi errata" -#: admin/app_settings.py:238 +#: admin/app_settings.py:245 msgid "This field is required" msgstr "Questo campo è obbligatorio" -#: admin/forms.py:17 admin/forms.py:460 admin/tables.py:18 +#: admin/forms.py:20 admin/forms.py:497 admin/tables.py:18 msgid "Alias(es)" msgstr "Alias" -#: admin/forms.py:19 +#: admin/forms.py:22 msgid "" "Alias(es) of this domain. Indicate only one name per input, press ENTER to " "add a new input." -msgstr "Alias per questo dominio. Inserire un solo nome alla volta, premere INVIO per aggiungere un nuovo elemento" +msgstr "" +"Alias per questo dominio. Inserire un solo nome alla volta, premere INVIO " +"per aggiungere un nuovo elemento" -#: admin/forms.py:56 +#: admin/forms.py:59 msgid "An alias with this name already exists" msgstr "Esiste già un alias con questo nome" -#: admin/forms.py:70 +#: admin/forms.py:73 msgid "A domain with this name already exists" msgstr "Esiste già un dominio con questo nome" -#: admin/forms.py:115 +#: admin/forms.py:146 msgid "Create a domain administrator" msgstr "Crea un amministratore di dominio" -#: admin/forms.py:117 +#: admin/forms.py:148 msgid "Automatically create an administrator for this domain" msgstr "Crea automaticamente un amministratore per questo dominio" -#: admin/forms.py:121 admin/tables.py:12 admin/tables.py:47 +#: admin/forms.py:152 admin/tables.py:12 admin/tables.py:47 #: admin/templates/admin/editdomainform.html:13 #: admin/templates/admin/identities_table.html:5 #: admin/templates/admin/information.html:8 @@ -279,348 +299,362 @@ msgstr "Crea automaticamente un amministratore per questo dominio" msgid "Name" msgstr "Nome" -#: admin/forms.py:123 +#: admin/forms.py:154 msgid "" "The administrator's name. Don't include the domain's name here, it will be " "automatically appended." -msgstr "Il nome dell'amministratore. Non includere il nome del dominio, verrà aggiunto automaticamente." +msgstr "" +"Il nome dell'amministratore. Non includere il nome del dominio, verrà " +"aggiunto automaticamente." -#: admin/forms.py:129 +#: admin/forms.py:160 msgid "Create aliases" msgstr "Crea alias" -#: admin/forms.py:131 +#: admin/forms.py:162 msgid "Automatically create standard aliases for this domain" msgstr "Crea automaticamente gli alias standard per questo dominio" -#: admin/forms.py:144 +#: admin/forms.py:175 msgid "Invalid format" msgstr "Formato non valido" -#: admin/forms.py:156 +#: admin/forms.py:187 #, python-format msgid "User '%s' already exists" msgstr "L'utente '%s' esiste già" -#: admin/forms.py:204 +#: admin/forms.py:235 msgid "Email address" msgstr "Indirizzo email" -#: admin/forms.py:205 +#: admin/forms.py:236 msgid "" "The distribution list address. Use the '*' character to create a 'catchall' " "address (ex: *@domain.tld)." msgstr "Elenco degli indirizzi di smistamento" -#: admin/forms.py:208 +#: admin/forms.py:239 msgid "Recipients" msgstr "Destinatari" -#: admin/forms.py:209 +#: admin/forms.py:240 msgid "" "Mailbox(es) this alias will point to. Indicate only one address per input, " "press ENTER to add a new input." -msgstr "Casella(e) di posta a cui l'alias punterà. Inserire un solo indirizzo alla volta, premere INVIO per aggiungere un nuovo elemento." +msgstr "" +"Casella(e) di posta a cui l'alias punterà. Inserire un solo indirizzo alla " +"volta, premere INVIO per aggiungere un nuovo elemento." -#: admin/forms.py:247 admin/forms.py:505 admin/forms.py:531 +#: admin/forms.py:278 admin/forms.py:542 admin/forms.py:568 msgid "Domain does not exist" msgstr "Il dominio non esiste" -#: admin/forms.py:249 +#: admin/forms.py:280 msgid "You don't have access to this domain" msgstr "Non hai accesso a questo dominio" -#: admin/forms.py:269 +#: admin/forms.py:300 msgid "Invalid mailbox" msgstr "Casella di posta non valida" -#: admin/forms.py:285 admin/models.py:1175 +#: admin/forms.py:316 admin/models.py:1202 #, python-format msgid "Local recipient %s not found" msgstr "Il destinatario locale %s non è stato trovato" -#: admin/forms.py:287 admin/forms.py:293 +#: admin/forms.py:318 admin/forms.py:324 #, python-format msgid "Recipient %s already present" msgstr "Il destinatario %s è già esistente" -#: admin/forms.py:298 +#: admin/forms.py:329 msgid "No recipient defined" msgstr "Non è stato definito un destinatario" -#: admin/forms.py:312 extensions/webmail/forms.py:19 +#: admin/forms.py:343 extensions/webmail/forms.py:19 msgid "Select a file" msgstr "Seleziona un file" -#: admin/forms.py:314 admin/forms.py:342 +#: admin/forms.py:345 admin/forms.py:373 msgid "Separator" msgstr "Separatore" -#: admin/forms.py:317 +#: admin/forms.py:348 msgid "Continue on error" msgstr "Continuare in caso di errore" -#: admin/forms.py:318 +#: admin/forms.py:349 msgid "Don't treat duplicated objects as error" msgstr "Non considerare errore gli oggetti duplicati" -#: admin/forms.py:333 +#: admin/forms.py:364 msgid "Crypt passwords" msgstr "Cripta le password" -#: admin/forms.py:334 +#: admin/forms.py:365 msgid "Check this option if passwords contained in your file are not crypted" -msgstr "Seleziona questa opzione se le password contenute nel file non sono criptate" +msgstr "" +"Seleziona questa opzione se le password contenute nel file non sono criptate" -#: admin/forms.py:340 +#: admin/forms.py:371 msgid "File name" msgstr "Nome del file" -#: admin/forms.py:372 admin/templates/admin/editdomainform.html:13 +#: admin/forms.py:403 admin/templates/admin/editdomainform.html:13 #: auth/forms.py:7 msgid "Username" msgstr "Nome utente" -#: admin/forms.py:374 +#: admin/forms.py:405 msgid "Role" msgstr "Ruolo" -#: admin/forms.py:375 admin/forms.py:402 +#: admin/forms.py:406 admin/forms.py:433 msgid "Choose" msgstr "Scegli" -#: admin/forms.py:376 +#: admin/forms.py:407 msgid "What level of permission this user will have" msgstr "Il livello di permessi che avrà questo utente" -#: admin/forms.py:378 auth/forms.py:11 +#: admin/forms.py:409 auth/forms.py:11 msgid "Password" msgstr "Password" -#: admin/forms.py:380 userprefs/forms.py:18 +#: admin/forms.py:411 userprefs/forms.py:18 msgid "Confirmation" msgstr "Conferma" -#: admin/forms.py:382 +#: admin/forms.py:413 msgid "Enter the same password as above, for verification." -msgstr "Inserisci la medesima password che hai inserito sopra, per la verifica." +msgstr "" +"Inserisci la medesima password che hai inserito sopra, per la verifica." -#: admin/forms.py:393 +#: admin/forms.py:424 msgid "Enabled" msgstr "Abilitato" -#: admin/forms.py:435 +#: admin/forms.py:471 msgid "The two password fields didn't match." msgstr "Le password nei due campi non corrispondono" -#: admin/forms.py:441 +#: admin/forms.py:477 msgid "You can't disable your own account" msgstr "Tu non puoi disabilitare il tuo account" -#: admin/forms.py:451 +#: admin/forms.py:488 msgid "E-mail" msgstr "E-mail" -#: admin/forms.py:453 +#: admin/forms.py:490 msgid "Quota" msgstr "Quota" -#: admin/forms.py:455 +#: admin/forms.py:492 msgid "" "Quota in MB for this mailbox. Define a custom value or use domain's default " "one. Leave empty to define an unlimited value (not allowed for domain " "administrators)." -msgstr "Quota in MB per questo account. Stabilire un valore personalizzato o usare quello predefinito. Lasciare vuoto per non impostare limiti (non consentito per gli amministratori di dominio)." +msgstr "" +"Quota in MB per questo account. Stabilire un valore personalizzato o usare " +"quello predefinito. Lasciare vuoto per non impostare limiti (non consentito " +"per gli amministratori di dominio)." -#: admin/forms.py:462 +#: admin/forms.py:499 msgid "" "Alias(es) of this mailbox. Indicate only one address per input, press ENTER " "to add a new input. Use the '*' character to create a 'catchall' alias (ex: " "*@domain.tld)." -msgstr "Alias per questa casella di posta. Inserire un solo indirizzo alla volta, premere INVIO per aggiungere un nuovo elemento. Utilizzare il carattere '*' per creare un alias 'prenditutto' (p.es.: *@dominio.org)." +msgstr "" +"Alias per questa casella di posta. Inserire un solo indirizzo alla volta, " +"premere INVIO per aggiungere un nuovo elemento. Utilizzare il carattere '*' " +"per creare un alias 'prenditutto' (p.es.: *@dominio.org)." -#: admin/forms.py:513 +#: admin/forms.py:550 #, python-format msgid "Mailbox %s already exists" msgstr "La casella di posta %s esiste già" -#: admin/forms.py:573 +#: admin/forms.py:610 msgid "Domain(s)" msgstr "Dominio(i)" -#: admin/forms.py:575 +#: admin/forms.py:612 msgid "Domain(s) that user administrates" msgstr "Dominio(i) amministrato(i) dall'utente" -#: admin/forms.py:617 admin/views.py:456 +#: admin/forms.py:654 admin/views.py:450 msgid "Mail" msgstr "Posta" -#: admin/forms.py:619 +#: admin/forms.py:656 msgid "Permissions" msgstr "Permessi" -#: admin/models.py:78 +#: admin/models.py:80 msgid "You can't delete your own account" msgstr "Non puoi cancellare il tuo account" -#: admin/models.py:159 +#: admin/models.py:161 msgid "Failed to update password: LDAP module not installed" msgstr "Aggiornamento della password fallito: il modulo LDAP non è installato" -#: admin/models.py:165 +#: admin/models.py:167 #, python-format msgid "Failed to update password: %s" msgstr "Aggiornamento della password fallito: %s" -#: admin/models.py:192 +#: admin/models.py:194 msgid "account" msgstr "account" -#: admin/models.py:494 admin/models.py:720 admin/models.py:782 +#: admin/models.py:496 admin/models.py:733 admin/models.py:795 msgid "Invalid line" msgstr "Riga non valida" -#: admin/models.py:498 +#: admin/models.py:500 msgid "You can't import an account with a role greater than yours" msgstr "Non puoi importare un account con un ruolo superiore al tuo" -#: admin/models.py:518 +#: admin/models.py:506 +#, python-format +msgid "The simple user '%s' must have a valid email address" +msgstr "" + +#: admin/models.py:510 +#, python-format +msgid "username and email fields must not differ for '%s'" +msgstr "" + +#: admin/models.py:534 #, python-format msgid "Account import failed (%s): domain does not exist" msgstr "Importazione dell'account fallito (%s): il dominio non esiste" -#: admin/models.py:607 admin/models.py:733 +#: admin/models.py:624 admin/models.py:746 msgid "name" msgstr "nome" -#: admin/models.py:608 +#: admin/models.py:625 msgid "The domain name" msgstr "Il nome del dominio" -#: admin/models.py:610 +#: admin/models.py:627 msgid "Default quota in MB applied to mailboxes" msgstr "Quota in MB predefinita applicata alle caselle di posta" -#: admin/models.py:613 admin/models.py:740 admin/models.py:1020 -#: admin/models.py:1190 extensions/postfix_autoreply/models.py:19 +#: admin/models.py:630 admin/models.py:753 admin/models.py:1045 +#: admin/models.py:1217 extensions/postfix_autoreply/models.py:27 msgid "enabled" msgstr "Attivato" -#: admin/models.py:614 +#: admin/models.py:631 msgid "Check to activate this domain" msgstr "Seleziona per attivare questo dominio" -#: admin/models.py:734 +#: admin/models.py:747 msgid "The alias name" msgstr "Il nome dell'alias" -#: admin/models.py:736 +#: admin/models.py:749 msgid "target" msgstr "destinazione" -#: admin/models.py:737 +#: admin/models.py:750 msgid "The domain this alias points to" msgstr "Il dominio a cui punta questo alias" -#: admin/models.py:741 admin/models.py:1021 +#: admin/models.py:754 admin/models.py:1046 msgid "Check to activate this alias" msgstr "Seleziona per attivare questo alias" -#: admin/models.py:788 +#: admin/models.py:801 #, python-format msgid "Unknown domain %s" msgstr "Dominio sconosciuto %s" -#: admin/models.py:805 admin/models.py:1006 +#: admin/models.py:818 admin/models.py:1031 msgid "address" msgstr "indirizzo" -#: admin/models.py:806 +#: admin/models.py:819 msgid "Mailbox address (without the @domain.tld part)" msgstr "Indirizzo della casella di posta (senza la parte @dominio.org)" -#: admin/models.py:852 +#: admin/models.py:877 #, python-format msgid "Failed to retrieve mailbox location (%s)" msgstr "Impossibile recuperare la posizione della casella di posta (%s)" -#: admin/models.py:868 -#, python-format -msgid "Failed to rename mailbox: %s" -msgstr "Impossibile rinominare la casella di posta: %s" - -#: admin/models.py:894 -#, python-format -msgid "Failed to remove mailbox: %s" -msgstr "Impossibile rimuovere la casella di posta: %s" - -#: admin/models.py:909 +#: admin/models.py:921 #, python-format msgid "Quota is greater than the allowed domain's limit (%dM)" msgstr "La quota è maggiore del limite stabilito per il dominio (%dM)" -#: admin/models.py:914 +#: admin/models.py:926 msgid "A quota is required" msgstr "È richiesta una quota" -#: admin/models.py:1007 +#: admin/models.py:1032 msgid "" "The alias address (without the domain part). For a 'catch-all' address, just " "enter an * character." -msgstr "L'indirizzo alternativo (senza la parte del dominio). Per un indirizzo 'prenditutto' inserisci un carattere '*'." +msgstr "" +"L'indirizzo alternativo (senza la parte del dominio). Per un indirizzo " +"'prenditutto' inserisci un carattere '*'." -#: admin/models.py:1011 +#: admin/models.py:1036 msgid "mailboxes" msgstr "caselle di posta" -#: admin/models.py:1012 +#: admin/models.py:1037 msgid "The mailboxes this alias points to" msgstr "Le caselle di posta a cui punta questo alias" -#: admin/models.py:1016 +#: admin/models.py:1041 msgid "The aliases this alias points to" msgstr "Gli alias a cui questo alias puntano" -#: admin/models.py:1064 +#: admin/models.py:1089 msgid "distribution list" msgstr "elenco di smistamento" -#: admin/models.py:1065 +#: admin/models.py:1090 msgid "forward" msgstr "inoltra" -#: admin/models.py:1066 +#: admin/models.py:1091 msgid "alias" msgstr "alias" -#: admin/models.py:1145 +#: admin/models.py:1170 #, python-format msgid "Invalid line: %s" msgstr "Riga non valida: %s" -#: admin/models.py:1150 +#: admin/models.py:1175 #, python-format msgid "Domain '%s' does not exist" msgstr "Il dominio '%s' non esiste" -#: admin/models.py:1191 +#: admin/models.py:1218 msgid "Check to enable this extension" msgstr "Seleziona per abilitare questa estensione" -#: admin/models.py:1291 +#: admin/models.py:1318 msgid "added" msgstr "aggiunto" -#: admin/models.py:1294 +#: admin/models.py:1321 msgid "modified" msgstr "modificato" -#: admin/models.py:1297 +#: admin/models.py:1324 msgid "deleted" msgstr "cancellato" -#: admin/models.py:1299 +#: admin/models.py:1326 #, python-format msgid "%(object)s '%(name)s' %(action)s by user %(user)s" msgstr "%(object)s '%(name)s' %(action)s dell'utente %(user)s" @@ -630,7 +664,7 @@ msgid "Edit domain" msgstr "Modifica dominio" #: admin/tables.py:21 admin/templates/admin/identities_table.html:8 -#: admin/templates/admin/listing.html:17 extensions/sievefilters/views.py:79 +#: admin/templates/admin/listing.html:17 extensions/sievefilters/views.py:83 #: extensions/sievefilters/templates/sievefilters/filter.html:17 #: extensions/sievefilters/templates/sievefilters/guieditor.html:5 #: extensions/webmail/templatetags/webextras.py:97 @@ -645,143 +679,143 @@ msgstr "Versione" msgid "Description" msgstr "Descrizione" -#: admin/views.py:87 +#: admin/views.py:88 msgid "New domain" msgstr "Nuovo dominio" -#: admin/views.py:88 admin/views.py:97 admin/views.py:224 admin/views.py:450 -#: admin/views.py:457 extensions/sievefilters/views.py:120 -#: extensions/sievefilters/views.py:187 extensions/webmail/views.py:133 +#: admin/views.py:89 admin/views.py:98 admin/views.py:228 admin/views.py:444 +#: admin/views.py:451 extensions/sievefilters/views.py:129 +#: extensions/sievefilters/views.py:198 extensions/webmail/views.py:136 msgid "Create" msgstr "Crea" -#: admin/views.py:94 admin/views.py:454 +#: admin/views.py:95 admin/views.py:448 msgid "Next" msgstr "Successivo" -#: admin/views.py:96 +#: admin/views.py:97 msgid "Options" msgstr "Opzioni" -#: admin/views.py:98 admin/views.py:458 +#: admin/views.py:99 admin/views.py:452 msgid "Previous" msgstr "Precedente" -#: admin/views.py:111 +#: admin/views.py:112 msgid "Domain created" msgstr "Dominio creato" -#: admin/views.py:144 admin/views.py:281 admin/views.py:504 +#: admin/views.py:146 admin/views.py:285 admin/views.py:498 #: extensions/postfix_autoreply/templates/postfix_autoreply/autoreply.html:9 -#: extensions/sievefilters/views.py:139 extensions/webmail/views.py:164 +#: extensions/sievefilters/views.py:148 extensions/webmail/views.py:168 #: userprefs/templates/userprefs/forward.html:8 #: userprefs/templates/userprefs/profile.html:8 msgid "Update" msgstr "Aggiorna" -#: admin/views.py:160 +#: admin/views.py:162 msgid "Domain modified" msgstr "Dominio modificato" -#: admin/views.py:185 +#: admin/views.py:189 msgid "You can't delete your own domain" msgstr "Non puoi cancellare il tuo dominio" -#: admin/views.py:188 +#: admin/views.py:192 msgid "Domain deleted" msgid_plural "Domains deleted" msgstr[0] "Dominio cancellato" msgstr[1] "Domini cancellati" -#: admin/views.py:203 +#: admin/views.py:207 msgid "Alias with this name already exists" msgstr "Un alias con questo nome esiste già" -#: admin/views.py:246 +#: admin/views.py:250 msgid "New distribution list" msgstr "Nuovo elenco di smistamento" -#: admin/views.py:247 +#: admin/views.py:251 msgid "Distribution list created" msgstr "Elenco di smistamento creato" -#: admin/views.py:256 +#: admin/views.py:260 msgid "New alias" msgstr "Nuovo alias" -#: admin/views.py:257 +#: admin/views.py:261 msgid "Alias created" msgstr "Alias creato" -#: admin/views.py:266 +#: admin/views.py:270 msgid "New forward" msgstr "Nuovo inoltro" -#: admin/views.py:267 +#: admin/views.py:271 msgid "Forward created" msgstr "Inoltro creato" -#: admin/views.py:285 +#: admin/views.py:289 msgid "Distribution list modified" msgstr "Elenco di smistamento modificato" -#: admin/views.py:287 +#: admin/views.py:291 msgid "Forward modified" msgstr "Inoltro modificato" -#: admin/views.py:289 +#: admin/views.py:293 msgid "Alias modified" msgstr "Alias modificato" -#: admin/views.py:408 admin/views.py:551 admin/views.py:556 -#: extensions/amavis/views.py:195 extensions/amavis/views.py:201 -#: extensions/amavis/views.py:234 extensions/amavis/views.py:238 -#: extensions/amavis/views.py:240 extensions/webmail/views.py:37 -#: extensions/webmail/views.py:65 extensions/webmail/views.py:78 -#: extensions/webmail/views.py:95 extensions/webmail/views.py:111 -#: extensions/webmail/views.py:195 extensions/webmail/views.py:422 -#: extensions/webmail/views.py:433 extensions/webmail/views.py:460 +#: admin/views.py:402 admin/views.py:545 admin/views.py:550 +#: extensions/amavis/views.py:204 extensions/amavis/views.py:210 +#: extensions/amavis/views.py:243 extensions/amavis/views.py:247 +#: extensions/amavis/views.py:249 extensions/webmail/views.py:41 +#: extensions/webmail/views.py:68 extensions/webmail/views.py:81 +#: extensions/webmail/views.py:98 extensions/webmail/views.py:114 +#: extensions/webmail/views.py:200 extensions/webmail/views.py:427 +#: extensions/webmail/views.py:438 extensions/webmail/views.py:465 #: lib/formutils.py:32 lib/formutils.py:37 msgid "Invalid request" msgstr "Richiesta non valida" -#: admin/views.py:447 +#: admin/views.py:441 msgid "New account" msgstr "Nuovo account" -#: admin/views.py:471 +#: admin/views.py:465 msgid "Account created" msgstr "Account creato" -#: admin/views.py:519 +#: admin/views.py:513 msgid "Account updated" msgstr "Account aggiornato" -#: admin/views.py:541 +#: admin/views.py:535 msgid "Account deleted" msgid_plural "Accounts deleted" msgstr[0] "Account cancellato" msgstr[1] "Account cancellati" -#: admin/views.py:596 +#: admin/views.py:590 msgid "Parameters saved" msgstr "Parametri salvati" -#: admin/views.py:642 +#: admin/views.py:636 msgid "Modifications applied." msgstr "Modifiche applicate" -#: admin/views.py:749 +#: admin/views.py:743 #, python-format msgid "Object already exists: %s" msgstr "L'oggetto esiste già: %s" -#: admin/views.py:751 +#: admin/views.py:745 #, python-format msgid "%d objects imported successfully" msgstr "%d oggetti importati correttamente" -#: admin/views.py:769 +#: admin/views.py:763 msgid "" "Provide a CSV file where lines respect one of the following formats:\n" "
                    \n" @@ -798,34 +832,37 @@ msgid "" msgstr "" "Fornire un file CSV le cui righe rispettino uno dei seguenti formati:\n" "
                      \n" -"
                    • account; loginname; password; nome; cognome; abilitato; group; indirizzo[, dominio, ...]
                      • \n" +"
                    • account; loginname; password; nome; cognome; abilitato; group; " +"indirizzo[, dominio, ...]
                      • \n" "
                    • alias; indirizzo; abilitato; destinatario interno
                      • \n" "
                    • forward; indirizzo; abilitato; destinatario esterno
                      • \n" -"
                    • dlist; indirizzo; abilitato; destinatario; destinatario; ...
                      • \n" +"
                    • dlist; indirizzo; abilitato; destinatario; destinatario; ...\n" "
                    \n" -"

                    Il primo elemento di ogni riga è obbligatorio e deve essere uguale a quello dei valori precedenti.

                    \n" +"

                    Il primo elemento di ogni riga è obbligatorio e deve essere uguale a " +"quello dei valori precedenti.

                    \n" "\n" "

                    Come separatore puoi utilizzare un carattere diverso.

                    \n" -#: admin/views.py:781 +#: admin/views.py:775 msgid "Import identities" msgstr "Identità di importazione" -#: admin/views.py:782 admin/views.py:852 admin/templatetags/admin_extras.py:87 +#: admin/views.py:776 admin/views.py:846 admin/templatetags/admin_extras.py:87 #: admin/templatetags/admin_extras.py:144 msgid "Import" msgstr "Importa" -#: admin/views.py:812 +#: admin/views.py:806 msgid "Export identities" msgstr "Identità di esportazione" -#: admin/views.py:813 admin/views.py:869 admin/templatetags/admin_extras.py:93 +#: admin/views.py:807 admin/views.py:863 admin/templatetags/admin_extras.py:93 #: admin/templatetags/admin_extras.py:150 msgid "Export" msgstr "Esporta" -#: admin/views.py:841 +#: admin/views.py:835 msgid "" "Provide a CSV file where lines respect one of the following formats:\n" "
                      \n" @@ -841,15 +878,16 @@ msgstr "" "
                    • dominio; nome; quota; abilitato
                      • \n" "
                    • aliasdominio; nome; dominio target; abilitato
                      • \n" "
                    \n" -"

                    Il primo elemento di ogni riga è obbligatorio e deve essere uguale a quello dei valori precedenti.

                    \n" +"

                    Il primo elemento di ogni riga è obbligatorio e deve essere uguale a " +"quello dei valori precedenti.

                    \n" "\n" "

                    Come separatore puoi utilizzare un carattere diverso.

                    \n" -#: admin/views.py:851 +#: admin/views.py:845 msgid "Import domains" msgstr "Importa domini" -#: admin/views.py:868 +#: admin/views.py:862 msgid "Export domains" msgstr "Esporta domini" @@ -922,7 +960,7 @@ msgid "Tags" msgstr "Tag" #: admin/templates/admin/importform.html:5 -#: admin/templatetags/admin_extras.py:305 +#: admin/templatetags/admin_extras.py:290 msgid "Help" msgstr "Aiuto" @@ -969,7 +1007,7 @@ msgid "Previously on Modoboa..." msgstr "Precedentemente su Modoboa ..." #: admin/templates/admin/logs.html:6 extensions/amavis/sql_listing.py:25 -#: extensions/webmail/lib.py:37 extensions/webmail/lib.py:406 +#: extensions/webmail/lib.py:38 extensions/webmail/lib.py:411 msgid "Date" msgstr "Data" @@ -1072,34 +1110,21 @@ msgid "View the domain's identities" msgstr "Visualizza le identita del dominio" #: admin/templatetags/admin_extras.py:178 -msgid "Delete the domain" -msgstr "Cancella il dominio" - #: admin/templatetags/admin_extras.py:194 -msgid "Delete this account" -msgstr "Cancella questo account" +#: admin/templatetags/admin_extras.py:201 +#, fuzzy, python-format +msgid "Delete %s?" +msgstr "Elimina" -#: admin/templatetags/admin_extras.py:202 -msgid "Delete this distribution list" -msgstr "Cancella l'elenco di smistamento" - -#: admin/templatetags/admin_extras.py:209 -msgid "Delete this forward" -msgstr "Cancella questo inoltro" - -#: admin/templatetags/admin_extras.py:216 -msgid "Delete this alias" -msgstr "Cancella questo alias" - -#: admin/templatetags/admin_extras.py:238 +#: admin/templatetags/admin_extras.py:223 msgid "Remove this permission" msgstr "Rimuovi questo permesso" -#: admin/templatetags/admin_extras.py:279 lib/formutils.py:206 +#: admin/templatetags/admin_extras.py:264 lib/formutils.py:206 msgid "Yes" msgstr "Si" -#: admin/templatetags/admin_extras.py:279 lib/formutils.py:206 +#: admin/templatetags/admin_extras.py:264 lib/formutils.py:206 msgid "No" msgstr "No" @@ -1151,8 +1176,10 @@ msgid "" msgstr "" "\n" "

                    Benvenuti alla demo online!

                    \n" -"

                    Attenzione: il contenuto della demo viene rinnovato ogni due ore.

                    \n" -"

                    Per provare la demo sono disponibili i seguenti utenti (username/passwordAttenzione: il contenuto della demo viene rinnovato ogni due ore.\n" +"

                    Per provare la demo sono disponibili i seguenti utenti (username/" +"password):

                    \n" "
                      \n" "
                    • Un super amministratore : admin/password
                      • \n" @@ -1206,7 +1233,8 @@ msgstr "Rimozione dei messaggi rilasciati" #: extensions/amavis/app_settings.py:24 msgid "Remove messages marked as released while cleaning up the database" -msgstr "Rimuovi i messaggi marcati come rilasciati durante la pulizia del database" +msgstr "" +"Rimuovi i messaggi marcati come rilasciati durante la pulizia del database" #: extensions/amavis/app_settings.py:28 msgid "Amavis connection mode" @@ -1295,12 +1323,12 @@ msgid "Virus filter" msgstr "Filtro virus" #: extensions/amavis/models.py:94 extensions/amavis/models.py:102 -#: extensions/amavis/models.py:110 extensions/sievefilters/views.py:268 +#: extensions/amavis/models.py:110 extensions/sievefilters/views.py:281 msgid "yes" msgstr "si" #: extensions/amavis/models.py:95 extensions/amavis/models.py:103 -#: extensions/amavis/models.py:111 extensions/sievefilters/views.py:272 +#: extensions/amavis/models.py:111 extensions/sievefilters/views.py:285 msgid "no" msgstr "no" @@ -1312,7 +1340,9 @@ msgstr "predefinito" #: extensions/amavis/models.py:98 msgid "Bypass virus checks or not. Choose 'default' to use global settings." -msgstr "Aggirare il controllo virus o no. Scegliere 'predefinito' per utilizzare le impostazioni globali." +msgstr "" +"Aggirare il controllo virus o no. Scegliere 'predefinito' per utilizzare le " +"impostazioni globali." #: extensions/amavis/models.py:101 msgid "Spam filter" @@ -1320,7 +1350,9 @@ msgstr "Filtro spam" #: extensions/amavis/models.py:106 msgid "Bypass spam checks or not. Choose 'default' to use global settings." -msgstr "Aggirare il controllo spam o no. Scegliere 'predefinito' per utilizzare le impostazioni globali." +msgstr "" +"Aggirare il controllo spam o no. Scegliere 'predefinito' per utilizzare le " +"impostazioni globali." #: extensions/amavis/models.py:109 msgid "Banned filter" @@ -1328,7 +1360,9 @@ msgstr "Filtro banned" #: extensions/amavis/models.py:114 msgid "Bypass banned checks or not. Choose 'default' to use global settings." -msgstr "Aggirare il controllo banned o no. Scegliere 'predefinito' per utilizzare le impostazioni globali." +msgstr "" +"Aggirare il controllo banned o no. Scegliere 'predefinito' per utilizzare le " +"impostazioni globali." #: extensions/amavis/models.py:144 msgid "Spam marker" @@ -1338,15 +1372,17 @@ msgstr "Contrassegno spam" msgid "" "Modify spam subject using the specified text. Choose 'default' to use global " "settings." -msgstr "Modifica dell'oggetto spam utilizzando un testo specifico. Scegliere 'predefinito' per utilizzare le impostazioni globali." +msgstr "" +"Modifica dell'oggetto spam utilizzando un testo specifico. Scegliere " +"'predefinito' per utilizzare le impostazioni globali." -#: extensions/amavis/sql_listing.py:23 extensions/webmail/lib.py:36 +#: extensions/amavis/sql_listing.py:23 extensions/webmail/lib.py:37 msgid "From" msgstr "Da" #: extensions/amavis/sql_listing.py:24 extensions/sievefilters/forms.py:68 -#: extensions/webmail/forms.py:10 extensions/webmail/lib.py:35 -#: extensions/webmail/lib.py:404 templates/common/email_searchbar.html:6 +#: extensions/webmail/forms.py:10 extensions/webmail/lib.py:36 +#: extensions/webmail/lib.py:409 templates/common/email_searchbar.html:6 msgid "Subject" msgstr "Oggetto" @@ -1356,37 +1392,37 @@ msgstr "Oggetto" msgid "To" msgstr "A" -#: extensions/amavis/views.py:34 +#: extensions/amavis/views.py:43 msgid "Empty quarantine" msgstr "Svuota quarantena" -#: extensions/amavis/views.py:202 +#: extensions/amavis/views.py:211 msgid "Message deleted" msgstr "Messaggio eliminato" -#: extensions/amavis/views.py:223 +#: extensions/amavis/views.py:232 #, python-format msgid "%(count)d message deleted successfully" msgid_plural "%(count)d messages deleted successfully" msgstr[0] "%(count)d messaggio eliminato con successo" msgstr[1] "%(count)d messaggi eliminati con successo" -#: extensions/amavis/views.py:243 +#: extensions/amavis/views.py:252 msgid "Request sent" msgstr "Request inviata" -#: extensions/amavis/views.py:249 +#: extensions/amavis/views.py:258 msgid "Message released" msgstr "Messaggio rilasciato" -#: extensions/amavis/views.py:271 +#: extensions/amavis/views.py:280 #, python-format msgid "%(count)d request sent" msgid_plural "%(count)d requests sent" msgstr[0] "%(count)d request inviata" msgstr[1] "%(count)d request inviate" -#: extensions/amavis/views.py:295 +#: extensions/amavis/views.py:304 #, python-format msgid "%(count)d message released successfully" msgid_plural "%(count)d messages released successfully" @@ -1421,8 +1457,12 @@ msgid "" msgid_plural "" "\n" "%(counter)s release requests are pending for action.\n" -msgstr[0] "\n%(counter)s richiesta di rilascio è in attesa di azioni\n" -msgstr[1] "\n%(counter)s richieste di rilascio sono in attesa di azioni\n" +msgstr[0] "" +"\n" +"%(counter)s richiesta di rilascio è in attesa di azioni\n" +msgstr[1] "" +"\n" +"%(counter)s richieste di rilascio sono in attesa di azioni\n" #: extensions/amavis/templates/amavis/notifications/pending_requests.html:6 msgid "Sketch:" @@ -1497,7 +1537,9 @@ msgstr "MIME errato" #: extensions/limits/__init__.py:23 msgid "" "Per administrator resources to limit the number of objects they can create" -msgstr "Risorse per amministratore. Limitazione del numero di oggetti che possono creare " +msgstr "" +"Risorse per amministratore. Limitazione del numero di oggetti che possono " +"creare " #: extensions/limits/__init__.py:54 msgid "Limits" @@ -1522,7 +1564,9 @@ msgstr "Amministratori di domini" #: extensions/limits/app_settings.py:15 msgid "Maximum number of allowed domain administrators for a new administrator" -msgstr "Numero massimo di amministratori di domini consentiti per un nuovo amministratore" +msgstr "" +"Numero massimo di amministratori di domini consentiti per un nuovo " +"amministratore" #: extensions/limits/app_settings.py:21 msgid "Maximum number of allowed domains for a new administrator" @@ -1530,11 +1574,13 @@ msgstr "Numero massimo di domini consentiti per un nuovo amministratore" #: extensions/limits/app_settings.py:27 msgid "Maximum number of allowed domain aliases for a new administrator" -msgstr "Numero massimo di alias di dominio consentiti per un nuovo amministratore" +msgstr "" +"Numero massimo di alias di dominio consentiti per un nuovo amministratore" #: extensions/limits/app_settings.py:33 msgid "Maximum number of allowed mailboxes for a new administrator" -msgstr "Numero massimo di caselle di posta consentite per un nuovo amministratore" +msgstr "" +"Numero massimo di caselle di posta consentite per un nuovo amministratore" #: extensions/limits/app_settings.py:39 msgid "Maximum number of allowed aliases for a new administrator" @@ -1542,7 +1588,8 @@ msgstr "Numero massimo di alias consentiti per un nuovo amministratore" #: extensions/limits/forms.py:13 msgid "Maximum number of domain administrators this user can create" -msgstr "Numero massimo di amministratori di dominio che questo utente può creare" +msgstr "" +"Numero massimo di amministratori di dominio che questo utente può creare" #: extensions/limits/forms.py:17 msgid "Maximum number of domains this user can create" @@ -1558,7 +1605,8 @@ msgstr "Numero massimo di caselle di posta che questo utente può creare" #: extensions/limits/forms.py:29 msgid "Maximum number of mailbox aliases this user can create" -msgstr "Numero massimo di alias di caselle di posta che questo utente può creare" +msgstr "" +"Numero massimo di alias di caselle di posta che questo utente può creare" #: extensions/limits/forms.py:46 msgid "Invalid limit" @@ -1612,7 +1660,9 @@ msgstr "Tempo massimo della risposta automatica" #: extensions/postfix_autoreply/app_settings.py:16 msgid "Timeout in seconds between two auto-replies to the same recipient" -msgstr "Tempo massimo in secondi tra due risposte automatiche al medesimo destinatario" +msgstr "" +"Tempo massimo in secondi tra due risposte automatiche al medesimo " +"destinatario" #: extensions/postfix_autoreply/forms.py:9 msgid "Until" @@ -1626,23 +1676,23 @@ msgstr "Attiva la tua risposta automatica fino a questa data" msgid "This date is over" msgstr "Questa data è passata" -#: extensions/postfix_autoreply/models.py:15 +#: extensions/postfix_autoreply/models.py:19 msgid "subject" msgstr "oggetto" -#: extensions/postfix_autoreply/models.py:16 +#: extensions/postfix_autoreply/models.py:20 msgid "The subject that will appear in sent emails" msgstr "L'oggetto che apparirà nelle mail inviate" -#: extensions/postfix_autoreply/models.py:17 +#: extensions/postfix_autoreply/models.py:23 msgid "content" msgstr "contenuto" -#: extensions/postfix_autoreply/models.py:18 +#: extensions/postfix_autoreply/models.py:24 msgid "The content that will appear in sent emails" msgstr "Il contenuto che apparirà nelle mail inviate" -#: extensions/postfix_autoreply/models.py:20 +#: extensions/postfix_autoreply/models.py:28 msgid "Activate/Deactivate your auto reply" msgstr "Attiva/disattiva la tua risposta automatica" @@ -1770,59 +1820,60 @@ msgstr "Ridireziona il messaggio a" #: extensions/sievefilters/lib.py:37 msgid "Connection to MANAGESIEVE server failed, check your configuration" -msgstr "Connessione al server MANAGESIEVE fallita, controlla la tua configurazione" +msgstr "" +"Connessione al server MANAGESIEVE fallita, controlla la tua configurazione" #: extensions/sievefilters/lib.py:82 msgid "Not enough space on server" msgstr "Non c'è spazio sufficiente nel server" -#: extensions/sievefilters/views.py:64 +#: extensions/sievefilters/views.py:68 msgid "Failed to retrieve filters set" msgstr "Recupero delle impostazioni di filtro fallito" -#: extensions/sievefilters/views.py:117 +#: extensions/sievefilters/views.py:126 #: extensions/sievefilters/templatetags/sfilters_tags.py:33 msgid "New filter" msgstr "Nuovo filtro" -#: extensions/sievefilters/views.py:124 +#: extensions/sievefilters/views.py:133 msgid "Filter created" msgstr "Filtro creato" -#: extensions/sievefilters/views.py:136 +#: extensions/sievefilters/views.py:145 #: extensions/sievefilters/templatetags/sfilters_tags.py:77 msgid "Edit filter" msgstr "Modifica filtro" -#: extensions/sievefilters/views.py:145 +#: extensions/sievefilters/views.py:154 msgid "Filter modified" msgstr "Filtro modificato" -#: extensions/sievefilters/views.py:165 +#: extensions/sievefilters/views.py:176 msgid "Filter removed" msgstr "Filtro eliminato" -#: extensions/sievefilters/views.py:166 +#: extensions/sievefilters/views.py:177 msgid "Failed to remove filter" msgstr "Rimozione del filtro fallita" -#: extensions/sievefilters/views.py:180 +#: extensions/sievefilters/views.py:191 msgid "Filters set saved" msgstr "Gruppo filtri salvato" -#: extensions/sievefilters/views.py:185 +#: extensions/sievefilters/views.py:196 msgid "Create a new filters set" msgstr "Crea un nuovo gruppo di filtri" -#: extensions/sievefilters/views.py:208 +#: extensions/sievefilters/views.py:219 msgid "Filters set created" msgstr "Gruppo filtri creato" -#: extensions/sievefilters/views.py:229 +#: extensions/sievefilters/views.py:240 msgid "Filters set deleted" msgstr "Gruppo filtri eliminato" -#: extensions/sievefilters/views.py:241 +#: extensions/sievefilters/views.py:252 msgid "Filters set activated" msgstr "Gruppo filtri attivato" @@ -1838,18 +1889,20 @@ msgstr "Attivo" msgid "No filter defined yet" msgstr "Non ci sono ancora filtri definiti" -#: extensions/sievefilters/templates/sievefilters/index.html:55 +#: extensions/sievefilters/templates/sievefilters/index.html:56 msgid "Filter sets" msgstr "Impostazioni dei filtri" -#: extensions/sievefilters/templates/sievefilters/index.html:59 +#: extensions/sievefilters/templates/sievefilters/index.html:60 msgid "active" msgstr "attivo" -#: extensions/sievefilters/templates/sievefilters/index.html:73 +#: extensions/sievefilters/templates/sievefilters/index.html:74 msgid "" "No filters set defined yet. You must create one in order to define filters." -msgstr "Non è ancora stato definito alcun gruppo di filtri. Devi crearne uno per definire dei filtri" +msgstr "" +"Non è ancora stato definito alcun gruppo di filtri. Devi crearne uno per " +"definire dei filtri" #: extensions/sievefilters/templatetags/sfilters_tags.py:16 msgid "New filters set" @@ -2031,7 +2084,8 @@ msgstr "Dimensione massima degli allegati" #: extensions/webmail/app_settings.py:16 msgid "Maximum attachment size in bytes (or KB, MB, GB if specified)" -msgstr "Dimensione massima degli allegati in bytes (o KB, MB, GB se specificato)" +msgstr "" +"Dimensione massima degli allegati in bytes (o KB, MB, GB se specificato)" #: extensions/webmail/app_settings.py:19 msgid "IMAP settings" @@ -2087,7 +2141,8 @@ msgstr "Modalità di visualizzazione del messaggio predefinita" #: extensions/webmail/app_settings.py:79 msgid "The default mode used when displaying a message" -msgstr "La modalità di visualizzazione predefinita quando viene mostrato il messaggio" +msgstr "" +"La modalità di visualizzazione predefinita quando viene mostrato il messaggio" #: extensions/webmail/app_settings.py:85 msgid "Enable HTML links display" @@ -2161,84 +2216,89 @@ msgstr "Risposta del server" msgid "Cci" msgstr "Cci" -#: extensions/webmail/imaputils.py:259 +#: extensions/webmail/imaputils.py:237 +#, fuzzy +msgid "Failed to retrieve hierarchy delimiter" +msgstr "Recupero delle impostazioni di filtro fallito" + +#: extensions/webmail/imaputils.py:278 #, python-format msgid "Connection to IMAP server failed: %s" msgstr "Connessione al server IMAP fallita: %s" -#: extensions/webmail/lib.py:353 +#: extensions/webmail/lib.py:358 msgid "wrote:" msgstr "scritto:" -#: extensions/webmail/lib.py:418 extensions/webmail/lib.py:422 +#: extensions/webmail/lib.py:423 extensions/webmail/lib.py:427 msgid "Original message" msgstr "Messaggio originale" -#: extensions/webmail/views.py:83 +#: extensions/webmail/views.py:86 #, python-format msgid "%(count)d message deleted" msgid_plural "%(count)d messages deleted" msgstr[0] "%(count)d messaggio cancellato" msgstr[1] "%(count)d messaggi cancellati" -#: extensions/webmail/views.py:100 +#: extensions/webmail/views.py:103 msgid "Unknown action" msgstr "Azione sconosciuta" -#: extensions/webmail/views.py:113 lib/email_listing.py:137 +#: extensions/webmail/views.py:116 lib/email_listing.py:137 msgid "Empty mailbox" msgstr "Casella di posta vuota" -#: extensions/webmail/views.py:130 +#: extensions/webmail/views.py:133 #: extensions/webmail/templatetags/webextras.py:170 msgid "Create a new mailbox" msgstr "Crea una nuova casella di posta" -#: extensions/webmail/views.py:145 +#: extensions/webmail/views.py:149 msgid "Mailbox created" msgstr "Casella di posta creata" -#: extensions/webmail/views.py:161 +#: extensions/webmail/views.py:165 msgid "Edit mailbox" msgstr "Modifica casella di posta" -#: extensions/webmail/views.py:175 +#: extensions/webmail/views.py:180 msgid "Mailbox updated" msgstr "Casella di posta aggiornata" -#: extensions/webmail/views.py:209 extensions/webmail/views.py:391 -#: extensions/webmail/views.py:500 +#: extensions/webmail/views.py:214 extensions/webmail/views.py:396 +#: extensions/webmail/views.py:505 msgid "Bad request" msgstr "Richiesta sbagliata" -#: extensions/webmail/views.py:241 +#: extensions/webmail/views.py:246 msgid "Failed to save attachment: " msgstr "Salvataggio allegato fallito: " -#: extensions/webmail/views.py:244 +#: extensions/webmail/views.py:249 #, python-format msgid "Attachment is too big (limit: %s)" msgstr "L'allegato è troppo grande (limite: %s)" -#: extensions/webmail/views.py:250 +#: extensions/webmail/views.py:255 #: extensions/webmail/templates/webmail/compose.html:15 #: extensions/webmail/templates/webmail/headers.html:4 msgid "Attachments" msgstr "Allegati" -#: extensions/webmail/views.py:266 +#: extensions/webmail/views.py:271 msgid "Bad query" msgstr "Domanda sbagliata" -#: extensions/webmail/views.py:276 +#: extensions/webmail/views.py:281 msgid "Failed to remove attachment: " msgstr "Rimozione allegato fallita: " -#: extensions/webmail/views.py:281 +#: extensions/webmail/views.py:286 msgid "Unknown attachment" msgstr "Allegato sconosciuto" -#: extensions/webmail/views.py:496 +#: extensions/webmail/views.py:501 msgid "Undefined action" msgstr "Azione non definita" @@ -2269,7 +2329,7 @@ msgstr[1] "%(counter)s file" msgid "Parent mailbox" msgstr "Casella di posta principale" -#: extensions/webmail/templates/webmail/index.html:37 +#: extensions/webmail/templates/webmail/index.html:38 msgid "Mailbox quota" msgstr "Quota casella di posta" @@ -2447,7 +2507,7 @@ msgstr "Impostazioni per-utente" msgid "Prefered language" msgstr "Lingua preferita" -#: userprefs/app_settings.py:26 +#: userprefs/app_settings.py:27 msgid "Prefered language to display pages" msgstr "Lingua preferita per mostrare le pagine" @@ -2481,13 +2541,16 @@ msgstr "Mantieni copie locali" #: userprefs/forms.py:67 msgid "Forward messages and store copies into your local mailbox" -msgstr "Inoltra i messaggi e memorizza le copie nella tua casella di posta locale" +msgstr "" +"Inoltra i messaggi e memorizza le copie nella tua casella di posta locale" #: userprefs/forms.py:84 msgid "" "You can't define a forward to a local destination. Please ask your " "administrator to create an alias instead." -msgstr "Non puoi definire l'inoltro con destinazione una cartella locale. Chiedi piuttosto all'amministratore di creare un alias." +msgstr "" +"Non puoi definire l'inoltro con destinazione una cartella locale. Chiedi " +"piuttosto all'amministratore di creare un alias." #: userprefs/views.py:32 msgid "You need a mailbox in order to define a forward" @@ -2535,3 +2598,24 @@ msgstr "Aggiorna le informazioni personali" #: userprefs/templatetags/uprefs_extras.py:57 msgid "Logout" msgstr "Esci" + +#~ msgid "Failed to rename mailbox: %s" +#~ msgstr "Impossibile rinominare la casella di posta: %s" + +#~ msgid "Failed to remove mailbox: %s" +#~ msgstr "Impossibile rimuovere la casella di posta: %s" + +#~ msgid "Delete the domain" +#~ msgstr "Cancella il dominio" + +#~ msgid "Delete this account" +#~ msgstr "Cancella questo account" + +#~ msgid "Delete this distribution list" +#~ msgstr "Cancella l'elenco di smistamento" + +#~ msgid "Delete this forward" +#~ msgstr "Cancella questo inoltro" + +#~ msgid "Delete this alias" +#~ msgstr "Cancella questo alias" diff --git a/modoboa/locale/pt_PT/LC_MESSAGES/django.po b/modoboa/locale/pt_PT/LC_MESSAGES/django.po index a5de42e61..a160de8a6 100644 --- a/modoboa/locale/pt_PT/LC_MESSAGES/django.po +++ b/modoboa/locale/pt_PT/LC_MESSAGES/django.po @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # mikec , 2012 # mikec , 2013 @@ -10,15 +10,16 @@ msgid "" msgstr "" "Project-Id-Version: Modoboa\n" -"Report-Msgid-Bugs-To: http://dev.modoboa.org/\n" -"POT-Creation-Date: 2013-06-01 16:35+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-09-20 22:30+0200\n" "PO-Revision-Date: 2013-06-21 13:19+0000\n" "Last-Translator: mikec \n" -"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/modoboa/language/pt_PT/)\n" +"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/" +"modoboa/language/pt_PT/)\n" +"Language: pt_PT\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: pt_PT\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: admin/__init__.py:9 @@ -29,8 +30,8 @@ msgstr "Consola de Administração" msgid "Web based console to manage domains, accounts and aliases" msgstr "Consola baseada na web para gestão de domínios, contas e aliases" -#: admin/__init__.py:16 admin/forms.py:179 admin/forms.py:614 -#: admin/views.py:93 admin/views.py:441 +#: admin/__init__.py:16 admin/forms.py:211 admin/forms.py:652 +#: admin/views.py:94 admin/views.py:447 #: extensions/postfix_autoreply/app_settings.py:11 #: extensions/sievefilters/app_settings.py:50 #: extensions/stats/app_settings.py:11 extensions/webmail/app_settings.py:11 @@ -124,7 +125,9 @@ msgstr "\"Bind DN\"" msgid "" "The distinguished name to use when binding to the LDAP server. Leave empty " "for an anonymous bind" -msgstr "O nome único usado para fazer o \"bind\" ao servidor LDAP. Deixar vario para \"bind\" anónimo" +msgstr "" +"O nome único usado para fazer o \"bind\" ao servidor LDAP. Deixar vario " +"para \"bind\" anónimo" #: admin/app_settings.py:97 msgid "Bind password" @@ -132,7 +135,8 @@ msgstr "Password para bind" #: admin/app_settings.py:99 msgid "The password to use when binding to the LDAP server (with 'Bind DN')" -msgstr "A password usada para fazer o \"bind\" ao servidor LDAP (com 'Bind DN')" +msgstr "" +"A password usada para fazer o \"bind\" ao servidor LDAP (com 'Bind DN')" #: admin/app_settings.py:105 msgid "Search base" @@ -150,7 +154,9 @@ msgstr "Filtro de pesquisa" msgid "" "An optional filter string (e.g. '(objectClass=person)'). In order to be " "valid, it must be enclosed in parentheses." -msgstr "Um filtro opcional (ex: '(objetClass=person)'). Tem de estar entre parênteses para ser válido" +msgstr "" +"Um filtro opcional (ex: '(objetClass=person)'). Tem de estar entre " +"parênteses para ser válido" #: admin/app_settings.py:119 msgid "User DN template" @@ -161,7 +167,9 @@ msgstr "Template DN de utilizador" msgid "" "The template used to construct a user's DN. It should contain one " "placeholder (ie. %(user)s)" -msgstr "O template usado para construir o DN (nome único). Deve apenas conter um 'placeholder' (ex: %(user)s) " +msgstr "" +"O template usado para construir o DN (nome único). Deve apenas conter um " +"'placeholder' (ex: %(user)s) " #: admin/app_settings.py:126 msgid "Password attribute" @@ -194,7 +202,9 @@ msgstr "Lidar com caixas de correio no sistema de ficheiros" msgid "" "Rename or remove mailboxes on the filesystem when they get renamed or " "removed within Modoboa" -msgstr "Renomear ou remover as caixas de correio no sistema de ficheiros quando estas são renomeadas no Modoboa" +msgstr "" +"Renomear ou remover as caixas de correio no sistema de ficheiros quando " +"estas são renomeadas no Modoboa" #: admin/app_settings.py:146 msgid "Mailboxes ower" @@ -210,7 +220,8 @@ msgstr "Remoção automática de conta" #: admin/app_settings.py:154 msgid "When a mailbox is removed, also remove the associated account" -msgstr "Ao remover uma caixa de correio estará também a remover a conta associada" +msgstr "" +"Ao remover uma caixa de correio estará também a remover a conta associada" #: admin/app_settings.py:157 admin/templates/admin/editdomainform.html:7 msgid "Miscellaneous" @@ -238,39 +249,52 @@ msgstr "Redirecionamento pré-definido" #: admin/app_settings.py:175 msgid "The default redirection used when no application is specified" -msgstr "O redirecionamento padrão usado quando nenhuma aplicação se encontra especificada" +msgstr "" +"O redirecionamento padrão usado quando nenhuma aplicação se encontra " +"especificada" -#: admin/app_settings.py:230 +#: admin/app_settings.py:213 +msgid "Key must be either 16, 24, or 32 bytes long" +msgstr "" + +#: admin/app_settings.py:222 +#, fuzzy +msgid "Invalid syntax" +msgstr "Linha inválida" + +#: admin/app_settings.py:245 msgid "This field is required" msgstr "Este campo é obrigatório" -#: admin/forms.py:16 admin/forms.py:459 admin/tables.py:18 +#: admin/forms.py:20 admin/forms.py:497 admin/tables.py:18 msgid "Alias(es)" msgstr "Alias(es)" -#: admin/forms.py:18 +#: admin/forms.py:22 msgid "" "Alias(es) of this domain. Indicate only one name per input, press ENTER to " "add a new input." -msgstr "Alias(es) deste domínio. Indicar apenas um nome por entrada, pressionar ENTER para acrescentar uma nova entrada." +msgstr "" +"Alias(es) deste domínio. Indicar apenas um nome por entrada, pressionar " +"ENTER para acrescentar uma nova entrada." -#: admin/forms.py:55 +#: admin/forms.py:59 msgid "An alias with this name already exists" msgstr "Já existe um alias com este nome" -#: admin/forms.py:69 +#: admin/forms.py:73 msgid "A domain with this name already exists" msgstr "Este nome de domínio já existe" -#: admin/forms.py:114 +#: admin/forms.py:146 msgid "Create a domain administrator" msgstr "Criar um administrador de domínio" -#: admin/forms.py:116 +#: admin/forms.py:148 msgid "Automatically create an administrator for this domain" msgstr "Criar automaticamente um administrador para este domínio" -#: admin/forms.py:120 admin/tables.py:12 admin/tables.py:47 +#: admin/forms.py:152 admin/tables.py:12 admin/tables.py:47 #: admin/templates/admin/editdomainform.html:13 #: admin/templates/admin/identities_table.html:5 #: admin/templates/admin/information.html:8 @@ -279,349 +303,362 @@ msgstr "Criar automaticamente um administrador para este domínio" msgid "Name" msgstr "Nome" -#: admin/forms.py:122 +#: admin/forms.py:154 msgid "" "The administrator's name. Don't include the domain's name here, it will be " "automatically appended." -msgstr "O nome do administrador. Não inclua o nome do domínio já que este será automaticamente anexado." +msgstr "" +"O nome do administrador. Não inclua o nome do domínio já que este será " +"automaticamente anexado." -#: admin/forms.py:128 +#: admin/forms.py:160 msgid "Create aliases" msgstr " Criar aliases" -#: admin/forms.py:130 +#: admin/forms.py:162 msgid "Automatically create standard aliases for this domain" msgstr "Criar automaticamente aliases para este domínio" -#: admin/forms.py:143 +#: admin/forms.py:175 msgid "Invalid format" msgstr "Formato inválido" -#: admin/forms.py:155 +#: admin/forms.py:187 #, python-format msgid "User '%s' already exists" msgstr "O utilizador '%s' já existe" -#: admin/forms.py:203 +#: admin/forms.py:235 msgid "Email address" msgstr "Endereço de e-mail" -#: admin/forms.py:204 +#: admin/forms.py:236 msgid "" "The distribution list address. Use the '*' character to create a 'catchall' " "address (ex: *@domain.tld)." -msgstr "Os endereços da lista de distribuição. Use o '*' para criar um endereço 'catchall' (Ex: *@domain.tld)." +msgstr "" +"Os endereços da lista de distribuição. Use o '*' para criar um endereço " +"'catchall' (Ex: *@domain.tld)." -#: admin/forms.py:207 +#: admin/forms.py:239 msgid "Recipients" msgstr "Destinatários" -#: admin/forms.py:208 +#: admin/forms.py:240 msgid "" "Mailbox(es) this alias will point to. Indicate only one address per input, " "press ENTER to add a new input." -msgstr "Caixa(s) de correio para o qual este 'alias' aponta. Indicar apenas um endereço por entrada, pressionar ENTER para acrescentar uma nova entrada." +msgstr "" +"Caixa(s) de correio para o qual este 'alias' aponta. Indicar apenas um " +"endereço por entrada, pressionar ENTER para acrescentar uma nova entrada." -#: admin/forms.py:246 admin/forms.py:504 admin/forms.py:530 -#: admin/models.py:1147 +#: admin/forms.py:278 admin/forms.py:542 admin/forms.py:568 msgid "Domain does not exist" msgstr "O domínio não existe" -#: admin/forms.py:248 +#: admin/forms.py:280 msgid "You don't have access to this domain" msgstr "Não tem acesso a este domínio" -#: admin/forms.py:268 +#: admin/forms.py:300 msgid "Invalid mailbox" msgstr "Caixa de correio inválida" -#: admin/forms.py:284 +#: admin/forms.py:316 admin/models.py:1202 #, python-format msgid "Local recipient %s not found" msgstr "O destinatário local %s não foi encontrado" -#: admin/forms.py:286 admin/forms.py:292 +#: admin/forms.py:318 admin/forms.py:324 #, python-format msgid "Recipient %s already present" msgstr "O destinatário %s já existe" -#: admin/forms.py:297 +#: admin/forms.py:329 msgid "No recipient defined" msgstr "Sem destinatário definido" -#: admin/forms.py:311 extensions/webmail/forms.py:19 +#: admin/forms.py:343 extensions/webmail/forms.py:19 msgid "Select a file" msgstr "Escolha um ficheiro" -#: admin/forms.py:313 admin/forms.py:341 +#: admin/forms.py:345 admin/forms.py:373 msgid "Separator" msgstr "Separador" -#: admin/forms.py:316 +#: admin/forms.py:348 msgid "Continue on error" msgstr "Continua com erro" -#: admin/forms.py:317 +#: admin/forms.py:349 msgid "Don't treat duplicated objects as error" msgstr "Não tratar objetos duplicados como erro" -#: admin/forms.py:332 +#: admin/forms.py:364 msgid "Crypt passwords" msgstr "Passwords encriptadas" -#: admin/forms.py:333 +#: admin/forms.py:365 msgid "Check this option if passwords contained in your file are not crypted" msgstr "Marque esta opção se as senhas contidas no arquivo não são encriptadas" -#: admin/forms.py:339 +#: admin/forms.py:371 msgid "File name" msgstr "Nome do ficheiro" -#: admin/forms.py:371 admin/templates/admin/editdomainform.html:13 +#: admin/forms.py:403 admin/templates/admin/editdomainform.html:13 #: auth/forms.py:7 msgid "Username" msgstr "Nome de Utilizador" -#: admin/forms.py:373 +#: admin/forms.py:405 msgid "Role" msgstr "Papel" -#: admin/forms.py:374 admin/forms.py:401 +#: admin/forms.py:406 admin/forms.py:433 msgid "Choose" msgstr "Escolher" -#: admin/forms.py:375 +#: admin/forms.py:407 msgid "What level of permission this user will have" msgstr "Que nível de permissões terá o utilizador" -#: admin/forms.py:377 auth/forms.py:11 +#: admin/forms.py:409 auth/forms.py:11 msgid "Password" msgstr "Password" -#: admin/forms.py:379 userprefs/forms.py:18 +#: admin/forms.py:411 userprefs/forms.py:18 msgid "Confirmation" msgstr "Confirmação" -#: admin/forms.py:381 +#: admin/forms.py:413 msgid "Enter the same password as above, for verification." msgstr "Repita a password acima, para verificação." -#: admin/forms.py:392 +#: admin/forms.py:424 msgid "Enabled" msgstr "Ativo" -#: admin/forms.py:434 +#: admin/forms.py:471 msgid "The two password fields didn't match." msgstr "Os dois campos de password não são idênticos." -#: admin/forms.py:440 +#: admin/forms.py:477 msgid "You can't disable your own account" msgstr "Não pode desativar a sua própria conta" -#: admin/forms.py:450 +#: admin/forms.py:488 msgid "E-mail" msgstr "E-mail" -#: admin/forms.py:452 +#: admin/forms.py:490 msgid "Quota" msgstr "Quota" -#: admin/forms.py:454 +#: admin/forms.py:492 msgid "" "Quota in MB for this mailbox. Define a custom value or use domain's default " "one. Leave empty to define an unlimited value (not allowed for domain " "administrators)." -msgstr "Quota em MB para esta caixa de correio. Definir uma valor personalizado ou usar o valor predefinido pelo domínio. Deixar em branco para definir uma valor ilimitado (não permitido para administradores do domínio)." +msgstr "" +"Quota em MB para esta caixa de correio. Definir uma valor personalizado ou " +"usar o valor predefinido pelo domínio. Deixar em branco para definir uma " +"valor ilimitado (não permitido para administradores do domínio)." -#: admin/forms.py:461 +#: admin/forms.py:499 msgid "" "Alias(es) of this mailbox. Indicate only one address per input, press ENTER " "to add a new input. Use the '*' character to create a 'catchall' alias (ex: " "*@domain.tld)." -msgstr "Alias(es) desta caixa de correio. Indique apenas um endereço por entrada, clique ENTER para adicionar uma nova entrada. Use o '*' para criar um alias 'catchall' (ex: *@domain.tld)." +msgstr "" +"Alias(es) desta caixa de correio. Indique apenas um endereço por entrada, " +"clique ENTER para adicionar uma nova entrada. Use o '*' para criar um alias " +"'catchall' (ex: *@domain.tld)." -#: admin/forms.py:512 +#: admin/forms.py:550 #, python-format msgid "Mailbox %s already exists" msgstr "Caixa de correio %s já existe" -#: admin/forms.py:572 +#: admin/forms.py:610 msgid "Domain(s)" msgstr "Domínio(s)" -#: admin/forms.py:574 +#: admin/forms.py:612 msgid "Domain(s) that user administrates" msgstr "Domínio(s) administrado pelo utilizador" -#: admin/forms.py:616 admin/views.py:444 +#: admin/forms.py:654 admin/views.py:450 msgid "Mail" msgstr "Correio" -#: admin/forms.py:618 +#: admin/forms.py:656 msgid "Permissions" msgstr "Permissões" -#: admin/models.py:78 +#: admin/models.py:80 msgid "You can't delete your own account" msgstr "Não pode apagar a sua própria conta" -#: admin/models.py:159 +#: admin/models.py:161 msgid "Failed to update password: LDAP module not installed" msgstr "Falha ao actualizar password: Modulo LDAP não instalado" -#: admin/models.py:165 +#: admin/models.py:167 #, python-format msgid "Failed to update password: %s" msgstr "Falha ao actualizar a password: %s" -#: admin/models.py:192 +#: admin/models.py:194 msgid "account" msgstr "conta" -#: admin/models.py:494 admin/models.py:720 admin/models.py:782 +#: admin/models.py:496 admin/models.py:733 admin/models.py:795 msgid "Invalid line" msgstr "Linha inválida" -#: admin/models.py:498 +#: admin/models.py:500 msgid "You can't import an account with a role greater than yours" msgstr "Não é possível importa uma conta com permissões superiores" -#: admin/models.py:518 +#: admin/models.py:506 +#, python-format +msgid "The simple user '%s' must have a valid email address" +msgstr "" + +#: admin/models.py:510 +#, python-format +msgid "username and email fields must not differ for '%s'" +msgstr "" + +#: admin/models.py:534 #, python-format msgid "Account import failed (%s): domain does not exist" msgstr "Importação da conta falhou (%s): domínio não existe" -#: admin/models.py:607 admin/models.py:733 +#: admin/models.py:624 admin/models.py:746 msgid "name" msgstr "nome" -#: admin/models.py:608 +#: admin/models.py:625 msgid "The domain name" msgstr "O nome do domínio" -#: admin/models.py:610 +#: admin/models.py:627 msgid "Default quota in MB applied to mailboxes" msgstr "Quota em MB aplicada por defeito às caixas de correio" -#: admin/models.py:613 admin/models.py:740 admin/models.py:1020 -#: admin/models.py:1181 extensions/postfix_autoreply/models.py:19 +#: admin/models.py:630 admin/models.py:753 admin/models.py:1045 +#: admin/models.py:1217 extensions/postfix_autoreply/models.py:27 msgid "enabled" msgstr "ativo" -#: admin/models.py:614 +#: admin/models.py:631 msgid "Check to activate this domain" msgstr "Marcar para ativar este domínio" -#: admin/models.py:734 +#: admin/models.py:747 msgid "The alias name" msgstr "O nome do 'alias'" -#: admin/models.py:736 +#: admin/models.py:749 msgid "target" msgstr "alvo" -#: admin/models.py:737 +#: admin/models.py:750 msgid "The domain this alias points to" msgstr "O domínio para o qual este alias irá apontar" -#: admin/models.py:741 admin/models.py:1021 +#: admin/models.py:754 admin/models.py:1046 msgid "Check to activate this alias" msgstr "Marcar para ativar este alias" -#: admin/models.py:788 +#: admin/models.py:801 #, python-format msgid "Unknown domain %s" msgstr "Domínio desconhecido: %s" -#: admin/models.py:805 admin/models.py:1006 +#: admin/models.py:818 admin/models.py:1031 msgid "address" msgstr "endereços" -#: admin/models.py:806 +#: admin/models.py:819 msgid "Mailbox address (without the @domain.tld part)" msgstr "Endereços das caixas de correio (sem a parte @domain.tld)" -#: admin/models.py:852 +#: admin/models.py:877 #, python-format msgid "Failed to retrieve mailbox location (%s)" msgstr "Falha ao recuperar a localização da caixa de correio (%s)" -#: admin/models.py:868 -#, python-format -msgid "Failed to rename mailbox: %s" -msgstr "Falha ao renomear a caixa de correio: %s" - -#: admin/models.py:894 -#, python-format -msgid "Failed to remove mailbox: %s" -msgstr "Falha ao remover a caixa de correio:%s" - -#: admin/models.py:909 +#: admin/models.py:921 #, python-format msgid "Quota is greater than the allowed domain's limit (%dM)" msgstr "A quota excede o limite permitido pelo domínio (%dM)" -#: admin/models.py:914 +#: admin/models.py:926 msgid "A quota is required" msgstr "É necessário uma quota" -#: admin/models.py:1007 +#: admin/models.py:1032 msgid "" -"The alias address (without the domain part). For a 'catch-all' address, just" -" enter an * character." -msgstr "O endereço do alias (sem a parte do domínio). Para um endereço 'cath-all', digite apenas o caractere *" +"The alias address (without the domain part). For a 'catch-all' address, just " +"enter an * character." +msgstr "" +"O endereço do alias (sem a parte do domínio). Para um endereço 'cath-all', " +"digite apenas o caractere *" -#: admin/models.py:1011 +#: admin/models.py:1036 msgid "mailboxes" msgstr "caixas de correio" -#: admin/models.py:1012 +#: admin/models.py:1037 msgid "The mailboxes this alias points to" msgstr "As caixas de correio para onde este alias irá apontar" -#: admin/models.py:1016 +#: admin/models.py:1041 msgid "The aliases this alias points to" msgstr "Este 'aliases' aponta para" -#: admin/models.py:1064 +#: admin/models.py:1089 msgid "distribution list" msgstr "lista de distribuição" -#: admin/models.py:1065 +#: admin/models.py:1090 msgid "forward" msgstr "reencaminhar" -#: admin/models.py:1066 +#: admin/models.py:1091 msgid "alias" msgstr "alias" -#: admin/models.py:1142 +#: admin/models.py:1170 #, python-format msgid "Invalid line: %s" msgstr "Linha inválida: %s" -#: admin/models.py:1167 -#, python-format -msgid "Mailbox %s does not exist" -msgstr "Caixa de correio %s não existe" +#: admin/models.py:1175 +#, fuzzy, python-format +msgid "Domain '%s' does not exist" +msgstr "O domínio não existe" -#: admin/models.py:1182 +#: admin/models.py:1218 msgid "Check to enable this extension" msgstr "Marque para ativar esta extensão" -#: admin/models.py:1282 +#: admin/models.py:1318 msgid "added" msgstr "acrescentado" -#: admin/models.py:1285 +#: admin/models.py:1321 msgid "modified" msgstr "modificado" -#: admin/models.py:1288 +#: admin/models.py:1324 msgid "deleted" msgstr "apagado" -#: admin/models.py:1290 +#: admin/models.py:1326 #, python-format msgid "%(object)s '%(name)s' %(action)s by user %(user)s" msgstr "%(object)s '%(name)s' %(action)s pelo utilizador %(user)s" @@ -631,7 +668,7 @@ msgid "Edit domain" msgstr "Editar domínio" #: admin/tables.py:21 admin/templates/admin/identities_table.html:8 -#: admin/templates/admin/listing.html:17 extensions/sievefilters/views.py:79 +#: admin/templates/admin/listing.html:17 extensions/sievefilters/views.py:83 #: extensions/sievefilters/templates/sievefilters/filter.html:17 #: extensions/sievefilters/templates/sievefilters/guieditor.html:5 #: extensions/webmail/templatetags/webextras.py:97 @@ -646,190 +683,210 @@ msgstr "Versão" msgid "Description" msgstr "Descrição" -#: admin/views.py:87 +#: admin/views.py:88 msgid "New domain" msgstr "Novo domínio" -#: admin/views.py:88 admin/views.py:97 admin/views.py:225 admin/views.py:438 -#: admin/views.py:445 extensions/sievefilters/views.py:120 -#: extensions/sievefilters/views.py:187 extensions/webmail/views.py:131 +#: admin/views.py:89 admin/views.py:98 admin/views.py:228 admin/views.py:444 +#: admin/views.py:451 extensions/sievefilters/views.py:129 +#: extensions/sievefilters/views.py:198 extensions/webmail/views.py:136 msgid "Create" msgstr "Criar" -#: admin/views.py:94 admin/views.py:442 +#: admin/views.py:95 admin/views.py:448 msgid "Next" msgstr "Seguinte" -#: admin/views.py:96 +#: admin/views.py:97 msgid "Options" msgstr "Opções" -#: admin/views.py:98 admin/views.py:446 +#: admin/views.py:99 admin/views.py:452 msgid "Previous" msgstr "Anterior" -#: admin/views.py:111 +#: admin/views.py:112 msgid "Domain created" msgstr "Domínio criado" -#: admin/views.py:144 admin/views.py:282 admin/views.py:492 +#: admin/views.py:146 admin/views.py:285 admin/views.py:498 #: extensions/postfix_autoreply/templates/postfix_autoreply/autoreply.html:9 -#: extensions/sievefilters/views.py:139 extensions/webmail/views.py:162 +#: extensions/sievefilters/views.py:148 extensions/webmail/views.py:168 #: userprefs/templates/userprefs/forward.html:8 #: userprefs/templates/userprefs/profile.html:8 msgid "Update" msgstr "Actualizar" -#: admin/views.py:160 +#: admin/views.py:162 msgid "Domain modified" msgstr "Domínio alterado" -#: admin/views.py:186 +#: admin/views.py:189 msgid "You can't delete your own domain" msgstr "Não é possível eliminar o seu próprio domínio" -#: admin/views.py:189 +#: admin/views.py:192 msgid "Domain deleted" msgid_plural "Domains deleted" msgstr[0] "Domínio criado" msgstr[1] "Domínios eliminados" -#: admin/views.py:204 +#: admin/views.py:207 msgid "Alias with this name already exists" msgstr "Já existe um 'alias' com este nome" -#: admin/views.py:247 +#: admin/views.py:250 msgid "New distribution list" msgstr "Nova lista de distribuição" -#: admin/views.py:248 +#: admin/views.py:251 msgid "Distribution list created" msgstr "A lista de distribuição foi criada" -#: admin/views.py:257 +#: admin/views.py:260 msgid "New alias" msgstr "Novo 'alias'" -#: admin/views.py:258 +#: admin/views.py:261 msgid "Alias created" msgstr "Alias criado" -#: admin/views.py:267 +#: admin/views.py:270 msgid "New forward" msgstr "Novo reencaminhamento" -#: admin/views.py:268 +#: admin/views.py:271 msgid "Forward created" msgstr "Reencaminhamento criado" -#: admin/views.py:286 +#: admin/views.py:289 msgid "Distribution list modified" msgstr "Lista de distribuição modificada" -#: admin/views.py:288 +#: admin/views.py:291 msgid "Forward modified" msgstr "Reencaminhamento modificado" -#: admin/views.py:290 +#: admin/views.py:293 msgid "Alias modified" msgstr "'Alias' modificado" -#: admin/views.py:403 admin/views.py:541 admin/views.py:546 -#: extensions/amavis/views.py:195 extensions/amavis/views.py:201 -#: extensions/amavis/views.py:234 extensions/amavis/views.py:238 -#: extensions/amavis/views.py:240 extensions/webmail/views.py:36 -#: extensions/webmail/views.py:64 extensions/webmail/views.py:77 -#: extensions/webmail/views.py:93 extensions/webmail/views.py:109 -#: extensions/webmail/views.py:193 extensions/webmail/views.py:419 -#: extensions/webmail/views.py:430 extensions/webmail/views.py:457 +#: admin/views.py:402 admin/views.py:545 admin/views.py:550 +#: extensions/amavis/views.py:204 extensions/amavis/views.py:210 +#: extensions/amavis/views.py:243 extensions/amavis/views.py:247 +#: extensions/amavis/views.py:249 extensions/webmail/views.py:41 +#: extensions/webmail/views.py:68 extensions/webmail/views.py:81 +#: extensions/webmail/views.py:98 extensions/webmail/views.py:114 +#: extensions/webmail/views.py:200 extensions/webmail/views.py:427 +#: extensions/webmail/views.py:438 extensions/webmail/views.py:465 #: lib/formutils.py:32 lib/formutils.py:37 msgid "Invalid request" msgstr "Pedido inválido" -#: admin/views.py:435 +#: admin/views.py:441 msgid "New account" msgstr "Nova conta" -#: admin/views.py:459 +#: admin/views.py:465 msgid "Account created" msgstr "Conta criada" -#: admin/views.py:507 +#: admin/views.py:513 msgid "Account updated" msgstr "Conta actualizada" -#: admin/views.py:531 +#: admin/views.py:535 msgid "Account deleted" msgid_plural "Accounts deleted" msgstr[0] "Conta eliminada" msgstr[1] "Contas eliminadas" -#: admin/views.py:586 +#: admin/views.py:590 msgid "Parameters saved" msgstr "Parâmetros salvos" -#: admin/views.py:632 +#: admin/views.py:636 msgid "Modifications applied." msgstr "Alterações efectuadas." -#: admin/views.py:740 +#: admin/views.py:743 #, python-format msgid "Object already exists: %s" msgstr "Este objeto já existe: %s" -#: admin/views.py:742 +#: admin/views.py:745 #, python-format msgid "%d objects imported successfully" msgstr "%d objetos importados com sucesso" -#: admin/views.py:760 +#: admin/views.py:763 msgid "" "Provide a CSV file where lines respect one of the following formats:\n" "
                        \n" -"
                      • account; loginname; password; first name; last name; enabled; group; address[, domain, ...]
                        • \n" +"
                      • account; loginname; password; first name; last name; enabled; group; " +"address[, domain, ...]
                        • \n" "
                      • alias; address; enabled; internal recipient
                        • \n" "
                      • forward; address; enabled; external recipient
                        • \n" "
                      • dlist; address; enabled; recipient; recipient; ...
                        • \n" "
                      \n" -"

                      The first element of each line is mandatory and must be equal to one of the previous values.

                      \n" +"

                      The first element of each line is mandatory and must be equal to one of " +"the previous values.

                      \n" "\n" "

                      You can use a different character as separator.

                      \n" -msgstr "Forneça um ficheiro CSV cujas linhas respeitem um dos seguintes formatos:⏎\n
                        ⏎\n
                      • account; loginname; password; first name; last name; enabled; group; address[, domain, ...]
                        • ⏎\n
                      • alias; address; enabled; internal recipient
                        • ⏎\n
                      • forward; address; enabled; external recipient
                        • ⏎\n
                      • dlist; address; enabled; recipient; recipient; ...
                        • ⏎\n
                      ⏎\n

                      O primeiro elemento de cada linha é obrigatório e deve ser igual a um dos valores anteriores..

                      ⏎\n⏎\n

                      Pode utilizar um caractere diferente como separador.

                      ⏎\n" +msgstr "" +"Forneça um ficheiro CSV cujas linhas respeitem um dos seguintes formatos:⏎\n" +"
                        ⏎\n" +"
                      • account; loginname; password; first name; last name; enabled; group; " +"address[, domain, ...]
                        • ⏎\n" +"
                      • alias; address; enabled; internal recipient
                        • ⏎\n" +"
                      • forward; address; enabled; external recipient
                        • ⏎\n" +"
                      • dlist; address; enabled; recipient; recipient; ...
                        • ⏎\n" +"
                      ⏎\n" +"

                      O primeiro elemento de cada linha é obrigatório e deve ser igual a um dos " +"valores anteriores..

                      ⏎\n" +"⏎\n" +"

                      Pode utilizar um caractere diferente como separador.

                      ⏎\n" -#: admin/views.py:772 +#: admin/views.py:775 msgid "Import identities" msgstr "Importar identidades" -#: admin/views.py:773 admin/views.py:843 admin/templatetags/admin_extras.py:87 +#: admin/views.py:776 admin/views.py:846 admin/templatetags/admin_extras.py:87 #: admin/templatetags/admin_extras.py:144 msgid "Import" msgstr "Importar" -#: admin/views.py:803 +#: admin/views.py:806 msgid "Export identities" msgstr "Exportar identidades" -#: admin/views.py:804 admin/views.py:860 admin/templatetags/admin_extras.py:93 +#: admin/views.py:807 admin/views.py:863 admin/templatetags/admin_extras.py:93 #: admin/templatetags/admin_extras.py:150 msgid "Export" msgstr "Exportar" -#: admin/views.py:832 +#: admin/views.py:835 msgid "" "Provide a CSV file where lines respect one of the following formats:\n" "
                        \n" "
                      • domain; name; quota; enabled
                        • \n" "
                      • domainalias; name; targeted domain; enabled
                        • \n" "
                      \n" -"

                      The first element of each line is mandatory and must be equal to one of the previous values.

                      \n" +"

                      The first element of each line is mandatory and must be equal to one of " +"the previous values.

                      \n" "

                      You can use a different character as separator.

                      \n" -msgstr "Forneça um ficheiro CSV cujas linhas respeitem um dos seguintes formatos:⏎
                        ⏎
                      • domain; name; quota; enabled
                        • ⏎
                      • domainalias; name; targeted domain; enabled
                        • ⏎
                      ⏎

                      O primeiro elemento de cada linha é obrigatório e deve ser igual a um dos valores anteriores.

                      ⏎

                      Pode utilizar um caractere diferente como separador.

                      ⏎\n" +msgstr "" +"Forneça um ficheiro CSV cujas linhas respeitem um dos seguintes formatos:⏎ " +"
                        ⏎
                      • domain; name; quota; enabled
                        • ⏎
                      • domainalias; " +"name; targeted domain; enabled
                        • ⏎
                      ⏎

                      O primeiro elemento de " +"cada linha é obrigatório e deve ser igual a um dos valores anteriores.

                      ⏎ " +"

                      Pode utilizar um caractere diferente como separador.

                      ⏎\n" -#: admin/views.py:842 +#: admin/views.py:845 msgid "Import domains" msgstr "Importar domínios" -#: admin/views.py:859 +#: admin/views.py:862 msgid "Export domains" msgstr "Exportar domínios" @@ -902,7 +959,7 @@ msgid "Tags" msgstr "Tags" #: admin/templates/admin/importform.html:5 -#: admin/templatetags/admin_extras.py:305 +#: admin/templatetags/admin_extras.py:290 msgid "Help" msgstr "Ajuda" @@ -949,7 +1006,7 @@ msgid "Previously on Modoboa..." msgstr "Anteriormente no Modoboa..." #: admin/templates/admin/logs.html:6 extensions/amavis/sql_listing.py:25 -#: extensions/webmail/lib.py:37 extensions/webmail/lib.py:406 +#: extensions/webmail/lib.py:38 extensions/webmail/lib.py:411 msgid "Date" msgstr "Data" @@ -1052,34 +1109,21 @@ msgid "View the domain's identities" msgstr "Visualizar as identidades do domínio" #: admin/templatetags/admin_extras.py:178 -msgid "Delete the domain" -msgstr "Apagar o domínio" - #: admin/templatetags/admin_extras.py:194 -msgid "Delete this account" -msgstr "Apagar esta conta" +#: admin/templatetags/admin_extras.py:201 +#, fuzzy, python-format +msgid "Delete %s?" +msgstr "Eliminar" -#: admin/templatetags/admin_extras.py:202 -msgid "Delete this distribution list" -msgstr "Apagar esta lista de distribuição" - -#: admin/templatetags/admin_extras.py:209 -msgid "Delete this forward" -msgstr "Apagar este reencaminhamento" - -#: admin/templatetags/admin_extras.py:216 -msgid "Delete this alias" -msgstr "Apagar este 'alias'" - -#: admin/templatetags/admin_extras.py:238 +#: admin/templatetags/admin_extras.py:223 msgid "Remove this permission" msgstr "Remover esta permissão" -#: admin/templatetags/admin_extras.py:279 lib/formutils.py:206 +#: admin/templatetags/admin_extras.py:264 lib/formutils.py:206 msgid "Yes" msgstr "Sim" -#: admin/templatetags/admin_extras.py:279 lib/formutils.py:206 +#: admin/templatetags/admin_extras.py:264 lib/formutils.py:206 msgid "No" msgstr "Não" @@ -1088,11 +1132,11 @@ msgstr "Não" msgid "User '%s' successfully logged in" msgstr "O utilizador '%s' fez login com sucesso" -#: auth/views.py:41 +#: auth/views.py:44 msgid "Your username and password didn't match. Please try again." msgstr "O seu nome de utilizador" -#: auth/views.py:64 +#: auth/views.py:67 #, python-format msgid "User '%s' logged out" msgstr "O utilizador '%s' fez logout" @@ -1118,15 +1162,31 @@ msgid "" "\n" "

                      Welcome to the online demo!

                      \n" "

                      Warning: the demo's concent is resetted every two hours.

                      \n" -"

                      To try the demo, the following users are available (username/password):

                      \n" +"

                      To try the demo, the following users are available (username/password):

                      \n" "
                        \n" "
                      • A super administrator : admin/password
                        • \n" "
                      • A domain administrator : admin@demo.local/admin
                        • \n" "
                      • A simple user : user@demo.local/user
                        • \n" "
                      \n" "

                      Please report any issue or give any suggestion to \n" -" the mailing list.

                      \n" -msgstr "\n

                      Bem-vindo à demo online!

                      \n

                      Aviso: os conteúdos desta demo são limpos a cada duas horas.

                      \n

                      Para experimentar a demo, estão disponíveis os seguintes utilizadores (username/password):

                      \n
                        \n
                      • Super administrador: admin/password
                        • \n
                      • Administrador de domínio: admin@demo.local/admin
                        • \n
                      • Utilizador básico: user@demo.local/user
                        • \n
                      \n

                      Para reportar qualquer problema ou apresentar uma sugestão, utilize o seguinte link \n mailing list.

                      \n" +" the " +"mailing list.

                      \n" +msgstr "" +"\n" +"

                      Bem-vindo à demo online!

                      \n" +"

                      Aviso: os conteúdos desta demo são limpos a cada duas horas.

                      \n" +"

                      Para experimentar a demo, estão disponíveis os seguintes utilizadores " +"(username/password):

                      \n" +"
                        \n" +"
                      • Super administrador: admin/password
                        • \n" +"
                      • Administrador de domínio: admin@demo.local/admin
                        • \n" +"
                      • Utilizador básico: user@demo.local/user
                        • \n" +"
                      \n" +"

                      Para reportar qualquer problema ou apresentar uma sugestão, utilize o " +"seguinte link \n" +" mailing " +"list.

                      \n" #: extensions/amavis/__init__.py:22 msgid "Simple amavis management frontend" @@ -1136,16 +1196,16 @@ msgstr "Interface de gestão básica do amavis" msgid "Quarantine" msgstr "Quarentena" -#: extensions/amavis/__init__.py:127 +#: extensions/amavis/__init__.py:129 msgid "pending requests" msgstr "pedidos pendentes" -#: extensions/amavis/__init__.py:144 +#: extensions/amavis/__init__.py:149 #, python-format msgid "%d pending requests" msgstr "%d pedidos pendentes" -#: extensions/amavis/__init__.py:156 +#: extensions/amavis/__init__.py:161 msgid "Content filter" msgstr "Filtro de conteúdo" @@ -1159,7 +1219,9 @@ msgstr "Idade maxima da messagem" #: extensions/amavis/app_settings.py:16 msgid "Quarantine messages maximum age (in days) before deletion" -msgstr "Tempo máximo que as mensagens ficam na quarentena (em dias) até serem eliminadas" +msgstr "" +"Tempo máximo que as mensagens ficam na quarentena (em dias) até serem " +"eliminadas" #: extensions/amavis/app_settings.py:19 msgid "Messages releasing" @@ -1171,7 +1233,9 @@ msgstr "Remover mensagens libertadas" #: extensions/amavis/app_settings.py:24 msgid "Remove messages marked as released while cleaning up the database" -msgstr "Remova as mensagens, marcadas como enviadas, durante a limpeza da base de dados" +msgstr "" +"Remova as mensagens, marcadas como enviadas, durante a limpeza da base de " +"dados" #: extensions/amavis/app_settings.py:28 msgid "Amavis connection mode" @@ -1260,12 +1324,12 @@ msgid "Virus filter" msgstr "Filtro de vírus" #: extensions/amavis/models.py:94 extensions/amavis/models.py:102 -#: extensions/amavis/models.py:110 extensions/sievefilters/views.py:268 +#: extensions/amavis/models.py:110 extensions/sievefilters/views.py:281 msgid "yes" msgstr "sim" #: extensions/amavis/models.py:95 extensions/amavis/models.py:103 -#: extensions/amavis/models.py:111 extensions/sievefilters/views.py:272 +#: extensions/amavis/models.py:111 extensions/sievefilters/views.py:285 msgid "no" msgstr "não" @@ -1277,7 +1341,9 @@ msgstr "predifinido" #: extensions/amavis/models.py:98 msgid "Bypass virus checks or not. Choose 'default' to use global settings." -msgstr "Ignorar a verificação de vírus ou não. Escolher 'predefinido' para utilizar as definições gerais." +msgstr "" +"Ignorar a verificação de vírus ou não. Escolher 'predefinido' para utilizar " +"as definições gerais." #: extensions/amavis/models.py:101 msgid "Spam filter" @@ -1285,7 +1351,9 @@ msgstr "Filtro de spam" #: extensions/amavis/models.py:106 msgid "Bypass spam checks or not. Choose 'default' to use global settings." -msgstr "Ignorar filtros de spam ou não. Escolher 'predefinido' para utilizar as definições gerais." +msgstr "" +"Ignorar filtros de spam ou não. Escolher 'predefinido' para utilizar as " +"definições gerais." #: extensions/amavis/models.py:109 msgid "Banned filter" @@ -1293,7 +1361,9 @@ msgstr "Ficheiros proibidos" #: extensions/amavis/models.py:114 msgid "Bypass banned checks or not. Choose 'default' to use global settings." -msgstr "Ignorar a verificação de ficheiros proibidos. Escolher 'predefinido' para utilizar as definições gerais." +msgstr "" +"Ignorar a verificação de ficheiros proibidos. Escolher 'predefinido' para " +"utilizar as definições gerais." #: extensions/amavis/models.py:144 msgid "Spam marker" @@ -1301,17 +1371,19 @@ msgstr "Marcador spam" #: extensions/amavis/models.py:146 msgid "" -"Modify spam subject using the specified text. Choose 'default' to use global" -" settings." -msgstr "Modifique o assunto de spam usando o texto especificado. Escolha 'default' para usar as configurações globais." +"Modify spam subject using the specified text. Choose 'default' to use global " +"settings." +msgstr "" +"Modifique o assunto de spam usando o texto especificado. Escolha 'default' " +"para usar as configurações globais." -#: extensions/amavis/sql_listing.py:23 extensions/webmail/lib.py:36 +#: extensions/amavis/sql_listing.py:23 extensions/webmail/lib.py:37 msgid "From" msgstr "De" #: extensions/amavis/sql_listing.py:24 extensions/sievefilters/forms.py:68 -#: extensions/webmail/forms.py:10 extensions/webmail/lib.py:35 -#: extensions/webmail/lib.py:404 templates/common/email_searchbar.html:6 +#: extensions/webmail/forms.py:10 extensions/webmail/lib.py:36 +#: extensions/webmail/lib.py:409 templates/common/email_searchbar.html:6 msgid "Subject" msgstr "Assunto" @@ -1321,37 +1393,37 @@ msgstr "Assunto" msgid "To" msgstr "Para" -#: extensions/amavis/views.py:34 +#: extensions/amavis/views.py:43 msgid "Empty quarantine" msgstr "Quarentena vazia" -#: extensions/amavis/views.py:202 +#: extensions/amavis/views.py:211 msgid "Message deleted" msgstr "Mensagem apagada" -#: extensions/amavis/views.py:223 +#: extensions/amavis/views.py:232 #, python-format msgid "%(count)d message deleted successfully" msgid_plural "%(count)d messages deleted successfully" msgstr[0] "%(count)d mensagem eliminada com sucesso" msgstr[1] "%(count)d mensagens eliminadas com sucesso" -#: extensions/amavis/views.py:243 +#: extensions/amavis/views.py:252 msgid "Request sent" msgstr "Pedido enviado" -#: extensions/amavis/views.py:249 +#: extensions/amavis/views.py:258 msgid "Message released" msgstr "Mensagem libertada" -#: extensions/amavis/views.py:271 +#: extensions/amavis/views.py:280 #, python-format msgid "%(count)d request sent" msgid_plural "%(count)d requests sent" msgstr[0] "%(count)d pedido enviado" msgstr[1] "%(count)d pedidos enviados" -#: extensions/amavis/views.py:295 +#: extensions/amavis/views.py:304 #, python-format msgid "%(count)d message released successfully" msgid_plural "%(count)d messages released successfully" @@ -1386,8 +1458,12 @@ msgid "" msgid_plural "" "\n" "%(counter)s release requests are pending for action.\n" -msgstr[0] "\n%(counter)s pedido de libertação pendente\n" -msgstr[1] "\n%(counter)s pedidos de libertação pendentes\n" +msgstr[0] "" +"\n" +"%(counter)s pedido de libertação pendente\n" +msgstr[1] "" +"\n" +"%(counter)s pedidos de libertação pendentes\n" #: extensions/amavis/templates/amavis/notifications/pending_requests.html:6 msgid "Sketch:" @@ -1472,7 +1548,7 @@ msgstr "Limites" msgid "Reseller" msgstr "Revendedor" -#: extensions/limits/__init__.py:96 +#: extensions/limits/__init__.py:94 msgid "Resources" msgstr "Recursos" @@ -1486,9 +1562,10 @@ msgid "Domain admins" msgstr "Administradores de domínio" #: extensions/limits/app_settings.py:15 -msgid "" -"Maximum number of allowed domain administrators for a new administrator" -msgstr "Número máximo permitido de administradores de domínio para um novo administrador" +msgid "Maximum number of allowed domain administrators for a new administrator" +msgstr "" +"Número máximo permitido de administradores de domínio para um novo " +"administrador" #: extensions/limits/app_settings.py:21 msgid "Maximum number of allowed domains for a new administrator" @@ -1496,7 +1573,8 @@ msgstr "Número máximo permitido de domínios para novo administrador" #: extensions/limits/app_settings.py:27 msgid "Maximum number of allowed domain aliases for a new administrator" -msgstr "Número máximo permitido de aliases de domínio para um novo administrador" +msgstr "" +"Número máximo permitido de aliases de domínio para um novo administrador" #: extensions/limits/app_settings.py:33 msgid "Maximum number of allowed mailboxes for a new administrator" @@ -1508,7 +1586,8 @@ msgstr "Número máximo de aliases permitidas para um novo administrador" #: extensions/limits/forms.py:13 msgid "Maximum number of domain administrators this user can create" -msgstr "Número máximo de administradores de domínio que este utilizador pode criar" +msgstr "" +"Número máximo de administradores de domínio que este utilizador pode criar" #: extensions/limits/forms.py:17 msgid "Maximum number of domains this user can create" @@ -1524,7 +1603,8 @@ msgstr "Número máximo de caixas de correio que este utilizador por criar" #: extensions/limits/forms.py:29 msgid "Maximum number of mailbox aliases this user can create" -msgstr "Número máximo de aliases para caixas de correio que este utilizador por criar" +msgstr "" +"Número máximo de aliases para caixas de correio que este utilizador por criar" #: extensions/limits/forms.py:46 msgid "Invalid limit" @@ -1578,7 +1658,9 @@ msgstr "Tempo limite de resposta automática" #: extensions/postfix_autoreply/app_settings.py:16 msgid "Timeout in seconds between two auto-replies to the same recipient" -msgstr "Tempo limite em segundos entre duas respostas automáticas para o mesmo destinatário" +msgstr "" +"Tempo limite em segundos entre duas respostas automáticas para o mesmo " +"destinatário" #: extensions/postfix_autoreply/forms.py:9 msgid "Until" @@ -1592,23 +1674,23 @@ msgstr "Ativar o seu aviso de ausência até esta data" msgid "This date is over" msgstr "Esta data ultrapassa" -#: extensions/postfix_autoreply/models.py:15 +#: extensions/postfix_autoreply/models.py:19 msgid "subject" msgstr "assunto" -#: extensions/postfix_autoreply/models.py:16 +#: extensions/postfix_autoreply/models.py:20 msgid "The subject that will appear in sent emails" msgstr "O assunto que irá constar nos e-mails enviados" -#: extensions/postfix_autoreply/models.py:17 +#: extensions/postfix_autoreply/models.py:23 msgid "content" msgstr "conteúdo" -#: extensions/postfix_autoreply/models.py:18 +#: extensions/postfix_autoreply/models.py:24 msgid "The content that will appear in sent emails" msgstr "O conteúdo que irá constar nos e-mails enviados" -#: extensions/postfix_autoreply/models.py:20 +#: extensions/postfix_autoreply/models.py:28 msgid "Activate/Deactivate your auto reply" msgstr "Ativar/desativar repostas automáticas" @@ -1742,53 +1824,53 @@ msgstr "Ligação ao servidor MANAGESIEVE falhou, valide a configuração" msgid "Not enough space on server" msgstr "Espaço insuficiente no servidor" -#: extensions/sievefilters/views.py:64 +#: extensions/sievefilters/views.py:68 msgid "Failed to retrieve filters set" msgstr "Falha ao recuperar os filtros definidos" -#: extensions/sievefilters/views.py:117 +#: extensions/sievefilters/views.py:126 #: extensions/sievefilters/templatetags/sfilters_tags.py:33 msgid "New filter" msgstr "Novo filtro" -#: extensions/sievefilters/views.py:124 +#: extensions/sievefilters/views.py:133 msgid "Filter created" msgstr "Filtro criado" -#: extensions/sievefilters/views.py:136 +#: extensions/sievefilters/views.py:145 #: extensions/sievefilters/templatetags/sfilters_tags.py:77 msgid "Edit filter" msgstr "Editar filtro" -#: extensions/sievefilters/views.py:145 +#: extensions/sievefilters/views.py:154 msgid "Filter modified" msgstr "Filtro modificado" -#: extensions/sievefilters/views.py:165 +#: extensions/sievefilters/views.py:176 msgid "Filter removed" msgstr "Filtro removido" -#: extensions/sievefilters/views.py:166 +#: extensions/sievefilters/views.py:177 msgid "Failed to remove filter" msgstr "Falha ao remover filtro" -#: extensions/sievefilters/views.py:180 +#: extensions/sievefilters/views.py:191 msgid "Filters set saved" msgstr "Grupo de filtros guardado" -#: extensions/sievefilters/views.py:185 +#: extensions/sievefilters/views.py:196 msgid "Create a new filters set" msgstr "Criar novo grupo de filtros" -#: extensions/sievefilters/views.py:208 +#: extensions/sievefilters/views.py:219 msgid "Filters set created" msgstr "Grupo de filtros criado" -#: extensions/sievefilters/views.py:229 +#: extensions/sievefilters/views.py:240 msgid "Filters set deleted" msgstr "Grupo de filtros eliminado" -#: extensions/sievefilters/views.py:241 +#: extensions/sievefilters/views.py:252 msgid "Filters set activated" msgstr "Grupo de filtros ativado" @@ -1804,18 +1886,19 @@ msgstr "Ativo" msgid "No filter defined yet" msgstr "Ainda não existe nenhum filtro definido" -#: extensions/sievefilters/templates/sievefilters/index.html:55 +#: extensions/sievefilters/templates/sievefilters/index.html:56 msgid "Filter sets" msgstr "Grupos de filtros" -#: extensions/sievefilters/templates/sievefilters/index.html:59 +#: extensions/sievefilters/templates/sievefilters/index.html:60 msgid "active" msgstr "ativo" -#: extensions/sievefilters/templates/sievefilters/index.html:73 +#: extensions/sievefilters/templates/sievefilters/index.html:74 msgid "" "No filters set defined yet. You must create one in order to define filters." -msgstr "Não existem grupos de filtros. Terá de criar um para poder definir filtros." +msgstr "" +"Não existem grupos de filtros. Terá de criar um para poder definir filtros." #: extensions/sievefilters/templatetags/sfilters_tags.py:16 msgid "New filters set" @@ -2127,84 +2210,89 @@ msgstr "Resposta do servidor" msgid "Cci" msgstr "Cci" -#: extensions/webmail/imaputils.py:259 +#: extensions/webmail/imaputils.py:237 +#, fuzzy +msgid "Failed to retrieve hierarchy delimiter" +msgstr "Falha ao recuperar os filtros definidos" + +#: extensions/webmail/imaputils.py:278 #, python-format msgid "Connection to IMAP server failed: %s" msgstr "A ligação ao servidor IMAP falhou: %s" -#: extensions/webmail/lib.py:353 +#: extensions/webmail/lib.py:358 msgid "wrote:" msgstr "escreveu:" -#: extensions/webmail/lib.py:418 extensions/webmail/lib.py:422 +#: extensions/webmail/lib.py:423 extensions/webmail/lib.py:427 msgid "Original message" msgstr "Mensagem original" -#: extensions/webmail/views.py:81 +#: extensions/webmail/views.py:86 #, python-format msgid "%(count)d message deleted" msgid_plural "%(count)d messages deleted" msgstr[0] "%(count)d mensagens eliminadas" msgstr[1] "%(count)d mensagens eliminadas" -#: extensions/webmail/views.py:98 +#: extensions/webmail/views.py:103 msgid "Unknown action" msgstr "Acção desconhecida" -#: extensions/webmail/views.py:111 lib/email_listing.py:137 +#: extensions/webmail/views.py:116 lib/email_listing.py:137 msgid "Empty mailbox" msgstr "Caixa de correio vazia" -#: extensions/webmail/views.py:128 -#: extensions/webmail/templatetags/webextras.py:169 +#: extensions/webmail/views.py:133 +#: extensions/webmail/templatetags/webextras.py:170 msgid "Create a new mailbox" msgstr "Criar nova caixa de correio" -#: extensions/webmail/views.py:143 +#: extensions/webmail/views.py:149 msgid "Mailbox created" msgstr "Caixa de correio criada" -#: extensions/webmail/views.py:159 +#: extensions/webmail/views.py:165 msgid "Edit mailbox" msgstr "Editar caixa de correio" -#: extensions/webmail/views.py:173 +#: extensions/webmail/views.py:180 msgid "Mailbox updated" msgstr "Caixa de correio actualizada" -#: extensions/webmail/views.py:207 extensions/webmail/views.py:388 -#: extensions/webmail/views.py:497 +#: extensions/webmail/views.py:214 extensions/webmail/views.py:396 +#: extensions/webmail/views.py:505 msgid "Bad request" msgstr "Pedido inválido" -#: extensions/webmail/views.py:238 +#: extensions/webmail/views.py:246 msgid "Failed to save attachment: " msgstr "Falha ao salvar o anexo:" -#: extensions/webmail/views.py:241 +#: extensions/webmail/views.py:249 #, python-format msgid "Attachment is too big (limit: %s)" msgstr "Anexo demasiado grande (limite %s)" -#: extensions/webmail/views.py:247 +#: extensions/webmail/views.py:255 #: extensions/webmail/templates/webmail/compose.html:15 #: extensions/webmail/templates/webmail/headers.html:4 msgid "Attachments" msgstr "Anexos" -#: extensions/webmail/views.py:263 +#: extensions/webmail/views.py:271 msgid "Bad query" msgstr "Pesquisa inválida" -#: extensions/webmail/views.py:273 +#: extensions/webmail/views.py:281 msgid "Failed to remove attachment: " msgstr "Falha ao remover os anexos:" -#: extensions/webmail/views.py:278 +#: extensions/webmail/views.py:286 msgid "Unknown attachment" msgstr "Anexo desconhecido" -#: extensions/webmail/views.py:493 +#: extensions/webmail/views.py:501 msgid "Undefined action" msgstr "Ação indefinida" @@ -2235,7 +2323,7 @@ msgstr[1] "%(counter)s ficheiros" msgid "Parent mailbox" msgstr "Caixa de correio principal" -#: extensions/webmail/templates/webmail/index.html:36 +#: extensions/webmail/templates/webmail/index.html:38 msgid "Mailbox quota" msgstr "Quota da caixa de correio" @@ -2297,15 +2385,15 @@ msgstr "Como não lidas" msgid "Compress folder" msgstr "Comprimir pasta" -#: extensions/webmail/templatetags/webextras.py:109 +#: extensions/webmail/templatetags/webextras.py:110 msgid "Empty folder" msgstr "Esvaziar pasta" -#: extensions/webmail/templatetags/webextras.py:177 +#: extensions/webmail/templatetags/webextras.py:178 msgid "Edit the selected mailbox" msgstr "Editar caixa de correio selecionada" -#: extensions/webmail/templatetags/webextras.py:182 +#: extensions/webmail/templatetags/webextras.py:183 msgid "Remove the selected mailbox" msgstr "Eliminar caixa de correio selecionada" @@ -2359,7 +2447,7 @@ msgstr "A página solicitada não existe." msgid "An internal error occured." msgstr "Ocorreu um erro interno." -#: templates/nlayout.html:56 +#: templates/nlayout.html:62 msgid "Powered by Modoboa" msgstr "Powered by Modoboa" @@ -2393,11 +2481,11 @@ msgstr "Fechar" msgid "Welcome to Modoboa" msgstr "Benvindo ao Modoboa" -#: templates/registration/login.html:33 +#: templates/registration/login.html:34 msgid "Remember me" msgstr "Lembrar-me" -#: templates/registration/login.html:35 +#: templates/registration/login.html:36 msgid "Log in" msgstr "Entrar" @@ -2413,7 +2501,7 @@ msgstr "Configurações por usuário" msgid "Prefered language" msgstr "Idioma preferido" -#: userprefs/app_settings.py:26 +#: userprefs/app_settings.py:27 msgid "Prefered language to display pages" msgstr "Idioma preferido para exibir páginas" @@ -2447,13 +2535,16 @@ msgstr "Conservar cópias locais" #: userprefs/forms.py:67 msgid "Forward messages and store copies into your local mailbox" -msgstr "Reencaminhar mensagens e armazenar cópias na sua caixa de correio local" +msgstr "" +"Reencaminhar mensagens e armazenar cópias na sua caixa de correio local" #: userprefs/forms.py:84 msgid "" "You can't define a forward to a local destination. Please ask your " "administrator to create an alias instead." -msgstr "Não é possível definir um reencaminhamento para um destino local. Por favor informe-se junto de um administrador para criar um alias." +msgstr "" +"Não é possível definir um reencaminhamento para um destino local. Por favor " +"informe-se junto de um administrador para criar um alias." #: userprefs/views.py:32 msgid "You need a mailbox in order to define a forward" @@ -2501,3 +2592,27 @@ msgstr "Atualizar o sua informação pessoal" #: userprefs/templatetags/uprefs_extras.py:57 msgid "Logout" msgstr "Sair" + +#~ msgid "Failed to rename mailbox: %s" +#~ msgstr "Falha ao renomear a caixa de correio: %s" + +#~ msgid "Failed to remove mailbox: %s" +#~ msgstr "Falha ao remover a caixa de correio:%s" + +#~ msgid "Mailbox %s does not exist" +#~ msgstr "Caixa de correio %s não existe" + +#~ msgid "Delete the domain" +#~ msgstr "Apagar o domínio" + +#~ msgid "Delete this account" +#~ msgstr "Apagar esta conta" + +#~ msgid "Delete this distribution list" +#~ msgstr "Apagar esta lista de distribuição" + +#~ msgid "Delete this forward" +#~ msgstr "Apagar este reencaminhamento" + +#~ msgid "Delete this alias" +#~ msgstr "Apagar este 'alias'" diff --git a/modoboa/locale/sv/LC_MESSAGES/django.po b/modoboa/locale/sv/LC_MESSAGES/django.po index f8a7c0833..7d8e66cac 100644 --- a/modoboa/locale/sv/LC_MESSAGES/django.po +++ b/modoboa/locale/sv/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Modoboa\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-01 16:40+0200\n" +"POT-Creation-Date: 2013-09-20 22:30+0200\n" "PO-Revision-Date: 2013-06-01 14:36+0000\n" "Last-Translator: Antoine Nguyen \n" "Language-Team: Swedish (http://www.transifex.com/projects/p/modoboa/language/" @@ -27,8 +27,8 @@ msgstr "Administrerings konsoll" msgid "Web based console to manage domains, accounts and aliases" msgstr "Webbaserad konsoll för att hantera domäner, konton och alias" -#: admin/__init__.py:16 admin/forms.py:179 admin/forms.py:614 -#: admin/views.py:93 admin/views.py:441 +#: admin/__init__.py:16 admin/forms.py:211 admin/forms.py:652 +#: admin/views.py:94 admin/views.py:447 #: extensions/postfix_autoreply/app_settings.py:11 #: extensions/sievefilters/app_settings.py:50 #: extensions/stats/app_settings.py:11 extensions/webmail/app_settings.py:11 @@ -247,15 +247,24 @@ msgstr "Standard topp omdirigering" msgid "The default redirection used when no application is specified" msgstr "Standard omdirigering när ingen applikation angetts" -#: admin/app_settings.py:230 +#: admin/app_settings.py:213 +msgid "Key must be either 16, 24, or 32 bytes long" +msgstr "" + +#: admin/app_settings.py:222 +#, fuzzy +msgid "Invalid syntax" +msgstr "Ogiltig rad" + +#: admin/app_settings.py:245 msgid "This field is required" msgstr "Detta fält är obligatoriskt" -#: admin/forms.py:16 admin/forms.py:459 admin/tables.py:18 +#: admin/forms.py:20 admin/forms.py:497 admin/tables.py:18 msgid "Alias(es)" msgstr "Alias" -#: admin/forms.py:18 +#: admin/forms.py:22 msgid "" "Alias(es) of this domain. Indicate only one name per input, press ENTER to " "add a new input." @@ -263,23 +272,23 @@ msgstr "" "Alias för denna domän. Ange endast ett namn per rad, tryck ENTER för att " "lägga till en rad." -#: admin/forms.py:55 +#: admin/forms.py:59 msgid "An alias with this name already exists" msgstr "Ett alias med detta namn finns redan" -#: admin/forms.py:69 +#: admin/forms.py:73 msgid "A domain with this name already exists" msgstr "En domän med detta namn existerar redan" -#: admin/forms.py:114 +#: admin/forms.py:146 msgid "Create a domain administrator" msgstr "Skapa en domän administratör" -#: admin/forms.py:116 +#: admin/forms.py:148 msgid "Automatically create an administrator for this domain" msgstr "Skapa en domän administratör automatiskt för denna domän" -#: admin/forms.py:120 admin/tables.py:12 admin/tables.py:47 +#: admin/forms.py:152 admin/tables.py:12 admin/tables.py:47 #: admin/templates/admin/editdomainform.html:13 #: admin/templates/admin/identities_table.html:5 #: admin/templates/admin/information.html:8 @@ -288,7 +297,7 @@ msgstr "Skapa en domän administratör automatiskt för denna domän" msgid "Name" msgstr "Namn" -#: admin/forms.py:122 +#: admin/forms.py:154 msgid "" "The administrator's name. Don't include the domain's name here, it will be " "automatically appended." @@ -296,28 +305,28 @@ msgstr "" "Administratörens namn. Inkludera inte domänens namn här, den kommer att " "läggas till automatiskt." -#: admin/forms.py:128 +#: admin/forms.py:160 msgid "Create aliases" msgstr "Skapa alias." -#: admin/forms.py:130 +#: admin/forms.py:162 msgid "Automatically create standard aliases for this domain" msgstr "Skapa automatiskt standard alias för den här domänen" -#: admin/forms.py:143 +#: admin/forms.py:175 msgid "Invalid format" msgstr "Ogiltigt format" -#: admin/forms.py:155 +#: admin/forms.py:187 #, python-format msgid "User '%s' already exists" msgstr "Användare '%s' finns redan" -#: admin/forms.py:203 +#: admin/forms.py:235 msgid "Email address" msgstr "E-post adress" -#: admin/forms.py:204 +#: admin/forms.py:236 msgid "" "The distribution list address. Use the '*' character to create a 'catchall' " "address (ex: *@domain.tld)." @@ -325,11 +334,11 @@ msgstr "" "Distributionslistans adress. Använd '*' för att skapa en 'catchall' adress " "(ex: *@domain.tld)." -#: admin/forms.py:207 +#: admin/forms.py:239 msgid "Recipients" msgstr "Mottagare" -#: admin/forms.py:208 +#: admin/forms.py:240 msgid "" "Mailbox(es) this alias will point to. Indicate only one address per input, " "press ENTER to add a new input." @@ -337,111 +346,110 @@ msgstr "" "Brevlåda/or detta alias kommer att peka på. Ange endast en adress per " "inlägg, tryck ENTER för att lägga till en ny inlägg." -#: admin/forms.py:246 admin/forms.py:504 admin/forms.py:530 -#: admin/models.py:1147 +#: admin/forms.py:278 admin/forms.py:542 admin/forms.py:568 msgid "Domain does not exist" msgstr "Domän existerar inte" -#: admin/forms.py:248 +#: admin/forms.py:280 msgid "You don't have access to this domain" msgstr "Du har inte åtkomst till denna domän" -#: admin/forms.py:268 +#: admin/forms.py:300 msgid "Invalid mailbox" msgstr "Ogiltig brevlåda" -#: admin/forms.py:284 +#: admin/forms.py:316 admin/models.py:1202 #, python-format msgid "Local recipient %s not found" msgstr "Lokal mottagare %s kunde inte hittas" -#: admin/forms.py:286 admin/forms.py:292 +#: admin/forms.py:318 admin/forms.py:324 #, python-format msgid "Recipient %s already present" msgstr "Mottagare %s finns redan" -#: admin/forms.py:297 +#: admin/forms.py:329 msgid "No recipient defined" msgstr "Ingen mottagare definierad" -#: admin/forms.py:311 extensions/webmail/forms.py:19 +#: admin/forms.py:343 extensions/webmail/forms.py:19 msgid "Select a file" msgstr "Välj en fil" -#: admin/forms.py:313 admin/forms.py:341 +#: admin/forms.py:345 admin/forms.py:373 msgid "Separator" msgstr "Separator" -#: admin/forms.py:316 +#: admin/forms.py:348 msgid "Continue on error" msgstr "Fortsätt vid fel" -#: admin/forms.py:317 +#: admin/forms.py:349 msgid "Don't treat duplicated objects as error" msgstr "Behandla inte duplicerade objekt som fel" -#: admin/forms.py:332 +#: admin/forms.py:364 msgid "Crypt passwords" msgstr "Krypterade lösenord" -#: admin/forms.py:333 +#: admin/forms.py:365 msgid "Check this option if passwords contained in your file are not crypted" msgstr "Markera det här alternativet om lösenord i filen inte är krypterad" -#: admin/forms.py:339 +#: admin/forms.py:371 msgid "File name" msgstr "Filnamn" -#: admin/forms.py:371 admin/templates/admin/editdomainform.html:13 +#: admin/forms.py:403 admin/templates/admin/editdomainform.html:13 #: auth/forms.py:7 msgid "Username" msgstr "Användarnamn" -#: admin/forms.py:373 +#: admin/forms.py:405 msgid "Role" msgstr "Roll" -#: admin/forms.py:374 admin/forms.py:401 +#: admin/forms.py:406 admin/forms.py:433 msgid "Choose" msgstr "Välj" -#: admin/forms.py:375 +#: admin/forms.py:407 msgid "What level of permission this user will have" msgstr "Vilken nivå av behörighet den här användaren har" -#: admin/forms.py:377 auth/forms.py:11 +#: admin/forms.py:409 auth/forms.py:11 msgid "Password" msgstr "Lösenord" -#: admin/forms.py:379 userprefs/forms.py:18 +#: admin/forms.py:411 userprefs/forms.py:18 msgid "Confirmation" msgstr "Bekräftelse" -#: admin/forms.py:381 +#: admin/forms.py:413 msgid "Enter the same password as above, for verification." msgstr "Ange samma lösenord som ovan för verifiering." -#: admin/forms.py:392 +#: admin/forms.py:424 msgid "Enabled" msgstr "Aktiverad" -#: admin/forms.py:434 +#: admin/forms.py:471 msgid "The two password fields didn't match." msgstr "Dessa två lösnordsfält matchar inte." -#: admin/forms.py:440 +#: admin/forms.py:477 msgid "You can't disable your own account" msgstr "Du kan inte inaktivera ditt eget konto" -#: admin/forms.py:450 +#: admin/forms.py:488 msgid "E-mail" msgstr "E-post" -#: admin/forms.py:452 +#: admin/forms.py:490 msgid "Quota" msgstr "Kvota" -#: admin/forms.py:454 +#: admin/forms.py:492 msgid "" "Quota in MB for this mailbox. Define a custom value or use domain's default " "one. Leave empty to define an unlimited value (not allowed for domain " @@ -451,7 +459,7 @@ msgstr "" "domänens förvalda. Lämna tomt för att definiera ett obegränsat värde (ej " "tillåtet för domänadministratörer)." -#: admin/forms.py:461 +#: admin/forms.py:499 msgid "" "Alias(es) of this mailbox. Indicate only one address per input, press ENTER " "to add a new input. Use the '*' character to create a 'catchall' alias (ex: " @@ -461,132 +469,132 @@ msgstr "" "lägga till ny rad. Använd '*' för att skapa ett 'catchall' alias (ex: " "*@domain.tld)." -#: admin/forms.py:512 +#: admin/forms.py:550 #, python-format msgid "Mailbox %s already exists" msgstr "Brevlåda %s finns redan" -#: admin/forms.py:572 +#: admin/forms.py:610 msgid "Domain(s)" msgstr "Domän(er)" -#: admin/forms.py:574 +#: admin/forms.py:612 msgid "Domain(s) that user administrates" msgstr "Domän(er) användaren administrerar" -#: admin/forms.py:616 admin/views.py:444 +#: admin/forms.py:654 admin/views.py:450 msgid "Mail" msgstr "Post" -#: admin/forms.py:618 +#: admin/forms.py:656 msgid "Permissions" msgstr "Rättigheter" -#: admin/models.py:78 +#: admin/models.py:80 msgid "You can't delete your own account" msgstr "Du kan inte radera ditt eget konto" -#: admin/models.py:159 +#: admin/models.py:161 msgid "Failed to update password: LDAP module not installed" msgstr "Misslyckades med att uppdatera lösenord: LDAP modul ej installerad" -#: admin/models.py:165 +#: admin/models.py:167 #, python-format msgid "Failed to update password: %s" msgstr "Misslyckades med att uppdatera lösenord: %s" -#: admin/models.py:192 +#: admin/models.py:194 msgid "account" msgstr "konto" -#: admin/models.py:494 admin/models.py:720 admin/models.py:782 +#: admin/models.py:496 admin/models.py:733 admin/models.py:795 msgid "Invalid line" msgstr "Ogiltig rad" -#: admin/models.py:498 +#: admin/models.py:500 msgid "You can't import an account with a role greater than yours" msgstr "Du kan inte importera konto med en roll större än din" -#: admin/models.py:518 +#: admin/models.py:506 +#, python-format +msgid "The simple user '%s' must have a valid email address" +msgstr "" + +#: admin/models.py:510 +#, python-format +msgid "username and email fields must not differ for '%s'" +msgstr "" + +#: admin/models.py:534 #, python-format msgid "Account import failed (%s): domain does not exist" msgstr "Konto import misslyckades (%s): domänen existerar inte" -#: admin/models.py:607 admin/models.py:733 +#: admin/models.py:624 admin/models.py:746 msgid "name" msgstr "namn" -#: admin/models.py:608 +#: admin/models.py:625 msgid "The domain name" msgstr "Domännamnet" -#: admin/models.py:610 +#: admin/models.py:627 msgid "Default quota in MB applied to mailboxes" msgstr "Standard kvota i MB applicerad för brevlådor" -#: admin/models.py:613 admin/models.py:740 admin/models.py:1020 -#: admin/models.py:1181 extensions/postfix_autoreply/models.py:19 +#: admin/models.py:630 admin/models.py:753 admin/models.py:1045 +#: admin/models.py:1217 extensions/postfix_autoreply/models.py:27 msgid "enabled" msgstr "aktiverad" -#: admin/models.py:614 +#: admin/models.py:631 msgid "Check to activate this domain" msgstr "Markera för att aktivera denna domän" -#: admin/models.py:734 +#: admin/models.py:747 msgid "The alias name" msgstr "Alias namn" -#: admin/models.py:736 +#: admin/models.py:749 msgid "target" msgstr "mål" -#: admin/models.py:737 +#: admin/models.py:750 msgid "The domain this alias points to" msgstr "Domän dit detta alias pekar mot" -#: admin/models.py:741 admin/models.py:1021 +#: admin/models.py:754 admin/models.py:1046 msgid "Check to activate this alias" msgstr "Markera för aktivera detta alias" -#: admin/models.py:788 +#: admin/models.py:801 #, python-format msgid "Unknown domain %s" msgstr "Okänt kommando %s" -#: admin/models.py:805 admin/models.py:1006 +#: admin/models.py:818 admin/models.py:1031 msgid "address" msgstr "adress" -#: admin/models.py:806 +#: admin/models.py:819 msgid "Mailbox address (without the @domain.tld part)" msgstr "Brevlåde adress (utan @domain.tld)" -#: admin/models.py:852 +#: admin/models.py:877 #, python-format msgid "Failed to retrieve mailbox location (%s)" msgstr "Kunde inte hitta brevlådans sökväg (%s)" -#: admin/models.py:868 -#, python-format -msgid "Failed to rename mailbox: %s" -msgstr "Kunde byta namn på brevlåda: %s" - -#: admin/models.py:894 -#, python-format -msgid "Failed to remove mailbox: %s" -msgstr "Kunde inte radera brevlåda: %s" - -#: admin/models.py:909 +#: admin/models.py:921 #, python-format msgid "Quota is greater than the allowed domain's limit (%dM)" msgstr "Kvotan är större än domänens gräns (%dM)" -#: admin/models.py:914 +#: admin/models.py:926 msgid "A quota is required" msgstr "En kvota krävs" -#: admin/models.py:1007 +#: admin/models.py:1032 msgid "" "The alias address (without the domain part). For a 'catch-all' address, just " "enter an * character." @@ -594,57 +602,57 @@ msgstr "" "Alias adress (utan domän delen). För en \"catch-all\"-adress, ange bara " "asterisk *." -#: admin/models.py:1011 +#: admin/models.py:1036 msgid "mailboxes" msgstr "brevlådor" -#: admin/models.py:1012 +#: admin/models.py:1037 msgid "The mailboxes this alias points to" msgstr "Brevlådorna detta alias pekar till" -#: admin/models.py:1016 +#: admin/models.py:1041 msgid "The aliases this alias points to" msgstr "Det alias detta alias pekar till" -#: admin/models.py:1064 +#: admin/models.py:1089 msgid "distribution list" msgstr "distributionslista" -#: admin/models.py:1065 +#: admin/models.py:1090 msgid "forward" msgstr "vidarebefordra" -#: admin/models.py:1066 +#: admin/models.py:1091 msgid "alias" msgstr "alias" -#: admin/models.py:1142 +#: admin/models.py:1170 #, python-format msgid "Invalid line: %s" msgstr "Ogiltig rad: %s" -#: admin/models.py:1167 -#, python-format -msgid "Mailbox %s does not exist" -msgstr "Brevlådan %s finns inte" +#: admin/models.py:1175 +#, fuzzy, python-format +msgid "Domain '%s' does not exist" +msgstr "Domän existerar inte" -#: admin/models.py:1182 +#: admin/models.py:1218 msgid "Check to enable this extension" msgstr "Markera för att aktivera detta tillägg" -#: admin/models.py:1282 +#: admin/models.py:1318 msgid "added" msgstr "tillagd" -#: admin/models.py:1285 +#: admin/models.py:1321 msgid "modified" msgstr "ändrad" -#: admin/models.py:1288 +#: admin/models.py:1324 msgid "deleted" msgstr "raderad" -#: admin/models.py:1290 +#: admin/models.py:1326 #, python-format msgid "%(object)s '%(name)s' %(action)s by user %(user)s" msgstr "%(object)s '%(name)s' %(action)s av användare %(user)s" @@ -654,7 +662,7 @@ msgid "Edit domain" msgstr "Redigera domän" #: admin/tables.py:21 admin/templates/admin/identities_table.html:8 -#: admin/templates/admin/listing.html:17 extensions/sievefilters/views.py:79 +#: admin/templates/admin/listing.html:17 extensions/sievefilters/views.py:83 #: extensions/sievefilters/templates/sievefilters/filter.html:17 #: extensions/sievefilters/templates/sievefilters/guieditor.html:5 #: extensions/webmail/templatetags/webextras.py:97 @@ -669,143 +677,143 @@ msgstr "Version" msgid "Description" msgstr "Beskrivning" -#: admin/views.py:87 +#: admin/views.py:88 msgid "New domain" msgstr "Ny domän" -#: admin/views.py:88 admin/views.py:97 admin/views.py:225 admin/views.py:438 -#: admin/views.py:445 extensions/sievefilters/views.py:120 -#: extensions/sievefilters/views.py:187 extensions/webmail/views.py:131 +#: admin/views.py:89 admin/views.py:98 admin/views.py:228 admin/views.py:444 +#: admin/views.py:451 extensions/sievefilters/views.py:129 +#: extensions/sievefilters/views.py:198 extensions/webmail/views.py:136 msgid "Create" msgstr "Skapa" -#: admin/views.py:94 admin/views.py:442 +#: admin/views.py:95 admin/views.py:448 msgid "Next" msgstr "Nästa" -#: admin/views.py:96 +#: admin/views.py:97 msgid "Options" msgstr "Inställningar" -#: admin/views.py:98 admin/views.py:446 +#: admin/views.py:99 admin/views.py:452 msgid "Previous" msgstr "Föregående" -#: admin/views.py:111 +#: admin/views.py:112 msgid "Domain created" msgstr "Domän skapad" -#: admin/views.py:144 admin/views.py:282 admin/views.py:492 +#: admin/views.py:146 admin/views.py:285 admin/views.py:498 #: extensions/postfix_autoreply/templates/postfix_autoreply/autoreply.html:9 -#: extensions/sievefilters/views.py:139 extensions/webmail/views.py:162 +#: extensions/sievefilters/views.py:148 extensions/webmail/views.py:168 #: userprefs/templates/userprefs/forward.html:8 #: userprefs/templates/userprefs/profile.html:8 msgid "Update" msgstr "Uppdatera" -#: admin/views.py:160 +#: admin/views.py:162 msgid "Domain modified" msgstr "Domän ändrad" -#: admin/views.py:186 +#: admin/views.py:189 msgid "You can't delete your own domain" msgstr "Du kan inte radera din egen domän" -#: admin/views.py:189 +#: admin/views.py:192 msgid "Domain deleted" msgid_plural "Domains deleted" msgstr[0] "Domän raderad" msgstr[1] "Domäner raderade" -#: admin/views.py:204 +#: admin/views.py:207 msgid "Alias with this name already exists" msgstr "Alias med detta namn existerar redan" -#: admin/views.py:247 +#: admin/views.py:250 msgid "New distribution list" msgstr "Ny distributionslista" -#: admin/views.py:248 +#: admin/views.py:251 msgid "Distribution list created" msgstr "Distributionslista skapad" -#: admin/views.py:257 +#: admin/views.py:260 msgid "New alias" msgstr "Nytt alias" -#: admin/views.py:258 +#: admin/views.py:261 msgid "Alias created" msgstr "Alias skapat" -#: admin/views.py:267 +#: admin/views.py:270 msgid "New forward" msgstr "Ny vidarebefodring" -#: admin/views.py:268 +#: admin/views.py:271 msgid "Forward created" msgstr "Vidarebefodring skapad" -#: admin/views.py:286 +#: admin/views.py:289 msgid "Distribution list modified" msgstr "Distributionslista ändrad" -#: admin/views.py:288 +#: admin/views.py:291 msgid "Forward modified" msgstr "Vidarebefodring ändrad" -#: admin/views.py:290 +#: admin/views.py:293 msgid "Alias modified" msgstr "Alias ändrat" -#: admin/views.py:403 admin/views.py:541 admin/views.py:546 -#: extensions/amavis/views.py:195 extensions/amavis/views.py:201 -#: extensions/amavis/views.py:234 extensions/amavis/views.py:238 -#: extensions/amavis/views.py:240 extensions/webmail/views.py:36 -#: extensions/webmail/views.py:64 extensions/webmail/views.py:77 -#: extensions/webmail/views.py:93 extensions/webmail/views.py:109 -#: extensions/webmail/views.py:193 extensions/webmail/views.py:419 -#: extensions/webmail/views.py:430 extensions/webmail/views.py:457 +#: admin/views.py:402 admin/views.py:545 admin/views.py:550 +#: extensions/amavis/views.py:204 extensions/amavis/views.py:210 +#: extensions/amavis/views.py:243 extensions/amavis/views.py:247 +#: extensions/amavis/views.py:249 extensions/webmail/views.py:41 +#: extensions/webmail/views.py:68 extensions/webmail/views.py:81 +#: extensions/webmail/views.py:98 extensions/webmail/views.py:114 +#: extensions/webmail/views.py:200 extensions/webmail/views.py:427 +#: extensions/webmail/views.py:438 extensions/webmail/views.py:465 #: lib/formutils.py:32 lib/formutils.py:37 msgid "Invalid request" msgstr "Ogiltig förfrågan" -#: admin/views.py:435 +#: admin/views.py:441 msgid "New account" msgstr "Nytt konto" -#: admin/views.py:459 +#: admin/views.py:465 msgid "Account created" msgstr "Konto skapat" -#: admin/views.py:507 +#: admin/views.py:513 msgid "Account updated" msgstr "Konto uppdaterat" -#: admin/views.py:531 +#: admin/views.py:535 msgid "Account deleted" msgid_plural "Accounts deleted" msgstr[0] "Konto raderat" msgstr[1] "Konton raderade" -#: admin/views.py:586 +#: admin/views.py:590 msgid "Parameters saved" msgstr "Parametrar sparade" -#: admin/views.py:632 +#: admin/views.py:636 msgid "Modifications applied." msgstr "Modifieringar tillämpade." -#: admin/views.py:740 +#: admin/views.py:743 #, python-format msgid "Object already exists: %s" msgstr "Objektet existerar redan: %s" -#: admin/views.py:742 +#: admin/views.py:745 #, python-format msgid "%d objects imported successfully" msgstr "%d objekt importerade" -#: admin/views.py:760 +#: admin/views.py:763 msgid "" "Provide a CSV file where lines respect one of the following formats:\n" "
                        \n" @@ -833,25 +841,25 @@ msgstr "" "⏎\n" "

                        Du kan använda ett annat tecken separator.

                        ⏎\n" -#: admin/views.py:772 +#: admin/views.py:775 msgid "Import identities" msgstr "Importera konton" -#: admin/views.py:773 admin/views.py:843 admin/templatetags/admin_extras.py:87 +#: admin/views.py:776 admin/views.py:846 admin/templatetags/admin_extras.py:87 #: admin/templatetags/admin_extras.py:144 msgid "Import" msgstr "Importera" -#: admin/views.py:803 +#: admin/views.py:806 msgid "Export identities" msgstr "Exportera konton" -#: admin/views.py:804 admin/views.py:860 admin/templatetags/admin_extras.py:93 +#: admin/views.py:807 admin/views.py:863 admin/templatetags/admin_extras.py:93 #: admin/templatetags/admin_extras.py:150 msgid "Export" msgstr "Exportera" -#: admin/views.py:832 +#: admin/views.py:835 msgid "" "Provide a CSV file where lines respect one of the following formats:\n" "
                          \n" @@ -871,11 +879,11 @@ msgstr "" "en av de tidigare värdena.\n" "

                          Du kan använda ett annat tecken som separator.\n" -#: admin/views.py:842 +#: admin/views.py:845 msgid "Import domains" msgstr "Importera domäner" -#: admin/views.py:859 +#: admin/views.py:862 msgid "Export domains" msgstr "Exportera domäner" @@ -948,7 +956,7 @@ msgid "Tags" msgstr "Tagg" #: admin/templates/admin/importform.html:5 -#: admin/templatetags/admin_extras.py:305 +#: admin/templatetags/admin_extras.py:290 msgid "Help" msgstr "Hjälp" @@ -995,7 +1003,7 @@ msgid "Previously on Modoboa..." msgstr "Tidigare på Modoboa..." #: admin/templates/admin/logs.html:6 extensions/amavis/sql_listing.py:25 -#: extensions/webmail/lib.py:37 extensions/webmail/lib.py:406 +#: extensions/webmail/lib.py:38 extensions/webmail/lib.py:411 msgid "Date" msgstr "Datum" @@ -1098,34 +1106,21 @@ msgid "View the domain's identities" msgstr "Visa domänens konton" #: admin/templatetags/admin_extras.py:178 -msgid "Delete the domain" -msgstr "Radera domänen" - #: admin/templatetags/admin_extras.py:194 -msgid "Delete this account" -msgstr "Radera detta konto" +#: admin/templatetags/admin_extras.py:201 +#, fuzzy, python-format +msgid "Delete %s?" +msgstr "Radera" -#: admin/templatetags/admin_extras.py:202 -msgid "Delete this distribution list" -msgstr "Radera denna distributionslista" - -#: admin/templatetags/admin_extras.py:209 -msgid "Delete this forward" -msgstr "Radera denna vidarebefodring" - -#: admin/templatetags/admin_extras.py:216 -msgid "Delete this alias" -msgstr "Radera detta alia" - -#: admin/templatetags/admin_extras.py:238 +#: admin/templatetags/admin_extras.py:223 msgid "Remove this permission" msgstr "Radera detta tillstånd" -#: admin/templatetags/admin_extras.py:279 lib/formutils.py:206 +#: admin/templatetags/admin_extras.py:264 lib/formutils.py:206 msgid "Yes" msgstr "Ja" -#: admin/templatetags/admin_extras.py:279 lib/formutils.py:206 +#: admin/templatetags/admin_extras.py:264 lib/formutils.py:206 msgid "No" msgstr "Nej" @@ -1134,11 +1129,11 @@ msgstr "Nej" msgid "User '%s' successfully logged in" msgstr "Användare '%s' har loggat in" -#: auth/views.py:41 +#: auth/views.py:44 msgid "Your username and password didn't match. Please try again." msgstr "Ditt användarnamn och lösenord matchar inte. Var vänlig försök igen." -#: auth/views.py:64 +#: auth/views.py:67 #, python-format msgid "User '%s' logged out" msgstr "Användare '%s' har loggat ut" @@ -1197,16 +1192,16 @@ msgstr "Enkel amavis hantering frontend" msgid "Quarantine" msgstr "Karantän" -#: extensions/amavis/__init__.py:127 +#: extensions/amavis/__init__.py:129 msgid "pending requests" msgstr "väntande förfrågningar" -#: extensions/amavis/__init__.py:144 +#: extensions/amavis/__init__.py:149 #, python-format msgid "%d pending requests" msgstr "%d väntande förfrågningar" -#: extensions/amavis/__init__.py:156 +#: extensions/amavis/__init__.py:161 msgid "Content filter" msgstr "Innehålls filter" @@ -1321,12 +1316,12 @@ msgid "Virus filter" msgstr "Virus filter" #: extensions/amavis/models.py:94 extensions/amavis/models.py:102 -#: extensions/amavis/models.py:110 extensions/sievefilters/views.py:268 +#: extensions/amavis/models.py:110 extensions/sievefilters/views.py:281 msgid "yes" msgstr "ja" #: extensions/amavis/models.py:95 extensions/amavis/models.py:103 -#: extensions/amavis/models.py:111 extensions/sievefilters/views.py:272 +#: extensions/amavis/models.py:111 extensions/sievefilters/views.py:285 msgid "no" msgstr "nej" @@ -1374,13 +1369,13 @@ msgstr "" "Ändra skräppost ämnesrad med vald text. Välj 'standard' för att använd " "globala inställningar." -#: extensions/amavis/sql_listing.py:23 extensions/webmail/lib.py:36 +#: extensions/amavis/sql_listing.py:23 extensions/webmail/lib.py:37 msgid "From" msgstr "Från" #: extensions/amavis/sql_listing.py:24 extensions/sievefilters/forms.py:68 -#: extensions/webmail/forms.py:10 extensions/webmail/lib.py:35 -#: extensions/webmail/lib.py:404 templates/common/email_searchbar.html:6 +#: extensions/webmail/forms.py:10 extensions/webmail/lib.py:36 +#: extensions/webmail/lib.py:409 templates/common/email_searchbar.html:6 msgid "Subject" msgstr "Ämne" @@ -1390,37 +1385,37 @@ msgstr "Ämne" msgid "To" msgstr "Till" -#: extensions/amavis/views.py:34 +#: extensions/amavis/views.py:43 msgid "Empty quarantine" msgstr "Karantän tom" -#: extensions/amavis/views.py:202 +#: extensions/amavis/views.py:211 msgid "Message deleted" msgstr "Meddelande raderat" -#: extensions/amavis/views.py:223 +#: extensions/amavis/views.py:232 #, python-format msgid "%(count)d message deleted successfully" msgid_plural "%(count)d messages deleted successfully" msgstr[0] "%(count)d meddelande raderadat" msgstr[1] "%(count)d meddelanden raderade" -#: extensions/amavis/views.py:243 +#: extensions/amavis/views.py:252 msgid "Request sent" msgstr "Begäran skickad" -#: extensions/amavis/views.py:249 +#: extensions/amavis/views.py:258 msgid "Message released" msgstr "Meddelande släppt" -#: extensions/amavis/views.py:271 +#: extensions/amavis/views.py:280 #, python-format msgid "%(count)d request sent" msgid_plural "%(count)d requests sent" msgstr[0] "%(count)d förfrågning skickad" msgstr[1] "%(count)d förfrågningar skickadade" -#: extensions/amavis/views.py:295 +#: extensions/amavis/views.py:304 #, python-format msgid "%(count)d message released successfully" msgid_plural "%(count)d messages released successfully" @@ -1546,7 +1541,7 @@ msgstr "Gräns" msgid "Reseller" msgstr "Återförsäljare" -#: extensions/limits/__init__.py:96 +#: extensions/limits/__init__.py:94 msgid "Resources" msgstr "Resurser" @@ -1665,23 +1660,23 @@ msgstr "Aktivera auto-svar fram till detta datum" msgid "This date is over" msgstr "Detta datum har varit" -#: extensions/postfix_autoreply/models.py:15 +#: extensions/postfix_autoreply/models.py:19 msgid "subject" msgstr "ämne" -#: extensions/postfix_autoreply/models.py:16 +#: extensions/postfix_autoreply/models.py:20 msgid "The subject that will appear in sent emails" msgstr "Ämnesraden i skickade e-post meddelanden" -#: extensions/postfix_autoreply/models.py:17 +#: extensions/postfix_autoreply/models.py:23 msgid "content" msgstr "innehåll" -#: extensions/postfix_autoreply/models.py:18 +#: extensions/postfix_autoreply/models.py:24 msgid "The content that will appear in sent emails" msgstr "Innehållet i skickade e-post meddelanden" -#: extensions/postfix_autoreply/models.py:20 +#: extensions/postfix_autoreply/models.py:28 msgid "Activate/Deactivate your auto reply" msgstr "Aktivera / inaktivera din autosvar" @@ -1817,53 +1812,53 @@ msgstr "" msgid "Not enough space on server" msgstr "Inte tillräckligt med utrymme på servern" -#: extensions/sievefilters/views.py:64 +#: extensions/sievefilters/views.py:68 msgid "Failed to retrieve filters set" msgstr "Det gick inte att hämta filteruppsättning" -#: extensions/sievefilters/views.py:117 +#: extensions/sievefilters/views.py:126 #: extensions/sievefilters/templatetags/sfilters_tags.py:33 msgid "New filter" msgstr "Nytt filter" -#: extensions/sievefilters/views.py:124 +#: extensions/sievefilters/views.py:133 msgid "Filter created" msgstr "Filter krashade" -#: extensions/sievefilters/views.py:136 +#: extensions/sievefilters/views.py:145 #: extensions/sievefilters/templatetags/sfilters_tags.py:77 msgid "Edit filter" msgstr "Redigera filter" -#: extensions/sievefilters/views.py:145 +#: extensions/sievefilters/views.py:154 msgid "Filter modified" msgstr "Filter modifierat" -#: extensions/sievefilters/views.py:165 +#: extensions/sievefilters/views.py:176 msgid "Filter removed" msgstr "Filter raderat" -#: extensions/sievefilters/views.py:166 +#: extensions/sievefilters/views.py:177 msgid "Failed to remove filter" msgstr "Det gick inte att radera filtret" -#: extensions/sievefilters/views.py:180 +#: extensions/sievefilters/views.py:191 msgid "Filters set saved" msgstr "Filter uppsättning sparat" -#: extensions/sievefilters/views.py:185 +#: extensions/sievefilters/views.py:196 msgid "Create a new filters set" msgstr "Skapa ny filteruppsättning" -#: extensions/sievefilters/views.py:208 +#: extensions/sievefilters/views.py:219 msgid "Filters set created" msgstr "Filter uppsättning skapat" -#: extensions/sievefilters/views.py:229 +#: extensions/sievefilters/views.py:240 msgid "Filters set deleted" msgstr "Filter uppsättning raderad" -#: extensions/sievefilters/views.py:241 +#: extensions/sievefilters/views.py:252 msgid "Filters set activated" msgstr "Filter uppsättning aktiverad" @@ -1879,15 +1874,15 @@ msgstr "Aktivera" msgid "No filter defined yet" msgstr "Inga filter definierade än" -#: extensions/sievefilters/templates/sievefilters/index.html:55 +#: extensions/sievefilters/templates/sievefilters/index.html:56 msgid "Filter sets" msgstr "Filter uppsättning" -#: extensions/sievefilters/templates/sievefilters/index.html:59 +#: extensions/sievefilters/templates/sievefilters/index.html:60 msgid "active" msgstr "aktivera" -#: extensions/sievefilters/templates/sievefilters/index.html:73 +#: extensions/sievefilters/templates/sievefilters/index.html:74 msgid "" "No filters set defined yet. You must create one in order to define filters." msgstr "" @@ -2204,84 +2199,89 @@ msgstr "Server svar" msgid "Cci" msgstr "BCC" -#: extensions/webmail/imaputils.py:259 +#: extensions/webmail/imaputils.py:237 +#, fuzzy +msgid "Failed to retrieve hierarchy delimiter" +msgstr "Det gick inte att hämta filteruppsättning" + +#: extensions/webmail/imaputils.py:278 #, python-format msgid "Connection to IMAP server failed: %s" msgstr "Anslutning till IMAP servern misslyckades: %s" -#: extensions/webmail/lib.py:353 +#: extensions/webmail/lib.py:358 msgid "wrote:" msgstr "skrev:" -#: extensions/webmail/lib.py:418 extensions/webmail/lib.py:422 +#: extensions/webmail/lib.py:423 extensions/webmail/lib.py:427 msgid "Original message" msgstr "Orginalmeddelande" -#: extensions/webmail/views.py:81 +#: extensions/webmail/views.py:86 #, python-format msgid "%(count)d message deleted" msgid_plural "%(count)d messages deleted" msgstr[0] "" msgstr[1] "" -#: extensions/webmail/views.py:98 +#: extensions/webmail/views.py:103 msgid "Unknown action" msgstr "Okänd åtgärd" -#: extensions/webmail/views.py:111 lib/email_listing.py:137 +#: extensions/webmail/views.py:116 lib/email_listing.py:137 msgid "Empty mailbox" msgstr "Tom brevlåda" -#: extensions/webmail/views.py:128 -#: extensions/webmail/templatetags/webextras.py:169 +#: extensions/webmail/views.py:133 +#: extensions/webmail/templatetags/webextras.py:170 msgid "Create a new mailbox" msgstr "Skapa en ny brevlåda" -#: extensions/webmail/views.py:143 +#: extensions/webmail/views.py:149 msgid "Mailbox created" msgstr "Brevlåda skapad" -#: extensions/webmail/views.py:159 +#: extensions/webmail/views.py:165 msgid "Edit mailbox" msgstr "Redigera brevlåda" -#: extensions/webmail/views.py:173 +#: extensions/webmail/views.py:180 msgid "Mailbox updated" msgstr "Brevlåda uppdaterad" -#: extensions/webmail/views.py:207 extensions/webmail/views.py:388 -#: extensions/webmail/views.py:497 +#: extensions/webmail/views.py:214 extensions/webmail/views.py:396 +#: extensions/webmail/views.py:505 msgid "Bad request" msgstr "Ogiltig fråga" -#: extensions/webmail/views.py:238 +#: extensions/webmail/views.py:246 msgid "Failed to save attachment: " msgstr "Det gick inte att spara bilaga:" -#: extensions/webmail/views.py:241 +#: extensions/webmail/views.py:249 #, python-format msgid "Attachment is too big (limit: %s)" msgstr "Bilagan är för stor (max:% s)" -#: extensions/webmail/views.py:247 +#: extensions/webmail/views.py:255 #: extensions/webmail/templates/webmail/compose.html:15 #: extensions/webmail/templates/webmail/headers.html:4 msgid "Attachments" msgstr "Bilagor" -#: extensions/webmail/views.py:263 +#: extensions/webmail/views.py:271 msgid "Bad query" msgstr "Dålig fråga" -#: extensions/webmail/views.py:273 +#: extensions/webmail/views.py:281 msgid "Failed to remove attachment: " msgstr "Misslyckades med att radera bilaga:" -#: extensions/webmail/views.py:278 +#: extensions/webmail/views.py:286 msgid "Unknown attachment" msgstr "Okänd bilaa" -#: extensions/webmail/views.py:493 +#: extensions/webmail/views.py:501 msgid "Undefined action" msgstr "Odefinierad åtgärd" @@ -2312,7 +2312,7 @@ msgstr[1] " %(counter)s filer" msgid "Parent mailbox" msgstr "Brevlådas förälder" -#: extensions/webmail/templates/webmail/index.html:36 +#: extensions/webmail/templates/webmail/index.html:38 msgid "Mailbox quota" msgstr "Brevlåde kvota" @@ -2374,15 +2374,15 @@ msgstr "Som oläst" msgid "Compress folder" msgstr "Komprimera katalog" -#: extensions/webmail/templatetags/webextras.py:109 +#: extensions/webmail/templatetags/webextras.py:110 msgid "Empty folder" msgstr "Töm katalog" -#: extensions/webmail/templatetags/webextras.py:177 +#: extensions/webmail/templatetags/webextras.py:178 msgid "Edit the selected mailbox" msgstr "Redigera vald brevlåda" -#: extensions/webmail/templatetags/webextras.py:182 +#: extensions/webmail/templatetags/webextras.py:183 msgid "Remove the selected mailbox" msgstr "Radera vald brevlåda" @@ -2436,7 +2436,7 @@ msgstr "Den begärda sidan finns inte." msgid "An internal error occured." msgstr "Ett internt fel uppstod." -#: templates/nlayout.html:56 +#: templates/nlayout.html:62 msgid "Powered by Modoboa" msgstr "Powered by Modoboa" @@ -2470,11 +2470,11 @@ msgstr "Stäng" msgid "Welcome to Modoboa" msgstr "Välkommen till Modoboa" -#: templates/registration/login.html:33 +#: templates/registration/login.html:34 msgid "Remember me" msgstr "Kom ihåg mig" -#: templates/registration/login.html:35 +#: templates/registration/login.html:36 msgid "Log in" msgstr "Logga in" @@ -2490,7 +2490,7 @@ msgstr "Per användare inställningar" msgid "Prefered language" msgstr "Önskat språk" -#: userprefs/app_settings.py:26 +#: userprefs/app_settings.py:27 msgid "Prefered language to display pages" msgstr "Önskat språk för att visa sidor" @@ -2580,3 +2580,27 @@ msgstr "Uppdatera personlig information" #: userprefs/templatetags/uprefs_extras.py:57 msgid "Logout" msgstr "Logga ut" + +#~ msgid "Failed to rename mailbox: %s" +#~ msgstr "Kunde byta namn på brevlåda: %s" + +#~ msgid "Failed to remove mailbox: %s" +#~ msgstr "Kunde inte radera brevlåda: %s" + +#~ msgid "Mailbox %s does not exist" +#~ msgstr "Brevlådan %s finns inte" + +#~ msgid "Delete the domain" +#~ msgstr "Radera domänen" + +#~ msgid "Delete this account" +#~ msgstr "Radera detta konto" + +#~ msgid "Delete this distribution list" +#~ msgstr "Radera denna distributionslista" + +#~ msgid "Delete this forward" +#~ msgstr "Radera denna vidarebefodring" + +#~ msgid "Delete this alias" +#~ msgstr "Radera detta alia" From 1a76cf9749f18543dc0716862b93d88e0ffeeac9 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Fri, 20 Sep 2013 22:47:47 +0200 Subject: [PATCH 44/97] French translation updated. --- modoboa/locale/fr/LC_MESSAGES/django.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modoboa/locale/fr/LC_MESSAGES/django.po b/modoboa/locale/fr/LC_MESSAGES/django.po index d874fc916..bed98c974 100644 --- a/modoboa/locale/fr/LC_MESSAGES/django.po +++ b/modoboa/locale/fr/LC_MESSAGES/django.po @@ -252,7 +252,7 @@ msgstr "" #: admin/app_settings.py:213 msgid "Key must be either 16, 24, or 32 bytes long" -msgstr "" +msgstr "La longueur d'une clé doit être de 16, 24 ou 32 octets" #: admin/app_settings.py:222 msgid "Invalid syntax" @@ -523,12 +523,12 @@ msgstr "Vous ne pouvez pas importer un compte avec un rôle supérieur au votre" #: admin/models.py:506 #, python-format msgid "The simple user '%s' must have a valid email address" -msgstr "" +msgstr "L'utilisateur simple '%s' doit avoir une adresse email valide" #: admin/models.py:510 #, python-format msgid "username and email fields must not differ for '%s'" -msgstr "" +msgstr "Les champs username et email de '%s' ne doivent pas différer" #: admin/models.py:534 #, python-format From bf6051bc31ec25402cfdb51aa470daff53f7bad7 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Sun, 22 Sep 2013 10:05:40 +0200 Subject: [PATCH 45/97] We now use factory-boy to generate test fixtures. --- modoboa/admin/factories.py | 48 +++++++++++++++ modoboa/admin/tests.py | 93 +++++++++++++++++++++++------- modoboa/extensions/limits/tests.py | 15 +++-- requirements.txt | 1 + 4 files changed, 130 insertions(+), 27 deletions(-) create mode 100644 modoboa/admin/factories.py diff --git a/modoboa/admin/factories.py b/modoboa/admin/factories.py new file mode 100644 index 000000000..78d1eb4d0 --- /dev/null +++ b/modoboa/admin/factories.py @@ -0,0 +1,48 @@ +import factory +from django.contrib.auth.models import Group +from . import models + + +class GroupFactory(factory.DjangoModelFactory): + FACTORY_FOR = Group + + name = 'DefaultGroup' + + +class MailboxFactory(factory.DjangoModelFactory): + FACTORY_FOR = models.Mailbox + + quota = 0 + use_domain_quota = True + + +class UserFactory(factory.DjangoModelFactory): + FACTORY_FOR = models.User + + email = factory.LazyAttribute(lambda a: a.username) + password = '{PLAIN}toto' + + mailbox = factory.RelatedFactory( + MailboxFactory, 'user', + address=factory.LazyAttribute( + lambda m: m.user.email.replace('@%s' % m.domain.name, '') + ) + ) + + @factory.post_generation + def groups(self, create, extracted, **kwargs): + if not create: + # Simple build, do nothing. + return + + if extracted: + # A list of groups were passed in, use them + for group in extracted: + self.groups.add(Group.objects.get(name=group)) + + +class DomainFactory(factory.DjangoModelFactory): + FACTORY_FOR = models.Domain + + quota = 10 + enabled = True diff --git a/modoboa/admin/tests.py b/modoboa/admin/tests.py index 18e5a7f4e..d1e516bae 100644 --- a/modoboa/admin/tests.py +++ b/modoboa/admin/tests.py @@ -19,10 +19,15 @@ from models import * from modoboa.admin.lib import * from modoboa.lib import parameters from modoboa.lib.tests import ModoTestCase +from . import factories class DomainTestCase(ModoTestCase): - fixtures = ["initial_users.json", "test_content.json"] + fixtures = ["initial_users.json"] + + def setUp(self): + super(DomainTestCase, self).setUp() + self.dom = factories.DomainFactory(name='test.com') def test_create(self): """Test the creation of a domain @@ -78,7 +83,10 @@ class DomainTestCase(ModoTestCase): values = { "name": "pouet.com", "quota": 100, "enabled": True } - self.check_ajax_post(reverse("modoboa.admin.views.editdomain", args=[1]), values) + self.check_ajax_post( + reverse("modoboa.admin.views.editdomain", args=[self.dom.id]), + values + ) dom = Domain.objects.get(name="pouet.com") self.assertEqual(dom.name, "pouet.com") self.assertTrue(dom.enabled) @@ -86,13 +94,17 @@ class DomainTestCase(ModoTestCase): def test_delete(self): """Test the removal of a domain """ - self.check_ajax_get(reverse("modoboa.admin.views.deldomain", args=[1]), {}) + self.check_ajax_get(reverse("modoboa.admin.views.deldomain", args=[self.dom.id]), {}) with self.assertRaises(Domain.DoesNotExist): Domain.objects.get(pk=1) class DomainAliasTestCase(ModoTestCase): - fixtures = ["initial_users.json", "test_content.json"] + fixtures = ['initial_users.json'] + + def setUp(self): + super(DomainAliasTestCase, self).setUp() + self.dom = factories.DomainFactory(name='test.com') def test_model(self): dom = Domain.objects.get(name="test.com") @@ -111,16 +123,23 @@ class DomainAliasTestCase(ModoTestCase): dom = Domain.objects.get(name="test.com") values = dict(name=dom.name, quota=dom.quota, enabled=dom.enabled, aliases="domalias.net", aliases_1="domalias.com") - self.check_ajax_post(reverse("modoboa.admin.views.editdomain", args=[1]), values) + self.check_ajax_post(reverse("modoboa.admin.views.editdomain", args=[dom.id]), values) self.assertEqual(dom.domainalias_set.count(), 2) del values["aliases_1"] - self.check_ajax_post(reverse("modoboa.admin.views.editdomain", args=[1]), values) + self.check_ajax_post(reverse("modoboa.admin.views.editdomain", args=[dom.id]), values) self.assertEqual(dom.domainalias_set.count(), 1) class AccountTestCase(ModoTestCase): - fixtures = ["initial_users.json", "test_content.json",] + fixtures = ["initial_users.json"] + + def setUp(self): + super(AccountTestCase, self).setUp() + self.dom = factories.DomainFactory(name="test.com") + self.account = factories.UserFactory( + username="user@test.com", groups=('SimpleUsers',), mailbox__domain=self.dom + ) def test_crud(self): values = dict(username="tester@test.com", first_name="Tester", last_name="Toto", @@ -132,14 +151,14 @@ class AccountTestCase(ModoTestCase): account = User.objects.get(username="tester@test.com") mb = account.mailbox_set.all()[0] self.assertEqual(mb.full_address, "tester@test.com") - self.assertEqual(mb.quota, 100) + self.assertEqual(mb.quota, 10) self.assertEqual(mb.enabled, True) self.assertEqual(mb.quota_value.username, "tester@test.com") self.assertEqual(account.username, mb.full_address) self.assertTrue(account.check_password("toto")) self.assertEqual(account.first_name, "Tester") self.assertEqual(account.last_name, "Toto") - self.assertEqual(mb.domain.mailbox_count, 4) + self.assertEqual(mb.domain.mailbox_count, 2) values["username"] = "pouet@test.com" self.check_ajax_post(reverse("modoboa.admin.views.editaccount", args=[account.id]), values) @@ -173,7 +192,17 @@ class AccountTestCase(ModoTestCase): class AliasTestCase(ModoTestCase): - fixtures = ["initial_users.json", "test_content.json"] + fixtures = ["initial_users.json"] + + def setUp(self): + super(AliasTestCase, self).setUp() + dom = factories.DomainFactory(name="test.com") + factories.UserFactory.create( + username="admin@test.com", groups=('DomainAdmins',), mailbox__domain=dom + ) + factories.UserFactory.create( + username="user@test.com", groups=('SimpleUsers',), mailbox__domain=dom + ) def test_alias(self): user = User.objects.get(username="user@test.com") @@ -245,24 +274,28 @@ class AliasTestCase(ModoTestCase): class PermissionsTestCase(ModoTestCase): - fixtures = ["initial_users.json", "test_content.json"] + fixtures = ["initial_users.json"] def setUp(self): - """ - FIXME: je n'arrive pas à générer des données de test incluant - déjà les permissions (cf. table ObjectAccess). C'est pour - cette raison que j'assigne le domaine test.com ici... - """ super(PermissionsTestCase, self).setUp() - self.user = User.objects.get(username="user@test.com") + dom = factories.DomainFactory(name='test.com') + self.user = factories.UserFactory( + username="user@test.com", groups=('SimpleUsers',), mailbox__domain=dom + ) self.values = dict( username=self.user.username, role="DomainAdmins", is_active=self.user.is_active, email="user@test.com" ) - self.admin = User.objects.get(username="admin@test.com") - dom = Domain.objects.get(name="test.com") + self.admin = factories.UserFactory( + username="admin@test.com", groups=('DomainAdmins',), mailbox__domain=dom + ) dom.add_admin(self.admin) + dom = factories.DomainFactory(name='test2.com') + factories.UserFactory( + username='user@test2.com', groups=('SimpleUsers',), mailbox__domain=dom + ) + def tearDown(self): self.clt.logout() @@ -336,15 +369,31 @@ class PermissionsTestCase(ModoTestCase): self.check_ajax_get(reverse("modoboa.admin.views.delaccount", args=[account.id]), {}, status="ko", respmsg="Permission denied") + def test_domainadmin_dlist_local_domain_not_owned(self): + """Check if a domain admin can use a local mailbox he can't + access as a recipient in a distribution list""" + values = dict( + email="all@test.com", + recipients="user@test.com", + recipients_1="user@test2.com", + enabled=True + ) + self.check_ajax_post(reverse("modoboa.admin.views.newdlist"), values) + class ImportTestCase(ModoTestCase): - fixtures = ["initial_users.json", "test_content.json"] + fixtures = ["initial_users.json"] def setUp(self): super(ImportTestCase, self).setUp() - self.admin = User.objects.get(username="admin@test.com") - dom = Domain.objects.get(name="test.com") + dom = factories.DomainFactory(name="test.com") + self.admin = factories.UserFactory.create( + username="admin@test.com", groups=('DomainAdmins',), mailbox__domain=dom + ) dom.add_admin(self.admin) + factories.UserFactory.create( + username="user@test.com", groups=('SimpleUsers',), mailbox__domain=dom + ) def test_domains_import(self): f = ContentFile(b"""domain; domain1.com; 100; True diff --git a/modoboa/extensions/limits/tests.py b/modoboa/extensions/limits/tests.py index 87fb27c32..c96536208 100644 --- a/modoboa/extensions/limits/tests.py +++ b/modoboa/extensions/limits/tests.py @@ -1,12 +1,21 @@ from django.core.urlresolvers import reverse from modoboa.lib.tests import ExtTestCase from modoboa.admin.models import User +from modoboa.admin import factories class PermissionsTestCase(ExtTestCase): - fixtures = ["initial_users.json", "test_content.json"] + fixtures = ["initial_users.json"] name = "limits" + def setUp(self): + super(PermissionsTestCase, self).setUp() + dom = factories.DomainFactory(name='test.com') + self.admin = factories.UserFactory( + username='admin@test.com', groups=('DomainAdmins',), mailbox__domain=dom + ) + dom.add_admin(self.admin) + def test_domainadmin_deletes_reseller(self): """Check if a domain admin can delete a reseller. @@ -23,7 +32,3 @@ class PermissionsTestCase(ExtTestCase): self.clt.login(username="admin@test.com", password="toto") self.check_ajax_get(reverse("modoboa.admin.views.delaccount", args=[account.id]), {}, status="ko", respmsg="Permission denied") - self.check_ajax_get(reverse("modoboa.admin.views.delaccount", args=[4]), {}, - status="ko", respmsg="Permission denied") - - diff --git a/requirements.txt b/requirements.txt index 33a9fecab..6b74c0566 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,3 +7,4 @@ sievelib chardet argparse rfc6266 +factory-boy From 8acc48fcfe51b7e1dafc28832a80a86925e125bd Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Sun, 22 Sep 2013 10:20:36 +0200 Subject: [PATCH 46/97] A non encoded filename must surrounded by "". see #473 --- modoboa/extensions/webmail/views.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modoboa/extensions/webmail/views.py b/modoboa/extensions/webmail/views.py index 57eebb635..5d536f5aa 100644 --- a/modoboa/extensions/webmail/views.py +++ b/modoboa/extensions/webmail/views.py @@ -50,9 +50,13 @@ def getattachment(request): # FIXME : ugly hack, see fetch_parser.py for more explanation # :p if type(disp[1][0]) != dict: - cd = '%s; %s=%s' % (disp[0], disp[1][0], disp[1][1]) + atype, fieldname, filename = disp[0], disp[1][0], disp[1][1] else: - cd = '%s; %s=%s' % (disp[0], disp[1][0]['struct'][0], disp[1][0]['struct'][1]) + atype, fieldname, filename = disp[0], disp[1][0]['struct'][0], disp[1][0]['struct'][1] + if fieldname.endswith('*'): + cd = '%s; %s=%s' % (atype, fieldname, filename) + else: + cd = '%s; %s="%s"' % (atype, fieldname, filename) else: cd = build_header(request.GET["fname"]) resp["Content-Disposition"] = cd From 97852a253d05abc8362ddbfa447f9d3fedbdab2f Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Mon, 23 Sep 2013 17:45:06 +0200 Subject: [PATCH 47/97] Fixed mistake. see #447 --- modoboa/core/commands/postfix_maps.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modoboa/core/commands/postfix_maps.py b/modoboa/core/commands/postfix_maps.py index 73358fab5..afe3b57d5 100644 --- a/modoboa/core/commands/postfix_maps.py +++ b/modoboa/core/commands/postfix_maps.py @@ -37,8 +37,8 @@ class DomainsMap(MapFile): class DomainsAliasesMap(MapFile): filename = 'sql-domain-aliases.cf' - mysql = "(SELECT concat(mb.address, '@', dom.name) FROM admin_domainalias domal INNER JOIN admin_domain dom ON domal.target_id=dom.id INNER JOIN admin_mailbox mb ON mb.domain_id=dom.id WHERE domal.name='%d' AND dom.enabled=1 AND mb.address='%u') UNION (SELECT concat(al.address, '@', dom.name) FROM admin_domainalias domal INNER JOIN admin_domain dom ON domal.target_id=dom.id INNER JOIN admin_alias al ON al.domain_id=dom.id WHERE domal.name='%d' AND dom.enabled=1 AND al.address='%u')" - postgres = "(SELECT mb.address || '@' || dom.name FROM admin_domainalias domal INNER JOIN admin_domain dom ON domal.target_id=dom.id INNER JOIN admin_mailbox mb ON mb.domain_id=dom.id WHERE domal.name='%d' AND dom.enabled AND mb.address='%u') UNION (SELECT al.address || '@' || dom.name FROM admin_domainalias domal INNER JOIN admin_domain dom ON domal.target_id=dom.id INNER JOIN admin_alias al ON al.domain_id=dom.id WHERE domal.name='%d' AND dom.enabled AND al.address='%u')" + mysql = "SELECT dom.name FROM admin_domain dom INNER JOIN admin_domainalias domal ON dom.id=domal.target_id WHERE domal.name='%s' AND domal.enabled=1 AND dom.enabled=1" + postgres = "SELECT dom.name FROM admin_domain dom INNER JOIN admin_domainalias domal ON dom.id=domal.target_id WHERE domal.name='%s' AND domal.enabled AND dom.enabled" class MailboxesMap(MapFile): @@ -55,8 +55,8 @@ class AliasesMap(MapFile): class DomainAliasesMailboxesMap(MapFile): filename = 'sql-domain-aliases-mailboxes.cf' - mysql = "SELECT DISTINCT concat(mb.address, '@', dom.name) FROM admin_alias al INNER JOIN admin_domain dom ON dom.id=al.domain_id INNER JOIN admin_domainalias domal ON domal.target_id=dom.id INNER JOIN (admin_alias_mboxes almb, admin_mailbox mb) ON (almb.alias_id=al.id AND almb.mailbox_id=mb.id) WHERE domal.name='%d' AND domal.enabled=1 AND (al.address='%u' OR mb.address='%u')" - postgres = "SELECT DISTINCT mb.address || '@' || dom.name FROM admin_alias al INNER JOIN admin_domain dom ON dom.id=al.domain_id INNER JOIN admin_domainalias domal ON domal.target_id=dom.id INNER JOIN admin_alias_mboxes almb ON almb.alias_id=al.id INNER JOIN admin_mailbox mb ON almb.mailbox_id=mb.id WHERE domal.name='%d' AND domal.enabled AND (al.address='%u' OR mb.address='%u')" + mysql = "(SELECT concat(mb.address, '@', dom.name) FROM admin_domainalias domal INNER JOIN admin_domain dom ON domal.target_id=dom.id INNER JOIN admin_mailbox mb ON mb.domain_id=dom.id WHERE domal.name='%d' AND dom.enabled=1 AND mb.address='%u') UNION (SELECT concat(al.address, '@', dom.name) FROM admin_domainalias domal INNER JOIN admin_domain dom ON domal.target_id=dom.id INNER JOIN admin_alias al ON al.domain_id=dom.id WHERE domal.name='%d' AND dom.enabled=1 AND al.address='%u')" + postgres = "(SELECT mb.address || '@' || dom.name FROM admin_domainalias domal INNER JOIN admin_domain dom ON domal.target_id=dom.id INNER JOIN admin_mailbox mb ON mb.domain_id=dom.id WHERE domal.name='%d' AND dom.enabled AND mb.address='%u') UNION (SELECT al.address || '@' || dom.name FROM admin_domainalias domal INNER JOIN admin_domain dom ON domal.target_id=dom.id INNER JOIN admin_alias al ON al.domain_id=dom.id WHERE domal.name='%d' AND dom.enabled AND al.address='%u')" class CatchallAliasesMap(MapFile): From da350976d44ec8854ffe84e1aff5a3c1580726f4 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Mon, 23 Sep 2013 17:46:20 +0200 Subject: [PATCH 48/97] More explicit migration instructions. --- doc/getting_started/upgrade.rst | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/doc/getting_started/upgrade.rst b/doc/getting_started/upgrade.rst index 9015d9e0a..5fd9d30cd 100644 --- a/doc/getting_started/upgrade.rst +++ b/doc/getting_started/upgrade.rst @@ -43,12 +43,18 @@ Finally, follow the common procedure:: $ python manage.py syncdb --migrate $ python manage.py collectstatic + 1.0.1: operations on mailboxes ============================== -The way Modoboa handles **rename** and **delete** operations on mailboxes has -been improved. Make sure to consult :ref:`fs_operations`. +The way Modoboa handles **rename** and **delete** operations on +mailboxes has been improved. Make sure to consult :ref:`fs_operations` +and :ref:`Postfix configuration `. Look at the +``smtpd_recipient_restrictions`` setting. +Run ``modoboa-admin.py postfix_maps --dbtype +`` and compare the files with those that postfix currently +use. Make necessary updates in light of the differences 1.0.0: production ready, at last ================================ From 2fe441ecff1ebdedac58e0de54471fd8639f4e92 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Mon, 23 Sep 2013 21:49:21 +0200 Subject: [PATCH 49/97] Wrong path removed. --- doc/integration/imap_and_smtp.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/integration/imap_and_smtp.rst b/doc/integration/imap_and_smtp.rst index 50d396112..3838c29ba 100644 --- a/doc/integration/imap_and_smtp.rst +++ b/doc/integration/imap_and_smtp.rst @@ -73,7 +73,7 @@ Edit the crontab of the user who owns the mailboxes on the file system:: And add the following line inside:: - * * * * * python /var/www/mail_koalabs_org/manage.py handle_mailbox_operations + * * * * * python /manage.py handle_mailbox_operations .. warning:: From 084004c0fcdf459bff3af74ef8794dbb8598f99d Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Tue, 24 Sep 2013 13:11:00 +0200 Subject: [PATCH 50/97] Don't always use rfc6266 decoder. see #473 --- modoboa/extensions/webmail/lib.py | 34 ++++++++++++++++--------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/modoboa/extensions/webmail/lib.py b/modoboa/extensions/webmail/lib.py index b8011d852..b82257265 100644 --- a/modoboa/extensions/webmail/lib.py +++ b/modoboa/extensions/webmail/lib.py @@ -274,27 +274,29 @@ class ImapEmail(Email): return None def _find_attachments(self): + """Retrieve attachments from the parsed body structure. + + We try to find and decode a file name for each attachment. If + we failed, a generic name will be used (ie. part_1, part_2, ...). + """ for att in self.bs.attachments: attname = "part_%s" % att["pnum"] - params = None - key = None if "params" in att and att["params"] != "NIL": - params = att["params"] - key = "name" - - if key is None and "disposition" in att and len(att["disposition"]) > 1: - params = att["disposition"][1] - key = "filename" - - if key and params: - for pos, value in enumerate(params): - if not value.startswith(key): + attname = u2u_decode.u2u_decode(att["params"][1]) \ + .strip("\r\t\n") + elif "disposition" in att and len(att["disposition"]) > 1: + for pos, value in enumerate(att["disposition"][1]): + if not value.startswith("filename"): continue - header = "%s; %s=%s" % (att['disposition'][0], value, - u2u_decode.u2u_decode(params[pos + 1]).strip("\r\t\n")) + header = "%s; %s=%s" \ + % (att['disposition'][0], + value, + att["disposition"][1][pos + 1].strip("\r\t\n")) attname = parse_headers(header).filename_unsafe if attname is None: - attname = u2u_decode.u2u_decode(params[pos + 1]).strip("\r\t\n") + attname = u2u_decode.u2u_decode( + att["disposition"][1][pos + 1] + ).strip("\r\t\n") break self.attachments[att["pnum"]] = attname @@ -307,7 +309,7 @@ class ImapEmail(Email): params["fname"] = os.path.join(settings.MEDIA_URL, fname) if os.path.exists(path): continue - + pdef, content = self.imapc.fetchpart(self.mailid, self.mbox, params["pnum"]) fp = open(path, "wb") fp.write(decode_payload(params["encoding"], content)) From 8b51fe965a3c3a3a79a6a08475c7a0ad66f01ccb Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Tue, 24 Sep 2013 18:41:42 +0200 Subject: [PATCH 51/97] Fixing admin unit tests. --- modoboa/extensions/admin/factories.py | 3 +- .../commands/handle_mailbox_operations.py | 6 +- modoboa/extensions/admin/models/domain.py | 1 - modoboa/extensions/admin/tests.py | 76 +++++++++---------- 4 files changed, 43 insertions(+), 43 deletions(-) diff --git a/modoboa/extensions/admin/factories.py b/modoboa/extensions/admin/factories.py index 78d1eb4d0..67df7e942 100644 --- a/modoboa/extensions/admin/factories.py +++ b/modoboa/extensions/admin/factories.py @@ -1,5 +1,6 @@ import factory from django.contrib.auth.models import Group +from modoboa.core.models import User from . import models @@ -17,7 +18,7 @@ class MailboxFactory(factory.DjangoModelFactory): class UserFactory(factory.DjangoModelFactory): - FACTORY_FOR = models.User + FACTORY_FOR = User email = factory.LazyAttribute(lambda a: a.username) password = '{PLAIN}toto' diff --git a/modoboa/extensions/admin/management/commands/handle_mailbox_operations.py b/modoboa/extensions/admin/management/commands/handle_mailbox_operations.py index 03b899e37..56a5d24a1 100644 --- a/modoboa/extensions/admin/management/commands/handle_mailbox_operations.py +++ b/modoboa/extensions/admin/management/commands/handle_mailbox_operations.py @@ -4,9 +4,9 @@ from optparse import make_option from django.core.management.base import BaseCommand from modoboa.lib import parameters from modoboa.lib.sysutils import exec_cmd -from modoboa.admin import AdminConsole -from modoboa.admin.exceptions import AdminError -from modoboa.admin.models import MailboxOperation +from modoboa.extensions.admin import AdminConsole +from modoboa.extensions.admin.exceptions import AdminError +from modoboa.extensions.admin.models import MailboxOperation class OperationError(Exception): diff --git a/modoboa/extensions/admin/models/domain.py b/modoboa/extensions/admin/models/domain.py index b1eb4ef6a..2c5fe1ff2 100644 --- a/modoboa/extensions/admin/models/domain.py +++ b/modoboa/extensions/admin/models/domain.py @@ -7,7 +7,6 @@ from modoboa.lib import events, parameters from modoboa.core.models import ObjectAccess from modoboa.extensions.admin.exceptions import AdminError from .base import DatesAware -from .mailbox import MailboxOperation class DomainManager(Manager): diff --git a/modoboa/extensions/admin/tests.py b/modoboa/extensions/admin/tests.py index a1db2344c..9f5569cae 100644 --- a/modoboa/extensions/admin/tests.py +++ b/modoboa/extensions/admin/tests.py @@ -36,7 +36,7 @@ class DomainTestCase(ModoTestCase): "name": "pouet.com", "quota": 100, "create_dom_admin": "no", "stepid": 2 } - self.check_ajax_post(reverse("modoboa.admin.views.newdomain"), values) + self.check_ajax_post(reverse("modoboa.extensions.admin.views.domain.newdomain"), values) dom = Domain.objects.get(name="pouet.com") self.assertEqual(dom.name, "pouet.com") self.assertEqual(dom.quota, 100) @@ -52,7 +52,7 @@ class DomainTestCase(ModoTestCase): "dom_admin_username": "toto", "create_aliases": "yes", "stepid": 2 } - self.check_ajax_post(reverse("modoboa.admin.views.newdomain"), values) + self.check_ajax_post(reverse("modoboa.extensions.admin.views.domain.newdomain"), values) dom = Domain.objects.get(name="pouet.com") da = User.objects.get(username="toto@pouet.com") self.assertIn(da, dom.admins) @@ -67,7 +67,7 @@ class DomainTestCase(ModoTestCase): "dom_admin_username": "toto", "create_aliases": "yes", "stepid": 2 } - self.check_ajax_post(reverse("modoboa.admin.views.newdomain"), values) + self.check_ajax_post(reverse("modoboa.extensions.admin.views.domain.newdomain"), values) dom = Domain.objects.get(name="pouet.com") da = User.objects.get(username="toto@pouet.com") self.assertIn(da, dom.admins) @@ -84,7 +84,7 @@ class DomainTestCase(ModoTestCase): "name": "pouet.com", "quota": 100, "enabled": True } self.check_ajax_post( - reverse("modoboa.admin.views.editdomain", args=[self.dom.id]), + reverse("modoboa.extensions.admin.views.domain.editdomain", args=[self.dom.id]), values ) dom = Domain.objects.get(name="pouet.com") @@ -94,7 +94,7 @@ class DomainTestCase(ModoTestCase): def test_delete(self): """Test the removal of a domain """ - self.check_ajax_get(reverse("modoboa.admin.views.deldomain", args=[self.dom.id]), {}) + self.check_ajax_get(reverse("modoboa.extensions.admin.views.domain.deldomain", args=[self.dom.id]), {}) with self.assertRaises(Domain.DoesNotExist): Domain.objects.get(pk=1) @@ -123,11 +123,11 @@ class DomainAliasTestCase(ModoTestCase): dom = Domain.objects.get(name="test.com") values = dict(name=dom.name, quota=dom.quota, enabled=dom.enabled, aliases="domalias.net", aliases_1="domalias.com") - self.check_ajax_post(reverse("modoboa.admin.views.editdomain", args=[dom.id]), values) + self.check_ajax_post(reverse("modoboa.extensions.admin.views.domain.editdomain", args=[dom.id]), values) self.assertEqual(dom.domainalias_set.count(), 2) del values["aliases_1"] - self.check_ajax_post(reverse("modoboa.admin.views.editdomain", args=[dom.id]), values) + self.check_ajax_post(reverse("modoboa.extensions.admin.views.domain.editdomain", args=[dom.id]), values) self.assertEqual(dom.domainalias_set.count(), 1) @@ -146,7 +146,7 @@ class AccountTestCase(ModoTestCase): password1="toto", password2="toto", role="SimpleUsers", quota_act=True, is_active=True, email="tester@test.com", stepid=2) - self.check_ajax_post(reverse("modoboa.admin.views.newaccount"), values) + self.check_ajax_post(reverse("modoboa.extensions.admin.views.identity.newaccount"), values) account = User.objects.get(username="tester@test.com") mb = account.mailbox_set.all()[0] @@ -161,12 +161,12 @@ class AccountTestCase(ModoTestCase): self.assertEqual(mb.domain.mailbox_count, 2) values["username"] = "pouet@test.com" - self.check_ajax_post(reverse("modoboa.admin.views.editaccount", args=[account.id]), values) + self.check_ajax_post(reverse("modoboa.extensions.admin.views.identity.editaccount", args=[account.id]), values) mb = Mailbox.objects.get(pk=mb.id) self.assertEqual(mb.full_address, "pouet@test.com") - self.check_ajax_get(reverse("modoboa.admin.views.delaccount", args=[account.id]), {}) + self.check_ajax_get(reverse("modoboa.extensions.admin.views.identity.delaccount", args=[account.id]), {}) def test_update_password(self): """Password update @@ -175,7 +175,7 @@ class AccountTestCase(ModoTestCase): * The default admin changes his password (no associated Mailbox) * A normal user changes his password """ - self.check_ajax_post(reverse("modoboa.userprefs.views.profile"), + self.check_ajax_post(reverse("modoboa.core.views.user.profile"), {"oldpassword" : "password", "newpassword" : "titi", "confirmation" : "titi"}) self.clt.logout() @@ -184,7 +184,7 @@ class AccountTestCase(ModoTestCase): self.assertEqual(self.clt.login(username="user@test.com", password="toto"), True) - self.check_ajax_post(reverse("modoboa.userprefs.views.profile"), + self.check_ajax_post(reverse("modoboa.core.views.user.profile"), {"oldpassword" : "toto", "newpassword" : "tutu", "confirmation" : "tutu"}) self.clt.logout() @@ -211,11 +211,11 @@ class AliasTestCase(ModoTestCase): is_active=user.is_active, email="user@test.com", aliases="toto@test.com", aliases_1="titi@test.com" ) - self.check_ajax_post(reverse("modoboa.admin.views.editaccount", args=[user.id]), values) + self.check_ajax_post(reverse("modoboa.extensions.admin.views.identity.editaccount", args=[user.id]), values) self.assertEqual(user.mailbox_set.all()[0].alias_set.count(), 2) del values["aliases_1"] - self.check_ajax_post(reverse("modoboa.admin.views.editaccount", args=[user.id]), values) + self.check_ajax_post(reverse("modoboa.extensions.admin.views.identity.editaccount", args=[user.id]), values) self.assertEqual(user.mailbox_set.all()[0].alias_set.count(), 1) def test_dlist(self): @@ -224,7 +224,7 @@ class AliasTestCase(ModoTestCase): recipients_1="admin@test.com", recipients_2="ext@titi.com", enabled=True) - self.check_ajax_post(reverse("modoboa.admin.views.newdlist"), values) + self.check_ajax_post(reverse("modoboa.extensions.admin.views.alias.newdlist"), values) user = User.objects.get(username="user@test.com") self.assertEqual(len(user.mailbox_set.all()[0].alias_set.all()), 1) admin = User.objects.get(username="admin@test.com") @@ -233,40 +233,40 @@ class AliasTestCase(ModoTestCase): dlist = Alias.objects.get(address="all", domain__name="test.com") self.assertEqual(len(dlist.get_recipients()), 3) del values["recipients_1"] - self.check_ajax_post(reverse("modoboa.admin.views.editalias", args=[dlist.id]), + self.check_ajax_post(reverse("modoboa.extensions.admin.views.alias.editalias", args=[dlist.id]), values) self.assertEqual(dlist.get_recipients_count(), 2) - self.check_ajax_get(reverse("modoboa.admin.views.delalias") + "?selection=%d" \ + self.check_ajax_get(reverse("modoboa.extensions.admin.views.alias.delalias") + "?selection=%d" \ % dlist.id, {}) self.assertRaises(Alias.DoesNotExist, Alias.objects.get, address="all", domain__name="test.com") def test_forward(self): values = dict(email="forward@test.com", recipients="rcpt@dest.com") - self.check_ajax_post(reverse("modoboa.admin.views.newforward"), values) + self.check_ajax_post(reverse("modoboa.extensions.admin.views.alias.newforward"), values) fwd = Alias.objects.get(address="forward", domain__name="test.com") self.assertEqual(fwd.get_recipients_count(), 1) values["recipients"] = "rcpt2@dest.com" - self.check_ajax_post(reverse("modoboa.admin.views.editalias", args=[fwd.id]), + self.check_ajax_post(reverse("modoboa.extensions.admin.views.alias.editalias", args=[fwd.id]), values) self.assertEqual(fwd.get_recipients_count(), 1) - self.check_ajax_get(reverse("modoboa.admin.views.delalias") + "?selection=%d" \ + self.check_ajax_get(reverse("modoboa.extensions.admin.views.alias.delalias") + "?selection=%d" \ % fwd.id, {}) self.assertRaises(Alias.DoesNotExist, Alias.objects.get, address="forward", domain__name="test.com") def test_forward_and_local_copies(self): values = dict(email="user@test.com", recipients="rcpt@dest.com") - self.check_ajax_post(reverse("modoboa.admin.views.newforward"), values) + self.check_ajax_post(reverse("modoboa.extensions.admin.views.alias.newforward"), values) fwd = Alias.objects.get(address="user", domain__name="test.com") self.assertEqual(fwd.get_recipients_count(), 1) values["recipients"] = "rcpt@dest.com" values["recipients_1"] = "user@test.com" - self.check_ajax_post(reverse("modoboa.admin.views.editalias", args=[fwd.id]), + self.check_ajax_post(reverse("modoboa.extensions.admin.views.alias.editalias", args=[fwd.id]), values) fwd = Alias.objects.get(pk=fwd.pk) self.assertEqual(fwd.get_recipients_count(), 2) @@ -301,23 +301,23 @@ class PermissionsTestCase(ModoTestCase): def test_domain_admins(self): self.values["role"] = "DomainAdmins" - self.check_ajax_post(reverse("modoboa.admin.views.editaccount", args=[self.user.id]), + self.check_ajax_post(reverse("modoboa.extensions.admin.views.identity.editaccount", args=[self.user.id]), self.values) self.assertEqual(self.user.group == "DomainAdmins", True) self.values["role"] = "SimpleUsers" - self.check_ajax_post(reverse("modoboa.admin.views.editaccount", args=[self.user.id]), + self.check_ajax_post(reverse("modoboa.extensions.admin.views.identity.editaccount", args=[self.user.id]), self.values) self.assertEqual(self.user.group == 'DomainAdmins', False) def test_superusers(self): self.values["role"] = "SuperAdmins" - self.check_ajax_post(reverse("modoboa.admin.views.editaccount", args=[self.user.id]), + self.check_ajax_post(reverse("modoboa.extensions.admin.views.identity.editaccount", args=[self.user.id]), self.values) self.assertEqual(User.objects.get(username="user@test.com").is_superuser, True) self.values["role"] = "SimpleUsers" - self.check_ajax_post(reverse("modoboa.admin.views.editaccount", args=[self.user.id]), + self.check_ajax_post(reverse("modoboa.extensions.admin.views.identity.editaccount", args=[self.user.id]), self.values) self.assertEqual(User.objects.get(username="user@test.com").is_superuser, False) @@ -328,12 +328,12 @@ class PermissionsTestCase(ModoTestCase): admin = User.objects.get(username="admin@test.com") values = dict(username="admin@test.com", first_name="Admin", password1="", password2="", quota=10, is_active=True, email="admin@test.com") - self.check_ajax_post(reverse("modoboa.admin.views.editaccount", args=[admin.id]), values) + self.check_ajax_post(reverse("modoboa.extensions.admin.views.identity.editaccount", args=[admin.id]), values) self.assertEqual(admin.group, "DomainAdmins") self.assertEqual(admin.can_access(Domain.objects.get(name="test.com")), True) values["role"] = "SuperAdmins" - self.check_ajax_post(reverse("modoboa.admin.views.editaccount", args=[admin.id]), values) + self.check_ajax_post(reverse("modoboa.extensions.admin.views.identity.editaccount", args=[admin.id]), values) admin = User.objects.get(username="admin@test.com") self.assertEqual(admin.group, "DomainAdmins") @@ -341,11 +341,11 @@ class PermissionsTestCase(ModoTestCase): self.clt.logout() self.assertEqual(self.clt.login(username="admin@test.com", password="toto"), True) - response = self.clt.get(reverse("modoboa.admin.views.domains")) + response = self.clt.get(reverse("modoboa.extensions.admin.views.domain.domains")) self.assertEqual(response.status_code, 200) user = User.objects.get(username="user@test.com") - response = self.clt.get(reverse("modoboa.admin.views.editaccount", args=[user.id]), + response = self.clt.get(reverse("modoboa.extensions.admin.views.identity.editaccount", args=[user.id]), HTTP_X_REQUESTED_WITH='XMLHttpRequest') self.assertNotEqual(response["Content-Type"], "application/json") @@ -359,14 +359,14 @@ class PermissionsTestCase(ModoTestCase): values = dict(username="superadmin2@test.com", first_name="Super", last_name="Admin", password1="toto", password2="toto", role="SuperAdmins", is_active=True, email="superadmin2@test.com", stepid=2) - self.check_ajax_post(reverse("modoboa.admin.views.newaccount"), values) + self.check_ajax_post(reverse("modoboa.extensions.admin.views.identity.newaccount"), values) account = User.objects.get(username="superadmin2@test.com") self.clt.logout() self.clt.login(username="admin@test.com", password="toto") - self.check_ajax_get(reverse("modoboa.admin.views.delaccount", args=[account.id]), {}, + self.check_ajax_get(reverse("modoboa.extensions.admin.views.identity.delaccount", args=[account.id]), {}, status="ko", respmsg="Permission denied") - self.check_ajax_get(reverse("modoboa.admin.views.delaccount", args=[account.id]), {}, + self.check_ajax_get(reverse("modoboa.extensions.admin.views.identity.delaccount", args=[account.id]), {}, status="ko", respmsg="Permission denied") def test_domainadmin_dlist_local_domain_not_owned(self): @@ -378,7 +378,7 @@ class PermissionsTestCase(ModoTestCase): recipients_1="user@test2.com", enabled=True ) - self.check_ajax_post(reverse("modoboa.admin.views.newdlist"), values) + self.check_ajax_post(reverse("modoboa.extensions.admin.views.alias.newdlist"), values) class ImportTestCase(ModoTestCase): @@ -400,7 +400,7 @@ class ImportTestCase(ModoTestCase): domain; domain2.com; 200; False domainalias; domalias1.com; domain1.com; True """, name="domains.csv") - self.clt.post(reverse("modoboa.admin.views.import_domains"), { + self.clt.post(reverse("modoboa.extensions.admin.views.import.import_domains"), { "sourcefile": f }) admin = User.objects.get(username="admin") @@ -425,7 +425,7 @@ alias; alias1@test.com; True; user1@test.com forward; fwd1@test.com; True; user@extdomain.com dlist; dlist@test.com; True; user1@test.com; user@extdomain.com """, name="identities.csv") - self.clt.post(reverse("modoboa.admin.views.import_identities"), { + self.clt.post(reverse("modoboa.extensions.admin.views.import.import_identities"), { "sourcefile": f, "crypt_password": True }) admin = User.objects.get(username="admin") @@ -467,7 +467,7 @@ dlist; dlist@test.com; True; user1@test.com; user@extdomain.com account; admin@test.com; toto; Admin; ; True; DomainAdmins; admin@test.com; test.com account; truc@test.com; toto; René; Truc; True; DomainAdmins; truc@test.com; test.com """, name="identities.csv") - self.clt.post(reverse("modoboa.admin.views.import_identities"), { + self.clt.post(reverse("modoboa.extensions.admin.views.import.import_identities"), { "sourcefile": f, "crypt_password": True, "continue_if_exists": True }) @@ -485,7 +485,7 @@ account; truc@test.com; toto; René; Truc; True; DomainAdmins; truc@test.com; te f = ContentFile(b""" account; sa@test.com; toto; Super; Admin; True; SuperAdmins; superadmin@test.com """, name="identities.csv") - self.clt.post(reverse("modoboa.admin.views.import_identities"), { + self.clt.post(reverse("modoboa.extensions.admin.views.import.import_identities"), { "sourcefile": f, "crypt_password": True, "continue_if_exists": True }) with self.assertRaises(User.DoesNotExist): From a68524264deb6223363194af0667c9b718ad28d4 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Wed, 25 Sep 2013 15:02:24 +0200 Subject: [PATCH 52/97] Two fixes Don't send Content-Length header if not needed. (see #480) Always use build_header... (see #473) --- modoboa/extensions/webmail/views.py | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/modoboa/extensions/webmail/views.py b/modoboa/extensions/webmail/views.py index 5d536f5aa..30c3055c6 100644 --- a/modoboa/extensions/webmail/views.py +++ b/modoboa/extensions/webmail/views.py @@ -1,6 +1,6 @@ # coding: utf-8 import os -from rfc6266 import build_header +from rfc6266 import build_header, parse_headers from django.conf import settings from django.http import HttpResponse from django.template import Template, Context @@ -29,6 +29,14 @@ from templatetags import webextras def getattachment(request): """Fetch a message attachment + The tricky part here consists in properly format the + *Content-Disposition* header. We use the rfc6266 package to encode + headers according to RFC5987 and RFC6266. + + Even if the header received from Dovecot is already encoded, we + decode and re-encode it to make sure it uses UTF-8. IE doesn't + support the ISO-8859-1 encoding even if it is allowed by RFCs. + FIXME: par manque de caching, le bodystructure du message est redemandé pour accéder aux headers de cette pièce jointe. @@ -52,15 +60,20 @@ def getattachment(request): if type(disp[1][0]) != dict: atype, fieldname, filename = disp[0], disp[1][0], disp[1][1] else: - atype, fieldname, filename = disp[0], disp[1][0]['struct'][0], disp[1][0]['struct'][1] + atype, fieldname, filename = \ + disp[0], disp[1][0]['struct'][0], disp[1][0]['struct'][1] if fieldname.endswith('*'): cd = '%s; %s=%s' % (atype, fieldname, filename) else: cd = '%s; %s="%s"' % (atype, fieldname, filename) + fname = parse_headers(cd).filename_unsafe else: - cd = build_header(request.GET["fname"]) - resp["Content-Disposition"] = cd - resp["Content-Length"] = partdef["size"] + fname = request.GET.get("fname", None) + if fname is None: + raise WebmailError(_("Invalid request")) + resp["Content-Disposition"] = build_header(fname) + if int(partdef["size"]) < 200: + resp["Content-Length"] = partdef["size"] return resp From cb7267c66ea30ee43a1e55d5a7266a3808e8f90a Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Wed, 25 Sep 2013 22:04:20 +0200 Subject: [PATCH 53/97] The fix may be easier than expected :p see #473 --- modoboa/extensions/webmail/views.py | 31 +++-------------------------- 1 file changed, 3 insertions(+), 28 deletions(-) diff --git a/modoboa/extensions/webmail/views.py b/modoboa/extensions/webmail/views.py index 30c3055c6..cf806f129 100644 --- a/modoboa/extensions/webmail/views.py +++ b/modoboa/extensions/webmail/views.py @@ -1,6 +1,6 @@ # coding: utf-8 import os -from rfc6266 import build_header, parse_headers +from rfc6266 import build_header from django.conf import settings from django.http import HttpResponse from django.template import Template, Context @@ -29,14 +29,6 @@ from templatetags import webextras def getattachment(request): """Fetch a message attachment - The tricky part here consists in properly format the - *Content-Disposition* header. We use the rfc6266 package to encode - headers according to RFC5987 and RFC6266. - - Even if the header received from Dovecot is already encoded, we - decode and re-encode it to make sure it uses UTF-8. IE doesn't - support the ISO-8859-1 encoding even if it is allowed by RFCs. - FIXME: par manque de caching, le bodystructure du message est redemandé pour accéder aux headers de cette pièce jointe. @@ -45,7 +37,8 @@ def getattachment(request): mbox = request.GET.get("mbox", None) mailid = request.GET.get("mailid", None) pnum = request.GET.get("partnumber", None) - if not mbox or not mailid or not pnum: + fname = request.GET.get("fname", None) + if not mbox or not mailid or not pnum or not fname: raise WebmailError(_("Invalid request")) imapc = get_imapconnector(request) @@ -53,24 +46,6 @@ def getattachment(request): resp = HttpResponse(decode_payload(partdef["encoding"], payload)) resp["Content-Type"] = partdef["Content-Type"] resp["Content-Transfer-Encoding"] = partdef["encoding"] - if partdef["disposition"] != 'NIL': - disp = partdef["disposition"] - # FIXME : ugly hack, see fetch_parser.py for more explanation - # :p - if type(disp[1][0]) != dict: - atype, fieldname, filename = disp[0], disp[1][0], disp[1][1] - else: - atype, fieldname, filename = \ - disp[0], disp[1][0]['struct'][0], disp[1][0]['struct'][1] - if fieldname.endswith('*'): - cd = '%s; %s=%s' % (atype, fieldname, filename) - else: - cd = '%s; %s="%s"' % (atype, fieldname, filename) - fname = parse_headers(cd).filename_unsafe - else: - fname = request.GET.get("fname", None) - if fname is None: - raise WebmailError(_("Invalid request")) resp["Content-Disposition"] = build_header(fname) if int(partdef["size"]) < 200: resp["Content-Length"] = partdef["size"] From 717ae951494f137e922fda047849dee186e41ed3 Mon Sep 17 00:00:00 2001 From: Alberto Berti Date: Fri, 27 Sep 2013 00:08:47 +0200 Subject: [PATCH 54/97] Updated italian translation --- modoboa/locale/it/LC_MESSAGES/django.po | 102 +++++++++------------- modoboa/locale/it/LC_MESSAGES/djangojs.po | 40 +++------ 2 files changed, 51 insertions(+), 91 deletions(-) diff --git a/modoboa/locale/it/LC_MESSAGES/django.po b/modoboa/locale/it/LC_MESSAGES/django.po index 36373ed17..dcf26d52d 100644 --- a/modoboa/locale/it/LC_MESSAGES/django.po +++ b/modoboa/locale/it/LC_MESSAGES/django.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-09-20 22:30+0200\n" -"PO-Revision-Date: 2013-06-28 17:03+0200\n" -"Last-Translator: Giancarlo Gaifas \n" +"POT-Creation-Date: 2013-09-26 23:42+0200\n" +"PO-Revision-Date: 2013-09-27 00:07+0200\n" +"Last-Translator: Alberto Berti \n" "Language-Team: ITALIANO \n" "Language: it\n" "MIME-Version: 1.0\n" @@ -252,7 +252,7 @@ msgstr "" #: admin/app_settings.py:213 msgid "Key must be either 16, 24, or 32 bytes long" -msgstr "" +msgstr "La chiave può essere lunga solo 16, 24 o 32 bytes" #: admin/app_settings.py:222 msgid "Invalid syntax" @@ -520,12 +520,12 @@ msgstr "Non puoi importare un account con un ruolo superiore al tuo" #: admin/models.py:506 #, python-format msgid "The simple user '%s' must have a valid email address" -msgstr "" +msgstr "L'utente '%s' deve avere un indirizzo email valido" #: admin/models.py:510 #, python-format msgid "username and email fields must not differ for '%s'" -msgstr "" +msgstr "I campi nome utente e email di '%s' devono avere lo stesso valore" #: admin/models.py:534 #, python-format @@ -685,7 +685,7 @@ msgstr "Nuovo dominio" #: admin/views.py:89 admin/views.py:98 admin/views.py:228 admin/views.py:444 #: admin/views.py:451 extensions/sievefilters/views.py:129 -#: extensions/sievefilters/views.py:198 extensions/webmail/views.py:136 +#: extensions/sievefilters/views.py:198 extensions/webmail/views.py:128 msgid "Create" msgstr "Crea" @@ -707,7 +707,7 @@ msgstr "Dominio creato" #: admin/views.py:146 admin/views.py:285 admin/views.py:498 #: extensions/postfix_autoreply/templates/postfix_autoreply/autoreply.html:9 -#: extensions/sievefilters/views.py:148 extensions/webmail/views.py:168 +#: extensions/sievefilters/views.py:148 extensions/webmail/views.py:160 #: userprefs/templates/userprefs/forward.html:8 #: userprefs/templates/userprefs/profile.html:8 msgid "Update" @@ -770,11 +770,11 @@ msgstr "Alias modificato" #: admin/views.py:402 admin/views.py:545 admin/views.py:550 #: extensions/amavis/views.py:204 extensions/amavis/views.py:210 #: extensions/amavis/views.py:243 extensions/amavis/views.py:247 -#: extensions/amavis/views.py:249 extensions/webmail/views.py:41 -#: extensions/webmail/views.py:68 extensions/webmail/views.py:81 -#: extensions/webmail/views.py:98 extensions/webmail/views.py:114 -#: extensions/webmail/views.py:200 extensions/webmail/views.py:427 -#: extensions/webmail/views.py:438 extensions/webmail/views.py:465 +#: extensions/amavis/views.py:249 extensions/webmail/views.py:42 +#: extensions/webmail/views.py:60 extensions/webmail/views.py:73 +#: extensions/webmail/views.py:90 extensions/webmail/views.py:106 +#: extensions/webmail/views.py:192 extensions/webmail/views.py:419 +#: extensions/webmail/views.py:430 extensions/webmail/views.py:457 #: lib/formutils.py:32 lib/formutils.py:37 msgid "Invalid request" msgstr "Richiesta non valida" @@ -1007,7 +1007,7 @@ msgid "Previously on Modoboa..." msgstr "Precedentemente su Modoboa ..." #: admin/templates/admin/logs.html:6 extensions/amavis/sql_listing.py:25 -#: extensions/webmail/lib.py:38 extensions/webmail/lib.py:411 +#: extensions/webmail/lib.py:38 extensions/webmail/lib.py:413 msgid "Date" msgstr "Data" @@ -1067,11 +1067,11 @@ msgstr "Impostazioni Modoboa" #: admin/templatetags/admin_extras.py:13 msgid "enabled_m" -msgstr "" +msgstr "Abilitato" #: admin/templatetags/admin_extras.py:13 msgid "enabled_f" -msgstr "" +msgstr "Abilitata" #: admin/templatetags/admin_extras.py:36 msgid "Modoboa" @@ -1112,9 +1112,9 @@ msgstr "Visualizza le identita del dominio" #: admin/templatetags/admin_extras.py:178 #: admin/templatetags/admin_extras.py:194 #: admin/templatetags/admin_extras.py:201 -#, fuzzy, python-format +#, python-format msgid "Delete %s?" -msgstr "Elimina" +msgstr "Eliminare %s?" #: admin/templatetags/admin_extras.py:223 msgid "Remove this permission" @@ -1382,7 +1382,7 @@ msgstr "Da" #: extensions/amavis/sql_listing.py:24 extensions/sievefilters/forms.py:68 #: extensions/webmail/forms.py:10 extensions/webmail/lib.py:36 -#: extensions/webmail/lib.py:409 templates/common/email_searchbar.html:6 +#: extensions/webmail/lib.py:411 templates/common/email_searchbar.html:6 msgid "Subject" msgstr "Oggetto" @@ -2217,88 +2217,87 @@ msgid "Cci" msgstr "Cci" #: extensions/webmail/imaputils.py:237 -#, fuzzy msgid "Failed to retrieve hierarchy delimiter" -msgstr "Recupero delle impostazioni di filtro fallito" +msgstr "Impossibile recuperare il delimitatore delle gerarchie" #: extensions/webmail/imaputils.py:278 #, python-format msgid "Connection to IMAP server failed: %s" msgstr "Connessione al server IMAP fallita: %s" -#: extensions/webmail/lib.py:358 +#: extensions/webmail/lib.py:360 msgid "wrote:" msgstr "scritto:" -#: extensions/webmail/lib.py:423 extensions/webmail/lib.py:427 +#: extensions/webmail/lib.py:425 extensions/webmail/lib.py:429 msgid "Original message" msgstr "Messaggio originale" -#: extensions/webmail/views.py:86 +#: extensions/webmail/views.py:78 #, python-format msgid "%(count)d message deleted" msgid_plural "%(count)d messages deleted" msgstr[0] "%(count)d messaggio cancellato" msgstr[1] "%(count)d messaggi cancellati" -#: extensions/webmail/views.py:103 +#: extensions/webmail/views.py:95 msgid "Unknown action" msgstr "Azione sconosciuta" -#: extensions/webmail/views.py:116 lib/email_listing.py:137 +#: extensions/webmail/views.py:108 lib/email_listing.py:137 msgid "Empty mailbox" msgstr "Casella di posta vuota" -#: extensions/webmail/views.py:133 +#: extensions/webmail/views.py:125 #: extensions/webmail/templatetags/webextras.py:170 msgid "Create a new mailbox" msgstr "Crea una nuova casella di posta" -#: extensions/webmail/views.py:149 +#: extensions/webmail/views.py:141 msgid "Mailbox created" msgstr "Casella di posta creata" -#: extensions/webmail/views.py:165 +#: extensions/webmail/views.py:157 msgid "Edit mailbox" msgstr "Modifica casella di posta" -#: extensions/webmail/views.py:180 +#: extensions/webmail/views.py:172 msgid "Mailbox updated" msgstr "Casella di posta aggiornata" -#: extensions/webmail/views.py:214 extensions/webmail/views.py:396 -#: extensions/webmail/views.py:505 +#: extensions/webmail/views.py:206 extensions/webmail/views.py:388 +#: extensions/webmail/views.py:497 msgid "Bad request" msgstr "Richiesta sbagliata" -#: extensions/webmail/views.py:246 +#: extensions/webmail/views.py:238 msgid "Failed to save attachment: " msgstr "Salvataggio allegato fallito: " -#: extensions/webmail/views.py:249 +#: extensions/webmail/views.py:241 #, python-format msgid "Attachment is too big (limit: %s)" msgstr "L'allegato è troppo grande (limite: %s)" -#: extensions/webmail/views.py:255 +#: extensions/webmail/views.py:247 #: extensions/webmail/templates/webmail/compose.html:15 #: extensions/webmail/templates/webmail/headers.html:4 msgid "Attachments" msgstr "Allegati" -#: extensions/webmail/views.py:271 +#: extensions/webmail/views.py:263 msgid "Bad query" msgstr "Domanda sbagliata" -#: extensions/webmail/views.py:281 +#: extensions/webmail/views.py:273 msgid "Failed to remove attachment: " msgstr "Rimozione allegato fallita: " -#: extensions/webmail/views.py:286 +#: extensions/webmail/views.py:278 msgid "Unknown attachment" msgstr "Allegato sconosciuto" -#: extensions/webmail/views.py:501 +#: extensions/webmail/views.py:493 msgid "Undefined action" msgstr "Azione non definita" @@ -2455,11 +2454,11 @@ msgstr "È intervenuto un errore interno" #: templates/nlayout.html:62 msgid "Powered by Modoboa" -msgstr "" +msgstr "Powered by Modoboa" #: templates/common/email_searchbar.html:5 msgid "From address" -msgstr "Indirizzo from" +msgstr "Mittente" #: templates/common/email_searchbar.html:10 msgid "Both" @@ -2598,24 +2597,3 @@ msgstr "Aggiorna le informazioni personali" #: userprefs/templatetags/uprefs_extras.py:57 msgid "Logout" msgstr "Esci" - -#~ msgid "Failed to rename mailbox: %s" -#~ msgstr "Impossibile rinominare la casella di posta: %s" - -#~ msgid "Failed to remove mailbox: %s" -#~ msgstr "Impossibile rimuovere la casella di posta: %s" - -#~ msgid "Delete the domain" -#~ msgstr "Cancella il dominio" - -#~ msgid "Delete this account" -#~ msgstr "Cancella questo account" - -#~ msgid "Delete this distribution list" -#~ msgstr "Cancella l'elenco di smistamento" - -#~ msgid "Delete this forward" -#~ msgstr "Cancella questo inoltro" - -#~ msgid "Delete this alias" -#~ msgstr "Cancella questo alias" diff --git a/modoboa/locale/it/LC_MESSAGES/djangojs.po b/modoboa/locale/it/LC_MESSAGES/djangojs.po index 17330283a..086b29052 100644 --- a/modoboa/locale/it/LC_MESSAGES/djangojs.po +++ b/modoboa/locale/it/LC_MESSAGES/djangojs.po @@ -6,9 +6,9 @@ msgid "" msgstr "" "Project-Id-Version: Modoboa\n" -"Report-Msgid-Bugs-To: http://dev.modoboa.org\n" -"POT-Creation-Date: 2013-06-28 16:37+0200\n" -"PO-Revision-Date: 2013-06-28 16:58+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-09-26 23:44+0200\n" +"PO-Revision-Date: 2013-09-27 00:07+0200\n" "Last-Translator: Giancarlo Gaifas \n" "Language-Team: Italiano \n" "Language: it\n" @@ -33,11 +33,9 @@ msgstr "Questa operazione eliminerà TUTTI i dati associati a questo dominio." msgid "" "This operation will remove all data associated to this domain, excepting " "accounts." -msgstr "Questa operazione eliminerà tutti i dati associati a questo dominio tranne gli account" - -#: admin/static/admin/js/admin.js:117 -msgid "Delete this domain?" -msgstr "Elimino questo dominio?" +msgstr "" +"Questa operazione eliminerà tutti i dati associati a questo dominio tranne " +"gli account" #: admin/static/admin/js/admin.js:161 msgid "No domain administrator defined" @@ -47,22 +45,6 @@ msgstr "Non è stato definito un amministratore di dominio" msgid "Do not delete mailbox directory" msgstr "Non eliminare la cartella della casella posta" -#: admin/static/admin/js/admin.js:243 -msgid "Delete this account?" -msgstr "Eliminare questo account" - -#: admin/static/admin/js/admin.js:249 -msgid "Delete this list?" -msgstr "Eliminare questo elenco?" - -#: admin/static/admin/js/admin.js:254 -msgid "Delete this forward?" -msgstr "Eliminare questo inoltro?" - -#: admin/static/admin/js/admin.js:259 -msgid "Delete this alias?" -msgstr "Eliminare questo alias?" - #: extensions/amavis/static/amavis/js/quarantine.js:126 msgid "Release this selection?" msgstr "Rilasciare questa selezione?" @@ -114,11 +96,11 @@ msgstr "attivo" msgid "Search a domain" msgstr "Cerca un dominio" -#: extensions/webmail/static/webmail/js/webmail.js:475 +#: extensions/webmail/static/webmail/js/webmail.js:476 msgid "Remove the selected mailbox?" msgstr "Rimuovere la casella di posta selezionata?" -#: extensions/webmail/static/webmail/js/webmail.js:489 +#: extensions/webmail/static/webmail/js/webmail.js:490 msgid "Mailbox removed" msgstr "Casella di posta rimossa" @@ -144,15 +126,15 @@ msgid_plural "Moving %s messages" msgstr[0] "Spostato %s messaggio" msgstr[1] "Spostati %s messaggi" -#: static/js/confirmation.js:48 +#: static/js/confirmation.js:50 msgid "Warning" msgstr "Attenzione" -#: static/js/confirmation.js:57 +#: static/js/confirmation.js:59 msgid "Cancel" msgstr "Elimina" -#: static/js/confirmation.js:99 static/js/history.js:239 +#: static/js/confirmation.js:101 static/js/history.js:235 msgid "Internal Error" msgstr "Errore interno" From 93a5fd5bb84cb29887de74d23049374c94f5b48a Mon Sep 17 00:00:00 2001 From: ricardopadilha Date: Fri, 27 Sep 2013 11:24:07 +0200 Subject: [PATCH 55/97] Update deploy.py to support sqlite3 modoboa-admin.py does not allow giving "sqlite3" as a database type. --- modoboa/core/commands/deploy.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modoboa/core/commands/deploy.py b/modoboa/core/commands/deploy.py index 3c9c15107..cd33fde07 100644 --- a/modoboa/core/commands/deploy.py +++ b/modoboa/core/commands/deploy.py @@ -75,8 +75,8 @@ class DeployCommand(Command): """ print "Configuring database connection: %s" % name info = {'conn_name': name, - 'dbtype': raw_input('Database type (mysql or postgres): ')} - if info['dbtype'] not in ['mysql', 'postgres']: + 'dbtype': raw_input('Database type (mysql, postgres or sqlite3): ')} + if info['dbtype'] not in ['mysql', 'postgres', 'sqlite3']: info['dbtype'] = 'mysql' if info['dbtype'] == 'postgres': info['dbtype'] = 'postgresql_psycopg2' From bab49c812dfd80a41e8a0429dda52fc05e37710f Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Fri, 27 Sep 2013 15:48:12 +0200 Subject: [PATCH 56/97] Swedish translation updated. --- modoboa/locale/sv/LC_MESSAGES/django.po | 215 ++++++------------------ 1 file changed, 54 insertions(+), 161 deletions(-) diff --git a/modoboa/locale/sv/LC_MESSAGES/django.po b/modoboa/locale/sv/LC_MESSAGES/django.po index 7d8e66cac..8373e44ff 100644 --- a/modoboa/locale/sv/LC_MESSAGES/django.po +++ b/modoboa/locale/sv/LC_MESSAGES/django.po @@ -1,22 +1,22 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # ogg1980 , 2013 +# ogg1980 , 2013 msgid "" msgstr "" "Project-Id-Version: Modoboa\n" -"Report-Msgid-Bugs-To: \n" +"Report-Msgid-Bugs-To: http://dev.modoboa.org/\n" "POT-Creation-Date: 2013-09-20 22:30+0200\n" -"PO-Revision-Date: 2013-06-01 14:36+0000\n" -"Last-Translator: Antoine Nguyen \n" -"Language-Team: Swedish (http://www.transifex.com/projects/p/modoboa/language/" -"sv/)\n" -"Language: sv\n" +"PO-Revision-Date: 2013-09-27 08:19+0000\n" +"Last-Translator: ogg1980 \n" +"Language-Team: Swedish (http://www.transifex.com/projects/p/modoboa/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: sv\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: admin/__init__.py:9 @@ -122,9 +122,7 @@ msgstr "Bind DN" msgid "" "The distinguished name to use when binding to the LDAP server. Leave empty " "for an anonymous bind" -msgstr "" -"Det unika namnet för att använda vid bindningar till LDAP-servern. Lämna " -"tomt för en anonym bindning" +msgstr "Det unika namnet för att använda vid bindningar till LDAP-servern. Lämna tomt för en anonym bindning" #: admin/app_settings.py:97 msgid "Bind password" @@ -132,8 +130,7 @@ msgstr "Bind lösenord" #: admin/app_settings.py:99 msgid "The password to use when binding to the LDAP server (with 'Bind DN')" -msgstr "" -"Lösenordet ska användas vid bindning till LDAP-servern (med \"Bind DN ')" +msgstr "Lösenordet ska användas vid bindning till LDAP-servern (med \"Bind DN ')" #: admin/app_settings.py:105 msgid "Search base" @@ -151,9 +148,7 @@ msgstr "Sökfilter" msgid "" "An optional filter string (e.g. '(objectClass=person)'). In order to be " "valid, it must be enclosed in parentheses." -msgstr "" -"En valfri filtersträng (t.ex. \"(objectClass = personer) '). För att vara " -"giltigt måste det omges av parenteser." +msgstr "En valfri filtersträng (t.ex. \"(objectClass = personer) '). För att vara giltigt måste det omges av parenteser." #: admin/app_settings.py:119 msgid "User DN template" @@ -164,9 +159,7 @@ msgstr "Anvädar DN mall" msgid "" "The template used to construct a user's DN. It should contain one " "placeholder (ie. %(user)s)" -msgstr "" -"Mallen som används för att konstruera en användares DN. Den bör innehålla en " -"platshållare (dvs. %(user)s)" +msgstr "Mallen som används för att konstruera en användares DN. Den bör innehålla en platshållare (dvs. %(user)s)" #: admin/app_settings.py:126 msgid "Password attribute" @@ -199,9 +192,7 @@ msgstr "Hantera brevlådor på filsystem" msgid "" "Rename or remove mailboxes on the filesystem when they get renamed or " "removed within Modoboa" -msgstr "" -"Byt namn på eller ta bort brevlådor på filsystemet när de kommer byta namn " -"eller tas bort inom Modoboa" +msgstr "Byt namn på eller ta bort brevlådor på filsystemet när de kommer byta namn eller tas bort inom Modoboa" #: admin/app_settings.py:146 msgid "Mailboxes ower" @@ -249,12 +240,11 @@ msgstr "Standard omdirigering när ingen applikation angetts" #: admin/app_settings.py:213 msgid "Key must be either 16, 24, or 32 bytes long" -msgstr "" +msgstr "Nyckel måste vara endera 16, 24 eller 32 bytes lång" #: admin/app_settings.py:222 -#, fuzzy msgid "Invalid syntax" -msgstr "Ogiltig rad" +msgstr "Ogiltig syntax" #: admin/app_settings.py:245 msgid "This field is required" @@ -268,9 +258,7 @@ msgstr "Alias" msgid "" "Alias(es) of this domain. Indicate only one name per input, press ENTER to " "add a new input." -msgstr "" -"Alias för denna domän. Ange endast ett namn per rad, tryck ENTER för att " -"lägga till en rad." +msgstr "Alias för denna domän. Ange endast ett namn per rad, tryck ENTER för att lägga till en rad." #: admin/forms.py:59 msgid "An alias with this name already exists" @@ -301,9 +289,7 @@ msgstr "Namn" msgid "" "The administrator's name. Don't include the domain's name here, it will be " "automatically appended." -msgstr "" -"Administratörens namn. Inkludera inte domänens namn här, den kommer att " -"läggas till automatiskt." +msgstr "Administratörens namn. Inkludera inte domänens namn här, den kommer att läggas till automatiskt." #: admin/forms.py:160 msgid "Create aliases" @@ -330,9 +316,7 @@ msgstr "E-post adress" msgid "" "The distribution list address. Use the '*' character to create a 'catchall' " "address (ex: *@domain.tld)." -msgstr "" -"Distributionslistans adress. Använd '*' för att skapa en 'catchall' adress " -"(ex: *@domain.tld)." +msgstr "Distributionslistans adress. Använd '*' för att skapa en 'catchall' adress (ex: *@domain.tld)." #: admin/forms.py:239 msgid "Recipients" @@ -342,9 +326,7 @@ msgstr "Mottagare" msgid "" "Mailbox(es) this alias will point to. Indicate only one address per input, " "press ENTER to add a new input." -msgstr "" -"Brevlåda/or detta alias kommer att peka på. Ange endast en adress per " -"inlägg, tryck ENTER för att lägga till en ny inlägg." +msgstr "Brevlåda/or detta alias kommer att peka på. Ange endast en adress per inlägg, tryck ENTER för att lägga till en ny inlägg." #: admin/forms.py:278 admin/forms.py:542 admin/forms.py:568 msgid "Domain does not exist" @@ -454,20 +436,14 @@ msgid "" "Quota in MB for this mailbox. Define a custom value or use domain's default " "one. Leave empty to define an unlimited value (not allowed for domain " "administrators)." -msgstr "" -"Kvot i MB för denna brevlåda. Definiera ett anpassat värde eller använda " -"domänens förvalda. Lämna tomt för att definiera ett obegränsat värde (ej " -"tillåtet för domänadministratörer)." +msgstr "Kvot i MB för denna brevlåda. Definiera ett anpassat värde eller använda domänens förvalda. Lämna tomt för att definiera ett obegränsat värde (ej tillåtet för domänadministratörer)." #: admin/forms.py:499 msgid "" "Alias(es) of this mailbox. Indicate only one address per input, press ENTER " "to add a new input. Use the '*' character to create a 'catchall' alias (ex: " "*@domain.tld)." -msgstr "" -"Alias för denna brevlåda. Ange endast en adress per rad, tryck ENTER för att " -"lägga till ny rad. Använd '*' för att skapa ett 'catchall' alias (ex: " -"*@domain.tld)." +msgstr "Alias för denna brevlåda. Ange endast en adress per rad, tryck ENTER för att lägga till ny rad. Använd '*' för att skapa ett 'catchall' alias (ex: *@domain.tld)." #: admin/forms.py:550 #, python-format @@ -518,12 +494,12 @@ msgstr "Du kan inte importera konto med en roll större än din" #: admin/models.py:506 #, python-format msgid "The simple user '%s' must have a valid email address" -msgstr "" +msgstr "Den enkla användaren '%s' måste ha en gällande e-postadress" #: admin/models.py:510 #, python-format msgid "username and email fields must not differ for '%s'" -msgstr "" +msgstr "användarnamn och e-post fält får inte avvika för '%s'" #: admin/models.py:534 #, python-format @@ -596,11 +572,9 @@ msgstr "En kvota krävs" #: admin/models.py:1032 msgid "" -"The alias address (without the domain part). For a 'catch-all' address, just " -"enter an * character." -msgstr "" -"Alias adress (utan domän delen). För en \"catch-all\"-adress, ange bara " -"asterisk *." +"The alias address (without the domain part). For a 'catch-all' address, just" +" enter an * character." +msgstr "Alias adress (utan domän delen). För en \"catch-all\"-adress, ange bara asterisk *." #: admin/models.py:1036 msgid "mailboxes" @@ -632,9 +606,9 @@ msgid "Invalid line: %s" msgstr "Ogiltig rad: %s" #: admin/models.py:1175 -#, fuzzy, python-format +#, python-format msgid "Domain '%s' does not exist" -msgstr "Domän existerar inte" +msgstr "Domänen '%s' existerar inte" #: admin/models.py:1218 msgid "Check to enable this extension" @@ -817,29 +791,15 @@ msgstr "%d objekt importerade" msgid "" "Provide a CSV file where lines respect one of the following formats:\n" "

                            \n" -"
                          • account; loginname; password; first name; last name; enabled; group; " -"address[, domain, ...]
                            • \n" +"
                          • account; loginname; password; first name; last name; enabled; group; address[, domain, ...]
                            • \n" "
                          • alias; address; enabled; internal recipient
                            • \n" "
                          • forward; address; enabled; external recipient
                            • \n" "
                          • dlist; address; enabled; recipient; recipient; ...
                            • \n" "
                          \n" -"

                          The first element of each line is mandatory and must be equal to one of " -"the previous values.

                          \n" +"

                          The first element of each line is mandatory and must be equal to one of the previous values.

                          \n" "\n" "

                          You can use a different character as separator.

                          \n" -msgstr "" -"Tillhandahåll en CSV-fil där raderna har följande format:⏎\n" -"
                            ⏎\n" -"
                          • account; loginname; password; first name; last name; enabled; group; " -"address[, domain, ...]
                            • ⏎\n" -"
                          • alias; address; enabled; internal recipient
                            • ⏎\n" -"
                          • forward; address; enabled; external recipient
                            • ⏎\n" -"
                          • dlist; address; enabled; recipient; recipient; ...
                            • ⏎\n" -"
                          ⏎\n" -"

                          Det första elementet i varje rad är obligatorisk och måste vara lika med " -"en av de tidigare värdena.

                          ⏎\n" -"⏎\n" -"

                          Du kan använda ett annat tecken separator.

                          ⏎\n" +msgstr "Tillhandahåll en CSV-fil där raderna har följande format:⏎\n
                            ⏎\n
                          • account; loginname; password; first name; last name; enabled; group; address[, domain, ...]
                            • ⏎\n
                          • alias; address; enabled; internal recipient
                            • ⏎\n
                          • forward; address; enabled; external recipient
                            • ⏎\n
                          • dlist; address; enabled; recipient; recipient; ...
                            • ⏎\n
                          ⏎\n

                          Det första elementet i varje rad är obligatorisk och måste vara lika med en av de tidigare värdena.

                          ⏎\n⏎\n

                          Du kan använda ett annat tecken separator.

                          ⏎\n" #: admin/views.py:775 msgid "Import identities" @@ -866,18 +826,9 @@ msgid "" "
                        • domain; name; quota; enabled
                          • \n" "
                        • domainalias; name; targeted domain; enabled
                          • \n" "
                        \n" -"

                        The first element of each line is mandatory and must be equal to one of " -"the previous values.

                        \n" +"

                        The first element of each line is mandatory and must be equal to one of the previous values.

                        \n" "

                        You can use a different character as separator.

                        \n" -msgstr "" -"Tillhandahåll en CSV fil där raderna har följande format:\n" -"
                          \n" -"
                        • domän, namn, kvot, aktiverade\n" -"
                        • domainalias, namn, riktad domän, aktiverade\n" -"\n" -"

                          det första elementet i varje rad är obligatoriskt och måste vara lika med " -"en av de tidigare värdena.\n" -"

                          Du kan använda ett annat tecken som separator.\n" +msgstr "Tillhandahåll en CSV fil där raderna har följande format:\n

                            \n
                          • domän, namn, kvot, aktiverade\n
                          • domainalias, namn, riktad domän, aktiverade\n\n

                            det första elementet i varje rad är obligatoriskt och måste vara lika med en av de tidigare värdena.\n

                            Du kan använda ett annat tecken som separator.\n" #: admin/views.py:845 msgid "Import domains" @@ -1108,9 +1059,9 @@ msgstr "Visa domänens konton" #: admin/templatetags/admin_extras.py:178 #: admin/templatetags/admin_extras.py:194 #: admin/templatetags/admin_extras.py:201 -#, fuzzy, python-format +#, python-format msgid "Delete %s?" -msgstr "Radera" +msgstr "Radera %s?" #: admin/templatetags/admin_extras.py:223 msgid "Remove this permission" @@ -1159,30 +1110,15 @@ msgid "" "\n" "

                            Welcome to the online demo!

                            \n" "

                            Warning: the demo's concent is resetted every two hours.

                            \n" -"

                            To try the demo, the following users are available (username/password):

                            \n" +"

                            To try the demo, the following users are available (username/password):

                            \n" "
                              \n" "
                            • A super administrator : admin/password
                              • \n" "
                            • A domain administrator : admin@demo.local/admin
                              • \n" "
                            • A simple user : user@demo.local/user
                              • \n" "
                            \n" "

                            Please report any issue or give any suggestion to \n" -" the " -"mailing list.

                            \n" -msgstr "" -"\n" -"

                            Välkommen till online-demot!

                            \n" -"

                            Varning: demots innehåll återställs varannan timme

                            \n" -"

                            För att prova demot, följande användare finns tillgängliga " -"(användarnamn/lösenord):

                            \n" -"
                              \n" -"
                            • En super administratör: admin/password
                              • \n" -"
                            • En domän administratölr: admin@demo.local/admin
                              • \n" -"
                            • En enkel användare: user@demo.local/user
                              • \n" -"
                            \n" -"

                            Var vänlig rapportera eventuella fel eller ge förslag på mailinglistan." -"

                            \n" +" the mailing list.

                            \n" +msgstr "\n

                            Välkommen till online-demot!

                            \n

                            Varning: demots innehåll återställs varannan timme

                            \n

                            För att prova demot, följande användare finns tillgängliga (användarnamn/lösenord):

                            \n
                              \n
                            • En super administratör: admin/password
                              • \n
                            • En domän administratölr: admin@demo.local/admin
                              • \n
                            • En enkel användare: user@demo.local/user
                              • \n
                            \n

                            Var vänlig rapportera eventuella fel eller ge förslag på mailinglistan.

                            \n" #: extensions/amavis/__init__.py:22 msgid "Simple amavis management frontend" @@ -1333,9 +1269,7 @@ msgstr "standard" #: extensions/amavis/models.py:98 msgid "Bypass virus checks or not. Choose 'default' to use global settings." -msgstr "" -"Kringgå virus kontroller eller ej. Välj \"standard\" för att använda globala " -"inställningar." +msgstr "Kringgå virus kontroller eller ej. Välj \"standard\" för att använda globala inställningar." #: extensions/amavis/models.py:101 msgid "Spam filter" @@ -1343,9 +1277,7 @@ msgstr "Skräp filter" #: extensions/amavis/models.py:106 msgid "Bypass spam checks or not. Choose 'default' to use global settings." -msgstr "" -"Kringgå skräp filter eller ej. Välj 'standard' för att använda globala " -"inställningar." +msgstr "Kringgå skräp filter eller ej. Välj 'standard' för att använda globala inställningar." #: extensions/amavis/models.py:109 msgid "Banned filter" @@ -1353,9 +1285,7 @@ msgstr "Förbjudna filter" #: extensions/amavis/models.py:114 msgid "Bypass banned checks or not. Choose 'default' to use global settings." -msgstr "" -"Kringgå förbjudna filter eller inte. Välj 'standard' för att använda globala " -"inställningar." +msgstr "Kringgå förbjudna filter eller inte. Välj 'standard' för att använda globala inställningar." #: extensions/amavis/models.py:144 msgid "Spam marker" @@ -1363,11 +1293,9 @@ msgstr "Skräp markering" #: extensions/amavis/models.py:146 msgid "" -"Modify spam subject using the specified text. Choose 'default' to use global " -"settings." -msgstr "" -"Ändra skräppost ämnesrad med vald text. Välj 'standard' för att använd " -"globala inställningar." +"Modify spam subject using the specified text. Choose 'default' to use global" +" settings." +msgstr "Ändra skräppost ämnesrad med vald text. Välj 'standard' för att använd globala inställningar." #: extensions/amavis/sql_listing.py:23 extensions/webmail/lib.py:37 msgid "From" @@ -1450,12 +1378,8 @@ msgid "" msgid_plural "" "\n" "%(counter)s release requests are pending for action.\n" -msgstr[0] "" -"\n" -"%(counter)s frisläpps förfrågning väntar på åtgärd.\n" -msgstr[1] "" -"\n" -"%(counter)s frisläpps förfrågningar väntar på åtgärd.'\n" +msgstr[0] "\n%(counter)s frisläpps förfrågning väntar på åtgärd.\n" +msgstr[1] "\n%(counter)s frisläpps förfrågningar väntar på åtgärd.'\n" #: extensions/amavis/templates/amavis/notifications/pending_requests.html:6 msgid "Sketch:" @@ -1530,8 +1454,7 @@ msgstr "Dålig MIME" #: extensions/limits/__init__.py:23 msgid "" "Per administrator resources to limit the number of objects they can create" -msgstr "" -"Per administratör resurser för att begränsa antalet objekt som de kan skapa" +msgstr "Per administratör resurser för att begränsa antalet objekt som de kan skapa" #: extensions/limits/__init__.py:54 msgid "Limits" @@ -1555,7 +1478,8 @@ msgid "Domain admins" msgstr "Domänadministratörer" #: extensions/limits/app_settings.py:15 -msgid "Maximum number of allowed domain administrators for a new administrator" +msgid "" +"Maximum number of allowed domain administrators for a new administrator" msgstr "Maximalt antal domänadministratörer den här användaren kan skapa" #: extensions/limits/app_settings.py:21 @@ -1804,9 +1728,7 @@ msgstr "Omdirigera meddelande till" #: extensions/sievefilters/lib.py:37 msgid "Connection to MANAGESIEVE server failed, check your configuration" -msgstr "" -"Anslutning till MANAGESIEVE servern misslyckades, kontrollera din " -"konfiguration" +msgstr "Anslutning till MANAGESIEVE servern misslyckades, kontrollera din konfiguration" #: extensions/sievefilters/lib.py:82 msgid "Not enough space on server" @@ -1885,9 +1807,7 @@ msgstr "aktivera" #: extensions/sievefilters/templates/sievefilters/index.html:74 msgid "" "No filters set defined yet. You must create one in order to define filters." -msgstr "" -"Inga filter uppsättningar definierade. Du måste skapa en uppsättning för att " -"kunna definiera filter." +msgstr "Inga filter uppsättningar definierade. Du måste skapa en uppsättning för att kunna definiera filter." #: extensions/sievefilters/templatetags/sfilters_tags.py:16 msgid "New filters set" @@ -2200,9 +2120,8 @@ msgid "Cci" msgstr "BCC" #: extensions/webmail/imaputils.py:237 -#, fuzzy msgid "Failed to retrieve hierarchy delimiter" -msgstr "Det gick inte att hämta filteruppsättning" +msgstr "Det gick inte att hämta hierarki avgränsare" #: extensions/webmail/imaputils.py:278 #, python-format @@ -2221,8 +2140,8 @@ msgstr "Orginalmeddelande" #, python-format msgid "%(count)d message deleted" msgid_plural "%(count)d messages deleted" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%(count)d meddelande raderat" +msgstr[1] "%(count)d meddelanden raderade" #: extensions/webmail/views.py:103 msgid "Unknown action" @@ -2530,9 +2449,7 @@ msgstr "Vidarebefordra meddelande och spara kopia i din lokala brevlåda" msgid "" "You can't define a forward to a local destination. Please ask your " "administrator to create an alias instead." -msgstr "" -"Du kan inte definiera en vidarebefordring till en lokal destination. Be din " -"administratör att skapa ett alias istället." +msgstr "Du kan inte definiera en vidarebefordring till en lokal destination. Be din administratör att skapa ett alias istället." #: userprefs/views.py:32 msgid "You need a mailbox in order to define a forward" @@ -2580,27 +2497,3 @@ msgstr "Uppdatera personlig information" #: userprefs/templatetags/uprefs_extras.py:57 msgid "Logout" msgstr "Logga ut" - -#~ msgid "Failed to rename mailbox: %s" -#~ msgstr "Kunde byta namn på brevlåda: %s" - -#~ msgid "Failed to remove mailbox: %s" -#~ msgstr "Kunde inte radera brevlåda: %s" - -#~ msgid "Mailbox %s does not exist" -#~ msgstr "Brevlådan %s finns inte" - -#~ msgid "Delete the domain" -#~ msgstr "Radera domänen" - -#~ msgid "Delete this account" -#~ msgstr "Radera detta konto" - -#~ msgid "Delete this distribution list" -#~ msgstr "Radera denna distributionslista" - -#~ msgid "Delete this forward" -#~ msgstr "Radera denna vidarebefodring" - -#~ msgid "Delete this alias" -#~ msgstr "Radera detta alia" From 8bb753e89003309a67370419a9c5cb6c0f9bf28b Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Fri, 27 Sep 2013 20:10:47 +0200 Subject: [PATCH 57/97] SQLite3 support. fixes #484 --- README.rst | 4 +- doc/integration/imap_and_smtp.rst | 39 ++++++--- modoboa/core/commands/postfix_maps.py | 111 +++++++++++++++++--------- 3 files changed, 106 insertions(+), 48 deletions(-) diff --git a/README.rst b/README.rst index 7c17f005f..d98c1dd09 100644 --- a/README.rst +++ b/README.rst @@ -11,8 +11,8 @@ as an administration panel or a webmail. Modoboa integrates with well known software such as `Postfix `_ or `Dovecot `_. A SQL database (`MySQL `_, `PostgreSQL -`_) is used as a central point of -communication between all components. +`_ or `SQLite `_) +is used as a central point of communication between all components. Modoboa is developed with modularity in mind, expanding it is really easy. Actually, all current features are extensions. diff --git a/doc/integration/imap_and_smtp.rst b/doc/integration/imap_and_smtp.rst index 3838c29ba..e2c28e187 100644 --- a/doc/integration/imap_and_smtp.rst +++ b/doc/integration/imap_and_smtp.rst @@ -161,6 +161,23 @@ PostgreSQL users iterate_query = SELECT email AS username FROM admin_user +SQLite users +------------ + +:: + + driver = sqlite + + connect = + + default_pass_scheme = CRYPT + + password_query = SELECT email AS user, password FROM admin_user WHERE email='%u' and is_active=1 + + user_query = SELECT '/%d/%n' AS home, as uid, as gid, ('*:bytes=' || mb.quota || 'M') AS quota_rule FROM admin_mailbox mb INNER JOIN admin_domain dom ON mb.domain_id=dom.id WHERE mb.address='%n' AND dom.name='%d' + + iterate_query = SELECT email AS username FROM admin_user + .. note:: Replace values between ``<>`` with yours. @@ -228,6 +245,8 @@ Finally, edit the :file:`dovecot-dict-sql.conf.ext` file and put the following content inside:: connect = host= dbname= user= password= + # SQLite users + # connect = /path/to/the/database.db map { pattern = priv/quota/storage @@ -404,7 +423,7 @@ be used by Postfix to lookup into Modoboa tables. To automaticaly generate the requested map files and store them in a directory, run the following command:: - $ modoboa-admin.py postfix_maps --dbtype mapfiles + $ modoboa-admin.py postfix_maps --dbtype mapfiles :file:`mapfiles` is the directory where the files will be stored. Answer the few questions and you're done. @@ -427,22 +446,24 @@ Use the following configuration in the :file:`/etc/postfix/main.cf` file virtual_mailbox_base = /var/vmail relay_domains = - virtual_mailbox_domains = mysql:/etc/postfix/sql-domains.cf - virtual_alias_domains = mysql:/etc/postfix/sql-domain-aliases.cf - virtual_mailbox_maps = mysql:/etc/postfix/sql-mailboxes.cf - virtual_alias_maps = mysql:/etc/postfix/sql-aliases.cf, - mysql:/etc/postfix/sql-domain-aliases-mailboxes.cf, - mysql:/etc/postfix/sql-email2email.cf, - mysql:/etc/postfix/sql-catchall-aliases.cf + virtual_mailbox_domains = :/etc/postfix/sql-domains.cf + virtual_alias_domains = :/etc/postfix/sql-domain-aliases.cf + virtual_mailbox_maps = :/etc/postfix/sql-mailboxes.cf + virtual_alias_maps = :/etc/postfix/sql-aliases.cf, + :/etc/postfix/sql-domain-aliases-mailboxes.cf, + :/etc/postfix/sql-email2email.cf, + :/etc/postfix/sql-catchall-aliases.cf smtpd_recipient_restrictions = ... - check_recipient_access mysql:/etc/postfix/maps/sql-maintain.cf + check_recipient_access :/etc/postfix/maps/sql-maintain.cf permit_mynetworks ... # Stuff after +Replace ```` by the name of the database you use. + Then, edit the :file:`/etc/postfix/master.cf` file and add the following definition at the end:: diff --git a/modoboa/core/commands/postfix_maps.py b/modoboa/core/commands/postfix_maps.py index afe3b57d5..e8c0e549a 100644 --- a/modoboa/core/commands/postfix_maps.py +++ b/modoboa/core/commands/postfix_maps.py @@ -6,69 +6,111 @@ from django.template import Context, Template from modoboa.core.management import Command -class MapFile(object): - category = 'std' +class MapFilesGenerator(object): def __init__(self): - self.base_tpl = Template("""user = {{ dbuser }} -password = {{ dbpassword }} + self.template = Template("""user = {{ dbuser }} +password = {{ dbpass }} dbname = {{ dbname }} hosts = {{ dbhost }} query = {{ query|safe }} """) + self.tpl_context = { + 'dbhost': raw_input('Database host: '), + 'dbname': raw_input('Database name: '), + 'dbuser': raw_input('Username: '), + 'dbpass': getpass.getpass('Password: ') + } + if not self.tpl_context['dbhost']: + self.tpl_context['dbhost'] = '127.0.0.1' - def render(self, destdir, dbtype, **options): + def render(self, args): + """Render all map files. + + :param args: arguments received from the command line + """ try: - options['query'] = getattr(self, dbtype) - except AttributeError: - return + os.mkdir(args.destdir) + except OSError: + pass - content = self.base_tpl.render(Context(options)) - fp = open("%s/%s" % (destdir, self.filename), "w") - fp.write(content) - fp.close() + for v in globals().values(): + if not inspect.isclass(v) or not issubclass(v, MapFile): + continue + if v is MapFile: + continue + if not v.category in args.categories: + continue + content = self.template.render( + Context(dict(self.tpl_context.items(), + query=getattr(v, args.dbtype))) + ) + with open("%s/%s" % (args.destdir, v.filename), "w") as fp: + print >> fp, content + + +class SQLiteMapFilesGenerator(MapFilesGenerator): + + def __init__(self): + self.template = Template("""dbpath = {{ dbpath }} +query = {{ query|safe }} +""") + self.tpl_context = { + 'dbpath': raw_input('Database path: ') + } + + +class MapFile(object): + category = 'std' class DomainsMap(MapFile): filename = 'sql-domains.cf' mysql = "SELECT name FROM admin_domain WHERE name='%s' AND enabled=1" postgres = "SELECT name FROM admin_domain WHERE name='%s' AND enabled" + sqlite = "SELECT name FROM admin_domain WHERE name='%s' AND enabled=1" class DomainsAliasesMap(MapFile): filename = 'sql-domain-aliases.cf' mysql = "SELECT dom.name FROM admin_domain dom INNER JOIN admin_domainalias domal ON dom.id=domal.target_id WHERE domal.name='%s' AND domal.enabled=1 AND dom.enabled=1" postgres = "SELECT dom.name FROM admin_domain dom INNER JOIN admin_domainalias domal ON dom.id=domal.target_id WHERE domal.name='%s' AND domal.enabled AND dom.enabled" + sqlite = "SELECT dom.name FROM admin_domain dom INNER JOIN admin_domainalias domal ON dom.id=domal.target_id WHERE domal.name='%s' AND domal.enabled=1 AND dom.enabled=1" class MailboxesMap(MapFile): filename = 'sql-mailboxes.cf' mysql = "SELECT 1 FROM admin_mailbox mb INNER JOIN admin_domain dom ON mb.domain_id=dom.id INNER JOIN admin_user user ON mb.user_id=user.id WHERE dom.enabled=1 AND dom.name='%d' AND user.is_active=1 AND mb.address='%u'" postgres = "SELECT 1 FROM admin_mailbox mb INNER JOIN admin_domain dom ON mb.domain_id=dom.id INNER JOIN admin_user u ON mb.user_id=u.id WHERE dom.enabled AND dom.name='%d' AND u.is_active AND mb.address='%u'" + sqlite = "SELECT 1 FROM admin_mailbox mb INNER JOIN admin_domain dom ON mb.domain_id=dom.id INNER JOIN admin_user user ON mb.user_id=user.id WHERE dom.enabled=1 AND dom.name='%d' AND user.is_active=1 AND mb.address='%u'" class AliasesMap(MapFile): filename = 'sql-aliases.cf' mysql = "(SELECT concat(mb.address, '@', dom.name) FROM admin_mailbox mb INNER JOIN admin_domain dom ON mb.domain_id=dom.id WHERE mb.id IN (SELECT al_mb.mailbox_id FROM admin_alias_mboxes al_mb INNER JOIN admin_alias al ON al_mb.alias_id=al.id INNER JOIN admin_domain dom ON al.domain_id=dom.id WHERE dom.name='%d' AND dom.enabled=1 AND al.address='%u' AND al.enabled=1)) UNION (SELECT concat(al.address, '@', dom.name) FROM admin_alias al INNER JOIN admin_domain dom ON al.domain_id=dom.id WHERE al.id IN (SELECT al_al.to_alias_id FROM admin_alias_aliases al_al INNER JOIN admin_alias al ON al_al.from_alias_id=al.id INNER JOIN admin_domain dom ON al.domain_id=dom.id WHERE dom.name='%d' AND dom.enabled=1 AND al.address='%u' AND al.enabled=1)) UNION (SELECT al.extmboxes FROM admin_alias al INNER JOIN admin_domain dom ON al.domain_id=dom.id WHERE dom.name='%d' AND dom.enabled=1 AND al.address='%u' AND al.enabled=1 AND al.extmboxes<>'')" postgres = "(SELECT mb.address || '@' || dom.name FROM admin_mailbox mb INNER JOIN admin_domain dom ON mb.domain_id=dom.id WHERE mb.id IN (SELECT al_mb.mailbox_id FROM admin_alias_mboxes al_mb INNER JOIN admin_alias al ON al_mb.alias_id=al.id INNER JOIN admin_domain dom ON al.domain_id=dom.id WHERE dom.name='%d' AND dom.enabled AND al.address='%u' AND al.enabled)) UNION (SELECT al.address || '@' || dom.name FROM admin_alias al INNER JOIN admin_domain dom ON al.domain_id=dom.id WHERE al.id IN (SELECT al_al.to_alias_id FROM admin_alias_aliases al_al INNER JOIN admin_alias al ON al_al.from_alias_id=al.id INNER JOIN admin_domain dom ON al.domain_id=dom.id WHERE dom.name='%d' AND dom.enabled AND al.address='%u' AND al.enabled)) UNION (SELECT al.extmboxes FROM admin_alias al INNER JOIN admin_domain dom ON al.domain_id=dom.id WHERE dom.name='%d' AND dom.enabled AND al.address='%u' AND al.enabled AND al.extmboxes<>'')" + sqlite = "(SELECT (mb.address || '@' || dom.name) FROM admin_mailbox mb INNER JOIN admin_domain dom ON mb.domain_id=dom.id WHERE mb.id IN (SELECT al_mb.mailbox_id FROM admin_alias_mboxes al_mb INNER JOIN admin_alias al ON al_mb.alias_id=al.id INNER JOIN admin_domain dom ON al.domain_id=dom.id WHERE dom.name='%d' AND dom.enabled=1 AND al.address='%u' AND al.enabled=1)) UNION (SELECT (al.address || '@' || dom.name) FROM admin_alias al INNER JOIN admin_domain dom ON al.domain_id=dom.id WHERE al.id IN (SELECT al_al.to_alias_id FROM admin_alias_aliases al_al INNER JOIN admin_alias al ON al_al.from_alias_id=al.id INNER JOIN admin_domain dom ON al.domain_id=dom.id WHERE dom.name='%d' AND dom.enabled=1 AND al.address='%u' AND al.enabled=1)) UNION (SELECT al.extmboxes FROM admin_alias al INNER JOIN admin_domain dom ON al.domain_id=dom.id WHERE dom.name='%d' AND dom.enabled=1 AND al.address='%u' AND al.enabled=1 AND al.extmboxes<>'')" class DomainAliasesMailboxesMap(MapFile): filename = 'sql-domain-aliases-mailboxes.cf' mysql = "(SELECT concat(mb.address, '@', dom.name) FROM admin_domainalias domal INNER JOIN admin_domain dom ON domal.target_id=dom.id INNER JOIN admin_mailbox mb ON mb.domain_id=dom.id WHERE domal.name='%d' AND dom.enabled=1 AND mb.address='%u') UNION (SELECT concat(al.address, '@', dom.name) FROM admin_domainalias domal INNER JOIN admin_domain dom ON domal.target_id=dom.id INNER JOIN admin_alias al ON al.domain_id=dom.id WHERE domal.name='%d' AND dom.enabled=1 AND al.address='%u')" postgres = "(SELECT mb.address || '@' || dom.name FROM admin_domainalias domal INNER JOIN admin_domain dom ON domal.target_id=dom.id INNER JOIN admin_mailbox mb ON mb.domain_id=dom.id WHERE domal.name='%d' AND dom.enabled AND mb.address='%u') UNION (SELECT al.address || '@' || dom.name FROM admin_domainalias domal INNER JOIN admin_domain dom ON domal.target_id=dom.id INNER JOIN admin_alias al ON al.domain_id=dom.id WHERE domal.name='%d' AND dom.enabled AND al.address='%u')" + sqlite = "(SELECT mb.address || '@' || dom.name FROM admin_domainalias domal INNER JOIN admin_domain dom ON domal.target_id=dom.id INNER JOIN admin_mailbox mb ON mb.domain_id=dom.id WHERE domal.name='%d' AND dom.enabled=1 AND mb.address='%u') UNION (SELECT al.address || '@' || dom.name FROM admin_domainalias domal INNER JOIN admin_domain dom ON domal.target_id=dom.id INNER JOIN admin_alias al ON al.domain_id=dom.id WHERE domal.name='%d' AND dom.enabled=1 AND al.address='%u')" class CatchallAliasesMap(MapFile): filename = 'sql-catchall-aliases.cf' mysql = "(SELECT concat(mb.address, '@', dom.name) FROM admin_mailbox mb INNER JOIN admin_domain dom ON mb.domain_id=dom.id WHERE mb.id IN (SELECT al_mb.mailbox_id FROM admin_alias al INNER JOIN admin_domain dom ON al.domain_id=dom.id INNER JOIN admin_alias_mboxes al_mb ON al.id=al_mb.alias_id WHERE al.enabled=1 AND al.address='*' AND dom.name='%d' AND dom.enabled=1)) UNION (SELECT al.extmboxes FROM admin_alias al INNER JOIN admin_domain dom ON al.domain_id=dom.id WHERE al.enabled='1' AND al.extmboxes<>'' AND al.address='*' AND dom.name='%d' AND dom.enabled=1)" postgres = "(SELECT mb.address || '@' || dom.name FROM admin_mailbox mb INNER JOIN admin_domain dom ON mb.domain_id=dom.id WHERE mb.id IN (SELECT al_mb.mailbox_id FROM admin_alias al INNER JOIN admin_domain dom ON al.domain_id=dom.id INNER JOIN admin_alias_mboxes al_mb ON al.id=al_mb.alias_id WHERE al.enabled AND al.address='*' AND dom.name='%d' AND dom.enabled)) UNION (SELECT al.extmboxes FROM admin_alias al INNER JOIN admin_domain dom ON al.domain_id=dom.id WHERE al.enabled AND al.extmboxes<>'' AND al.address='*' AND dom.name='%d' AND dom.enabled)" + sqlite = "(SELECT (mb.address || '@' || dom.name) FROM admin_mailbox mb INNER JOIN admin_domain dom ON mb.domain_id=dom.id WHERE mb.id IN (SELECT al_mb.mailbox_id FROM admin_alias al INNER JOIN admin_domain dom ON al.domain_id=dom.id INNER JOIN admin_alias_mboxes al_mb ON al.id=al_mb.alias_id WHERE al.enabled=1 AND al.address='*' AND dom.name='%d' AND dom.enabled=1)) UNION (SELECT al.extmboxes FROM admin_alias al INNER JOIN admin_domain dom ON al.domain_id=dom.id WHERE al.enabled='1' AND al.extmboxes<>'' AND al.address='*' AND dom.name='%d' AND dom.enabled=1)" class MaintainMap(MapFile): filename = 'sql-maintain.cf' mysql = "SELECT '450 Requested mail action not taken: mailbox unavailable' FROM admin_mailbox mb INNER JOIN admin_domain dom ON mb.domain_id=dom.id INNER JOIN admin_mailboxoperation mbop ON mbop.mailbox_id=mb.id WHERE dom.name='%d' AND mb.address='%u' LIMIT 1" postgres = "SELECT '450 Requested mail action not taken: mailbox unavailable' FROM admin_mailbox mb INNER JOIN admin_domain dom ON mb.domain_id=dom.id INNER JOIN admin_mailboxoperation mbop ON mbop.mailbox_id=mb.id WHERE dom.name='%d' AND mb.address='%u' LIMIT 1" + sqlite = "SELECT '450 Requested mail action not taken: mailbox unavailable' FROM admin_mailbox mb INNER JOIN admin_domain dom ON mb.domain_id=dom.id INNER JOIN admin_mailboxoperation mbop ON mbop.mailbox_id=mb.id WHERE dom.name='%d' AND mb.address='%u' LIMIT 1" class TransportMap(MapFile): @@ -76,6 +118,7 @@ class TransportMap(MapFile): filename = 'sql-transport.cf' mysql = "SELECT method FROM postfix_autoreply_transport WHERE domain='%s'" postgres = "SELECT method FROM postfix_autoreply_transport WHERE domain='%s'" + sqlite = "SELECT method FROM postfix_autoreply_transport WHERE domain='%s'" class AutoRepliesMap(MapFile): @@ -83,6 +126,7 @@ class AutoRepliesMap(MapFile): filename = 'sql-autoreplies.cf' mysql = "SELECT full_address, autoreply_address FROM postfix_autoreply_alias WHERE full_address='%s'" postgres = "SELECT full_address, autoreply_address FROM postfix_autoreply_alias WHERE full_address='%s'" + sqlite = "SELECT full_address, autoreply_address FROM postfix_autoreply_alias WHERE full_address='%s'" class PostfixMapsCommand(Command): @@ -90,30 +134,23 @@ class PostfixMapsCommand(Command): def __init__(self, *args, **kwargs): super(PostfixMapsCommand, self).__init__(*args, **kwargs) - self._parser.add_argument('destdir', type=str, - help='Directory that will contain generated map files') - self._parser.add_argument('--dbtype', type=str, choices=['mysql', 'postgres'], default='mysql', - help='Used database type') - self._parser.add_argument('--dbhost', type=str, default='127.0.0.1', - help='Database host address') - self._parser.add_argument('--categories', type=str, nargs='*', default=['std'], - help='Map file categories to generate (choices: std, autoreply)') + self._parser.add_argument( + 'destdir', type=str, + help='Directory that will contain generated map files' + ) + self._parser.add_argument( + '--dbtype', type=str, choices=['mysql', 'postgres', 'sqlite'], + default='mysql', + help='Used database type' + ) + self._parser.add_argument( + '--categories', type=str, nargs='*', default=['std'], + help='Map file categories to generate (choices: std, autoreply)' + ) def handle(self, parsed_args): - dbname = raw_input('Database name: ') - dbuser = raw_input('Username: ') - dbpass = getpass.getpass('Password: ') - - try: - os.mkdir(parsed_args.destdir) - except OSError: - pass - - for k, v in globals().iteritems(): - if not inspect.isclass(v) or not issubclass(v, MapFile): - continue - if not v.category in parsed_args.categories: - continue - v().render(parsed_args.destdir, parsed_args.dbtype, - dbname=dbname, dbuser=dbuser, dbpassword=dbpass, - dbhost=parsed_args.dbhost) + if parsed_args.dbtype == 'sqlite': + g = SQLiteMapFilesGenerator() + else: + g = MapFilesGenerator() + g.render(parsed_args) From bbddac39537ce0da7eecbe242377fb51fca945db Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Sun, 29 Sep 2013 18:20:52 +0200 Subject: [PATCH 58/97] Various changes. Migration to the new layout is now ok. --- modoboa/core/factories.py | 34 ++++ modoboa/core/forms.py | 2 +- modoboa/core/migrations/0001_initial.py | 161 ++++++++++++++++++ .../migrations/0002_update_permissions.py | 126 ++++++++++++++ modoboa/core/migrations/__init__.py | 0 modoboa/core/models.py | 19 ++- modoboa/core/tests.py | 42 +++++ modoboa/extensions/admin/__init__.py | 3 +- modoboa/extensions/admin/factories.py | 32 ---- modoboa/extensions/admin/forms.py | 8 +- .../admin/migrations/0037_rename_tables.py | 142 +++++++++++++++ modoboa/extensions/admin/models/__init__.py | 4 +- modoboa/extensions/admin/models/mailbox.py | 3 + .../extensions/admin/static/admin/js/admin.js | 3 - .../admin/templates/admin/identities.html | 6 - .../admin/templatetags/admin_tags.py | 2 +- modoboa/extensions/admin/tests.py | 69 +++----- modoboa/extensions/admin/urls.py | 1 - modoboa/extensions/admin/views/alias.py | 9 - modoboa/extensions/admin/views/export.py | 2 +- modoboa/extensions/admin/views/import.py | 2 +- modoboa/extensions/amavis/sql_listing.py | 9 +- modoboa/extensions/amavis/views.py | 6 +- .../0003_auto__chg_field_limitspool_user.py | 76 +++++++++ modoboa/extensions/stats/views.py | 6 +- modoboa/lib/authbackends.py | 2 +- modoboa/lib/cryptutils.py | 4 +- modoboa/lib/events.py | 8 +- modoboa/lib/migrations/0005_rename_table.py | 102 +++++++++++ .../lib/migrations/0006_move_parameters.py | 89 ++++++++++ 30 files changed, 847 insertions(+), 125 deletions(-) create mode 100644 modoboa/core/factories.py create mode 100644 modoboa/core/migrations/0001_initial.py create mode 100644 modoboa/core/migrations/0002_update_permissions.py create mode 100644 modoboa/core/migrations/__init__.py create mode 100644 modoboa/core/tests.py create mode 100644 modoboa/extensions/admin/migrations/0037_rename_tables.py create mode 100644 modoboa/extensions/limits/migrations/0003_auto__chg_field_limitspool_user.py create mode 100644 modoboa/lib/migrations/0005_rename_table.py create mode 100644 modoboa/lib/migrations/0006_move_parameters.py diff --git a/modoboa/core/factories.py b/modoboa/core/factories.py new file mode 100644 index 000000000..19767d20e --- /dev/null +++ b/modoboa/core/factories.py @@ -0,0 +1,34 @@ +import factory +from django.contrib.auth.models import Group +from . import models + + +class GroupFactory(factory.DjangoModelFactory): + FACTORY_FOR = Group + + name = 'DefaultGroup' + + +class UserFactory(factory.DjangoModelFactory): + FACTORY_FOR = models.User + + email = factory.LazyAttribute(lambda a: a.username) + password = '{PLAIN}toto' + + # mailbox = factory.RelatedFactory( + # MailboxFactory, 'user', + # address=factory.LazyAttribute( + # lambda m: m.user.email.replace('@%s' % m.domain.name, '') + # ) + # ) + + @factory.post_generation + def groups(self, create, extracted, **kwargs): + if not create: + # Simple build, do nothing. + return + + if extracted: + # A list of groups were passed in, use them + for group in extracted: + self.groups.add(Group.objects.get(name=group)) diff --git a/modoboa/core/forms.py b/modoboa/core/forms.py index 00c2119a0..4dc7d38ae 100644 --- a/modoboa/core/forms.py +++ b/modoboa/core/forms.py @@ -49,7 +49,7 @@ class ProfileForm(forms.ModelForm): if self.cleaned_data["oldpassword"] == "": return self.cleaned_data["oldpassword"] - if parameters.get_admin("AUTHENTICATION_TYPE", app="admin") != "local": + if parameters.get_admin("AUTHENTICATION_TYPE") != "local": return self.cleaned_data["oldpassword"] if not self.instance.check_password(self.cleaned_data["oldpassword"]): diff --git a/modoboa/core/migrations/0001_initial.py b/modoboa/core/migrations/0001_initial.py new file mode 100644 index 000000000..4b0bbe9ed --- /dev/null +++ b/modoboa/core/migrations/0001_initial.py @@ -0,0 +1,161 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + # Adding model 'User' + db.create_table(u'core_user', ( + (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('password', self.gf('django.db.models.fields.CharField')(max_length=128)), + ('last_login', self.gf('django.db.models.fields.DateTimeField')(default=datetime.datetime.now)), + ('is_superuser', self.gf('django.db.models.fields.BooleanField')(default=False)), + ('username', self.gf('django.db.models.fields.CharField')(unique=True, max_length=254)), + ('first_name', self.gf('django.db.models.fields.CharField')(max_length=30, blank=True)), + ('last_name', self.gf('django.db.models.fields.CharField')(max_length=30, blank=True)), + ('email', self.gf('django.db.models.fields.EmailField')(max_length=254, blank=True)), + ('is_staff', self.gf('django.db.models.fields.BooleanField')(default=False)), + ('is_active', self.gf('django.db.models.fields.BooleanField')(default=True)), + ('date_joined', self.gf('django.db.models.fields.DateTimeField')(default=datetime.datetime.now)), + ('is_local', self.gf('django.db.models.fields.BooleanField')(default=True)), + )) + db.send_create_signal(u'core', ['User']) + + # Adding M2M table for field groups on 'User' + db.create_table(u'core_user_groups', ( + ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), + ('user', models.ForeignKey(orm[u'core.user'], null=False)), + ('group', models.ForeignKey(orm[u'auth.group'], null=False)) + )) + db.create_unique(u'core_user_groups', ['user_id', 'group_id']) + + # Adding M2M table for field user_permissions on 'User' + db.create_table(u'core_user_user_permissions', ( + ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), + ('user', models.ForeignKey(orm[u'core.user'], null=False)), + ('permission', models.ForeignKey(orm[u'auth.permission'], null=False)) + )) + db.create_unique(u'core_user_user_permissions', ['user_id', 'permission_id']) + + # Adding model 'ObjectAccess' + db.create_table(u'core_objectaccess', ( + (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['core.User'])), + ('content_type', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['contenttypes.ContentType'])), + ('object_id', self.gf('django.db.models.fields.PositiveIntegerField')()), + ('is_owner', self.gf('django.db.models.fields.BooleanField')(default=False)), + )) + db.send_create_signal(u'core', ['ObjectAccess']) + + # Adding unique constraint on 'ObjectAccess', fields ['user', 'content_type', 'object_id'] + db.create_unique(u'core_objectaccess', ['user_id', 'content_type_id', 'object_id']) + + # Adding model 'Extension' + db.create_table(u'core_extension', ( + (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('name', self.gf('django.db.models.fields.CharField')(max_length=150)), + ('enabled', self.gf('django.db.models.fields.BooleanField')(default=False)), + )) + db.send_create_signal(u'core', ['Extension']) + + # Adding model 'Log' + db.create_table(u'core_log', ( + (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('date_created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)), + ('message', self.gf('django.db.models.fields.CharField')(max_length=255)), + ('level', self.gf('django.db.models.fields.CharField')(max_length=15)), + ('logger', self.gf('django.db.models.fields.CharField')(max_length=30)), + )) + db.send_create_signal(u'core', ['Log']) + + + def backwards(self, orm): + # Removing unique constraint on 'ObjectAccess', fields ['user', 'content_type', 'object_id'] + db.delete_unique(u'core_objectaccess', ['user_id', 'content_type_id', 'object_id']) + + # Deleting model 'User' + db.delete_table(u'core_user') + + # Removing M2M table for field groups on 'User' + db.delete_table('core_user_groups') + + # Removing M2M table for field user_permissions on 'User' + db.delete_table('core_user_user_permissions') + + # Deleting model 'ObjectAccess' + db.delete_table(u'core_objectaccess') + + # Deleting model 'Extension' + db.delete_table(u'core_extension') + + # Deleting model 'Log' + db.delete_table(u'core_log') + + + models = { + u'auth.group': { + 'Meta': {'object_name': 'Group'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + u'auth.permission': { + 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + u'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + u'core.extension': { + 'Meta': {'object_name': 'Extension'}, + 'enabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}) + }, + u'core.log': { + 'Meta': {'object_name': 'Log'}, + 'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'level': ('django.db.models.fields.CharField', [], {'max_length': '15'}), + 'logger': ('django.db.models.fields.CharField', [], {'max_length': '30'}), + 'message': ('django.db.models.fields.CharField', [], {'max_length': '255'}) + }, + u'core.objectaccess': { + 'Meta': {'unique_together': "(('user', 'content_type', 'object_id'),)", 'object_name': 'ObjectAccess'}, + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_owner': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['core.User']"}) + }, + u'core.user': { + 'Meta': {'ordering': "['username']", 'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '254', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_local': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '254'}) + } + } + + complete_apps = ['core'] \ No newline at end of file diff --git a/modoboa/core/migrations/0002_update_permissions.py b/modoboa/core/migrations/0002_update_permissions.py new file mode 100644 index 000000000..8e8e4c481 --- /dev/null +++ b/modoboa/core/migrations/0002_update_permissions.py @@ -0,0 +1,126 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import DataMigration +from django.db import models + +class Migration(DataMigration): + depends_on = ( + ('admin', '0037_rename_tables'), + ) + + def forwards(self, orm): + "Write your forwards methods here." + oldct = orm['contenttypes.ContentType'].objects.get( + app_label='admin', model='user' + ) + newct = orm['contenttypes.ContentType'].objects.get( + app_label='core', model='user' + ) + orm['core.ObjectAccess'].objects.filter(content_type=oldct).update( + content_type=newct + ) + orm['reversion.Version'].objects.filter(content_type=oldct).update( + content_type=newct + ) + oldct.delete() + + def backwards(self, orm): + "Write your backwards methods here." + newct = orm['contenttypes.ContentType'].objects.create( + app_label='admin', model='user', name='user' + ) + oldct = orm['contenttypes.ContentType'].objects.get( + app_label='core', model='user' + ) + orm['core.ObjectAccess'].objects.filter(content_type=oldct).update( + content_type=newct + ) + orm['reversion.Version'].objects.filter(content_type=oldct).update( + content_type=newct + ) + + models = { + u'auth.group': { + 'Meta': {'object_name': 'Group'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + u'auth.permission': { + 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + u'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + u'core.extension': { + 'Meta': {'object_name': 'Extension'}, + 'enabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}) + }, + u'core.log': { + 'Meta': {'object_name': 'Log'}, + 'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'level': ('django.db.models.fields.CharField', [], {'max_length': '15'}), + 'logger': ('django.db.models.fields.CharField', [], {'max_length': '30'}), + 'message': ('django.db.models.fields.CharField', [], {'max_length': '255'}) + }, + u'core.objectaccess': { + 'Meta': {'unique_together': "(('user', 'content_type', 'object_id'),)", 'object_name': 'ObjectAccess'}, + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_owner': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['core.User']"}) + }, + u'core.user': { + 'Meta': {'ordering': "['username']", 'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '254', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_local': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '254'}) + }, + u'reversion.revision': { + 'Meta': {'object_name': 'Revision'}, + 'comment': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'manager_slug': ('django.db.models.fields.CharField', [], {'default': "u'default'", 'max_length': '200', 'db_index': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['core.User']", 'null': 'True', 'blank': 'True'}) + }, + u'reversion.version': { + 'Meta': {'object_name': 'Version'}, + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), + 'format': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'object_id': ('django.db.models.fields.TextField', [], {}), + 'object_id_int': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'object_repr': ('django.db.models.fields.TextField', [], {}), + 'revision': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['reversion.Revision']"}), + 'serialized_data': ('django.db.models.fields.TextField', [], {}), + 'type': ('django.db.models.fields.PositiveSmallIntegerField', [], {'db_index': 'True'}) + } + } + + complete_apps = ['reversion', 'core'] + symmetrical = True diff --git a/modoboa/core/migrations/__init__.py b/modoboa/core/migrations/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/modoboa/core/models.py b/modoboa/core/models.py index 7e8b887c8..71364982d 100644 --- a/modoboa/core/models.py +++ b/modoboa/core/models.py @@ -54,7 +54,6 @@ class User(AbstractBaseUser, PermissionsMixin): REQUIRED_FIELDS = ['email'] class Meta: - db_table = "admin_user" ordering = ["username"] password_expr = re.compile(r'(\{(\w+)\}|(\$1\$))(.+)') @@ -86,7 +85,7 @@ class User(AbstractBaseUser, PermissionsMixin): events.raiseEvent("AccountDeleted", self, fromuser, **kwargs) ungrant_access_to_object(self) - super(User, self).delete(*args, **kwargs) + super(User, self).delete() def _crypt_password(self, raw_value): scheme = parameters.get_admin("PASSWORD_SCHEME") @@ -312,13 +311,13 @@ class User(AbstractBaseUser, PermissionsMixin): The expected order is the following:: - loginname, password, first name, last name, enabled, group, address[, domain, ...] + "account", loginname, password, first name, last name, enabled, group, address[, domain, ...] :param user: :param row: a list containing the expected information :param crypt_password: """ - if len(row) < 6: + if len(row) < 7: raise AdminError(_("Invalid line")) role = row[6].strip() if not user.is_superuser and not role in ["SimpleUsers", "DomainAdmins"]: @@ -326,6 +325,16 @@ class User(AbstractBaseUser, PermissionsMixin): _("You can't import an account with a role greater than yours") ) self.username = row[1].strip() + if role == "SimpleUsers": + if (len(row) < 8 or not row[7].strip()): + raise AdminError( + _("The simple user '%s' must have a valid email address" % self.username) + ) + if self.username != row[7].strip(): + raise AdminError( + _("username and email fields must not differ for '%s'" % self.username) + ) + if crypt_password: self.set_password(row[2].strip()) else: @@ -335,6 +344,8 @@ class User(AbstractBaseUser, PermissionsMixin): self.is_active = (row[5].strip() == 'True') self.save(creator=user) self.set_role(role) + if len(row) < 8: + return events.raiseEvent("AccountImported", user, self, row[7:]) def to_csv(self, csvwriter): diff --git a/modoboa/core/tests.py b/modoboa/core/tests.py new file mode 100644 index 000000000..5b3491ba2 --- /dev/null +++ b/modoboa/core/tests.py @@ -0,0 +1,42 @@ +from django.core.urlresolvers import reverse +from modoboa.lib.tests import ModoTestCase +from . import factories + + +class ProfileTestCase(ModoTestCase): + fixtures = ['initial_users.json'] + + def setUp(self): + super(ProfileTestCase, self).setUp() + self.account = factories.UserFactory( + username="user@test.com", groups=('SimpleUsers',) + ) + + def test_update_password(self): + """Password update + + Two cases: + * The default admin changes his password (no associated Mailbox) + * A normal user changes his password + """ + self.check_ajax_post(reverse("modoboa.core.views.user.profile"), + {"oldpassword": "password", + "newpassword": "titi", "confirmation": "titi"}) + self.clt.logout() + + self.assertEqual( + self.clt.login(username="admin", password="titi"), True + ) + self.assertEqual( + self.clt.login(username="user@test.com", password="toto"), True + ) + + self.check_ajax_post( + reverse("modoboa.core.views.user.profile"), + {"oldpassword": "toto", + "newpassword": "tutu", "confirmation": "tutu"} + ) + self.clt.logout() + self.assertEqual( + self.clt.login(username="user@test.com", password="tutu"), True + ) diff --git a/modoboa/extensions/admin/__init__.py b/modoboa/extensions/admin/__init__.py index 4677515d9..763ff5054 100644 --- a/modoboa/extensions/admin/__init__.py +++ b/modoboa/extensions/admin/__init__.py @@ -70,7 +70,7 @@ def admin_menu(target, user): "url" : reverse("modoboa.extensions.admin.views.domain.domains"), "label" : _("Domains")} ] - if user.has_perm("admin.add_user") or user.has_perm("admin.add_alias"): + if user.has_perm("core.add_user") or user.has_perm("admin.add_alias"): entries += [ {"name" : "identities", "url" : reverse("modoboa.extensions.admin.views.identity.identities"), @@ -134,6 +134,7 @@ def export_admin_domains(admin): def import_account_mailbox(user, account, row): account.email = row[0].strip() if account.email != "": + account.save() mailbox, domname = split_mailbox(account.email) try: domain = Domain.objects.get(name=domname) diff --git a/modoboa/extensions/admin/factories.py b/modoboa/extensions/admin/factories.py index 67df7e942..fb41dd231 100644 --- a/modoboa/extensions/admin/factories.py +++ b/modoboa/extensions/admin/factories.py @@ -1,15 +1,8 @@ import factory from django.contrib.auth.models import Group -from modoboa.core.models import User from . import models -class GroupFactory(factory.DjangoModelFactory): - FACTORY_FOR = Group - - name = 'DefaultGroup' - - class MailboxFactory(factory.DjangoModelFactory): FACTORY_FOR = models.Mailbox @@ -17,31 +10,6 @@ class MailboxFactory(factory.DjangoModelFactory): use_domain_quota = True -class UserFactory(factory.DjangoModelFactory): - FACTORY_FOR = User - - email = factory.LazyAttribute(lambda a: a.username) - password = '{PLAIN}toto' - - mailbox = factory.RelatedFactory( - MailboxFactory, 'user', - address=factory.LazyAttribute( - lambda m: m.user.email.replace('@%s' % m.domain.name, '') - ) - ) - - @factory.post_generation - def groups(self, create, extracted, **kwargs): - if not create: - # Simple build, do nothing. - return - - if extracted: - # A list of groups were passed in, use them - for group in extracted: - self.groups.add(Group.objects.get(name=group)) - - class DomainFactory(factory.DjangoModelFactory): FACTORY_FOR = models.Domain diff --git a/modoboa/extensions/admin/forms.py b/modoboa/extensions/admin/forms.py index f483e6ec5..7a12ffe98 100644 --- a/modoboa/extensions/admin/forms.py +++ b/modoboa/extensions/admin/forms.py @@ -625,14 +625,14 @@ class AccountPermissionsForm(forms.Form, DynamicForm): if not hasattr(self, "account") or self.account is None: return - for pos, domain in enumerate(self.account.get_domains()): + for pos, domain in enumerate(Domain.objects.get_for_admin(self.account)): name = "domains_%d" % (pos + 1) self._create_field(DomainNameField, name, domain.name) if len(args) and isinstance(args[0], QueryDict): self._load_from_qdict(args[0], "domains", DomainNameField) def save(self): - current_domains = [dom.name for dom in self.account.get_domains()] + current_domains = [dom.name for dom in Domain.objects.get_for_admin(self.account)] for name, value in self.cleaned_data.items(): if not name.startswith("domains"): continue @@ -642,7 +642,7 @@ class AccountPermissionsForm(forms.Form, DynamicForm): domain = Domain.objects.get(name=value) domain.add_admin(self.account) - for domain in self.account.get_domains(): + for domain in Domain.objects.get_for_admin(self.account): if not len(filter(lambda name: self.cleaned_data[name] == domain.name, self.cleaned_data.keys())): domain.remove_admin(self.account) @@ -671,7 +671,7 @@ class AccountForm(TabForms): if account.is_superuser: return False return self.user.has_perm("admin.add_domain") \ - and account.has_perm("admin.add_user") + and account.has_perm("core.add_user") def _before_is_valid(self, form): if form["id"] == "general": diff --git a/modoboa/extensions/admin/migrations/0037_rename_tables.py b/modoboa/extensions/admin/migrations/0037_rename_tables.py new file mode 100644 index 000000000..01eac0d54 --- /dev/null +++ b/modoboa/extensions/admin/migrations/0037_rename_tables.py @@ -0,0 +1,142 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + depends_on = ( + ('core', '0001_initial'), + ) + + def forwards(self, orm): + db.rename_table('admin_user', 'core_user') + # Changing field 'Mailbox.user' + db.alter_column(u'admin_mailbox', 'user_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['core.User'])) + + db.rename_table('admin_objectaccess', 'core_objectaccess') + db.alter_column(u'core_objectaccess', 'user_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['core.User'])) + + db.rename_table('admin_user_groups', 'core_user_groups') + db.rename_table('admin_user_user_permissions', 'core_user_user_permissions') + + db.rename_table('admin_extension', 'core_extension') + + db.send_create_signal('core', ['User', 'Extension', 'ObjectAccess']) + + def backwards(self, orm): + db.rename_table('core_user', 'admin_user') + # Changing field 'Mailbox.user' + db.alter_column(u'admin_mailbox', 'user_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['admin.User'])) + + db.rename_table('core_objectaccess', 'admin_objectaccess') + db.alter_column(u'admin_objectaccess', 'user_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['admin.User'])) + + db.rename_table('core_user_groups', 'admin_user_groups') + db.rename_table('core_user_user_permissions', 'admin_user_user_permissions') + + db.rename_table('core_extension', 'admin_extension') + + db.send_create_signal('admin', ['User', 'Extension', 'ObjectAccess']) + + models = { + 'admin.alias': { + 'Meta': {'ordering': "['domain__name', 'address']", 'unique_together': "(('address', 'domain'),)", 'object_name': 'Alias'}, + 'address': ('django.db.models.fields.CharField', [], {'max_length': '254'}), + 'aliases': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['admin.Alias']", 'symmetrical': 'False'}), + 'dates': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['admin.ObjectDates']"}), + 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['admin.Domain']"}), + 'enabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'extmboxes': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'mboxes': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['admin.Mailbox']", 'symmetrical': 'False'}) + }, + 'admin.domain': { + 'Meta': {'ordering': "['name']", 'object_name': 'Domain'}, + 'dates': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['admin.ObjectDates']"}), + 'enabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}), + 'quota': ('django.db.models.fields.IntegerField', [], {}) + }, + 'admin.domainalias': { + 'Meta': {'object_name': 'DomainAlias'}, + 'dates': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['admin.ObjectDates']"}), + 'enabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}), + 'target': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['admin.Domain']"}) + }, + 'admin.mailbox': { + 'Meta': {'object_name': 'Mailbox'}, + 'address': ('django.db.models.fields.CharField', [], {'max_length': '252'}), + 'dates': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['admin.ObjectDates']"}), + 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['admin.Domain']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'quota': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'use_domain_quota': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['core.User']"}) + }, + 'admin.objectdates': { + 'Meta': {'object_name': 'ObjectDates'}, + 'creation': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'last_modification': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}) + }, + 'admin.quota': { + 'Meta': {'object_name': 'Quota'}, + 'bytes': ('django.db.models.fields.BigIntegerField', [], {'default': '0'}), + 'mbox': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'quota_value'", 'unique': 'True', 'null': 'True', 'to': "orm['admin.Mailbox']"}), + 'messages': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'username': ('django.db.models.fields.EmailField', [], {'max_length': '254', 'primary_key': 'True'}) + }, + u'auth.group': { + 'Meta': {'object_name': 'Group'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + u'auth.permission': { + 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + u'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + u'core.objectaccess': { + 'Meta': {'unique_together': "(('user', 'content_type', 'object_id'),)", 'object_name': 'ObjectAccess'}, + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_owner': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['core.User']"}) + }, + u'core.user': { + 'Meta': {'ordering': "['username']", 'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '254', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_local': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '254'}) + } + } + + complete_apps = ['admin'] diff --git a/modoboa/extensions/admin/models/__init__.py b/modoboa/extensions/admin/models/__init__.py index 8ef79509f..8edb89898 100644 --- a/modoboa/extensions/admin/models/__init__.py +++ b/modoboa/extensions/admin/models/__init__.py @@ -1,8 +1,8 @@ from .domain import Domain from .domain_alias import DomainAlias -from .mailbox import Mailbox, Quota +from .mailbox import Mailbox, Quota, MailboxOperation from .alias import Alias __all__ = [ - 'Domain', 'DomainAlias', 'Mailbox', 'Quota', 'Alias' + 'Domain', 'DomainAlias', 'Mailbox', 'Quota', 'Alias', 'MailboxOperation' ] diff --git a/modoboa/extensions/admin/models/mailbox.py b/modoboa/extensions/admin/models/mailbox.py index d0fb15092..79f3c1f08 100644 --- a/modoboa/extensions/admin/models/mailbox.py +++ b/modoboa/extensions/admin/models/mailbox.py @@ -259,6 +259,9 @@ class MailboxOperation(models.Model): ) argument = models.TextField() + class Meta: + app_label = 'admin' + def __str__(self): if self.type == 'rename': return 'Rename %s -> %s' % (self.argument, self.mailbox.mail_home) diff --git a/modoboa/extensions/admin/static/admin/js/admin.js b/modoboa/extensions/admin/static/admin/js/admin.js index 835ea339d..0e7c225be 100644 --- a/modoboa/extensions/admin/static/admin/js/admin.js +++ b/modoboa/extensions/admin/static/admin/js/admin.js @@ -394,9 +394,6 @@ Identities.prototype = { choices: get_domains_list }); $("#id_recipients").dynamic_input(); - $("#id_int_recipient").autocompleter({ - choices: get_allowed_recipients - }); $(".submit").one('click', $.proxy(function(e) { simple_ajax_form_post(e, { formid: "aliasform", diff --git a/modoboa/extensions/admin/templates/admin/identities.html b/modoboa/extensions/admin/templates/admin/identities.html index e19b57331..53bd55568 100644 --- a/modoboa/extensions/admin/templates/admin/identities.html +++ b/modoboa/extensions/admin/templates/admin/identities.html @@ -16,12 +16,6 @@ function get_account_list(container) { }); } -function get_allowed_recipients(container) { - $.getJSON("{% url 'modoboa.extensions.admin.views.alias.allowed_recipients_list' %}", function(data) { - container.value = data; - }); -} - $(document).ready(function() { admin = new Identities(); }); diff --git a/modoboa/extensions/admin/templatetags/admin_tags.py b/modoboa/extensions/admin/templatetags/admin_tags.py index bbc59e552..59a68b63c 100644 --- a/modoboa/extensions/admin/templatetags/admin_tags.py +++ b/modoboa/extensions/admin/templatetags/admin_tags.py @@ -140,7 +140,7 @@ def identity_actions(user, ident): else: actions = [ {"name": "delalias", - "url": reverse("modoboa.admin.views.delalias") + "?selection=%s" % objid, + "url": reverse("modoboa.extensions.admin.views.alias.delalias") + "?selection=%s" % objid, "img": "icon-trash", "title": _("Delete %s?" % ident.full_address)}, ] diff --git a/modoboa/extensions/admin/tests.py b/modoboa/extensions/admin/tests.py index 9f5569cae..d32ad74f1 100644 --- a/modoboa/extensions/admin/tests.py +++ b/modoboa/extensions/admin/tests.py @@ -9,13 +9,10 @@ TODO: create_directories == yes """ -import os -from django.test import TestCase -from django.test.client import Client -from django.utils import simplejson from django.core.urlresolvers import reverse from django.core.files.base import ContentFile -from modoboa.lib import parameters +from modoboa.core.models import User +from modoboa.core.factories import UserFactory, GroupFactory from modoboa.lib.tests import ModoTestCase from modoboa.extensions.admin.lib import * from modoboa.extensions.admin.models import * @@ -137,9 +134,10 @@ class AccountTestCase(ModoTestCase): def setUp(self): super(AccountTestCase, self).setUp() self.dom = factories.DomainFactory(name="test.com") - self.account = factories.UserFactory( - username="user@test.com", groups=('SimpleUsers',), mailbox__domain=self.dom + self.account = UserFactory( + username="user@test.com", groups=('SimpleUsers',) ) + factories.MailboxFactory(address='user', domain=self.dom, user=self.account) def test_crud(self): values = dict(username="tester@test.com", first_name="Tester", last_name="Toto", @@ -168,28 +166,6 @@ class AccountTestCase(ModoTestCase): self.check_ajax_get(reverse("modoboa.extensions.admin.views.identity.delaccount", args=[account.id]), {}) - def test_update_password(self): - """Password update - - Two cases: - * The default admin changes his password (no associated Mailbox) - * A normal user changes his password - """ - self.check_ajax_post(reverse("modoboa.core.views.user.profile"), - {"oldpassword" : "password", - "newpassword" : "titi", "confirmation" : "titi"}) - self.clt.logout() - - self.assertEqual(self.clt.login(username="admin", password="titi"), True) - self.assertEqual(self.clt.login(username="user@test.com", password="toto"), - True) - - self.check_ajax_post(reverse("modoboa.core.views.user.profile"), - {"oldpassword" : "toto", - "newpassword" : "tutu", "confirmation" : "tutu"}) - self.clt.logout() - self.assertEqual(self.clt.login(username="user@test.com", password="tutu"), True) - class AliasTestCase(ModoTestCase): fixtures = ["initial_users.json"] @@ -197,12 +173,14 @@ class AliasTestCase(ModoTestCase): def setUp(self): super(AliasTestCase, self).setUp() dom = factories.DomainFactory(name="test.com") - factories.UserFactory.create( - username="admin@test.com", groups=('DomainAdmins',), mailbox__domain=dom + u = UserFactory.create( + username="admin@test.com", groups=('DomainAdmins',) ) - factories.UserFactory.create( - username="user@test.com", groups=('SimpleUsers',), mailbox__domain=dom + factories.MailboxFactory(address='admin', domain=dom, user=u) + u = UserFactory.create( + username="user@test.com", groups=('SimpleUsers',) ) + factories.MailboxFactory(address='user', domain=dom, user=u) def test_alias(self): user = User.objects.get(username="user@test.com") @@ -279,22 +257,25 @@ class PermissionsTestCase(ModoTestCase): def setUp(self): super(PermissionsTestCase, self).setUp() dom = factories.DomainFactory(name='test.com') - self.user = factories.UserFactory( - username="user@test.com", groups=('SimpleUsers',), mailbox__domain=dom + self.user = UserFactory( + username="user@test.com", groups=('SimpleUsers',) ) + factories.MailboxFactory(address='user', domain=dom, user=self.user) self.values = dict( username=self.user.username, role="DomainAdmins", is_active=self.user.is_active, email="user@test.com" ) - self.admin = factories.UserFactory( - username="admin@test.com", groups=('DomainAdmins',), mailbox__domain=dom + self.admin = UserFactory( + username="admin@test.com", groups=('DomainAdmins',) ) + factories.MailboxFactory(address='admin', domain=dom, user=self.admin) dom.add_admin(self.admin) dom = factories.DomainFactory(name='test2.com') - factories.UserFactory( - username='user@test2.com', groups=('SimpleUsers',), mailbox__domain=dom + u = UserFactory( + username='user@test2.com', groups=('SimpleUsers',) ) + factories.MailboxFactory(address='user', domain=dom, user=u) def tearDown(self): self.clt.logout() @@ -387,13 +368,15 @@ class ImportTestCase(ModoTestCase): def setUp(self): super(ImportTestCase, self).setUp() dom = factories.DomainFactory(name="test.com") - self.admin = factories.UserFactory.create( - username="admin@test.com", groups=('DomainAdmins',), mailbox__domain=dom + self.admin = UserFactory.create( + username="admin@test.com", groups=('DomainAdmins',) ) + factories.MailboxFactory(address='admin', domain=dom, user=self.admin) dom.add_admin(self.admin) - factories.UserFactory.create( - username="user@test.com", groups=('SimpleUsers',), mailbox__domain=dom + u = UserFactory.create( + username="user@test.com", groups=('SimpleUsers',) ) + factories.MailboxFactory(address='user', domain=dom, user=u) def test_domains_import(self): f = ContentFile(b"""domain; domain1.com; 100; True diff --git a/modoboa/extensions/admin/urls.py b/modoboa/extensions/admin/urls.py index 6f5650814..24a0462c0 100644 --- a/modoboa/extensions/admin/urls.py +++ b/modoboa/extensions/admin/urls.py @@ -34,7 +34,6 @@ urlpatterns += patterns( (r'^aliases/new/$', 'newalias'), (r'^aliases/edit/(?P\d+)/$', 'editalias'), (r'^aliases/delete/$', 'delalias'), - (r'^aliases/allowed_recipients/$', 'allowed_recipients_list'), ) urlpatterns += patterns( diff --git a/modoboa/extensions/admin/views/alias.py b/modoboa/extensions/admin/views/alias.py index 809fe17c6..7ffb9c991 100644 --- a/modoboa/extensions/admin/views/alias.py +++ b/modoboa/extensions/admin/views/alias.py @@ -62,15 +62,6 @@ def _new_alias(request, title, action, successmsg, return render(request, tplname, ctx) -@login_required -@user_passes_test(lambda u: u.has_perm("admin.add_user") - or u.has_perm("admin.add_alias")) -def allowed_recipients_list(request): - ret = [mb.full_address for mb in request.user.get_mailboxes()] - ret += [al.full_address for al in request.user.get_aliases()] - return ajax_simple_response(ret) - - @login_required @permission_required("admin.add_alias") @transaction.commit_on_success diff --git a/modoboa/extensions/admin/views/export.py b/modoboa/extensions/admin/views/export.py index 18098f40b..58c2928f3 100644 --- a/modoboa/extensions/admin/views/export.py +++ b/modoboa/extensions/admin/views/export.py @@ -32,7 +32,7 @@ def _export(content, filename): @login_required @user_passes_test( - lambda u: u.has_perm("admin.add_user") or u.has_perm("admin.add_alias") + lambda u: u.has_perm("core.add_user") or u.has_perm("admin.add_alias") ) def export_identities(request): ctx = { diff --git a/modoboa/extensions/admin/views/import.py b/modoboa/extensions/admin/views/import.py index 6f964c2aa..c1c732aa7 100644 --- a/modoboa/extensions/admin/views/import.py +++ b/modoboa/extensions/admin/views/import.py @@ -134,7 +134,7 @@ def importdata(request, formclass=ImportDataForm): @login_required @user_passes_test( - lambda u: u.has_perm("admin.add_user") or u.has_perm("admin.add_alias") + lambda u: u.has_perm("core.add_user") or u.has_perm("admin.add_alias") ) def import_identities(request): if request.method == "POST": diff --git a/modoboa/extensions/amavis/sql_listing.py b/modoboa/extensions/amavis/sql_listing.py index e92a61b41..fb357d9be 100644 --- a/modoboa/extensions/amavis/sql_listing.py +++ b/modoboa/extensions/amavis/sql_listing.py @@ -8,6 +8,7 @@ from modoboa.lib.webutils import static_url from modoboa.lib.email_listing import MBconnector, EmailListing from modoboa.lib.emailutils import * from modoboa.lib.dbutils import db_type +from modoboa.extensions.admin.models import Domain from models import * @@ -105,7 +106,7 @@ class SQLWrapper(object): q &= Q(rid__email=request.user.email) else: if not request.user.is_superuser: - doms = request.user.get_domains() + doms = Domain.objects.get_for_admin(request.user) regexp = "(%s)" % '|'.join([dom.name for dom in doms]) doms_q = Q(rid__email__regex=regexp) q &= doms_q @@ -131,7 +132,7 @@ class SQLWrapper(object): """ rq = Q(rs='p') if not user.is_superuser: - doms = user.get_domains() + doms = Domain.objects.get_for_admin(user) if not doms.count(): return 0 regexp = "(%s)" % '|'.join([dom.name for dom in doms]) @@ -163,7 +164,7 @@ class PgWrapper(SQLWrapper): ) if not request.user.is_superuser: - doms = request.user.get_domains() + doms = Domain.objects.get_for_admin(request.user) regexp = "(%s)" % '|'.join([dom.name for dom in doms]) where.append("convert_from(maddr.email, 'UTF8') ~ '%s'" % regexp) if rcptfilter is not None: @@ -193,7 +194,7 @@ class PgWrapper(SQLWrapper): def get_pending_requests(self, user): rq = Q(rs='p') if not user.is_superuser: - doms = user.get_domains() + doms = Domain.objects.get_for_admin(user) if not doms.count(): return 0 regexp = "(%s)" % '|'.join([dom.name for dom in doms]) diff --git a/modoboa/extensions/amavis/views.py b/modoboa/extensions/amavis/views.py index 4ccedf61e..cca601a2f 100644 --- a/modoboa/extensions/amavis/views.py +++ b/modoboa/extensions/amavis/views.py @@ -15,7 +15,7 @@ from modoboa.lib.webutils import ( getctx, ajax_response, ajax_simple_response ) from modoboa.lib.email_listing import parse_search_parameters -from modoboa.extensions.admin.models import Mailbox +from modoboa.extensions.admin.models import Mailbox, Domain from templatetags.amextras import quar_menu, viewm_menu from .lib import selfservice, AMrelease from .sql_listing import SQLlisting, SQLemail, get_wrapper @@ -56,7 +56,7 @@ def _listing(request): msgs = None if not request.user.is_superuser and request.user.group != 'SimpleUsers': - if not len(request.user.get_domains()): + if not Domain.objects.get_for_admin(request.user).count(): return empty_quarantine(request) order = request.GET.get("order", "-date") @@ -184,7 +184,7 @@ def viewheaders(request, mail_id): for qm in get_wrapper().get_mail_content(mail_id): content += qm.mail_text msg = email.message_from_string(content) - return _render(request, 'amavis/viewheader.html', { + return render(request, 'amavis/viewheader.html', { "headers": msg.items() }) diff --git a/modoboa/extensions/limits/migrations/0003_auto__chg_field_limitspool_user.py b/modoboa/extensions/limits/migrations/0003_auto__chg_field_limitspool_user.py new file mode 100644 index 000000000..9762fda21 --- /dev/null +++ b/modoboa/extensions/limits/migrations/0003_auto__chg_field_limitspool_user.py @@ -0,0 +1,76 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + depends_on = ( + ('admin', '0037_rename_tables'), + ) + + def forwards(self, orm): + + # Changing field 'LimitsPool.user' + db.alter_column(u'limits_limitspool', 'user_id', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['core.User'], unique=True)) + + def backwards(self, orm): + + # Changing field 'LimitsPool.user' + db.alter_column(u'limits_limitspool', 'user_id', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['admin.User'], unique=True)) + + models = { + u'auth.group': { + 'Meta': {'object_name': 'Group'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + u'auth.permission': { + 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + u'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + u'core.user': { + 'Meta': {'ordering': "['username']", 'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '254', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_local': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '254'}) + }, + u'limits.limit': { + 'Meta': {'unique_together': "(('name', 'pool'),)", 'object_name': 'Limit'}, + 'curvalue': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'maxvalue': ('django.db.models.fields.IntegerField', [], {'default': '-2'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'pool': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['limits.LimitsPool']"}) + }, + u'limits.limitspool': { + 'Meta': {'object_name': 'LimitsPool'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['core.User']", 'unique': 'True'}) + } + } + + complete_apps = ['limits'] diff --git a/modoboa/extensions/stats/views.py b/modoboa/extensions/stats/views.py index 3bfffae5b..a6b95c8e7 100644 --- a/modoboa/extensions/stats/views.py +++ b/modoboa/extensions/stats/views.py @@ -9,7 +9,9 @@ from modoboa.lib.exceptions import ModoboaException, PermDeniedException from modoboa.lib.webutils import ( _render_to_string, ajax_simple_response ) -from modoboa.extensions.admin.models import Domain, Mailbox +from modoboa.extensions.admin.models import ( + Domain, Mailbox +) from modoboa.extensions.stats.grapher import periods, str2Time, Grapher @@ -21,7 +23,7 @@ def index(request): """ deflocation = "graphs/?gset=mailtraffic" if not request.user.is_superuser: - if not len(request.user.get_domains()): + if not Domain.objects.get_for_admin(request.user).count(): raise ModoboaException(_("No statistics available")) period = request.GET.get("period", "day") diff --git a/modoboa/lib/authbackends.py b/modoboa/lib/authbackends.py index 4edefd86d..325dc361d 100644 --- a/modoboa/lib/authbackends.py +++ b/modoboa/lib/authbackends.py @@ -56,7 +56,7 @@ try: return user def authenticate(self, username, password): - auth_type = parameters.get_admin("AUTHENTICATION_TYPE", app="admin") + auth_type = parameters.get_admin("AUTHENTICATION_TYPE", app="core") if auth_type == "ldap": return super(LDAPBackend, self).authenticate(username, password) return None diff --git a/modoboa/lib/cryptutils.py b/modoboa/lib/cryptutils.py index 8808cd240..0c778cda8 100644 --- a/modoboa/lib/cryptutils.py +++ b/modoboa/lib/cryptutils.py @@ -17,7 +17,7 @@ def random_key(l=16): def encrypt(clear): - key = parameters.get_admin("SECRET_KEY", app="admin") + key = parameters.get_admin("SECRET_KEY", app="core") obj = AES.new(key, AES.MODE_ECB) if type(clear) is unicode: clear = clear.encode("utf-8") @@ -30,7 +30,7 @@ def encrypt(clear): def decrypt(ciph): obj = AES.new( - parameters.get_admin("SECRET_KEY", app="admin"), AES.MODE_ECB + parameters.get_admin("SECRET_KEY", app="core"), AES.MODE_ECB ) ciph = base64.b64decode(ciph) clear = obj.decrypt(ciph) diff --git a/modoboa/lib/events.py b/modoboa/lib/events.py index a296374cc..85284b1f2 100644 --- a/modoboa/lib/events.py +++ b/modoboa/lib/events.py @@ -111,7 +111,7 @@ class observe(object): else self.__guess_extension_name(modname) @wraps(f) - def wrapped_f(*args): + def wrapped_f(*args, **kwargs): if extname: from modoboa.core.models import Extension from modoboa.core.extensions import exts_pool @@ -126,7 +126,7 @@ class observe(object): return [] elif not modname in settings.MODOBOA_APPS: return [] - return f(*args) + return f(*args, **kwargs) for evt in self.evtnames: register(evt, wrapped_f) return wrapped_f @@ -149,7 +149,7 @@ def unregister(event, callback): pass -def raiseEvent(event, *args): +def raiseEvent(event, *args, **kwargs): """Raise a specific event Any additional keyword argument will be passed to registered @@ -160,7 +160,7 @@ def raiseEvent(event, *args): if not event in events or not event in callbacks.keys(): return 0 for callback in callbacks[event].values(): - callback(*args) + callback(*args, **kwargs) return 1 diff --git a/modoboa/lib/migrations/0005_rename_table.py b/modoboa/lib/migrations/0005_rename_table.py new file mode 100644 index 000000000..cd5ab6347 --- /dev/null +++ b/modoboa/lib/migrations/0005_rename_table.py @@ -0,0 +1,102 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + depends_on = ( + ('admin', '0037_rename_tables'), + ) + + def forwards(self, orm): + db.rename_table('lib_log', 'core_log') + db.send_create_signal('core', ['Log']) + + # Changing field 'UserParameter.user' + db.alter_column(u'lib_userparameter', 'user_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['core.User'])) + + def backwards(self, orm): + db.rename_table('core_log', 'lib_log') + db.send_create_signal(u'lib', ['Log']) + + # Changing field 'UserParameter.user' + db.alter_column(u'lib_userparameter', 'user_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['admin.User'])) + + models = { + u'auth.group': { + 'Meta': {'object_name': 'Group'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + u'auth.permission': { + 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + u'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + u'core.extension': { + 'Meta': {'object_name': 'Extension'}, + 'enabled': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}) + }, + u'core.log': { + 'Meta': {'object_name': 'Log'}, + 'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'level': ('django.db.models.fields.CharField', [], {'max_length': '15'}), + 'logger': ('django.db.models.fields.CharField', [], {'max_length': '30'}), + 'message': ('django.db.models.fields.CharField', [], {'max_length': '255'}) + }, + u'core.objectaccess': { + 'Meta': {'unique_together': "(('user', 'content_type', 'object_id'),)", 'object_name': 'ObjectAccess'}, + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_owner': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['core.User']"}) + }, + u'core.user': { + 'Meta': {'ordering': "['username']", 'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '254', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_local': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '254'}) + }, + u'lib.parameter': { + 'Meta': {'object_name': 'Parameter'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'value': ('django.db.models.fields.CharField', [], {'max_length': '255'}) + }, + u'lib.userparameter': { + 'Meta': {'object_name': 'UserParameter'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['core.User']"}), + 'value': ('django.db.models.fields.CharField', [], {'max_length': '255'}) + } + } + + complete_apps = ['core', 'lib'] diff --git a/modoboa/lib/migrations/0006_move_parameters.py b/modoboa/lib/migrations/0006_move_parameters.py new file mode 100644 index 000000000..0913b626a --- /dev/null +++ b/modoboa/lib/migrations/0006_move_parameters.py @@ -0,0 +1,89 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import DataMigration +from django.db import models + +class Migration(DataMigration): + depends_on = ( + ('admin', '0037_rename_tables'), + ) + + params = ['AUTHENTICATION_TYPE', 'PASSWORD_SCHEME', 'SECRET_KEY', + 'LOG_MAXIMUM_AGE', 'ITEMS_PER_PAGE', 'DEFAULT_TOP_REDIRECTION'] + + def forwards(self, orm): + "Write your forwards methods here." + for p in orm['lib.Parameter'].objects.filter( + name__in=['admin.%s' % n for n in self.params]): + p.name = p.name.replace('admin.', 'core.') + p.save() + for ldap_p in orm['lib.Parameter'].objects.filter(name__contains='admin.LDAP'): + ldap_p.name = ldap_p.name.replace('admin.', 'core.') + ldap_p.save() + + def backwards(self, orm): + "Write your backwards methods here." + for p in orm['lib.Parameter'].objects.filter( + name__in=['core.%s' % n for n in self.params]): + p.name = p.name.replace('core.', 'admin.') + p.save() + for ldap_p in orm['lib.Parameter'].objects.filter(name__contains='core.LDAP'): + ldap_p.name = ldap_p.name.replace('core.', 'admin.') + ldap_p.save() + + models = { + u'auth.group': { + 'Meta': {'object_name': 'Group'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + u'auth.permission': { + 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + u'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + u'core.user': { + 'Meta': {'ordering': "['username']", 'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '254', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_local': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '254'}) + }, + u'lib.parameter': { + 'Meta': {'object_name': 'Parameter'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'value': ('django.db.models.fields.CharField', [], {'max_length': '255'}) + }, + u'lib.userparameter': { + 'Meta': {'object_name': 'UserParameter'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['core.User']"}), + 'value': ('django.db.models.fields.CharField', [], {'max_length': '255'}) + } + } + + complete_apps = ['lib'] + symmetrical = True From 45560493dea71fa95c6fc69858529ca64f43b5db Mon Sep 17 00:00:00 2001 From: Bitdeli Chef Date: Mon, 30 Sep 2013 08:58:11 +0000 Subject: [PATCH 59/97] Add a Bitdeli badge to README --- README.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.rst b/README.rst index d98c1dd09..956639ad1 100644 --- a/README.rst +++ b/README.rst @@ -65,3 +65,9 @@ The following external libraries are provided with Modoboa: .. |downloads| image:: https://pypip.in/d/modoboa/badge.png :alt: Downloads from Pypi :target: https://crate.io/packages/modoboa/ + + +.. image:: https://d2weczhvl823v0.cloudfront.net/tonioo/modoboa/trend.png + :alt: Bitdeli badge + :target: https://bitdeli.com/free + From 8bc0bfcae2a80f5f2de459726fe83bbe5f378d77 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Mon, 30 Sep 2013 22:03:05 +0200 Subject: [PATCH 60/97] PEP8 compliance and cleanup. --- modoboa/lib/email_listing.py | 35 ++++++++++++++-------- modoboa/lib/formutils.py | 44 +++++++++++++++++---------- modoboa/lib/parameters.py | 34 ++++++++++++++------- modoboa/lib/sysutils.py | 31 ++++++++----------- modoboa/lib/tables.py | 58 ++++++++++++++---------------------- modoboa/lib/webutils.py | 15 ++-------- 6 files changed, 112 insertions(+), 105 deletions(-) diff --git a/modoboa/lib/email_listing.py b/modoboa/lib/email_listing.py index 0f066bce5..8cd0115b4 100644 --- a/modoboa/lib/email_listing.py +++ b/modoboa/lib/email_listing.py @@ -2,18 +2,20 @@ import time import re import os -import time, random, hashlib +import time +import random +import hashlib import lxml.html from lxml import etree from django.conf import settings from django.template.loader import render_to_string from django.template import Template, Context from django.utils.translation import ugettext as _ -from modoboa.lib.webutils import _render from modoboa.lib.emailutils import decode attached_map = {} + class MBconnector(object): def __init__(self, address, port): self.address = address @@ -22,6 +24,7 @@ class MBconnector(object): def messages_count(self, **kwargs): pass + class Page(object): def __init__(self, pageid, id_start, id_stop, items, items_per_page, has_previous, has_next, @@ -53,6 +56,7 @@ class Page(object): lid += 1 return lid + class Paginator(object): def __init__(self, total, elems_per_page): self.total = total @@ -65,7 +69,7 @@ class Paginator(object): id_start = self.elems_per_page * page + 1 id_stop = id_start + self.elems_per_page - 1 return (id_start, id_stop) - + def getpage(self, page): if page < 1: return None @@ -85,6 +89,7 @@ class Paginator(object): p.paginator = self return p + class EmailListing(object): def __init__(self, baseurl=None, folder=None, elems_per_page=40, @@ -113,21 +118,25 @@ class EmailListing(object): def render_navbar(page, baseurl=None): if page is None: return "" - context = {"page": page, "STATIC_URL": settings.STATIC_URL, "baseurl": baseurl} + context = { + "page": page, "STATIC_URL": settings.STATIC_URL, "baseurl": baseurl + } return render_to_string("common/pagination_bar.html", context) - + def fetch(self, request, id_start, id_stop): - table = self.tbltype(request, - self.mbc.fetch(start=id_start, stop=id_stop, - mbox=self.folder, - nbelems=self.elems_per_page)) + table = self.tbltype( + request, + self.mbc.fetch(start=id_start, stop=id_stop, + mbox=self.folder, + nbelems=self.elems_per_page) + ) tpl = Template("""
                            {{ table }}
                            """) return tpl.render( Context({ - "table" : table.render(withheader=self.show_listing_headers) + "table": table.render(withheader=self.show_listing_headers) }) ) @@ -139,10 +148,11 @@ class EmailListing(object): listing = self.fetch(request, page.id_start, page.id_stop) return dict(listing=listing, navbar=self.render_navbar(page, self.baseurl)) + def parse_search_parameters(request): - if request.GET.has_key("pattern"): + if 'pattern' in request.GET: request.session["pattern"] = re.escape(request.GET["pattern"]) - if request.GET.has_key("criteria"): + if 'criteria' in request.GET: request.session["criteria"] = request.GET["criteria"] else: request.session["criteria"] = ["from_addr"] @@ -150,4 +160,3 @@ def parse_search_parameters(request): for p in ["pattern", "criteria"]: if p in request.session.keys(): del request.session[p] - diff --git a/modoboa/lib/formutils.py b/modoboa/lib/formutils.py index 37ec8144c..fa4e62cb3 100644 --- a/modoboa/lib/formutils.py +++ b/modoboa/lib/formutils.py @@ -8,19 +8,20 @@ from django.utils.encoding import force_unicode from django.utils.safestring import mark_safe from django.utils.html import conditional_escape + class CreationWizard(object): def __init__(self, done_cb): self.steps = [] self.done_cb = done_cb def add_step(self, cls, title, buttons, formtpl=None, new_args=None): - self.steps += [dict(cls=cls, title=title, buttons=buttons, + self.steps += [dict(cls=cls, title=title, buttons=buttons, formtpl=formtpl, new_args=new_args)] def create_forms(self, data=None): for step in self.steps: args = [] - if step.has_key("new_args") and step["new_args"]: + if 'new_args' in step and step["new_args"]: args += step["new_args"] if data: args.append(data) @@ -46,6 +47,7 @@ class CreationWizard(object): def get_title(self, stepid): return "%d. %s" % (stepid + 1, self.steps[stepid]["title"]) + class DynamicForm(object): def _create_field(self, typ, name, value=None, pos=None): @@ -66,12 +68,13 @@ class DynamicForm(object): ndata = self.data.copy() values.reverse() for v in values: - if self.fields.has_key(v[0]): + if v[0] in self.fields: continue self._create_field(typ, v[0]) ndata[v[0]] = v[1] self.data = ndata + class TabForms(object): """ Simple forms container @@ -99,21 +102,21 @@ class TabForms(object): fd["instance"] = classes[fd["id"]](*args, **kwargs) else: fd["instance"] = fd["cls"](*args, **kwargs) - map(lambda fd: self.forms.remove(fd), to_remove) + self.forms = [form for form in self.forms if not form in to_remove] if self.forms: self.active_id = self.forms[0]["id"] def _before_is_valid(self, form): return True - + def is_valid(self, mandatory_only=False, optional_only=False): to_remove = [] for f in self.forms: if mandatory_only and \ - (not f.has_key("mandatory") or not f["mandatory"]): + (not 'mandatory' in f or not f["mandatory"]): continue elif optional_only and \ - (f.has_key("mandatory") and f["mandatory"]): + ('mandatory' in f and f["mandatory"]): continue if not self._before_is_valid(f): to_remove.append(f) @@ -121,7 +124,7 @@ class TabForms(object): if not f["instance"].is_valid(): self.active_id = f["id"] return False - map(lambda fd: self.forms.remove(fd), to_remove) + self.forms = [f for f in self.forms if not f in to_remove] return True def save(self, *args, **kwargs): @@ -132,7 +135,7 @@ class TabForms(object): if f["id"] == tabid: self.forms.remove(f) break - + def __iter__(self): return self.forward() @@ -144,6 +147,7 @@ class TabForms(object): # Custom fields from here # + def is_valid_host(host): """IDN compatible domain validator """ @@ -152,6 +156,7 @@ def is_valid_host(host): is_valid_host._re = re.compile(r'^([0-9a-z][-\w]*[0-9a-z]\.)+[a-z0-9\-]{2,15}$') return bool(is_valid_host._re.match(host)) + def validate_domain_name(value): if not is_valid_host(value): raise ValidationError(_('Enter a valid domain name'), 'invalid') @@ -162,8 +167,8 @@ class DomainNameField(CharField): A subclass of CharField that only accepts a valid domain name. """ default_error_messages = { - 'invalid' : _('Enter a valid domain name') - } + 'invalid': _('Enter a valid domain name') + } default_validators = [validate_domain_name] @@ -179,16 +184,23 @@ class CustomRadioInput(RadioInput): else: label_for = '' choice_label = conditional_escape(force_unicode(self.choice_label)) - return mark_safe(u'' % (label_for, self.tag(), choice_label)) + return mark_safe( + u'' + % (label_for, self.tag(), choice_label) + ) class InlineRadioRenderer(RadioSelect.renderer): def __iter__(self): for i, choice in enumerate(self.choices): - yield CustomRadioInput(self.name, self.value, self.attrs.copy(), choice, i) + yield CustomRadioInput( + self.name, self.value, self.attrs.copy(), choice, i + ) def render(self): - return mark_safe(u'\n'.join([u'%s\n' % force_unicode(w) for w in self])) + return mark_safe( + u'\n'.join([u'%s\n' % force_unicode(w) for w in self]) + ) class InlineRadioSelect(RadioSelect): @@ -203,6 +215,8 @@ class SeparatorField(Field): class YesNoField(ChoiceField): def __init__(self, *args, **kwargs): - kwargs["choices"] = [("yes", ugettext_lazy("Yes")), ("no", ugettext_lazy("No"))] + kwargs["choices"] = [ + ("yes", ugettext_lazy("Yes")), ("no", ugettext_lazy("No")) + ] kwargs["widget"] = InlineRadioSelect super(YesNoField, self).__init__(*args, **kwargs) diff --git a/modoboa/lib/parameters.py b/modoboa/lib/parameters.py index 56d9a8590..c6989f513 100644 --- a/modoboa/lib/parameters.py +++ b/modoboa/lib/parameters.py @@ -70,14 +70,14 @@ class GenericParametersForm(forms.Form): class AdminParametersForm(GenericParametersForm): def _load_initial_values(self): - from models import Parameter + from .models import Parameter names = ["%s.%s" % (self.app, name.upper()) for name in self.fields.keys()] for p in Parameter.objects.filter(name__in=names): self.fields[p.shortname].initial = p.value def save(self): - from models import Parameter + from .models import Parameter from modoboa.lib.formutils import SeparatorField for name, value in self.cleaned_data.items(): @@ -111,7 +111,7 @@ class UserParametersForm(GenericParametersForm): def _load_initial_values(self): if self.user is None: return - from models import UserParameter + from .models import UserParameter names = ["%s.%s" % (self.app, name.upper()) for name in self.fields.keys()] for p in UserParameter.objects.filter(user=self.user, name__in=names): @@ -122,7 +122,7 @@ class UserParametersForm(GenericParametersForm): return True def save(self): - from models import UserParameter + from .models import UserParameter from modoboa.lib.formutils import SeparatorField for name, value in self.cleaned_data.items(): @@ -141,7 +141,7 @@ class UserParametersForm(GenericParametersForm): def register(formclass, label): """Register a form class containing parameters - formclass must inherit from ``AdminParametersForm`` of + formclass must inherit from ``AdminParametersForm`` or ``UserParametersForm``. :param formclass: a form class @@ -155,7 +155,9 @@ def register(formclass, label): level = 'U' else: raise RuntimeError("Unknown parameter class") - _params[level][formclass.app] = {"label": label, "form": formclass, "defaults": {}} + _params[level][formclass.app] = { + "label": label, "form": formclass, "defaults": {} + } form = formclass() for name, field in form.fields.items(): if type(field) is SeparatorField: @@ -198,7 +200,7 @@ def __guess_extension(): def save_admin(name, value, app=None): - from models import Parameter + from .models import Parameter if app is None: app = __guess_extension() @@ -215,7 +217,7 @@ def save_admin(name, value, app=None): def save_user(user, name, value, app=None): - from models import UserParameter + from .models import UserParameter if app is None: app = __guess_extension() @@ -240,7 +242,7 @@ def get_admin(name, app=None, raise_error=True): :param app: the application owning the parameter :return: the corresponding value as a string """ - from models import Parameter + from .models import Parameter if app is None: app = __guess_extension() @@ -267,7 +269,7 @@ def get_user(user, name, app=None, raise_error=True): :param app: the application owning the parameter :return: the corresponding value as a string """ - from models import UserParameter + from .models import UserParameter if app is None: app = __guess_extension() @@ -284,7 +286,13 @@ def get_user(user, name, app=None, raise_error=True): return p.value.decode("unicode_escape") -def get_sorted_apps(level, first="admin"): +def get_sorted_apps(level, first="core"): + """Retrieve the sorted list of all registerd applications. + + :param str level: application level + :param str first: force the first item of the result + :rtype: list + """ sorted_apps = [] if first in _params[level]: sorted_apps.append(first) @@ -296,6 +304,10 @@ def get_sorted_apps(level, first="admin"): def get_admin_forms(*args, **kwargs): + """Get all admin level forms. + + Generates an instance of each declared form. + """ for app in get_sorted_apps('A'): formdef = _params['A'][app] yield {"label": formdef["label"], diff --git a/modoboa/lib/sysutils.py b/modoboa/lib/sysutils.py index 2358760cd..8ce692064 100644 --- a/modoboa/lib/sysutils.py +++ b/modoboa/lib/sysutils.py @@ -4,29 +4,24 @@ This module extra functions/shortcuts to communicate with the system (executing commands, etc.) """ -import logging -import logging.handlers +import subprocess from modoboa.lib import parameters -def exec_cmd(cmd, sudo_user=None, **kwargs): - import subprocess +def exec_cmd(cmd, sudo_user=None, **kwargs): + """Execute a shell command. + + Run a command using the current user. Set :keyword:`sudo_user` if + you need different privileges. + + :param str cmd: the command to execute + :param str sudo_user: a valid system username + :rtype: tuple + :return: return code, command output + """ if sudo_user is not None: cmd = "sudo -u %s %s" % (sudo_user, cmd) - p = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, + p = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, **kwargs) output = p.communicate()[0] return p.returncode, output - -def __log(msg, facility=logging.handlers.SysLogHandler.LOG_AUTH): - logger = logging.getLogger('modoboa') - logger.setLevel(logging.DEBUG) - handler = logging.handlers.SysLogHandler(address='/dev/log', facility=facility) - formatter = logging.Formatter('%(name)s: %(levelname)s %(message)s') - handler.setFormatter(formatter) - logger.addHandler(handler) - return logger - -def log_warning(msg): - logger = __log(msg) - logger.warning(msg) diff --git a/modoboa/lib/tables.py b/modoboa/lib/tables.py index 5d696c990..5ea8814a7 100644 --- a/modoboa/lib/tables.py +++ b/modoboa/lib/tables.py @@ -16,6 +16,7 @@ from django.template import Template, RequestContext, Context from django.template.loader import render_to_string from templatetags.libextras import render_link + class Column(object): """Simple column representation """ @@ -24,7 +25,7 @@ class Column(object): self.sortable = True for k, v in kwargs.iteritems(): setattr(self, k, v) - + def __unicode__(self): try: label = getattr(self, "label") @@ -51,6 +52,7 @@ class Column(object): except AttributeError: pass + class SelectionColumn(Column): """Specific column: selection @@ -64,7 +66,7 @@ class SelectionColumn(Column): def render(self, value, selection): return "" \ - % {'id': self.name, 'value': value, + % {'id': self.name, 'value': value, "checked": "checked=''" if selection else ""} def transform(self, row, col, table): @@ -72,9 +74,10 @@ class SelectionColumn(Column): col["value"] = self.render(row[table.idkey], selection) col["safe"] = True + class ImgColumn(Column): """Specific column: image - + This kind of column only contains images tags (). """ def __str__(self): @@ -86,7 +89,7 @@ class ImgColumn(Column): def render(self, value): if type(value) in [list, tuple]: - return "".join(map(lambda i: "" % i, value)) + return "".join(["" % i for i in value]) return "" % value def transform(self, row, col, table): @@ -100,6 +103,7 @@ class ImgColumn(Column): pass col["safe"] = True + class DivColumn(Column): def __str__(self): return "" @@ -111,6 +115,7 @@ class DivColumn(Column): col["value"] = self.render() col["safe"] = True + class ActionColumn(Column): def render(self, fct, user, rowid): return fct(user, rowid) @@ -119,10 +124,11 @@ class ActionColumn(Column): col["value"] = self.render(self.defvalue, table.request.user, row[table.idkey]) col["safe"] = True + class LinkColumn(Column): def render(self, rowid, value): linkdef = dict(label=value, modal=self.modal) - if type(self.urlpattern) == dict: + if type(self.urlpattern) is dict: t, value = rowid.split(":") linkdef.update(url=reverse(self.urlpattern[t], args=[value]), modalcb=self.modalcb[t]) @@ -135,12 +141,15 @@ class LinkColumn(Column): col["value"] = self.render(row[table.idkey], row[self.name]) col["safe"] = True + class Table(object): tableid = "" - def __init__(self, request, rows={}): + def __init__(self, request, rows=None): self.columns = [] self.request = request + if rows is None: + rows = {} try: order = getattr(self, "cols_order") except AttributeError: @@ -168,13 +177,13 @@ class Table(object): self.rows = [] trcpt = 0 for row in rows: - nrow = {"id" : row[self.idkey], "cols" : [], "trcpt" : trcpt} + nrow = {"id": row[self.idkey], "cols": [], "trcpt": trcpt} for name in ["style", "options"]: - if row.has_key(name): + if name in row: nrow[name] = row[name] - + for c in self.columns: - newcol = {"name" : c.name} + newcol = {"name": c.name} for key in ["width", "align", "cssclass"]: try: newcol[key] = getattr(c, key) @@ -184,7 +193,7 @@ class Table(object): nrow["cols"] += [newcol] self.rows += [nrow] trcpt += 1 - + def _rows_from_model(self, objects, include_type_in_id=False): rows = [] for obj in objects: @@ -232,32 +241,11 @@ class Table(object): """) return t.render(RequestContext(self.request, { - "table" : self, "tableid" : self.tableid, "styles" : styles, - "withheader" : withheader - })) + "table": self, "tableid": self.tableid, "styles": styles, + "withheader": withheader + })) t = Template("""
                            %s
                            """ % _("No entries to display")) return t.render(Context()) - - def render_head(self, request): - t = Template(""" - - {% include "common/table_head.html" %} -
                            -""") - return t.render(Context({ - "table" : self, "tableid" : "%s_head" % self.tableid - })) - - def render_body(self, request): - t = Template(""" - - {% include "common/table_body.html" %} -
                            -""") - return t.render(Context({ - "table" : self, "tableid" : "%s_body" % self.tableid - })) - diff --git a/modoboa/lib/webutils.py b/modoboa/lib/webutils.py index 28ac626a5..c9977d244 100644 --- a/modoboa/lib/webutils.py +++ b/modoboa/lib/webutils.py @@ -15,23 +15,12 @@ from django.utils import simplejson from django.conf import settings -def _render(request, tpl, user_context): - """Custom rendering function +def _render_to_string(request, tpl, user_context): + """Custom rendering function. Just a wrapper which automatically adds a RequestContext instance (useful to use settings variables like STATIC_URL inside templates) """ - return render_to_response( - tpl, user_context, - context_instance=template.RequestContext(request) - ) - - -def _render_to_string(request, tpl, user_context): - """Custom rendering function - - Same as _render. - """ return render_to_string(tpl, user_context, context_instance=template.RequestContext(request)) From b623b7253e4f7e79ad8b5a770b3d75246ad5e2f2 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Mon, 30 Sep 2013 22:14:09 +0200 Subject: [PATCH 61/97] Unit test fixed. --- tests/install_from_scratch.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/install_from_scratch.py b/tests/install_from_scratch.py index dfa94a2e4..4d6800cec 100644 --- a/tests/install_from_scratch.py +++ b/tests/install_from_scratch.py @@ -15,6 +15,7 @@ def runcmd(cmd, **kwargs): output = p.communicate()[0] return p.returncode, output + class DeployTest(unittest.TestCase): dbtype = "mysql" dbhost = "localhost" @@ -42,7 +43,7 @@ class DeployTest(unittest.TestCase): child = pexpect.spawn(cmd, cwd=self.workdir) fout = open('install_from_scratch.log','w') child.logfile = fout - child.expect("Database type \(mysql or postgres\):", timeout=timeout) + child.expect("Database type \(mysql, postgres or sqlite3\):", timeout=timeout) child.sendline(self.dbtype) child.expect("Database host \(default: 'localhost'\):", timeout=timeout) child.sendline(self.dbhost) From 922c2bb5ff010851298010b1ae6e6f4eaba4093d Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Tue, 1 Oct 2013 12:03:59 +0200 Subject: [PATCH 62/97] Spanish translation updated. --- modoboa/locale/es/LC_MESSAGES/django.po | 237 ++++++------------------ 1 file changed, 58 insertions(+), 179 deletions(-) diff --git a/modoboa/locale/es/LC_MESSAGES/django.po b/modoboa/locale/es/LC_MESSAGES/django.po index 3457ecc93..b29cc231a 100644 --- a/modoboa/locale/es/LC_MESSAGES/django.po +++ b/modoboa/locale/es/LC_MESSAGES/django.po @@ -1,23 +1,22 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Pedro Gracia , 2011-2013 # Pedro Gracia , 2010-2011 msgid "" msgstr "" "Project-Id-Version: Modoboa\n" -"Report-Msgid-Bugs-To: \n" +"Report-Msgid-Bugs-To: http://dev.modoboa.org/\n" "POT-Creation-Date: 2013-09-20 22:30+0200\n" -"PO-Revision-Date: 2013-06-03 16:33+0000\n" +"PO-Revision-Date: 2013-10-01 09:56+0000\n" "Last-Translator: Pedro Gracia \n" -"Language-Team: Spanish (http://www.transifex.com/projects/p/modoboa/language/" -"es/)\n" -"Language: es\n" +"Language-Team: Spanish (http://www.transifex.com/projects/p/modoboa/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: admin/__init__.py:9 @@ -123,9 +122,7 @@ msgstr "Unir a DN" msgid "" "The distinguished name to use when binding to the LDAP server. Leave empty " "for an anonymous bind" -msgstr "" -"El nombre distinguido a usar cuando nos unimos al servidor LDAP. Dejar vació " -"para una unión anónima" +msgstr "El nombre distinguido a usar cuando nos unimos al servidor LDAP. Dejar vació para una unión anónima" #: admin/app_settings.py:97 msgid "Bind password" @@ -133,8 +130,7 @@ msgstr "Unir contraseña" #: admin/app_settings.py:99 msgid "The password to use when binding to the LDAP server (with 'Bind DN')" -msgstr "" -"La contraseña a usar cuando nos unimos al servidor LDAP (con 'Unir a DN')" +msgstr "La contraseña a usar cuando nos unimos al servidor LDAP (con 'Unir a DN')" #: admin/app_settings.py:105 msgid "Search base" @@ -152,9 +148,7 @@ msgstr "Filtro de búsqueda" msgid "" "An optional filter string (e.g. '(objectClass=person)'). In order to be " "valid, it must be enclosed in parentheses." -msgstr "" -"Una cadena de filtro opcional (p.e. '(objectClass=person)'). Para que sea " -"válido tiene que ser encerrado entre paréntesis." +msgstr "Una cadena de filtro opcional (p.e. '(objectClass=person)'). Para que sea válido tiene que ser encerrado entre paréntesis." #: admin/app_settings.py:119 msgid "User DN template" @@ -165,9 +159,7 @@ msgstr "Plantilla DN del usuario" msgid "" "The template used to construct a user's DN. It should contain one " "placeholder (ie. %(user)s)" -msgstr "" -"La plantilla usada para contriunr un DN de usuario. Debería contener una " -"cadena reemplazables (p.e. %(user)s)" +msgstr "La plantilla usada para contriunr un DN de usuario. Debería contener una cadena reemplazables (p.e. %(user)s)" #: admin/app_settings.py:126 msgid "Password attribute" @@ -200,9 +192,7 @@ msgstr "Manejar mailboxes en el sistema de fichero" msgid "" "Rename or remove mailboxes on the filesystem when they get renamed or " "removed within Modoboa" -msgstr "" -"Renombrar o eliminar mailboxes en el sistema de ficheros cuando sean " -"renombrados o eliminados dentro de Modoboa" +msgstr "Renombrar o eliminar mailboxes en el sistema de ficheros cuando sean renombrados o eliminados dentro de Modoboa" #: admin/app_settings.py:146 msgid "Mailboxes ower" @@ -246,17 +236,15 @@ msgstr "Redirección principal por defecto" #: admin/app_settings.py:175 msgid "The default redirection used when no application is specified" -msgstr "" -"La redirección que será usada cuando ninguna aplicación sea especificada." +msgstr "La redirección que será usada cuando ninguna aplicación sea especificada." #: admin/app_settings.py:213 msgid "Key must be either 16, 24, or 32 bytes long" -msgstr "" +msgstr "La clave debe tener 16, 24 o 32 bytes de longitud" #: admin/app_settings.py:222 -#, fuzzy msgid "Invalid syntax" -msgstr "Línea inválida" +msgstr "Sintaxis inválida" #: admin/app_settings.py:245 msgid "This field is required" @@ -270,9 +258,7 @@ msgstr "Alias" msgid "" "Alias(es) of this domain. Indicate only one name per input, press ENTER to " "add a new input." -msgstr "" -"Alia(s) de este dominio. Indique únicamente un nombre por entrada, presione " -"ENTER para añadir una nueva entrada." +msgstr "Alia(s) de este dominio. Indique únicamente un nombre por entrada, presione ENTER para añadir una nueva entrada." #: admin/forms.py:59 msgid "An alias with this name already exists" @@ -303,9 +289,7 @@ msgstr "Nombre" msgid "" "The administrator's name. Don't include the domain's name here, it will be " "automatically appended." -msgstr "" -"El nombre del administrador. No incluya el nombre del dominio aquí, será " -"añadido automáticamente." +msgstr "El nombre del administrador. No incluya el nombre del dominio aquí, será añadido automáticamente." #: admin/forms.py:160 msgid "Create aliases" @@ -332,9 +316,7 @@ msgstr "Dirección de email" msgid "" "The distribution list address. Use the '*' character to create a 'catchall' " "address (ex: *@domain.tld)." -msgstr "" -"La dirección de la lista de distribución. Use el carácter '*' para crear una " -"dirección 'catchall' (recogerlos todos, ej. *@domain.tld)" +msgstr "La dirección de la lista de distribución. Use el carácter '*' para crear una dirección 'catchall' (recogerlos todos, ej. *@domain.tld)" #: admin/forms.py:239 msgid "Recipients" @@ -344,9 +326,7 @@ msgstr "Destinatarios" msgid "" "Mailbox(es) this alias will point to. Indicate only one address per input, " "press ENTER to add a new input." -msgstr "" -"Mailbox(es) a los que apuntará este alias. Indique únicamente una dirección " -"por entrada, presione ENTER para añadir una nueva entrada." +msgstr "Mailbox(es) a los que apuntará este alias. Indique únicamente una dirección por entrada, presione ENTER para añadir una nueva entrada." #: admin/forms.py:278 admin/forms.py:542 admin/forms.py:568 msgid "Domain does not exist" @@ -396,9 +376,7 @@ msgstr "Contraseñas cifradas" #: admin/forms.py:365 msgid "Check this option if passwords contained in your file are not crypted" -msgstr "" -"Marque esta opción si las contraseñas que contiene su fichero no están " -"cifradas" +msgstr "Marque esta opción si las contraseñas que contiene su fichero no están cifradas" #: admin/forms.py:371 msgid "File name" @@ -458,20 +436,14 @@ msgid "" "Quota in MB for this mailbox. Define a custom value or use domain's default " "one. Leave empty to define an unlimited value (not allowed for domain " "administrators)." -msgstr "" -"Cuota en MB para este mailbox. Defina un valor por defecto o use el del " -"dominio por defecto. Déjelo vacío para definir un valor ilimitado (no " -"permitido para los administradores del dominio)" +msgstr "Cuota en MB para este mailbox. Defina un valor por defecto o use el del dominio por defecto. Déjelo vacío para definir un valor ilimitado (no permitido para los administradores del dominio)" #: admin/forms.py:499 msgid "" "Alias(es) of this mailbox. Indicate only one address per input, press ENTER " "to add a new input. Use the '*' character to create a 'catchall' alias (ex: " "*@domain.tld)." -msgstr "" -"Alias de este mailbox. Indique sólo una dirección por entrada, presione " -"ENTER para añadir una nueva entrada. Use el carácter '*' para crear una " -"dirección 'catchall' (recogerlos todos, ej. *@domain.tld)" +msgstr "Alias de este mailbox. Indique sólo una dirección por entrada, presione ENTER para añadir una nueva entrada. Use el carácter '*' para crear una dirección 'catchall' (recogerlos todos, ej. *@domain.tld)" #: admin/forms.py:550 #, python-format @@ -522,12 +494,12 @@ msgstr "No puede importar una cuenta con un rol mayor que el suyo" #: admin/models.py:506 #, python-format msgid "The simple user '%s' must have a valid email address" -msgstr "" +msgstr "El usuario normal '%s' debe tener una dirección de email válida" #: admin/models.py:510 #, python-format msgid "username and email fields must not differ for '%s'" -msgstr "" +msgstr "Los campos de nombre de usuario y de email no deben ser diferentes para '%s'" #: admin/models.py:534 #, python-format @@ -600,11 +572,9 @@ msgstr "Una cuota es obligatoria" #: admin/models.py:1032 msgid "" -"The alias address (without the domain part). For a 'catch-all' address, just " -"enter an * character." -msgstr "" -"La dirección del alias (sin la parte del dominio). Para una dirección que lo " -"recoja todo, ponga un asterisco (*)." +"The alias address (without the domain part). For a 'catch-all' address, just" +" enter an * character." +msgstr "La dirección del alias (sin la parte del dominio). Para una dirección que lo recoja todo, ponga un asterisco (*)." #: admin/models.py:1036 msgid "mailboxes" @@ -636,9 +606,9 @@ msgid "Invalid line: %s" msgstr "Línea inválida: %s" #: admin/models.py:1175 -#, fuzzy, python-format +#, python-format msgid "Domain '%s' does not exist" -msgstr "El dominio no existe" +msgstr "El dominio '%s' no existe" #: admin/models.py:1218 msgid "Check to enable this extension" @@ -821,30 +791,15 @@ msgstr "%d objetos importados con éxito" msgid "" "Provide a CSV file where lines respect one of the following formats:\n" "
                              \n" -"
                            • account; loginname; password; first name; last name; enabled; group; " -"address[, domain, ...]
                              • \n" +"
                            • account; loginname; password; first name; last name; enabled; group; address[, domain, ...]
                              • \n" "
                            • alias; address; enabled; internal recipient
                              • \n" "
                            • forward; address; enabled; external recipient
                              • \n" "
                            • dlist; address; enabled; recipient; recipient; ...
                              • \n" "
                            \n" -"

                            The first element of each line is mandatory and must be equal to one of " -"the previous values.

                            \n" +"

                            The first element of each line is mandatory and must be equal to one of the previous values.

                            \n" "\n" "

                            You can use a different character as separator.

                            \n" -msgstr "" -"Importe un fichero CSV dónde las líneas respetan uno de los siguientes " -"formatos:\n" -"
                              \n" -"
                            • account; loginname; password; first name; last name; enabled; group; " -"address[, domain, ...]
                              • ⏎\n" -"
                            • alias; address; enabled; internal recipient
                              • ⏎\n" -"
                            • forward; address; enabled; external recipient
                              • ⏎\n" -"
                            • dlist; address; enabled; recipient; recipient; ...
                              • ⏎\n" -"
                            ⏎\n" -"

                            El primer elemento de cada línea es obligatorio y debe ser igual al de " -"los valores previos.

                            \n" -"\n" -"

                            Puede usar un carácter diferente como separador.

                            \n" +msgstr "Importe un fichero CSV dónde las líneas respetan uno de los siguientes formatos:\n
                              \n
                            • account; loginname; password; first name; last name; enabled; group; address[, domain, ...]
                              • ⏎\n
                            • alias; address; enabled; internal recipient
                              • ⏎\n
                            • forward; address; enabled; external recipient
                              • ⏎\n
                            • dlist; address; enabled; recipient; recipient; ...
                              • ⏎\n
                            ⏎\n

                            El primer elemento de cada línea es obligatorio y debe ser igual al de los valores previos.

                            \n\n

                            Puede usar un carácter diferente como separador.

                            \n" #: admin/views.py:775 msgid "Import identities" @@ -871,16 +826,9 @@ msgid "" "
                          • domain; name; quota; enabled
                            • \n" "
                          • domainalias; name; targeted domain; enabled
                            • \n" "
                          \n" -"

                          The first element of each line is mandatory and must be equal to one of " -"the previous values.

                          \n" +"

                          The first element of each line is mandatory and must be equal to one of the previous values.

                          \n" "

                          You can use a different character as separator.

                          \n" -msgstr "" -"Provea un fichero CSV dónde las líneas respetan uno de los siguientes " -"formatos:⏎
                            ⏎
                          • dominio; nombre; cuota; activado
                            • ⏎ " -"
                          • aliasdeldominio; nombre; dominio objetivo; activado
                            • ⏎ ⏎

                            El primer elemento de cada línea es obligatorio y debe ser igual a " -"uno de los valores anteriores.

                            ⏎

                            Puede usar un carácter diferente como " -"separador.

                            ⏎\n" +msgstr "Provea un fichero CSV dónde las líneas respetan uno de los siguientes formatos:⏎
                              ⏎
                            • dominio; nombre; cuota; activado
                              • ⏎
                            • aliasdeldominio; nombre; dominio objetivo; activado
                              • ⏎
                            ⏎

                            El primer elemento de cada línea es obligatorio y debe ser igual a uno de los valores anteriores.

                            ⏎

                            Puede usar un carácter diferente como separador.

                            ⏎\n" #: admin/views.py:845 msgid "Import domains" @@ -1111,9 +1059,9 @@ msgstr "Ver las identidades del dominio" #: admin/templatetags/admin_extras.py:178 #: admin/templatetags/admin_extras.py:194 #: admin/templatetags/admin_extras.py:201 -#, fuzzy, python-format +#, python-format msgid "Delete %s?" -msgstr "Eliminar" +msgstr "¿Eliminar %s?" #: admin/templatetags/admin_extras.py:223 msgid "Remove this permission" @@ -1134,9 +1082,7 @@ msgstr "Usuario '%s' ha entrado con éxito" #: auth/views.py:44 msgid "Your username and password didn't match. Please try again." -msgstr "" -"Su nombre de usuario y contraseña no concuerdan. Por favor, inténtelo de " -"nuevo." +msgstr "Su nombre de usuario y contraseña no concuerdan. Por favor, inténtelo de nuevo." #: auth/views.py:67 #, python-format @@ -1164,32 +1110,15 @@ msgid "" "\n" "

                            Welcome to the online demo!

                            \n" "

                            Warning: the demo's concent is resetted every two hours.

                            \n" -"

                            To try the demo, the following users are available (username/password):

                            \n" +"

                            To try the demo, the following users are available (username/password):

                            \n" "
                              \n" "
                            • A super administrator : admin/password
                              • \n" "
                            • A domain administrator : admin@demo.local/admin
                              • \n" "
                            • A simple user : user@demo.local/user
                              • \n" "
                            \n" "

                            Please report any issue or give any suggestion to \n" -" the " -"mailing list.

                            \n" -msgstr "" -"\n" -"

                            ¡Bienvendio a la demo!

                            \n" -"

                            Aviso: el contenido de la demo será inicializado cada dos horas.\n" -"

                            Para probar la demo están disponibles los siguientes usuarios (usuario/" -"contraseña):

                            \n" -"
                              \n" -"
                            • Un super administrador : admin/password
                              • \n" -"
                            • Un administrador de dominio : admin@demo.local/admin
                              • \n" -"
                            • Un usuario normal : user@demo.local/user
                              • \n" -"
                            \n" -"

                            Por favor, informe de cualquier incidencia o denos cualquier sugerencia " -"a \n" -" la lista " -"de correo.

                            \n" +" the mailing list.

                            \n" +msgstr "\n

                            ¡Bienvendio a la demo!

                            \n

                            Aviso: el contenido de la demo será inicializado cada dos horas.

                            \n

                            Para probar la demo están disponibles los siguientes usuarios (usuario/contraseña):

                            \n
                              \n
                            • Un super administrador : admin/password
                              • \n
                            • Un administrador de dominio : admin@demo.local/admin
                              • \n
                            • Un usuario normal : user@demo.local/user
                              • \n
                            \n

                            Por favor, informe de cualquier incidencia o denos cualquier sugerencia a \n la lista de correo.

                            \n" #: extensions/amavis/__init__.py:22 msgid "Simple amavis management frontend" @@ -1222,9 +1151,7 @@ msgstr "Tiempo máximo del mensaje" #: extensions/amavis/app_settings.py:16 msgid "Quarantine messages maximum age (in days) before deletion" -msgstr "" -"Máxima edad (en días) de los mensajes de cuarentena antes de proceder a su " -"eliminación" +msgstr "Máxima edad (en días) de los mensajes de cuarentena antes de proceder a su eliminación" #: extensions/amavis/app_settings.py:19 msgid "Messages releasing" @@ -1236,9 +1163,7 @@ msgstr "Eliminar mensajes publicados" #: extensions/amavis/app_settings.py:24 msgid "Remove messages marked as released while cleaning up the database" -msgstr "" -"Eliminar los mensajes marcados como publicados cuando se haga limpieza de la " -"base de datos" +msgstr "Eliminar los mensajes marcados como publicados cuando se haga limpieza de la base de datos" #: extensions/amavis/app_settings.py:28 msgid "Amavis connection mode" @@ -1344,9 +1269,7 @@ msgstr "Por defecto" #: extensions/amavis/models.py:98 msgid "Bypass virus checks or not. Choose 'default' to use global settings." -msgstr "" -"Saltarse la comprobación de virus o no. Elija 'Por defecto' para usar la " -"configuración global." +msgstr "Saltarse la comprobación de virus o no. Elija 'Por defecto' para usar la configuración global." #: extensions/amavis/models.py:101 msgid "Spam filter" @@ -1354,9 +1277,7 @@ msgstr "Filtro de spam" #: extensions/amavis/models.py:106 msgid "Bypass spam checks or not. Choose 'default' to use global settings." -msgstr "" -"Saltarse la comprobación de spam o no. Elija 'Por defecto' para usar la " -"configuración global." +msgstr "Saltarse la comprobación de spam o no. Elija 'Por defecto' para usar la configuración global." #: extensions/amavis/models.py:109 msgid "Banned filter" @@ -1364,9 +1285,7 @@ msgstr "Filtro de expulsados" #: extensions/amavis/models.py:114 msgid "Bypass banned checks or not. Choose 'default' to use global settings." -msgstr "" -"Saltarse la comprobación de expulsados o no. Elija 'Por defecto' para usar " -"la configuración global." +msgstr "Saltarse la comprobación de expulsados o no. Elija 'Por defecto' para usar la configuración global." #: extensions/amavis/models.py:144 msgid "Spam marker" @@ -1374,11 +1293,9 @@ msgstr "Marcador de spam" #: extensions/amavis/models.py:146 msgid "" -"Modify spam subject using the specified text. Choose 'default' to use global " -"settings." -msgstr "" -"Modificar el asunto del spam usando el texto especificado. Elija 'por " -"defecto' para usar la configuración global." +"Modify spam subject using the specified text. Choose 'default' to use global" +" settings." +msgstr "Modificar el asunto del spam usando el texto especificado. Elija 'por defecto' para usar la configuración global." #: extensions/amavis/sql_listing.py:23 extensions/webmail/lib.py:37 msgid "From" @@ -1461,12 +1378,8 @@ msgid "" msgid_plural "" "\n" "%(counter)s release requests are pending for action.\n" -msgstr[0] "" -"\n" -"%(counter)s petición de publicación está pendiente de acción.\n" -msgstr[1] "" -"\n" -"%(counter)s peticiones de publicación están pendiente de acción.\n" +msgstr[0] "\n%(counter)s petición de publicación está pendiente de acción.\n" +msgstr[1] "\n%(counter)s peticiones de publicación están pendiente de acción.\n" #: extensions/amavis/templates/amavis/notifications/pending_requests.html:6 msgid "Sketch:" @@ -1541,8 +1454,7 @@ msgstr "Mal MIME" #: extensions/limits/__init__.py:23 msgid "" "Per administrator resources to limit the number of objects they can create" -msgstr "" -"Recursos por administrador para limitar el número de objetos que pueden crear" +msgstr "Recursos por administrador para limitar el número de objetos que pueden crear" #: extensions/limits/__init__.py:54 msgid "Limits" @@ -1566,10 +1478,9 @@ msgid "Domain admins" msgstr "Administradores del dominio" #: extensions/limits/app_settings.py:15 -msgid "Maximum number of allowed domain administrators for a new administrator" -msgstr "" -"Número máximo de dominios permitido de administradores para un nuevo " -"administrador" +msgid "" +"Maximum number of allowed domain administrators for a new administrator" +msgstr "Número máximo de dominios permitido de administradores para un nuevo administrador" #: extensions/limits/app_settings.py:21 msgid "Maximum number of allowed domains for a new administrator" @@ -1577,8 +1488,7 @@ msgstr "Número máximo de dominios permitidos para un nuevo administrador" #: extensions/limits/app_settings.py:27 msgid "Maximum number of allowed domain aliases for a new administrator" -msgstr "" -"Número máximo permitido de alias de dominio para un nuevo administrador" +msgstr "Número máximo permitido de alias de dominio para un nuevo administrador" #: extensions/limits/app_settings.py:33 msgid "Maximum number of allowed mailboxes for a new administrator" @@ -1590,8 +1500,7 @@ msgstr "Número máxido de alias permitidos para un nuevo administrador" #: extensions/limits/forms.py:13 msgid "Maximum number of domain administrators this user can create" -msgstr "" -"Número máximo de administradores de dominio que este usuario puede crear" +msgstr "Número máximo de administradores de dominio que este usuario puede crear" #: extensions/limits/forms.py:17 msgid "Maximum number of domains this user can create" @@ -1701,8 +1610,7 @@ msgstr "El mensaje de autorespuesta se ha actualizado correctamente." #: extensions/postfix_autoreply/templates/postfix_autoreply/autoreply.html:2 msgid "Define a message to automatically send when you are off" -msgstr "" -"Defina el mensaje que automáticamente se enviará cuando esté desconectado" +msgstr "Defina el mensaje que automáticamente se enviará cuando esté desconectado" #: extensions/sievefilters/__init__.py:12 msgid "Plugin to easily create server-side filters" @@ -1899,9 +1807,7 @@ msgstr "activo" #: extensions/sievefilters/templates/sievefilters/index.html:74 msgid "" "No filters set defined yet. You must create one in order to define filters." -msgstr "" -"No hay un conjunto de filtros definido aún. Debe crear uno para poder " -"definir filtros." +msgstr "No hay un conjunto de filtros definido aún. Debe crear uno para poder definir filtros." #: extensions/sievefilters/templatetags/sfilters_tags.py:16 msgid "New filters set" @@ -2214,9 +2120,8 @@ msgid "Cci" msgstr "Cco" #: extensions/webmail/imaputils.py:237 -#, fuzzy msgid "Failed to retrieve hierarchy delimiter" -msgstr "Fallo en la recuperación de un conjunto de filtros" +msgstr "Fallo al recuperar el delimitador jerárquico" #: extensions/webmail/imaputils.py:278 #, python-format @@ -2544,9 +2449,7 @@ msgstr "Reenvía mensajes y guarda copias en su mailbox local" msgid "" "You can't define a forward to a local destination. Please ask your " "administrator to create an alias instead." -msgstr "" -"No puede definir un reenvío a un destino local. Por favor, pregunte a su " -"administrador para crear un alias en su lugar." +msgstr "No puede definir un reenvío a un destino local. Por favor, pregunte a su administrador para crear un alias en su lugar." #: userprefs/views.py:32 msgid "You need a mailbox in order to define a forward" @@ -2594,27 +2497,3 @@ msgstr "Actualizar su información personal" #: userprefs/templatetags/uprefs_extras.py:57 msgid "Logout" msgstr "Salir" - -#~ msgid "Failed to rename mailbox: %s" -#~ msgstr "Fallo al renombrar el mailbox: %s" - -#~ msgid "Failed to remove mailbox: %s" -#~ msgstr "Fallo al eliminar el mailbox: %s" - -#~ msgid "Mailbox %s does not exist" -#~ msgstr "El mailbox %s no existe" - -#~ msgid "Delete the domain" -#~ msgstr "Eliminar el dominio" - -#~ msgid "Delete this account" -#~ msgstr "Eliminar esta cuenta" - -#~ msgid "Delete this distribution list" -#~ msgstr "Eliminar esta lista de distribución" - -#~ msgid "Delete this forward" -#~ msgstr "Eliminar este reenvío" - -#~ msgid "Delete this alias" -#~ msgstr "Eliminar este alias" From e06aa57bae30efce888b863f58ec852adb311c9c Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Tue, 1 Oct 2013 19:10:16 +0200 Subject: [PATCH 63/97] Easier setup for sqlite3. see #484 --- modoboa/core/commands/deploy.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/modoboa/core/commands/deploy.py b/modoboa/core/commands/deploy.py index cd33fde07..297ee0509 100644 --- a/modoboa/core/commands/deploy.py +++ b/modoboa/core/commands/deploy.py @@ -80,14 +80,17 @@ class DeployCommand(Command): info['dbtype'] = 'mysql' if info['dbtype'] == 'postgres': info['dbtype'] = 'postgresql_psycopg2' - default_host = 'localhost' if info['dbtype'] == 'mysql' else '' - info['dbhost'] = \ - raw_input("Database host (default: '%s'): " % default_host) - if info['dbhost'] == '': - info['dbhost'] = default_host - info['dbname'] = raw_input('Database name: ') - info['username'] = raw_input('Username: ') - info['password'] = getpass.getpass('Password: ') + if info['dbtype'] == 'sqlite3': + info['dbname'] = '%s.db' % name + else: + default_host = 'localhost' if info['dbtype'] == 'mysql' else '' + info['dbhost'] = \ + raw_input("Database host (default: '%s'): " % default_host) + if info['dbhost'] == '': + info['dbhost'] = default_host + info['dbname'] = raw_input('Database name: ') + info['username'] = raw_input('Username: ') + info['password'] = getpass.getpass('Password: ') return info def handle(self, parsed_args): From 859970ab9b769e6475d71d12c5cc35b0e7594dcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Abrah=C3=A1m?= Date: Wed, 2 Oct 2013 14:32:29 +0200 Subject: [PATCH 64/97] Adding the Czech translation --- modoboa/locale/cs/LC_MESSAGES/djangojspo.po | 165 ++ modoboa/locale/cs/LC_MESSAGES/djangopo.po | 2605 +++++++++++++++++++ modoboa/userprefs/app_settings.py | 8 +- 3 files changed, 2774 insertions(+), 4 deletions(-) create mode 100644 modoboa/locale/cs/LC_MESSAGES/djangojspo.po create mode 100644 modoboa/locale/cs/LC_MESSAGES/djangopo.po diff --git a/modoboa/locale/cs/LC_MESSAGES/djangojspo.po b/modoboa/locale/cs/LC_MESSAGES/djangojspo.po new file mode 100644 index 000000000..473badd33 --- /dev/null +++ b/modoboa/locale/cs/LC_MESSAGES/djangojspo.po @@ -0,0 +1,165 @@ +# Modoboa Czech translation +# Copyright (C) 2013 +# This file is distributed under the same license as the Modoboa package. +# +# Miroslav Abrahám , 2013. +msgid "" +msgstr "" +"Project-Id-Version: modoboa-1.0.0\n" +"Report-Msgid-Bugs-To: miris@kunago.com\n" +"POT-Creation-Date: 2013-09-20 22:30+0200\n" +"PO-Revision-Date: 2013-09-29 22:13+0100\n" +"Last-Translator: Miroslav Abrahám \n" +"Language-Team: CS \n" +"Language: Čeština\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"X-Generator: Poedit 1.5.7\n" + +#: admin/static/admin/js/admin.js:26 +msgid "Search" +msgstr "Hledat" + +#: admin/static/admin/js/admin.js:110 +msgid "Do not delete domain directory" +msgstr "Nemazat adresář domény" + +#: admin/static/admin/js/admin.js:113 +msgid "This operation will remove ALL data associated to this domain." +msgstr "Tento krok odstraní VŠECHNA data související s touto doménou." + +#: admin/static/admin/js/admin.js:114 +msgid "" +"This operation will remove all data associated to this domain, excepting " +"accounts." +msgstr "" +"Tento krok odstraní VŠECHNA data související s touto doménou, vyjma účtů." + +#: admin/static/admin/js/admin.js:117 +msgid "Delete this domain?" +msgstr "Smazat tuto doménu?" + +#: admin/static/admin/js/admin.js:161 +msgid "No domain administrator defined" +msgstr "Není určen správce domény" + +#: admin/static/admin/js/admin.js:238 +msgid "Do not delete mailbox directory" +msgstr "Nemazat adresář schránky" + +#: admin/static/admin/js/admin.js:243 +msgid "Delete this account?" +msgstr "Smazat tento účet?" + +#: admin/static/admin/js/admin.js:249 +msgid "Delete this list?" +msgstr "Smazat tento seznam?" + +#: admin/static/admin/js/admin.js:254 +msgid "Delete this forward?" +msgstr "Smazat toto přeposílání?" + +#: admin/static/admin/js/admin.js:259 +msgid "Delete this alias?" +msgstr "Smazat tento alias?" + +#: extensions/amavis/static/amavis/js/quarantine.js:126 +msgid "Release this selection?" +msgstr "Odblokovat tento výběr?" + +#: extensions/amavis/static/amavis/js/quarantine.js:130 +msgid "Delete this selection?" +msgstr "Smazat tento výběr?" + +#: extensions/amavis/static/amavis/js/quarantine.js:148 +#: extensions/amavis/static/amavis/js/selfservice.js:22 +msgid "Release this message?" +msgstr "Odblokovat tuto zprávu?" + +#: extensions/amavis/static/amavis/js/quarantine.js:152 +#: extensions/amavis/static/amavis/js/selfservice.js:26 +msgid "Delete this message?" +msgstr "Smazat tuto zprávu?" + +#: extensions/amavis/static/amavis/js/quarantine.js:169 +msgid "View full headers" +msgstr "Zobrazit úplné záhlaví" + +#: extensions/amavis/static/amavis/js/quarantine.js:174 +msgid "Hide full headers" +msgstr "Skrýt záhlaví" + +#: extensions/sievefilters/static/sievefilters/js/lib.js:14 +msgid "Remove this filter?" +msgstr "Odstranit tento filtr?" + +#: extensions/sievefilters/static/sievefilters/js/lib.js:117 +msgid "Save changes?" +msgstr "Uložit změny?" + +#: extensions/sievefilters/static/sievefilters/js/lib.js:144 +msgid "Remove filters set?" +msgstr "Smazat sadu filtrů?" + +#: extensions/sievefilters/static/sievefilters/js/lib.js:161 +msgid "Activate this filters set?" +msgstr "Aktivovat tuto sadu filtrů?" + +#: extensions/sievefilters/static/sievefilters/js/lib.js:169 +#: extensions/sievefilters/static/sievefilters/js/lib.js:224 +msgid "active" +msgstr "aktivní" + +#: extensions/stats/static/stats/js/stats.js:37 +msgid "Search a domain" +msgstr "Vyhledat doménu" + +#: extensions/webmail/static/webmail/js/webmail.js:485 +msgid "Remove the selected mailbox?" +msgstr "Odstranit vybranou schránku?" + +#: extensions/webmail/static/webmail/js/webmail.js:499 +msgid "Mailbox removed" +msgstr "Schránka odstraněna" + +#: extensions/webmail/static/webmail/js/webmail.js:823 +msgid "Message sent" +msgstr "Zpráva odeslána" + +#: extensions/webmail/static/webmail/js/webmail.js:856 +msgid "Message deleted" +msgstr "Zpráva smazána" + +#: extensions/webmail/static/webmail/js/webmail.js:981 +#, c-format +msgid "%s file" +msgid_plural "%s files" +msgstr[0] "%s soubor" +msgstr[1] "%s soubory" +msgstr[2] "%s souborů" + +#: extensions/webmail/static/webmail/js/webmail.js:1013 +#, c-format +msgid "Moving %s message" +msgid_plural "Moving %s messages" +msgstr[0] "Přesunuji %s zprávu" +msgstr[1] "Přesunuji %s zprávy" +msgstr[2] "Přesunuji %s zpráv" + +#: static/js/confirmation.js:48 +msgid "Warning" +msgstr "Upozornění" + +#: static/js/confirmation.js:57 +msgid "Cancel" +msgstr "Zrušit" + +#: static/js/confirmation.js:99 static/js/history.js:239 +msgid "Internal Error" +msgstr "Interní chyba" + +#: static/js/searchbar.js:20 +msgid "Search..." +msgstr "Hledat..." diff --git a/modoboa/locale/cs/LC_MESSAGES/djangopo.po b/modoboa/locale/cs/LC_MESSAGES/djangopo.po new file mode 100644 index 000000000..fef7d5376 --- /dev/null +++ b/modoboa/locale/cs/LC_MESSAGES/djangopo.po @@ -0,0 +1,2605 @@ +# Modoboa Czech translation +# Copyright (C) 2013 +# This file is distributed under the same license as the Modoboa package. +# +# Miroslav Abrahám , 2013. +msgid "" +msgstr "" +"Project-Id-Version: modoboa-1.0.0\n" +"Report-Msgid-Bugs-To: miris@kunago.com\n" +"POT-Creation-Date: 2013-09-20 22:30+0200\n" +"PO-Revision-Date: 2013-09-29 22:08+0100\n" +"Last-Translator: Miroslav Abrahám \n" +"Language-Team: CS \n" +"Language: Čeština\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"X-Generator: Poedit 1.5.7\n" + +#: admin/__init__.py:9 +msgid "Administration console" +msgstr "Konzola správce" + +#: admin/__init__.py:11 +msgid "Web based console to manage domains, accounts and aliases" +msgstr "Webová konzola pro správu domén, účtů a aliasů" + +#: admin/__init__.py:16 admin/forms.py:211 admin/forms.py:652 +#: admin/views.py:94 admin/views.py:447 +#: extensions/postfix_autoreply/app_settings.py:11 +#: extensions/sievefilters/app_settings.py:50 +#: extensions/stats/app_settings.py:11 extensions/webmail/app_settings.py:11 +#: userprefs/__init__.py:15 +msgid "General" +msgstr "Obecné" + +#: admin/app_settings.py:31 +msgid "Authentication" +msgstr "Ověření" + +#: admin/app_settings.py:34 +msgid "Authentication type" +msgstr "Typ ověření" + +#: admin/app_settings.py:35 +msgid "Local" +msgstr "Lokální" + +#: admin/app_settings.py:38 +msgid "The backend used for authentication" +msgstr "Rozhraní pro ověřování přístupu" + +#: admin/app_settings.py:43 +msgid "Default password scheme" +msgstr "Výchozí schéma hesel" + +#: admin/app_settings.py:50 +msgid "Scheme used to crypt mailbox passwords" +msgstr "Použité schéma pro šifrování hesel schránek" + +#: admin/app_settings.py:54 +msgid "Secret key" +msgstr "Tajný klíč" + +#: admin/app_settings.py:56 +msgid "Key used to encrypt/decrypt passwords" +msgstr "Klíč používaný k šifrování/dešifrování hesel" + +#: admin/app_settings.py:60 +msgid "LDAP settings" +msgstr "Nastavení LDAP" + +#: admin/app_settings.py:63 extensions/sievefilters/app_settings.py:22 +#: extensions/webmail/app_settings.py:22 extensions/webmail/app_settings.py:42 +msgid "Server address" +msgstr "Adresa serveru" + +#: admin/app_settings.py:65 +msgid "The IP address of the DNS name of the LDAP server" +msgstr "IP adresa DNS jména LDAP serveru" + +#: admin/app_settings.py:69 extensions/sievefilters/app_settings.py:28 +#: extensions/webmail/app_settings.py:34 extensions/webmail/app_settings.py:58 +msgid "Server port" +msgstr "Port serveru" + +#: admin/app_settings.py:71 +msgid "The TCP port number used by the LDAP server" +msgstr "Port TCP, který používá LDAP server" + +#: admin/app_settings.py:75 extensions/webmail/app_settings.py:28 +msgid "Use a secured connection" +msgstr "Použít zabezpečené připojení" + +#: admin/app_settings.py:77 +msgid "Use an SSL/TLS connection to access the LDAP server" +msgstr "Použít připojení SSL/TLS pro přístup k LDAP serveru" + +#: admin/app_settings.py:81 +msgid "Authentication method" +msgstr "Metoda ověření" + +#: admin/app_settings.py:82 +msgid "Search and bind" +msgstr "Vyhledat a spojit" + +#: admin/app_settings.py:83 +msgid "Direct bind" +msgstr "Přímé spojení" + +#: admin/app_settings.py:85 +msgid "Choose the authentication method to use" +msgstr "Zvolte si metodu ověření, která se použije" + +#: admin/app_settings.py:90 +msgid "Bind DN" +msgstr "Spojení pomocí DN" + +#: admin/app_settings.py:92 +msgid "" +"The distinguished name to use when binding to the LDAP server. Leave empty " +"for an anonymous bind" +msgstr "" +"Rozlišovací jméno, které se použije při spojování s LDAP serverem. " +"Ponechejte prázdné pro anonymní spojení." + +#: admin/app_settings.py:97 +msgid "Bind password" +msgstr "Heslo spojení" + +#: admin/app_settings.py:99 +msgid "The password to use when binding to the LDAP server (with 'Bind DN')" +msgstr "" +"Heslo, které se použije při spojování s LDAP serverem (při výběru DN " +"spojení)." + +#: admin/app_settings.py:105 +msgid "Search base" +msgstr "Základna struktury" + +#: admin/app_settings.py:107 +msgid "The distinguished name of the search base" +msgstr "Rozlišovací jméno (DN) základny struktury" + +#: admin/app_settings.py:112 +msgid "Search filter" +msgstr "Vyhledávací filtr" + +#: admin/app_settings.py:114 +msgid "" +"An optional filter string (e.g. '(objectClass=person)'). In order to be " +"valid, it must be enclosed in parentheses." +msgstr "" +"Volitelný filtr (např. '(objectClass=osoba)'). Aby byl filtr platný, je " +"nezbytné jen uzavřít do závorek." + +#: admin/app_settings.py:119 +msgid "User DN template" +msgstr "Šablona uživatelského DN" + +#: admin/app_settings.py:121 +#, python-format +msgid "" +"The template used to construct a user's DN. It should contain one " +"placeholder (ie. %(user)s)" +msgstr "" +"Šablona použitá pro tvorbu uživatelského rozlišovacího jména (DN). Měla by " +"obsahovat jeden zástupný řetězec (tj. %(user)s)." + +#: admin/app_settings.py:126 +msgid "Password attribute" +msgstr "Atribut hesla" + +#: admin/app_settings.py:128 +msgid "The attribute used to store user passwords" +msgstr "Atribut používaný pro ukládání hesel uživatelů" + +#: admin/app_settings.py:132 +msgid "Active Directory" +msgstr "Active Directory" + +#: admin/app_settings.py:134 +msgid "Tell if the LDAP server is an Active Directory one" +msgstr "" +"Volba určující, jestli je nebo není LDAP server serverem Active Directory" + +#: admin/app_settings.py:137 admin/templates/admin/editdomainform.html:25 +#: extensions/limits/app_settings.py:31 extensions/limits/forms.py:24 +#: extensions/limits/models.py:14 extensions/webmail/app_settings.py:101 +#: extensions/webmail/templates/webmail/folders.html:4 +msgid "Mailboxes" +msgstr "Schránky" + +#: admin/app_settings.py:140 +msgid "Handle mailboxes on filesystem" +msgstr "Spravovat schránky v souborovém systému" + +#: admin/app_settings.py:142 +msgid "" +"Rename or remove mailboxes on the filesystem when they get renamed or " +"removed within Modoboa" +msgstr "" +"Přejmenovat nebo odstranit schránky v souborovém systému, pokud jsou " +"přejmenovány nebo odstraněny v Modoboa" + +#: admin/app_settings.py:146 +msgid "Mailboxes ower" +msgstr "Vlastník schránek" + +#: admin/app_settings.py:148 +msgid "The UNIX account who owns mailboxes on the filesystem" +msgstr "Účet UNIXu, který vlastní schránky v souborovém systému" + +#: admin/app_settings.py:152 +msgid "Automatic account removal" +msgstr "Automatické odstranění účtu" + +#: admin/app_settings.py:154 +msgid "When a mailbox is removed, also remove the associated account" +msgstr "Když je schránka odstraněná, odstranit také přiřazený účet uživatele" + +#: admin/app_settings.py:157 admin/templates/admin/editdomainform.html:7 +msgid "Miscellaneous" +msgstr "Různé" + +#: admin/app_settings.py:160 +msgid "Maximum log record age" +msgstr "Maximální stáří záznamu" + +#: admin/app_settings.py:162 +msgid "The maximum age in days of a log record" +msgstr "Maximální stáří záznamu ve dnech" + +#: admin/app_settings.py:166 +msgid "Items per page" +msgstr "Položek na stránce" + +#: admin/app_settings.py:168 +msgid "Number of displayed items per page" +msgstr "Počet zobrazených položek na stránce" + +#: admin/app_settings.py:172 +msgid "Default top redirection" +msgstr "Výchozí přesměrování aplikace" + +#: admin/app_settings.py:175 +msgid "The default redirection used when no application is specified" +msgstr "" +"Výchozí přesměrování, které se použije, pokud není žádná aplikace " +"specifikována" + +#: admin/app_settings.py:213 +msgid "Key must be either 16, 24, or 32 bytes long" +msgstr "Klíč musí mít délku 16, 24 nebo 32 znaků" + +#: admin/app_settings.py:222 +msgid "Invalid syntax" +msgstr "Neplatná syntaxe" + +#: admin/app_settings.py:245 +msgid "This field is required" +msgstr "Toto pole je vyžadováno" + +#: admin/forms.py:20 admin/forms.py:497 admin/tables.py:18 +msgid "Alias(es)" +msgstr "Alias(y)" + +#: admin/forms.py:22 +msgid "" +"Alias(es) of this domain. Indicate only one name per input, press ENTER to " +"add a new input." +msgstr "" +"Alias(y) této domény. Uveďte na řádek pouze jeden alias; pro vložení dalšího " +"aliasu stiskněte po vložení ENTER." + +#: admin/forms.py:59 +msgid "An alias with this name already exists" +msgstr "Alias s tímto názvem již existuje" + +#: admin/forms.py:73 +msgid "A domain with this name already exists" +msgstr "Doména s tímto názvem již existuje" + +#: admin/forms.py:146 +msgid "Create a domain administrator" +msgstr "Vytvořit správce domény" + +#: admin/forms.py:148 +msgid "Automatically create an administrator for this domain" +msgstr "Automaticky vytvořit správce této domény" + +#: admin/forms.py:152 admin/tables.py:12 admin/tables.py:47 +#: admin/templates/admin/editdomainform.html:13 +#: admin/templates/admin/identities_table.html:5 +#: admin/templates/admin/information.html:8 +#: extensions/sievefilters/forms.py:53 +#: extensions/sievefilters/templates/sievefilters/guieditor.html:6 +msgid "Name" +msgstr "Jméno" + +#: admin/forms.py:154 +msgid "" +"The administrator's name. Don't include the domain's name here, it will be " +"automatically appended." +msgstr "" +"Jméno správce. Nevkládejte sem název domény, název bude automaticky doplněn." + +#: admin/forms.py:160 +msgid "Create aliases" +msgstr "Vytvořit aliasy" + +#: admin/forms.py:162 +msgid "Automatically create standard aliases for this domain" +msgstr "Automaticky vytvořit běžné aliasy pro tuto doménu" + +#: admin/forms.py:175 +msgid "Invalid format" +msgstr "Neplatný formát" + +#: admin/forms.py:187 +#, python-format +msgid "User '%s' already exists" +msgstr "Uživatel '%s' již existuje" + +#: admin/forms.py:235 +msgid "Email address" +msgstr "Emailová adresa" + +#: admin/forms.py:236 +msgid "" +"The distribution list address. Use the '*' character to create a 'catchall' " +"address (ex: *@domain.tld)." +msgstr "" +"Distribuční seznam adres. Pro vytvoření doménového koše vložte znak " +"'*' (např. *@domena.cz)." + +#: admin/forms.py:239 +msgid "Recipients" +msgstr "Příjemci" + +#: admin/forms.py:240 +msgid "" +"Mailbox(es) this alias will point to. Indicate only one address per input, " +"press ENTER to add a new input." +msgstr "" +"Schránka/Schránky, na kterou/které bude tento alias odkazovat. Uveďte na " +"řádek pouze jednu adresu; pro vložení další adresy stiskněte po vložení " +"ENTER." + +#: admin/forms.py:278 admin/forms.py:542 admin/forms.py:568 +msgid "Domain does not exist" +msgstr "Doména neexistuje" + +#: admin/forms.py:280 +msgid "You don't have access to this domain" +msgstr "Nemáte oprávnění k přístupu k této doméně" + +#: admin/forms.py:300 +msgid "Invalid mailbox" +msgstr "Neplatná schránka" + +#: admin/forms.py:316 admin/models.py:1202 +#, python-format +msgid "Local recipient %s not found" +msgstr "Místní příjemce %s nebyl nalezen" + +#: admin/forms.py:318 admin/forms.py:324 +#, python-format +msgid "Recipient %s already present" +msgstr "Příjemce %s je již vložen" + +#: admin/forms.py:329 +msgid "No recipient defined" +msgstr "Nebyl určen příjemce" + +#: admin/forms.py:343 extensions/webmail/forms.py:19 +msgid "Select a file" +msgstr "Vybrat soubor" + +#: admin/forms.py:345 admin/forms.py:373 +msgid "Separator" +msgstr "Oddělovač" + +#: admin/forms.py:348 +msgid "Continue on error" +msgstr "Při výskytu chyby pokračovat" + +#: admin/forms.py:349 +msgid "Don't treat duplicated objects as error" +msgstr "Nepovažovat duplikáty objektů za chybu" + +#: admin/forms.py:364 +msgid "Crypt passwords" +msgstr "Zašifrovat hesla" + +#: admin/forms.py:365 +msgid "Check this option if passwords contained in your file are not crypted" +msgstr "Zatrhněte toto pole, pokud hesla ve vašem souboru nejsou zašifrována" + +#: admin/forms.py:371 +msgid "File name" +msgstr "Název souboru" + +#: admin/forms.py:403 admin/templates/admin/editdomainform.html:13 +#: auth/forms.py:7 +msgid "Username" +msgstr "Uživatelské jméno" + +#: admin/forms.py:405 +msgid "Role" +msgstr "Role" + +#: admin/forms.py:406 admin/forms.py:433 +msgid "Choose" +msgstr "Vybrat" + +#: admin/forms.py:407 +msgid "What level of permission this user will have" +msgstr "Jaká úroveň oprávnění bude tomuto uživateli nastavena" + +#: admin/forms.py:409 auth/forms.py:11 +msgid "Password" +msgstr "Heslo" + +#: admin/forms.py:411 userprefs/forms.py:18 +msgid "Confirmation" +msgstr "Potvrzení" + +#: admin/forms.py:413 +msgid "Enter the same password as above, for verification." +msgstr "Vložte stejné heslo jako v poli výše, pro jeho ověření." + +#: admin/forms.py:424 +msgid "Enabled" +msgstr "Povoleno" + +#: admin/forms.py:471 +msgid "The two password fields didn't match." +msgstr "Obě pole s heslem se neshodují." + +#: admin/forms.py:477 +msgid "You can't disable your own account" +msgstr "Nemůžete zakázat váš vlastní účet" + +#: admin/forms.py:488 +msgid "E-mail" +msgstr "E-mail" + +#: admin/forms.py:490 +msgid "Quota" +msgstr "Kvóta" + +#: admin/forms.py:492 +msgid "" +"Quota in MB for this mailbox. Define a custom value or use domain's default " +"one. Leave empty to define an unlimited value (not allowed for domain " +"administrators)." +msgstr "" +"Kvóta pro tuto chránku v MB. Definujte vlastní hodnotu nebo použijte výchozí " +"hodnotu domény. Ponechejte prázdné pro neomezenou kvótu (není povoleno " +"správcům domény)." + +#: admin/forms.py:499 +msgid "" +"Alias(es) of this mailbox. Indicate only one address per input, press ENTER " +"to add a new input. Use the '*' character to create a 'catchall' alias (ex: " +"*@domain.tld)." +msgstr "" +"Alias(y) této schránky. Vložte pouze jeden alias na řádek, stiskněte ENTER " +"pro vložení dalšího aliasu. Pro vytvoření doménového koše vložte '*' (např. " +"*@domena.cz)." + +#: admin/forms.py:550 +#, python-format +msgid "Mailbox %s already exists" +msgstr "Schránka %s již existuje" + +#: admin/forms.py:610 +msgid "Domain(s)" +msgstr "Doména(y)" + +#: admin/forms.py:612 +msgid "Domain(s) that user administrates" +msgstr "Doména(y) pod správou uživatele" + +#: admin/forms.py:654 admin/views.py:450 +msgid "Mail" +msgstr "Mail" + +#: admin/forms.py:656 +msgid "Permissions" +msgstr "Oprávnění" + +#: admin/models.py:80 +msgid "You can't delete your own account" +msgstr "Nemůžete smazat vlastní účet" + +#: admin/models.py:161 +msgid "Failed to update password: LDAP module not installed" +msgstr "Nebylo možné změnit heslo: LDAP modul není instalován" + +#: admin/models.py:167 +#, python-format +msgid "Failed to update password: %s" +msgstr "Nebylo možné změnit heslo: %s" + +#: admin/models.py:194 +msgid "account" +msgstr "účet" + +#: admin/models.py:496 admin/models.py:733 admin/models.py:795 +msgid "Invalid line" +msgstr "Neplatný řádek" + +#: admin/models.py:500 +msgid "You can't import an account with a role greater than yours" +msgstr "Nemůžete importvat účet s vyšším oprávněním, než máte vy sám" + +#: admin/models.py:506 +#, python-format +msgid "The simple user '%s' must have a valid email address" +msgstr "Uživatel '%s' musí mít nastavenou platnou emailovou adresu" + +#: admin/models.py:510 +#, python-format +msgid "username and email fields must not differ for '%s'" +msgstr "pole uživatelského jména a emailu se nesmí pro '%s' lišit" + +#: admin/models.py:534 +#, python-format +msgid "Account import failed (%s): domain does not exist" +msgstr "Import účtu nebyl úspěšný (%s): doména neexistuje" + +#: admin/models.py:624 admin/models.py:746 +msgid "name" +msgstr "název" + +#: admin/models.py:625 +msgid "The domain name" +msgstr "Doménové jméno" + +#: admin/models.py:627 +msgid "Default quota in MB applied to mailboxes" +msgstr "Výchozí kvóta schránek v MB" + +#: admin/models.py:630 admin/models.py:753 admin/models.py:1045 +#: admin/models.py:1217 extensions/postfix_autoreply/models.py:27 +msgid "enabled" +msgstr "povoleno" + +#: admin/models.py:631 +msgid "Check to activate this domain" +msgstr "Zatrhněte pole pro povolení této domény" + +#: admin/models.py:747 +msgid "The alias name" +msgstr "Název aliasu" + +#: admin/models.py:749 +msgid "target" +msgstr "cíl" + +#: admin/models.py:750 +msgid "The domain this alias points to" +msgstr "Doména, na kterou tento alias odkazuje" + +#: admin/models.py:754 admin/models.py:1046 +msgid "Check to activate this alias" +msgstr "Zatrhněte pole pro povolení tohoto aliasu" + +#: admin/models.py:801 +#, python-format +msgid "Unknown domain %s" +msgstr "Neznámá doména %s" + +#: admin/models.py:818 admin/models.py:1031 +msgid "address" +msgstr "adresa" + +#: admin/models.py:819 +msgid "Mailbox address (without the @domain.tld part)" +msgstr "Adresa schránky (bez části @doména.tld)" + +#: admin/models.py:877 +#, python-format +msgid "Failed to retrieve mailbox location (%s)" +msgstr "Nebylo možné zjistit umístění schránky (%s)" + +#: admin/models.py:921 +#, python-format +msgid "Quota is greater than the allowed domain's limit (%dM)" +msgstr "Zvolená kvóta je větší než povolené omezení domény (%dM)" + +#: admin/models.py:926 +msgid "A quota is required" +msgstr "Kvóta je vyžadována" + +#: admin/models.py:1032 +msgid "" +"The alias address (without the domain part). For a 'catch-all' address, just " +"enter an * character." +msgstr "" +"Alias adresy (bez části označující doménu). Pro vytvoření doménového koše " +"vložte znak '*'." + +#: admin/models.py:1036 +msgid "mailboxes" +msgstr "schránky" + +#: admin/models.py:1037 +msgid "The mailboxes this alias points to" +msgstr "Schránky, na které tento alias odkazuje" + +#: admin/models.py:1041 +msgid "The aliases this alias points to" +msgstr "Aliasy, na které tento alias odkazuje" + +#: admin/models.py:1089 +msgid "distribution list" +msgstr "distribuční seznam" + +#: admin/models.py:1090 +msgid "forward" +msgstr "přeposlat" + +#: admin/models.py:1091 +msgid "alias" +msgstr "alias" + +#: admin/models.py:1170 +#, python-format +msgid "Invalid line: %s" +msgstr "Neplatný řádek: %s" + +#: admin/models.py:1175 +#, python-format +msgid "Domain '%s' does not exist" +msgstr "Doména '%s' neexistuje" + +#: admin/models.py:1218 +msgid "Check to enable this extension" +msgstr "Zatrhněte pole pro povolení tohoto rozšíření" + +#: admin/models.py:1318 +msgid "added" +msgstr "přidáno" + +#: admin/models.py:1321 +msgid "modified" +msgstr "upraveno" + +#: admin/models.py:1324 +msgid "deleted" +msgstr "smazáno" + +#: admin/models.py:1326 +#, python-format +msgid "%(object)s '%(name)s' %(action)s by user %(user)s" +msgstr "%(object)s '%(name)s' %(action)s uživatelem %(user)s" + +#: admin/tables.py:14 +msgid "Edit domain" +msgstr "Upravit doménu" + +#: admin/tables.py:21 admin/templates/admin/identities_table.html:8 +#: admin/templates/admin/listing.html:17 extensions/sievefilters/views.py:83 +#: extensions/sievefilters/templates/sievefilters/filter.html:17 +#: extensions/sievefilters/templates/sievefilters/guieditor.html:5 +#: extensions/webmail/templatetags/webextras.py:97 +msgid "Actions" +msgstr "Akce" + +#: admin/tables.py:48 +msgid "Version" +msgstr "Verze" + +#: admin/tables.py:49 +msgid "Description" +msgstr "Popis" + +#: admin/views.py:88 +msgid "New domain" +msgstr "Nová doména" + +#: admin/views.py:89 admin/views.py:98 admin/views.py:228 admin/views.py:444 +#: admin/views.py:451 extensions/sievefilters/views.py:129 +#: extensions/sievefilters/views.py:198 extensions/webmail/views.py:136 +msgid "Create" +msgstr "Vytvořit" + +#: admin/views.py:95 admin/views.py:448 +msgid "Next" +msgstr "Další" + +#: admin/views.py:97 +msgid "Options" +msgstr "Možnosti" + +#: admin/views.py:99 admin/views.py:452 +msgid "Previous" +msgstr "Předchozí" + +#: admin/views.py:112 +msgid "Domain created" +msgstr "Doména vytvořena" + +#: admin/views.py:146 admin/views.py:285 admin/views.py:498 +#: extensions/postfix_autoreply/templates/postfix_autoreply/autoreply.html:9 +#: extensions/sievefilters/views.py:148 extensions/webmail/views.py:168 +#: userprefs/templates/userprefs/forward.html:8 +#: userprefs/templates/userprefs/profile.html:8 +msgid "Update" +msgstr "Aktualizovat" + +#: admin/views.py:162 +msgid "Domain modified" +msgstr "Doména upravena" + +#: admin/views.py:189 +msgid "You can't delete your own domain" +msgstr "Nemůžete smazat vlastní doménu" + +#: admin/views.py:192 +msgid "Domain deleted" +msgid_plural "Domains deleted" +msgstr[0] "Doména smazána" +msgstr[1] "Domény smazány" +msgstr[2] "Domén smazáno" + +#: admin/views.py:207 +msgid "Alias with this name already exists" +msgstr "Alias s tímto názvem již existuje" + +#: admin/views.py:250 +msgid "New distribution list" +msgstr "Nový distribuční seznam" + +#: admin/views.py:251 +msgid "Distribution list created" +msgstr "Distribuční seznam vytvořen" + +#: admin/views.py:260 +msgid "New alias" +msgstr "Nový alias" + +#: admin/views.py:261 +msgid "Alias created" +msgstr "Alias vytvořen" + +#: admin/views.py:270 +msgid "New forward" +msgstr "Nové přeposílání" + +#: admin/views.py:271 +msgid "Forward created" +msgstr "Přeposílání vytvořeno" + +#: admin/views.py:289 +msgid "Distribution list modified" +msgstr "Distribuční seznam upraven" + +#: admin/views.py:291 +msgid "Forward modified" +msgstr "Přeposílání upraveno" + +#: admin/views.py:293 +msgid "Alias modified" +msgstr "Alias upraven" + +#: admin/views.py:402 admin/views.py:545 admin/views.py:550 +#: extensions/amavis/views.py:204 extensions/amavis/views.py:210 +#: extensions/amavis/views.py:243 extensions/amavis/views.py:247 +#: extensions/amavis/views.py:249 extensions/webmail/views.py:41 +#: extensions/webmail/views.py:68 extensions/webmail/views.py:81 +#: extensions/webmail/views.py:98 extensions/webmail/views.py:114 +#: extensions/webmail/views.py:200 extensions/webmail/views.py:427 +#: extensions/webmail/views.py:438 extensions/webmail/views.py:465 +#: lib/formutils.py:32 lib/formutils.py:37 +msgid "Invalid request" +msgstr "Neplatný požadavek" + +#: admin/views.py:441 +msgid "New account" +msgstr "Nový účet" + +#: admin/views.py:465 +msgid "Account created" +msgstr "Účet vytvořen" + +#: admin/views.py:513 +msgid "Account updated" +msgstr "Účet aktualizován" + +#: admin/views.py:535 +msgid "Account deleted" +msgid_plural "Accounts deleted" +msgstr[0] "Účet smazán" +msgstr[1] "Účty smazány" +msgstr[2] "Účtů smazáno" + +#: admin/views.py:590 +msgid "Parameters saved" +msgstr "Parametry uloženy" + +#: admin/views.py:636 +msgid "Modifications applied." +msgstr "Úpravy byly uloženy." + +#: admin/views.py:743 +#, python-format +msgid "Object already exists: %s" +msgstr "Objekt již existuje: %s" + +#: admin/views.py:745 +#, python-format +msgid "%d objects imported successfully" +msgstr "%d objektů úspěšně importováno" + +#: admin/views.py:763 +msgid "" +"Provide a CSV file where lines respect one of the following formats:\n" +"
                              \n" +"
                            • account; loginname; password; first name; last name; enabled; group; " +"address[, domain, ...]
                              • \n" +"
                            • alias; address; enabled; internal recipient
                              • \n" +"
                            • forward; address; enabled; external recipient
                              • \n" +"
                            • dlist; address; enabled; recipient; recipient; ...
                              • \n" +"
                            \n" +"

                            The first element of each line is mandatory and must be equal to one of " +"the previous values.

                            \n" +"\n" +"

                            You can use a different character as separator.

                            \n" +msgstr "" +"Nahrajte CSV soubor, který bude mít jednotlivé řádky v některém z uvedených " +"formátů:\n" +"
                              \n" +"
                            • account; přihlašovacíjméno; heslo; křestní jméno; příjmení; " +"povoleno; skupina; adresa[, doména, ...]
                              • \n" +"
                            • alias; adresa; povoleno; interní příjemce
                              • \n" +"
                            • forward; adresa; povoleno; externí příjemce
                              • \n" +"
                            • dlist; adresa; povoleno; příjemce; příjemce; ...
                              • \n" +"
                            \n" +"

                            První element každého řádku je povinný a musí být shodný s některou z " +"předchozích hodnot.

                            \n" +"\n" +"

                            Můžete také použít odlišný oddělovač hodnot.

                            \n" + +#: admin/views.py:775 +msgid "Import identities" +msgstr "Importovat identity" + +#: admin/views.py:776 admin/views.py:846 admin/templatetags/admin_extras.py:87 +#: admin/templatetags/admin_extras.py:144 +msgid "Import" +msgstr "Import" + +#: admin/views.py:806 +msgid "Export identities" +msgstr "Exportovat identity" + +#: admin/views.py:807 admin/views.py:863 admin/templatetags/admin_extras.py:93 +#: admin/templatetags/admin_extras.py:150 +msgid "Export" +msgstr "Export" + +#: admin/views.py:835 +msgid "" +"Provide a CSV file where lines respect one of the following formats:\n" +"
                              \n" +"
                            • domain; name; quota; enabled
                              • \n" +"
                            • domainalias; name; targeted domain; enabled
                              • \n" +"
                            \n" +"

                            The first element of each line is mandatory and must be equal to one of " +"the previous values.

                            \n" +"

                            You can use a different character as separator.

                            \n" +msgstr "" +"Nahrajte CSV soubor, který bude mít jednotlivé řádky v některém z uvedených " +"formátů:\n" +"
                              \n" +"
                            • domain; název; kvóta; povoleno
                              • \n" +"
                            • domainalias; název; cílová doména; povoleno
                              • \n" +"
                            \n" +"

                            První element každého řádku je povinný a musí být shodný s některou z " +"předchozích hodnot.

                            \n" +"

                            Můžete také použít odlišný oddělovač hodnot.

                            \n" + +#: admin/views.py:845 +msgid "Import domains" +msgstr "Importovat domény" + +#: admin/views.py:862 +msgid "Export domains" +msgstr "Exportovat domény" + +#: admin/templates/admin/domain_general_form.html:3 +#: admin/templates/admin/mailform.html:3 +#: admin/templates/admin/newdomainform.html:3 +msgid "MB" +msgstr "MB" + +#: admin/templates/admin/domains.html:2 admin/templatetags/admin_extras.py:23 +#: extensions/limits/app_settings.py:19 extensions/limits/forms.py:16 +#: extensions/limits/models.py:12 +msgid "Domains" +msgstr "Domény" + +#: admin/templates/admin/editdomainform.html:4 +msgid "Administrators" +msgstr "Správci" + +#: admin/templates/admin/editdomainform.html:19 +msgid "No domain administrator defined" +msgstr " Nebyl určen správce domény" + +#: admin/templates/admin/editdomainform.html:22 +msgid "Creation date" +msgstr "Datum vytvoření" + +#: admin/templates/admin/editdomainform.html:23 +msgid "Last modification date" +msgstr "Datum poslední změny" + +#: admin/templates/admin/editdomainform.html:24 +#: extensions/limits/app_settings.py:25 extensions/limits/forms.py:20 +#: extensions/limits/models.py:13 +msgid "Domain aliases" +msgstr "Doménové aliasy" + +#: admin/templates/admin/editdomainform.html:26 +#: extensions/limits/app_settings.py:37 extensions/limits/forms.py:28 +#: extensions/limits/models.py:15 +msgid "Mailbox aliases" +msgstr "Aliasy schránek" + +#: admin/templates/admin/extensions.html:2 +#: admin/templatetags/admin_extras.py:51 +msgid "Extensions" +msgstr "Rozšíření" + +#: admin/templates/admin/extensions.html:2 +msgid "Choose the extension(s) to use" +msgstr "Zvolte rozšíření, která chcete použít" + +#: admin/templates/admin/extensions.html:6 +#: admin/templates/admin/parameters.html:8 +#: userprefs/templates/userprefs/preferences.html:8 +msgid "Save" +msgstr "Uložit" + +#: admin/templates/admin/identities.html:2 +#: admin/templatetags/admin_extras.py:31 +msgid "Identities" +msgstr "Identity" + +#: admin/templates/admin/identities_table.html:6 +msgid "Fullname/Recipient" +msgstr "Celé jméno/Příjemce" + +#: admin/templates/admin/identities_table.html:7 +msgid "Tags" +msgstr "Značky" + +#: admin/templates/admin/importform.html:5 +#: admin/templatetags/admin_extras.py:290 +msgid "Help" +msgstr "Nápověda" + +#: admin/templates/admin/importform.html:12 +msgid "Importing..." +msgstr "Importuji..." + +#: admin/templates/admin/information.html:2 +#: admin/templatetags/admin_extras.py:56 +msgid "Information" +msgstr "Informace" + +#: admin/templates/admin/information.html:2 +msgid "Various information about Modoboa" +msgstr "Různé informace o Modoboa" + +#: admin/templates/admin/information.html:3 +msgid "is currently in use." +msgstr "se aktuálně používá." + +#: admin/templates/admin/information.html:5 +msgid "Active users" +msgstr "Aktivní uživatelé" + +#: admin/templates/admin/information.html:9 +msgid "Group name" +msgstr "Název skupiny" + +#: admin/templates/admin/information.html:10 +msgid "Last login" +msgstr "Poslední přihlášení" + +#: admin/templates/admin/listing.html:14 +#: extensions/stats/templates/stats/index.html:28 +msgid "Filter" +msgstr "Filtr" + +#: admin/templates/admin/logs.html:2 admin/templatetags/admin_extras.py:60 +msgid "Logs" +msgstr "Záznamy" + +#: admin/templates/admin/logs.html:2 +msgid "Previously on Modoboa..." +msgstr "Dříve v Modoboa..." + +#: admin/templates/admin/logs.html:6 extensions/amavis/sql_listing.py:25 +#: extensions/webmail/lib.py:38 extensions/webmail/lib.py:411 +msgid "Date" +msgstr "Datum" + +#: admin/templates/admin/logs.html:7 +msgid "Level" +msgstr "Úroveň" + +#: admin/templates/admin/logs.html:8 +msgid "Logger" +msgstr "Zaznamenal" + +#: admin/templates/admin/logs.html:9 +msgid "Message" +msgstr "Zpráva" + +#: admin/templates/admin/mailboxes_raw.html:3 +msgid "Choose a value" +msgstr "Zvolte hodnotu" + +#: admin/templates/admin/mailform.html:3 +msgid "Use domain default value" +msgstr "Použít výchozí hodnotu domény" + +#: admin/templates/admin/parameters.html:3 +#: admin/templatetags/admin_extras.py:65 +msgid "Parameters" +msgstr "Parametry" + +#: admin/templates/admin/parameters.html:3 +msgid "Configure Modoboa" +msgstr "Nastavit Modoboa" + +#: admin/templates/admin/quotas.html:5 +msgid "Address" +msgstr "Adresa" + +#: admin/templates/admin/quotas.html:6 +msgid "Value" +msgstr "Hodnota" + +#: admin/templates/admin/quotas.html:7 +msgid "Limit" +msgstr "Omezení" + +#: admin/templates/admin/quotas.html:8 +#, python-format +msgid "Usage (%%)" +msgstr "Využití (%%)" + +#: admin/templates/admin/searchform.html:6 +msgid "Search" +msgstr "Hledat" + +#: admin/templates/admin/settings_header.html:3 +msgid "Modoboa settings" +msgstr "Nastavení Modoboa" + +#: admin/templatetags/admin_extras.py:13 +msgid "enabled_m" +msgstr "Aktivovaný" + +#: admin/templatetags/admin_extras.py:13 +msgid "enabled_f" +msgstr "Aktivovaná" + +#: admin/templatetags/admin_extras.py:36 +msgid "Modoboa" +msgstr "Modoboa" + +#: admin/templatetags/admin_extras.py:81 +msgid "Add domain" +msgstr "Přidat doménu" + +#: admin/templatetags/admin_extras.py:110 +msgid "List identities" +msgstr "Seznam identit" + +#: admin/templatetags/admin_extras.py:115 +msgid "List quotas" +msgstr "Seznam kvót" + +#: admin/templatetags/admin_extras.py:120 +msgid "Add account" +msgstr "Přidat účet" + +#: admin/templatetags/admin_extras.py:126 +msgid "Add alias" +msgstr "Přidat alias" + +#: admin/templatetags/admin_extras.py:132 +msgid "Add forward" +msgstr "Přidat přeposílání" + +#: admin/templatetags/admin_extras.py:138 +msgid "Add distribution list" +msgstr "Přidat distribuční seznam" + +#: admin/templatetags/admin_extras.py:171 +msgid "View the domain's identities" +msgstr "Zobrazit seznam identit domény" + +#: admin/templatetags/admin_extras.py:178 +#: admin/templatetags/admin_extras.py:194 +#: admin/templatetags/admin_extras.py:201 +#, python-format +msgid "Delete %s?" +msgstr "Smazat %s?" + +#: admin/templatetags/admin_extras.py:223 +msgid "Remove this permission" +msgstr "Odstranit toto oprávnění" + +#: admin/templatetags/admin_extras.py:264 lib/formutils.py:206 +msgid "Yes" +msgstr "Ano" + +#: admin/templatetags/admin_extras.py:264 lib/formutils.py:206 +msgid "No" +msgstr "Ne" + +#: auth/views.py:32 +#, python-format +msgid "User '%s' successfully logged in" +msgstr "Uživatel '%s' se úspěšně přihlásil" + +#: auth/views.py:44 +msgid "Your username and password didn't match. Please try again." +msgstr "" +"Vaše uživatelské jméno nebo heslo se neshodují. Zkuste to prosím znovu." + +#: auth/views.py:67 +#, python-format +msgid "User '%s' logged out" +msgstr "Uživatel '%s' se odhlásil" + +#: demo/__init__.py:17 +msgid "Test messages" +msgstr "Testovací zprávy" + +#: demo/__init__.py:22 +msgid "Send virus" +msgstr "Poslat vir" + +#: demo/__init__.py:25 +msgid "Send spam" +msgstr "Poslat spam" + +#: demo/views.py:17 demo/views.py:41 +msgid "Message sent" +msgstr "Zpráva odeslána" + +#: demo/templates/demo/login_announcement.html:2 +msgid "" +"\n" +"

                            Welcome to the online demo!

                            \n" +"

                            Warning: the demo's concent is resetted every two hours.

                            \n" +"

                            To try the demo, the following users are available (username/password):

                            \n" +"
                              \n" +"
                            • A super administrator : admin/password
                              • \n" +"
                            • A domain administrator : admin@demo.local/admin
                              • \n" +"
                            • A simple user : user@demo.local/user
                              • \n" +"
                            \n" +"

                            Please report any issue or give any suggestion to \n" +" the " +"mailing list.

                            \n" +msgstr "" +"\n" +"

                            Vítejte v online demo verzi!

                            \n" +"

                            Upozornění: obsah této demo verze je automaticky obnoven každé 2 " +"hodiny.

                            \n" +"

                            Pro vyzkoušení demo verze jsou dostupní tito uživatelé (jméno/heslo):

                            \n" +"
                              \n" +"
                            • Super správce : admin/password
                              • \n" +"
                            • Správce domény: admin@demo.local/admin
                              • \n" +"
                            • Uživatel: user@demo.local/user
                              • \n" +"
                            \n" +"

                            Nahlašte prosím jakékoli objevené problémy nebo vaše návrhy přes\n" +" emailový " +"seznam.

                            \n" + +#: extensions/amavis/__init__.py:22 +msgid "Simple amavis management frontend" +msgstr "Jednoduché rozhraní pro správu amavis" + +#: extensions/amavis/__init__.py:45 extensions/amavis/__init__.py:61 +msgid "Quarantine" +msgstr "Karanténa" + +#: extensions/amavis/__init__.py:129 +msgid "pending requests" +msgstr "nevyřízené požadavky" + +#: extensions/amavis/__init__.py:149 +#, python-format +msgid "%d pending requests" +msgstr "%d nevyřízených požadavků" + +#: extensions/amavis/__init__.py:161 +msgid "Content filter" +msgstr "Filtr obsahu" + +#: extensions/amavis/app_settings.py:11 +msgid "Quarantine settings" +msgstr "Nastavení karantény" + +#: extensions/amavis/app_settings.py:14 +msgid "Maximum message age" +msgstr "Maximální stáří zprávy" + +#: extensions/amavis/app_settings.py:16 +msgid "Quarantine messages maximum age (in days) before deletion" +msgstr "Maximální doba karantény zpráv (ve dnech) před jejich smazáním" + +#: extensions/amavis/app_settings.py:19 +msgid "Messages releasing" +msgstr "Odblokování zpráv" + +#: extensions/amavis/app_settings.py:22 +msgid "Remove released messages" +msgstr "Odstranit odblokované zprávy" + +#: extensions/amavis/app_settings.py:24 +msgid "Remove messages marked as released while cleaning up the database" +msgstr "" +"Odstranit zprávy, které jsou označeny jako odblokované, při čištění databáze" + +#: extensions/amavis/app_settings.py:28 +msgid "Amavis connection mode" +msgstr "Režim připojení amavis" + +#: extensions/amavis/app_settings.py:31 +msgid "Mode used to access the PDP server" +msgstr "Používaný režim pro přístup k PDP serveru" + +#: extensions/amavis/app_settings.py:36 +msgid "PDP server address" +msgstr "adresa PDP serveru" + +#: extensions/amavis/app_settings.py:38 +msgid "PDP server address (if inet mode)" +msgstr "adresa PDP serveru (v režimu inet)" + +#: extensions/amavis/app_settings.py:42 +msgid "PDP server port" +msgstr "port PDP serveru" + +#: extensions/amavis/app_settings.py:44 +msgid "PDP server port (if inet mode)" +msgstr "port PDP serveru (v režimu inet)" + +#: extensions/amavis/app_settings.py:48 +msgid "PDP server socket" +msgstr "socket PDP serveru" + +#: extensions/amavis/app_settings.py:50 +msgid "Path to the PDP server socket (if unix mode)" +msgstr "Cesta k socketu PDP serveru (v režimu unix)" + +#: extensions/amavis/app_settings.py:54 +msgid "Check requests interval" +msgstr "Interval kontroly požadavků" + +#: extensions/amavis/app_settings.py:56 +msgid "Interval between two release requests checks" +msgstr "" +"Časový interval mezi jednotlivými kontrolami na požadavky pro odblokování" + +#: extensions/amavis/app_settings.py:60 +msgid "Allow direct release" +msgstr "Umožnit přímé odbokování" + +#: extensions/amavis/app_settings.py:62 +msgid "Allow users to directly release their messages" +msgstr "Umožnit napřímo uživatelům doblokovat jejich zprávy" + +#: extensions/amavis/app_settings.py:66 +msgid "Enable self-service mode" +msgstr "Povolit samoobslužný režim" + +#: extensions/amavis/app_settings.py:68 +msgid "Activate the 'self-service' mode" +msgstr "Aktivovat samoobslužný režim" + +#: extensions/amavis/app_settings.py:72 +msgid "Notifications sender" +msgstr "Odesílatel upozornění" + +#: extensions/amavis/app_settings.py:74 +msgid "The e-mail address used to send notitications" +msgstr "E-mailová adresa používaná k zasílání upozornění" + +#: extensions/amavis/app_settings.py:87 extensions/webmail/app_settings.py:73 +#: userprefs/app_settings.py:18 +msgid "Display" +msgstr "Zobrazení" + +#: extensions/amavis/app_settings.py:91 extensions/webmail/app_settings.py:91 +msgid "Number of displayed emails per page" +msgstr "Počet zobrazených zpráv na stránce" + +#: extensions/amavis/app_settings.py:92 +msgid "Set the maximum number of messages displayed in a page" +msgstr "Nastavit maximální počet zobrazených zpráv na stránce" + +#: extensions/amavis/lib.py:53 +#, python-format +msgid "Connection to amavis failed: %s" +msgstr "Spojení s amavis selhalo: %s" + +#: extensions/amavis/models.py:93 +msgid "Virus filter" +msgstr "Filtr virů" + +#: extensions/amavis/models.py:94 extensions/amavis/models.py:102 +#: extensions/amavis/models.py:110 extensions/sievefilters/views.py:281 +msgid "yes" +msgstr "ano" + +#: extensions/amavis/models.py:95 extensions/amavis/models.py:103 +#: extensions/amavis/models.py:111 extensions/sievefilters/views.py:285 +msgid "no" +msgstr "ne" + +#: extensions/amavis/models.py:96 extensions/amavis/models.py:104 +#: extensions/amavis/models.py:112 +#: extensions/amavis/templates/amavis/domain_content_filter.html:11 +msgid "default" +msgstr "výchozí" + +#: extensions/amavis/models.py:98 +msgid "Bypass virus checks or not. Choose 'default' to use global settings." +msgstr "" +"Obcházet nebo neobcházet kontrolu zpráv na viry. Pokud zvolíte 'výchozí', " +"bude se nastavení řídit globálním nastavením." + +#: extensions/amavis/models.py:101 +msgid "Spam filter" +msgstr "Filtr nevyžádané pošty" + +#: extensions/amavis/models.py:106 +msgid "Bypass spam checks or not. Choose 'default' to use global settings." +msgstr "" +"Obcházet nebo neobcházet kontrolu zpráv na nevyžádanou poštu. Pokud zvolíte " +"'výchozí', bude se nastavení řídit globálním nastavením." + +#: extensions/amavis/models.py:109 +msgid "Banned filter" +msgstr "Filtr zakázané pošty" + +#: extensions/amavis/models.py:114 +msgid "Bypass banned checks or not. Choose 'default' to use global settings." +msgstr "" +"Obcházet nebo neobcházet kontrolu zpráv na zakázanou poštu. Pokud zvolíte " +"'výchozí', bude se nastavení řídit globálním nastavením." + +#: extensions/amavis/models.py:144 +msgid "Spam marker" +msgstr "Označení spamu" + +#: extensions/amavis/models.py:146 +msgid "" +"Modify spam subject using the specified text. Choose 'default' to use global " +"settings." +msgstr "" +"Upravit předmět nevyžádané zprávy uvedeným textem. Pro zachování globálního " +"nastavení serveru zatrhněte 'výchozí'." + +#: extensions/amavis/sql_listing.py:23 extensions/webmail/lib.py:37 +msgid "From" +msgstr "Od" + +#: extensions/amavis/sql_listing.py:24 extensions/sievefilters/forms.py:68 +#: extensions/webmail/forms.py:10 extensions/webmail/lib.py:36 +#: extensions/webmail/lib.py:409 templates/common/email_searchbar.html:6 +msgid "Subject" +msgstr "Předmět" + +#: extensions/amavis/sql_listing.py:26 +#: extensions/amavis/templatetags/amextras.py:102 +#: extensions/webmail/forms.py:7 +msgid "To" +msgstr "Komu" + +#: extensions/amavis/views.py:43 +msgid "Empty quarantine" +msgstr "Vyprázdnit karanténu" + +#: extensions/amavis/views.py:211 +msgid "Message deleted" +msgstr "Zpráva smazána" + +#: extensions/amavis/views.py:232 +#, python-format +msgid "%(count)d message deleted successfully" +msgid_plural "%(count)d messages deleted successfully" +msgstr[0] "%(count)d zpráva úspěšně smazána" +msgstr[1] "%(count)d zprávy úspěšně smazány" +msgstr[2] "%(count)d zpráv úspěšně smazáno" + +#: extensions/amavis/views.py:252 +msgid "Request sent" +msgstr "Požadavek odeslán" + +#: extensions/amavis/views.py:258 +msgid "Message released" +msgstr "Zprávy odblokována" + +#: extensions/amavis/views.py:280 +#, python-format +msgid "%(count)d request sent" +msgid_plural "%(count)d requests sent" +msgstr[0] "%(count)d požadavek odeslán" +msgstr[1] "%(count)d požadavky odeslány" +msgstr[2] "%(count)d požadavků odesláno" + +#: extensions/amavis/views.py:304 +#, python-format +msgid "%(count)d message released successfully" +msgid_plural "%(count)d messages released successfully" +msgstr[0] "%(count)d zpráva úspěšně odblokována" +msgstr[1] "%(count)d zprávy úspěšně odblokovány" +msgstr[2] "%(count)d zpráv úspěšně odblokováno" + +#: extensions/amavis/management/commands/amnotify.py:57 +msgid "[modoboa] Pending release requests" +msgstr "[modoboa] Nevyřízené požadavky na odblokování" + +#: extensions/amavis/templates/amavis/domain_content_filter.html:5 +msgid "Thresholds" +msgstr "Mezní hodnoty" + +#: extensions/amavis/templates/amavis/domain_content_filter.html:7 +msgid "or more is spam" +msgstr "nebo více je spam" + +#: extensions/amavis/templates/amavis/domain_content_filter.html:8 +msgid "or more throw spam message away" +msgstr "nebo více zahodí spam zprávu" + +#: extensions/amavis/templates/amavis/index.html:2 +msgid "Quarantine management" +msgstr "Nastavení karantény" + +#: extensions/amavis/templates/amavis/notifications/pending_requests.html:1 +#, python-format +msgid "" +"\n" +"%(counter)s release request is pending for action.\n" +msgid_plural "" +"\n" +"%(counter)s release requests are pending for action.\n" +msgstr[0] "" +"\n" +"%(counter)s požadavek na odblokování čeká na vyřízení.\n" +msgstr[1] "" +"\n" +"%(counter)s požadavky na odblokování čekají na vyřízení.\n" +msgstr[2] "" +"\n" +"%(counter)s požadavků na odblokování čeká na vyřízení.\n" + +#: extensions/amavis/templates/amavis/notifications/pending_requests.html:6 +msgid "Sketch:" +msgstr "Náhled:" + +#: extensions/amavis/templates/amavis/notifications/pending_requests.html:8 +msgid "From:" +msgstr "Od:" + +#: extensions/amavis/templates/amavis/notifications/pending_requests.html:9 +msgid "To:" +msgstr "Komu:" + +#: extensions/amavis/templates/amavis/notifications/pending_requests.html:10 +msgid "Date:" +msgstr "Datum:" + +#: extensions/amavis/templates/amavis/notifications/pending_requests.html:11 +msgid "Subject:" +msgstr "Předmět" + +#: extensions/amavis/templates/amavis/notifications/pending_requests.html:12 +msgid "Act on this message:" +msgstr "Úkony na zprávě:" + +#: extensions/amavis/templates/amavis/notifications/pending_requests.html:14 +#, python-format +msgid "Please visit %(listingurl)s for a full listing." +msgstr "Navštivte stránku %(listingurl)s pro zobrazení kompletního seznamu." + +#: extensions/amavis/templatetags/amextras.py:20 +#: extensions/amavis/templatetags/amextras.py:52 +#: extensions/amavis/templatetags/amextras.py:72 +msgid "Release" +msgstr "Odblokovat" + +#: extensions/amavis/templatetags/amextras.py:26 +#: extensions/amavis/templatetags/amextras.py:59 +#: extensions/amavis/templatetags/amextras.py:77 +#: extensions/webmail/templatetags/webextras.py:31 +msgid "Delete" +msgstr "Smazat" + +#: extensions/amavis/templatetags/amextras.py:29 +msgid "View full headers" +msgstr "Zobrazit úplné záhlaví" + +#: extensions/amavis/templatetags/amextras.py:80 +msgid "Content Class" +msgstr "Třída obsahu" + +#: extensions/amavis/templatetags/amextras.py:84 +msgid "Nothing" +msgstr "Nic" + +#: extensions/amavis/templatetags/amextras.py:87 +msgid "Spam" +msgstr "Spam" + +#: extensions/amavis/templatetags/amextras.py:90 +msgid "Virus" +msgstr "Vir" + +#: extensions/amavis/templatetags/amextras.py:93 +msgid "Bad header" +msgstr "Chybné záhlaví" + +#: extensions/amavis/templatetags/amextras.py:96 +msgid "Bad MIME" +msgstr "Špatný MIME" + +#: extensions/limits/__init__.py:23 +msgid "" +"Per administrator resources to limit the number of objects they can create" +msgstr "" +"Každému správci dostupné zdroje omezující počet objektů, které mohou správci " +"vytvořit" + +#: extensions/limits/__init__.py:54 +msgid "Limits" +msgstr "Omezení" + +#: extensions/limits/__init__.py:65 +msgid "Reseller" +msgstr "Distributor" + +#: extensions/limits/__init__.py:94 +msgid "Resources" +msgstr "Zdroje" + +#: extensions/limits/app_settings.py:10 +msgid "Default limits" +msgstr "Výchozí omezení" + +#: extensions/limits/app_settings.py:13 extensions/limits/forms.py:12 +#: extensions/limits/models.py:11 +msgid "Domain admins" +msgstr "Správci domén" + +#: extensions/limits/app_settings.py:15 +msgid "Maximum number of allowed domain administrators for a new administrator" +msgstr "Maximální povolený počet správců domény (nastavení nového správce)" + +#: extensions/limits/app_settings.py:21 +msgid "Maximum number of allowed domains for a new administrator" +msgstr "Maximální povolený počet domén (nastavení nového správce)" + +#: extensions/limits/app_settings.py:27 +msgid "Maximum number of allowed domain aliases for a new administrator" +msgstr "Maximální povolený počet doménových aliasů (nastavení nového správce)" + +#: extensions/limits/app_settings.py:33 +msgid "Maximum number of allowed mailboxes for a new administrator" +msgstr "Maximální povolený počet schránek (nastavení nového správce)" + +#: extensions/limits/app_settings.py:39 +msgid "Maximum number of allowed aliases for a new administrator" +msgstr "Maximální povolený počet aliasů (nastavení nového správce)" + +#: extensions/limits/forms.py:13 +msgid "Maximum number of domain administrators this user can create" +msgstr "" +"Maximální povolený počet správců domény, které může tento uživatel vytvořit" + +#: extensions/limits/forms.py:17 +msgid "Maximum number of domains this user can create" +msgstr "Maximální povolený počet domén, které může tento uživatel vytvořit" + +#: extensions/limits/forms.py:21 +msgid "Maximum number of domain aliases this user can create" +msgstr "" +"Maximální povolený počet doménových aliasů, které může tento uživatel " +"vytvořit" + +#: extensions/limits/forms.py:25 +msgid "Maximum number of mailboxes this user can create" +msgstr "Maximální povolený počet schránek, které může tento uživatel vytvořit" + +#: extensions/limits/forms.py:29 +msgid "Maximum number of mailbox aliases this user can create" +msgstr "" +"Maximální povolený počet aliasů chránek, které může tento uživatel vytvořit" + +#: extensions/limits/forms.py:46 +msgid "Invalid limit" +msgstr "Neplatné omezení" + +#: extensions/limits/forms.py:74 +msgid "Your resources are not initialized yet" +msgstr "Vaše zdroje nebyly dosud definovány" + +#: extensions/limits/forms.py:78 +msgid "You're not allowed to define unlimited values" +msgstr "Nemáte oprávnění nastavovat neomezené hodnoty" + +#: extensions/limits/lib.py:16 +#, python-format +msgid "%s: limit reached" +msgstr "%s: limit byl dosažen" + +#: extensions/limits/lib.py:23 +msgid "Not enough resources" +msgstr "Nedostatek zdrojů" + +#: extensions/limits/models.py:103 +msgid "undefined" +msgstr "nedefinováno" + +#: extensions/limits/models.py:105 +msgid "unlimited" +msgstr "neomezeno" + +#: extensions/limits/templates/limits/poolusage.html:4 +msgid "Resources usage" +msgstr "Využití zdrojů" + +#: extensions/postfix_autoreply/__init__.py:20 +msgid "Auto-reply (vacation) functionality using Postfix" +msgstr "Funkce automatické odpovědi (vacation) Postfix" + +#: extensions/postfix_autoreply/__init__.py:41 +msgid "Automatic replies" +msgstr "Automatické odpovědi" + +#: extensions/postfix_autoreply/__init__.py:79 +#: extensions/postfix_autoreply/templates/postfix_autoreply/autoreply.html:2 +msgid "Auto-reply message" +msgstr "Automatická odpověď" + +#: extensions/postfix_autoreply/app_settings.py:14 +msgid "Automatic reply timeout" +msgstr "Interval automatické odpovědi" + +#: extensions/postfix_autoreply/app_settings.py:16 +msgid "Timeout in seconds between two auto-replies to the same recipient" +msgstr "" +"Interval v sekundách mezi dvěmi automatickými odpověďmi stejnému příjemci" + +#: extensions/postfix_autoreply/forms.py:9 +msgid "Until" +msgstr "Do" + +#: extensions/postfix_autoreply/forms.py:11 +msgid "Activate your auto reply until this date" +msgstr "Povolit automatické odpovědi až do uvedeného data" + +#: extensions/postfix_autoreply/forms.py:25 +msgid "This date is over" +msgstr "Zvolené datum je v minulosti" + +#: extensions/postfix_autoreply/models.py:19 +msgid "subject" +msgstr "předmět" + +#: extensions/postfix_autoreply/models.py:20 +msgid "The subject that will appear in sent emails" +msgstr "Předmět, který se vloží do odesílaných emailů" + +#: extensions/postfix_autoreply/models.py:23 +msgid "content" +msgstr "obsah" + +#: extensions/postfix_autoreply/models.py:24 +msgid "The content that will appear in sent emails" +msgstr "Obsah, který se vloží do odesílaných emailů" + +#: extensions/postfix_autoreply/models.py:28 +msgid "Activate/Deactivate your auto reply" +msgstr "Povolit/Zakázat automatickou odpověď" + +#: extensions/postfix_autoreply/views.py:37 +msgid "Auto reply message updated successfully." +msgstr "Automatická odpověď byla aktualizována." + +#: extensions/postfix_autoreply/templates/postfix_autoreply/autoreply.html:2 +msgid "Define a message to automatically send when you are off" +msgstr "Vložte zprávu, která se během vaší nepřítomnosti automaticky odešle" + +#: extensions/sievefilters/__init__.py:12 +msgid "Plugin to easily create server-side filters" +msgstr "Doplněk pro jednoduchou tvorbu filtrů zpráv na serveru" + +#: extensions/sievefilters/__init__.py:17 +msgid "Sieve filters" +msgstr "Sieve filtry" + +#: extensions/sievefilters/__init__.py:18 +#: extensions/sievefilters/__init__.py:36 +#: extensions/sievefilters/templates/sievefilters/index.html:2 +msgid "Message filters" +msgstr "Filtry zpráv" + +#: extensions/sievefilters/app_settings.py:19 +msgid "ManageSieve settings" +msgstr "Nastavení ManageSieve" + +#: extensions/sievefilters/app_settings.py:24 +msgid "Address of your MANAGESIEVE server" +msgstr "Adresa vašeho serveru ManegeSieve" + +#: extensions/sievefilters/app_settings.py:30 +msgid "Listening port of your MANAGESIEVE server" +msgstr "Port, na kterém naslouchá váš ManageSieve server" + +#: extensions/sievefilters/app_settings.py:34 +msgid "Connect using STARTTLS" +msgstr "Připojit pomocí STARTTLS" + +#: extensions/sievefilters/app_settings.py:36 +msgid "Use the STARTTLS extension" +msgstr "Použít rozšíření STARTTLS" + +#: extensions/sievefilters/app_settings.py:40 +msgid "Authentication mechanism" +msgstr "Režim ověření" + +#: extensions/sievefilters/app_settings.py:43 +msgid "Prefered authentication mechanism" +msgstr "Preferovaný režim ověření" + +#: extensions/sievefilters/app_settings.py:54 +msgid "Editor mode" +msgstr "Režim úpravy" + +#: extensions/sievefilters/app_settings.py:56 +msgid "Select the mode you want the editor to work in" +msgstr "Zvolte režim editoru textu, ve kterém si přejete pracovat" + +#: extensions/sievefilters/forms.py:14 +msgid "Check to activate this filters set" +msgstr "Zatrhněte pole pro povolení této sady filtrů" + +#: extensions/sievefilters/forms.py:55 +msgid "All of the following" +msgstr "Všechna pravidla" + +#: extensions/sievefilters/forms.py:56 +msgid "Any of the following" +msgstr "Alespoň jedno z pravidel" + +#: extensions/sievefilters/forms.py:57 +msgid "All messages" +msgstr "Všechny zprávy" + +#: extensions/sievefilters/forms.py:62 +msgid "contains" +msgstr "obsahuje" + +#: extensions/sievefilters/forms.py:63 +msgid "does not contain" +msgstr "neobsahuje" + +#: extensions/sievefilters/forms.py:64 +msgid "is" +msgstr "je" + +#: extensions/sievefilters/forms.py:65 +msgid "is not" +msgstr "není" + +#: extensions/sievefilters/forms.py:69 +msgid "Sender" +msgstr "Odesílatel" + +#: extensions/sievefilters/forms.py:70 +msgid "Recipient" +msgstr "Příjemce" + +#: extensions/sievefilters/forms.py:71 extensions/webmail/forms.py:8 +msgid "Cc" +msgstr "Kopie" + +#: extensions/sievefilters/forms.py:72 +msgid "Size" +msgstr "Velikost" + +#: extensions/sievefilters/forms.py:73 +msgid "is greater than" +msgstr "Je větší než" + +#: extensions/sievefilters/forms.py:74 +msgid "is less than" +msgstr "Je menší než" + +#: extensions/sievefilters/forms.py:78 +msgid "Move message to" +msgstr "Přesunout zprávu do" + +#: extensions/sievefilters/forms.py:80 +msgid "Redirect message to" +msgstr "Přesměrovat zprávu na" + +#: extensions/sievefilters/lib.py:37 +msgid "Connection to MANAGESIEVE server failed, check your configuration" +msgstr "Spojení se serverem ManageSieve selhalo, zkontrolujte nastavení" + +#: extensions/sievefilters/lib.py:82 +msgid "Not enough space on server" +msgstr "Nedostatek prostoru na serveru" + +#: extensions/sievefilters/views.py:68 +msgid "Failed to retrieve filters set" +msgstr "Nebylo možné získat sadu filtrů" + +#: extensions/sievefilters/views.py:126 +#: extensions/sievefilters/templatetags/sfilters_tags.py:33 +msgid "New filter" +msgstr "Nový filtr" + +#: extensions/sievefilters/views.py:133 +msgid "Filter created" +msgstr "Filtr vytvořen" + +#: extensions/sievefilters/views.py:145 +#: extensions/sievefilters/templatetags/sfilters_tags.py:77 +msgid "Edit filter" +msgstr "Upravit filtr" + +#: extensions/sievefilters/views.py:154 +msgid "Filter modified" +msgstr "Filtr upraven" + +#: extensions/sievefilters/views.py:176 +msgid "Filter removed" +msgstr "Filtr odstraněn" + +#: extensions/sievefilters/views.py:177 +msgid "Failed to remove filter" +msgstr "Nezdařilo se odstranit filtr" + +#: extensions/sievefilters/views.py:191 +msgid "Filters set saved" +msgstr "Sada filtrů uložena" + +#: extensions/sievefilters/views.py:196 +msgid "Create a new filters set" +msgstr "Vytvořit novou sadu filtrů" + +#: extensions/sievefilters/views.py:219 +msgid "Filters set created" +msgstr "Sada filtrů vytvořena" + +#: extensions/sievefilters/views.py:240 +msgid "Filters set deleted" +msgstr "Sada filtrů vymazána" + +#: extensions/sievefilters/views.py:252 +msgid "Filters set activated" +msgstr "Sada filtrů povolena" + +#: extensions/sievefilters/templates/sievefilters/filter.html:6 +msgid "Conditions" +msgstr "Podmínky" + +#: extensions/sievefilters/templates/sievefilters/guieditor.html:7 +msgid "Active" +msgstr "Aktivní" + +#: extensions/sievefilters/templates/sievefilters/guieditor.html:24 +msgid "No filter defined yet" +msgstr "Dosud nebyl vytvořen žádný filtr" + +#: extensions/sievefilters/templates/sievefilters/index.html:56 +msgid "Filter sets" +msgstr "Sady filtrů" + +#: extensions/sievefilters/templates/sievefilters/index.html:60 +msgid "active" +msgstr "aktivní" + +#: extensions/sievefilters/templates/sievefilters/index.html:74 +msgid "" +"No filters set defined yet. You must create one in order to define filters." +msgstr "" +"Dosud nebyla vytvořena žádná sada filtrů. Aby bylo možné vytvořit filtry, je " +"nejprve potřeba vytvořit sadu filtrů." + +#: extensions/sievefilters/templatetags/sfilters_tags.py:16 +msgid "New filters set" +msgstr "Nová sada filtrů" + +#: extensions/sievefilters/templatetags/sfilters_tags.py:44 +msgid "Save filters set" +msgstr "Uložit sadu filtrů" + +#: extensions/sievefilters/templatetags/sfilters_tags.py:52 +msgid "Activate filters set" +msgstr "Aktitovat sadu filtrů" + +#: extensions/sievefilters/templatetags/sfilters_tags.py:57 +msgid "Remove filters set" +msgstr "Odstranit sadu filtrů" + +#: extensions/sievefilters/templatetags/sfilters_tags.py:62 +msgid "Download" +msgstr "Stáhnout" + +#: extensions/sievefilters/templatetags/sfilters_tags.py:85 +msgid "Remove this filter" +msgstr "Odstranit tento filtr" + +#: extensions/sievefilters/templatetags/sfilters_tags.py:93 +msgid "Move this filter up" +msgstr "Posunout tento filtr nahoru" + +#: extensions/sievefilters/templatetags/sfilters_tags.py:101 +msgid "Move this filter down" +msgstr "Posunout tento filtr dolů" + +#: extensions/stats/__init__.py:20 +msgid "Graphical statistics about emails traffic using RRDtool" +msgstr "Grafické statistiky emailového provozu s použitím RRDtool" + +#: extensions/stats/__init__.py:26 +#: extensions/stats/templates/stats/index.html:2 +msgid "Graphical statistics" +msgstr "Grafické statistiky" + +#: extensions/stats/__init__.py:40 +msgid "Statistics" +msgstr "Statistiky" + +#: extensions/stats/app_settings.py:14 +msgid "Path to the log file" +msgstr "Cesta k souboru záznamů" + +#: extensions/stats/app_settings.py:16 +msgid "Path to log file used to collect statistics" +msgstr "" +"Cesta k souboru záznamů, který se používá pro sběr statistických informací" + +#: extensions/stats/app_settings.py:20 +msgid "Directory to store RRD files" +msgstr "Adresář pro ukládání RRD souborů" + +#: extensions/stats/app_settings.py:22 +msgid "Path to directory where RRD files are stored" +msgstr "Cesta k adresáři, ve kterém budou ukládány RRD soubory" + +#: extensions/stats/app_settings.py:26 +msgid "Directory to store PNG files" +msgstr "Adresář pro ukládání PNG souborů" + +#: extensions/stats/app_settings.py:28 +msgid "Path to directory where PNG files are stored" +msgstr "Cesta k adresáři, ve kterém budou ukládány PNG soubory" + +#: extensions/stats/graph_templates.py:20 +msgid "Average normal traffic" +msgstr "Průměrný běžný provoz" + +#: extensions/stats/graph_templates.py:21 +#: extensions/stats/graph_templates.py:33 +msgid "msgs/min" +msgstr "zpráv/min" + +#: extensions/stats/graph_templates.py:26 +msgid "sent messages" +msgstr "odeslané zprávy" + +#: extensions/stats/graph_templates.py:28 +msgid "received messages" +msgstr "přijaté zprávy" + +#: extensions/stats/graph_templates.py:32 +msgid "Average bad traffic" +msgstr "Průměrný závadný provoz" + +#: extensions/stats/graph_templates.py:38 +msgid "bounced messages" +msgstr "nedoručené zprávy" + +#: extensions/stats/graph_templates.py:40 +msgid "rejected messages" +msgstr "odmítnuté zprávy" + +#: extensions/stats/graph_templates.py:44 +msgid "Average normal traffic size" +msgstr "Průměrná velikost běžného provozu" + +#: extensions/stats/graph_templates.py:45 +msgid "bytes/min" +msgstr "Bajtů/min" + +#: extensions/stats/graph_templates.py:50 +msgid "received size" +msgstr "doručená velikost" + +#: extensions/stats/graph_templates.py:52 +msgid "sent size" +msgstr "odeslaná velikost" + +#: extensions/stats/graph_templates.py:73 +msgid "Mail traffic" +msgstr "Provoz emailů" + +#: extensions/stats/grapher.py:9 +msgid "Day" +msgstr "Den" + +#: extensions/stats/grapher.py:10 +msgid "Week" +msgstr "Týden" + +#: extensions/stats/grapher.py:11 +msgid "Month" +msgstr "Měsíc" + +#: extensions/stats/grapher.py:12 +msgid "Year" +msgstr "Rok" + +#: extensions/stats/grapher.py:59 +msgid "Total" +msgstr "Celkem" + +#: extensions/stats/views.py:21 extensions/stats/templates/stats/graphs.html:4 +msgid "No statistics available" +msgstr "Žádné statistiky nejsou dostupné" + +#: extensions/stats/views.py:39 +msgid "Unknown graphic set" +msgstr "Nastaveno neznámé zobrazení" + +#: extensions/stats/views.py:61 +msgid "Bad custom period" +msgstr "Neplatně nastavený vlastní časový interval" + +#: extensions/stats/templates/stats/index.html:33 +msgid "Search a domain" +msgstr "Hledat doménu" + +#: extensions/stats/templates/stats/index.html:37 +msgid "Predefined time ranges" +msgstr "Předdefinované časové intervaly" + +#: extensions/stats/templates/stats/index.html:44 +msgid "Custom time range" +msgstr "Vlastní časový interval" + +#: extensions/stats/templates/stats/index.html:55 +msgid "Apply" +msgstr "Uložit" + +#: extensions/webmail/__init__.py:12 +msgid "Simple IMAP webmail" +msgstr "Jednoduchý IMAP webmail" + +#: extensions/webmail/__init__.py:35 +msgid "Webmail" +msgstr "Webmail" + +#: extensions/webmail/app_settings.py:14 +msgid "Maximum attachment size" +msgstr "Maximální velikost přílohy" + +#: extensions/webmail/app_settings.py:16 +msgid "Maximum attachment size in bytes (or KB, MB, GB if specified)" +msgstr "" +"Maximální velikost přílohy v Bajtech (nebo KB, MB, GB, pokud je uvedeno)" + +#: extensions/webmail/app_settings.py:19 +msgid "IMAP settings" +msgstr "Nastavení IMAP" + +#: extensions/webmail/app_settings.py:24 +msgid "Address of your IMAP server" +msgstr "Adresa vašeho IMAP serveru" + +#: extensions/webmail/app_settings.py:30 +msgid "Use a secured connection to access IMAP server" +msgstr "Použít zabezpečené připojení pro přístup k IMAP serveru" + +#: extensions/webmail/app_settings.py:36 +msgid "Listening port of your IMAP server" +msgstr "Port, na kterém naslouchá váš IMAP server" + +#: extensions/webmail/app_settings.py:39 +msgid "SMTP settings" +msgstr "Nastavení SMTP" + +#: extensions/webmail/app_settings.py:44 +msgid "Address of your SMTP server" +msgstr "Adresa vašeho SMTP serveru" + +#: extensions/webmail/app_settings.py:48 +msgid "Secured connection mode" +msgstr "Režim zabezpečeného připojení" + +#: extensions/webmail/app_settings.py:49 +msgid "None" +msgstr "Nic" + +#: extensions/webmail/app_settings.py:53 +msgid "Use a secured connection to access SMTP server" +msgstr "Použít zabezpečené připojení pro přístup k SMTP serveru" + +#: extensions/webmail/app_settings.py:60 +msgid "Listening port of your SMTP server" +msgstr "Port, na kterém naslouchá váš SMTP server" + +#: extensions/webmail/app_settings.py:64 +msgid "Authentication required" +msgstr "Ověření vyžadováno" + +#: extensions/webmail/app_settings.py:66 +msgid "Server needs authentication" +msgstr "Server vyžaduje ověření" + +#: extensions/webmail/app_settings.py:77 +msgid "Default message display mode" +msgstr "Výchozí režim zobrazení zprávy" + +#: extensions/webmail/app_settings.py:79 +msgid "The default mode used when displaying a message" +msgstr "Výchozí režim, který se použije pro zobrazení zprávy" + +#: extensions/webmail/app_settings.py:85 +msgid "Enable HTML links display" +msgstr "Povolit zobrazení HTML odkazů" + +#: extensions/webmail/app_settings.py:86 +msgid "Enable/Disable HTML links display" +msgstr "Povolit/Zakázat zobrazení HTML odkazů" + +#: extensions/webmail/app_settings.py:92 +msgid "Sets the maximum number of messages displayed in a page" +msgstr "Nastavuje maximální počet zobrazených zpráv na stránce" + +#: extensions/webmail/app_settings.py:97 +msgid "Listing refresh rate" +msgstr "Automatické obnovení stránky" + +#: extensions/webmail/app_settings.py:98 +msgid "Automatic folder refresh rate (in seconds)" +msgstr "Automatické načítání obsahu složky (v sekundách)" + +#: extensions/webmail/app_settings.py:105 +msgid "Trash folder" +msgstr "Složka koše" + +#: extensions/webmail/app_settings.py:106 +msgid "Folder where deleted messages go" +msgstr "Složka pro smazané zprávy" + +#: extensions/webmail/app_settings.py:111 +msgid "Sent folder" +msgstr "Složka odeslané pošty" + +#: extensions/webmail/app_settings.py:112 +msgid "Folder where copies of sent messages go" +msgstr "Složka pro kopie odeslaných zpráv" + +#: extensions/webmail/app_settings.py:117 +msgid "Drafts folder" +msgstr "Složka konceptů" + +#: extensions/webmail/app_settings.py:118 +msgid "Folder where drafts go" +msgstr "Složka pro koncepty zpráv" + +#: extensions/webmail/app_settings.py:121 +msgid "Composing messages" +msgstr "Vytváření zpráv" + +#: extensions/webmail/app_settings.py:125 +msgid "Default editor" +msgstr "Výchozí editor" + +#: extensions/webmail/app_settings.py:127 +msgid "The default editor to use when composing a message" +msgstr "Výchozí editor textu, který se použije pro vytváření zpráv" + +#: extensions/webmail/app_settings.py:133 +msgid "Signature text" +msgstr "Text podpisu" + +#: extensions/webmail/app_settings.py:134 +msgid "User defined email signature" +msgstr "Emailový podpis uživatele" + +#: extensions/webmail/exceptions.py:19 +msgid "Server response" +msgstr "Odpověď serveru" + +#: extensions/webmail/forms.py:9 +msgid "Cci" +msgstr "BCC" + +#: extensions/webmail/imaputils.py:237 +msgid "Failed to retrieve hierarchy delimiter" +msgstr "Nebylo možné zjistit hierarchický oddělovač" + +#: extensions/webmail/imaputils.py:278 +#, python-format +msgid "Connection to IMAP server failed: %s" +msgstr "Spojení se serverem IMAP selhalo: %s" + +#: extensions/webmail/lib.py:358 +msgid "wrote:" +msgstr "napsal/a:" + +#: extensions/webmail/lib.py:423 extensions/webmail/lib.py:427 +msgid "Original message" +msgstr "Původní zpráva" + +#: extensions/webmail/views.py:86 +#, python-format +msgid "%(count)d message deleted" +msgid_plural "%(count)d messages deleted" +msgstr[0] "%(count)d zpráva smazána" +msgstr[1] "%(count)d zprávy smazány" +msgstr[2] "%(count)d zpráv smazáno" + +#: extensions/webmail/views.py:103 +msgid "Unknown action" +msgstr "Neznámá akce" + +#: extensions/webmail/views.py:116 lib/email_listing.py:137 +msgid "Empty mailbox" +msgstr "Vyprázdnit schránku" + +#: extensions/webmail/views.py:133 +#: extensions/webmail/templatetags/webextras.py:170 +msgid "Create a new mailbox" +msgstr "Vytvořit novou schránku" + +#: extensions/webmail/views.py:149 +msgid "Mailbox created" +msgstr "Schránka vytvořena" + +#: extensions/webmail/views.py:165 +msgid "Edit mailbox" +msgstr "Upravit schránku" + +#: extensions/webmail/views.py:180 +msgid "Mailbox updated" +msgstr "Schránka aktualizována" + +#: extensions/webmail/views.py:214 extensions/webmail/views.py:396 +#: extensions/webmail/views.py:505 +msgid "Bad request" +msgstr "Neplatný požadavek" + +#: extensions/webmail/views.py:246 +msgid "Failed to save attachment: " +msgstr "Nebylo možné uložit přílohu:" + +#: extensions/webmail/views.py:249 +#, python-format +msgid "Attachment is too big (limit: %s)" +msgstr "Příloha je příliš velká (omezení: %s)" + +#: extensions/webmail/views.py:255 +#: extensions/webmail/templates/webmail/compose.html:15 +#: extensions/webmail/templates/webmail/headers.html:4 +msgid "Attachments" +msgstr "Přílohy" + +#: extensions/webmail/views.py:271 +msgid "Bad query" +msgstr "Neplatný dotaz" + +#: extensions/webmail/views.py:281 +msgid "Failed to remove attachment: " +msgstr "Nebylo možné odstranit přílohu:" + +#: extensions/webmail/views.py:286 +msgid "Unknown attachment" +msgstr "Neznámá příloha" + +#: extensions/webmail/views.py:501 +msgid "Undefined action" +msgstr "Neznámá akce" + +#: extensions/webmail/templates/webmail/attachments.html:6 +msgid "Attach" +msgstr "Připojit" + +#: extensions/webmail/templates/webmail/attachments.html:9 +msgid "Uploading.." +msgstr "Nahrávám.." + +#: extensions/webmail/templates/webmail/compose.html:7 +msgid "Add Cc field" +msgstr "Přidat pole CC" + +#: extensions/webmail/templates/webmail/compose.html:7 +msgid "Add Cci field" +msgstr "Přidat pole BCC" + +#: extensions/webmail/templates/webmail/compose.html:18 +#, python-format +msgid "%(counter)s file" +msgid_plural "%(counter)s files" +msgstr[0] "%(counter)s soubor" +msgstr[1] "%(counter)s soubory" +msgstr[2] "%(counter)s souborů" + +#: extensions/webmail/templates/webmail/folder.html:6 +msgid "Parent mailbox" +msgstr "Nadřazená schránka" + +#: extensions/webmail/templates/webmail/index.html:38 +msgid "Mailbox quota" +msgstr "Kvóta schránky" + +#: extensions/webmail/templatetags/webextras.py:19 +msgid "Reply" +msgstr "Odpovědět" + +#: extensions/webmail/templatetags/webextras.py:23 +msgid "Reply all" +msgstr "Odpovědět všem" + +#: extensions/webmail/templatetags/webextras.py:27 +#: userprefs/templates/userprefs/forward.html:2 +#: userprefs/templatetags/uprefs_extras.py:27 +msgid "Forward" +msgstr "Přeposlat" + +#: extensions/webmail/templatetags/webextras.py:33 +msgid "Display options" +msgstr "Možnosti zobrazení" + +#: extensions/webmail/templatetags/webextras.py:36 +msgid "Activate links" +msgstr "Povolit odkazy" + +#: extensions/webmail/templatetags/webextras.py:38 +msgid "Disable links" +msgstr "Zakákaz odkazy" + +#: extensions/webmail/templatetags/webextras.py:47 +msgid "Close this message" +msgstr "Zavřít tuto zprávu" + +#: extensions/webmail/templatetags/webextras.py:60 +msgid "Back" +msgstr "Zpět" + +#: extensions/webmail/templatetags/webextras.py:64 +msgid "Send" +msgstr "Odeslat" + +#: extensions/webmail/templatetags/webextras.py:76 +msgid "New message" +msgstr "Nová zpráva" + +#: extensions/webmail/templatetags/webextras.py:85 +msgid "Mark messages" +msgstr "Označit zprávy" + +#: extensions/webmail/templatetags/webextras.py:89 +msgid "As read" +msgstr "Jako přečtené" + +#: extensions/webmail/templatetags/webextras.py:92 +msgid "As unread" +msgstr "Jako nepřečtené" + +#: extensions/webmail/templatetags/webextras.py:101 +msgid "Compress folder" +msgstr "Stlačit složku" + +#: extensions/webmail/templatetags/webextras.py:110 +msgid "Empty folder" +msgstr "Vyprázdnit složku" + +#: extensions/webmail/templatetags/webextras.py:178 +msgid "Edit the selected mailbox" +msgstr "Upravit vybranou schránku" + +#: extensions/webmail/templatetags/webextras.py:183 +msgid "Remove the selected mailbox" +msgstr "Odstranit označené schránky" + +#: lib/exceptions.py:18 +#, python-format +msgid "Permission denied: %s" +msgstr "Přístup zamítnut: %s" + +#: lib/exceptions.py:19 +msgid "Permission denied" +msgstr "Přístup zamítnut" + +#: lib/formutils.py:157 lib/formutils.py:165 +msgid "Enter a valid domain name" +msgstr "Vložte platné doménové jméno" + +#: lib/permissions.py:27 +msgid "Simple user" +msgstr "Uživatel" + +#: lib/permissions.py:29 +msgid "Super administrator" +msgstr "Super správce" + +#: lib/permissions.py:31 +msgid "Domain administrator" +msgstr "Správce domény" + +#: lib/permissions.py:75 +#, python-format +msgid "Failed to grant access (%s)" +msgstr "Nebylo možné povolit přístup (%s)" + +#: lib/tables.py:241 +msgid "No entries to display" +msgstr "Žádné položky k zobrazení" + +#: lib/templatetags/libextras.py:108 +msgid "activate" +msgstr "aktivovat" + +#: templates/404.html:4 templates/500.html:4 +msgid "Sorry" +msgstr "Omlouváme se" + +#: templates/404.html:5 +msgid "The requested page does not exist." +msgstr "Požadovaná stránka neexistuje." + +#: templates/500.html:5 +msgid "An internal error occured." +msgstr "Objevila se interní chyba." + +#: templates/nlayout.html:62 +msgid "Powered by Modoboa" +msgstr "Běží na systému Modoboa" + +#: templates/common/email_searchbar.html:5 +msgid "From address" +msgstr "Z adresy" + +#: templates/common/email_searchbar.html:10 +msgid "Both" +msgstr "Obojí" + +#: templates/common/email_searchbar.html:12 +msgid "Search..." +msgstr "Hledat..." + +#: templates/common/error.html:4 +msgid "Error:" +msgstr "Chyba:" + +#: templates/common/generic_field.html:3 +#: templates/common/generic_fields_group.html:3 +msgid "Help:" +msgstr "Nápověda:" + +#: templates/common/generic_modal.html:11 +#: templates/common/wizard_forms.html:29 +msgid "Close" +msgstr "Zavřít" + +#: templates/registration/login.html:5 +msgid "Welcome to Modoboa" +msgstr "Vítejte v Modoboa" + +#: templates/registration/login.html:34 +msgid "Remember me" +msgstr "Zapamatovat si" + +#: templates/registration/login.html:36 +msgid "Log in" +msgstr "Přihlásit" + +#: userprefs/__init__.py:8 +msgid "User preferences" +msgstr "Uživatelské možnosti" + +#: userprefs/__init__.py:10 +msgid "Per-user settings" +msgstr "Uživatelské nastavení" + +#: userprefs/app_settings.py:22 +msgid "Prefered language" +msgstr "Preferovaný jazyk" + +#: userprefs/app_settings.py:27 +msgid "Prefered language to display pages" +msgstr "Preferovaný jazyk pro zobrazení stránek" + +#: userprefs/forms.py:14 +msgid "Old password" +msgstr "Původní heslo" + +#: userprefs/forms.py:16 +msgid "New password" +msgstr "Nové heslo" + +#: userprefs/forms.py:40 +msgid "Old password mismatchs" +msgstr "Původní heslo se neshoduje" + +#: userprefs/forms.py:45 +msgid "Passwords mismatch" +msgstr "Hesla se neshodují" + +#: userprefs/forms.py:59 +msgid "Recipient(s)" +msgstr "Příjemce(i)" + +#: userprefs/forms.py:62 +msgid "Indicate one or more recipients separated by a ','" +msgstr "Uveďte jednoho nebo více příjemců oddělených pomocí ','" + +#: userprefs/forms.py:65 +msgid "Keep local copies" +msgstr "Ponechat místní kopie" + +#: userprefs/forms.py:67 +msgid "Forward messages and store copies into your local mailbox" +msgstr "Přeposílat zprávy a ukládat kopie do místní schránky" + +#: userprefs/forms.py:84 +msgid "" +"You can't define a forward to a local destination. Please ask your " +"administrator to create an alias instead." +msgstr "" +"Nemůžete nastavit přeposílání na místní adresu. Požádejte správce o " +"vytvoření aliasu." + +#: userprefs/views.py:32 +msgid "You need a mailbox in order to define a forward" +msgstr "Pro nastavení přeposílání nejprve potřebujete schránku" + +#: userprefs/views.py:56 +msgid "Forward updated" +msgstr "Přeposílání aktualizováno" + +#: userprefs/views.py:98 +msgid "Profile updated" +msgstr "Profil aktualizován" + +#: userprefs/views.py:127 +msgid "Preferences saved" +msgstr "Možnosti uloženy" + +#: userprefs/templates/userprefs/forward.html:2 +msgid "Automatically forward emails to another address" +msgstr "Automaticky přesměrovat emaily na jinou adresu" + +#: userprefs/templates/userprefs/index.html:2 +#: userprefs/templatetags/uprefs_extras.py:48 +msgid "Settings" +msgstr "Nastavení" + +#: userprefs/templates/userprefs/preferences.html:2 +#: userprefs/templatetags/uprefs_extras.py:21 +msgid "Preferences" +msgstr "Možnosti" + +#: userprefs/templates/userprefs/preferences.html:2 +msgid "Customize Modoboa" +msgstr "Nastavit Modoboa" + +#: userprefs/templates/userprefs/profile.html:2 +#: userprefs/templatetags/uprefs_extras.py:17 +msgid "Profile" +msgstr "Profil" + +#: userprefs/templates/userprefs/profile.html:2 +msgid "Update your personal information" +msgstr "Aktualizovat osobní informace" + +#: userprefs/templatetags/uprefs_extras.py:57 +msgid "Logout" +msgstr "Odhlásit se" diff --git a/modoboa/userprefs/app_settings.py b/modoboa/userprefs/app_settings.py index 7652fada0..2b5fb0d17 100644 --- a/modoboa/userprefs/app_settings.py +++ b/modoboa/userprefs/app_settings.py @@ -20,9 +20,9 @@ class UserSettings(UserParametersForm): lang = forms.ChoiceField( initial=translate_language_code(settings.LANGUAGE_CODE), label=ugettext_lazy("Prefered language"), - choices=[("de", "deutsch"), ("en", "english"), - ("es", "español"), ("fr", "français"), - ("it", "italiano"), ("pt", "português"), - ("sv", "svenska"),], + choices=[("cs", "čeština"), ("de", "deutsch"), + ("en", "english"), ("es", "español"), + ("fr", "français"), ("it", "italiano"), + ("pt", "português"), ("sv", "svenska"),], help_text=ugettext_lazy("Prefered language to display pages") ) From 74ef43aa214cf23633738efda823fbf8af7967c3 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Wed, 2 Oct 2013 17:26:18 +0200 Subject: [PATCH 65/97] Rename files. --- .../{cs/LC_MESSAGES/djangopo.po => cs_CZ/LC_MESSAGES/django.po} | 0 .../LC_MESSAGES/djangojspo.po => cs_CZ/LC_MESSAGES/djangojs.po} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename modoboa/locale/{cs/LC_MESSAGES/djangopo.po => cs_CZ/LC_MESSAGES/django.po} (100%) rename modoboa/locale/{cs/LC_MESSAGES/djangojspo.po => cs_CZ/LC_MESSAGES/djangojs.po} (100%) diff --git a/modoboa/locale/cs/LC_MESSAGES/djangopo.po b/modoboa/locale/cs_CZ/LC_MESSAGES/django.po similarity index 100% rename from modoboa/locale/cs/LC_MESSAGES/djangopo.po rename to modoboa/locale/cs_CZ/LC_MESSAGES/django.po diff --git a/modoboa/locale/cs/LC_MESSAGES/djangojspo.po b/modoboa/locale/cs_CZ/LC_MESSAGES/djangojs.po similarity index 100% rename from modoboa/locale/cs/LC_MESSAGES/djangojspo.po rename to modoboa/locale/cs_CZ/LC_MESSAGES/djangojs.po From d855f25d1a912c460a07eaee971f475df3647ee9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Abrah=C3=A1m?= Date: Wed, 2 Oct 2013 14:32:29 +0200 Subject: [PATCH 66/97] Adding the Czech translation --- modoboa/locale/cs/LC_MESSAGES/djangojspo.po | 165 ++ modoboa/locale/cs/LC_MESSAGES/djangopo.po | 2605 +++++++++++++++++++ modoboa/userprefs/app_settings.py | 8 +- 3 files changed, 2774 insertions(+), 4 deletions(-) create mode 100644 modoboa/locale/cs/LC_MESSAGES/djangojspo.po create mode 100644 modoboa/locale/cs/LC_MESSAGES/djangopo.po diff --git a/modoboa/locale/cs/LC_MESSAGES/djangojspo.po b/modoboa/locale/cs/LC_MESSAGES/djangojspo.po new file mode 100644 index 000000000..473badd33 --- /dev/null +++ b/modoboa/locale/cs/LC_MESSAGES/djangojspo.po @@ -0,0 +1,165 @@ +# Modoboa Czech translation +# Copyright (C) 2013 +# This file is distributed under the same license as the Modoboa package. +# +# Miroslav Abrahám , 2013. +msgid "" +msgstr "" +"Project-Id-Version: modoboa-1.0.0\n" +"Report-Msgid-Bugs-To: miris@kunago.com\n" +"POT-Creation-Date: 2013-09-20 22:30+0200\n" +"PO-Revision-Date: 2013-09-29 22:13+0100\n" +"Last-Translator: Miroslav Abrahám \n" +"Language-Team: CS \n" +"Language: Čeština\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"X-Generator: Poedit 1.5.7\n" + +#: admin/static/admin/js/admin.js:26 +msgid "Search" +msgstr "Hledat" + +#: admin/static/admin/js/admin.js:110 +msgid "Do not delete domain directory" +msgstr "Nemazat adresář domény" + +#: admin/static/admin/js/admin.js:113 +msgid "This operation will remove ALL data associated to this domain." +msgstr "Tento krok odstraní VŠECHNA data související s touto doménou." + +#: admin/static/admin/js/admin.js:114 +msgid "" +"This operation will remove all data associated to this domain, excepting " +"accounts." +msgstr "" +"Tento krok odstraní VŠECHNA data související s touto doménou, vyjma účtů." + +#: admin/static/admin/js/admin.js:117 +msgid "Delete this domain?" +msgstr "Smazat tuto doménu?" + +#: admin/static/admin/js/admin.js:161 +msgid "No domain administrator defined" +msgstr "Není určen správce domény" + +#: admin/static/admin/js/admin.js:238 +msgid "Do not delete mailbox directory" +msgstr "Nemazat adresář schránky" + +#: admin/static/admin/js/admin.js:243 +msgid "Delete this account?" +msgstr "Smazat tento účet?" + +#: admin/static/admin/js/admin.js:249 +msgid "Delete this list?" +msgstr "Smazat tento seznam?" + +#: admin/static/admin/js/admin.js:254 +msgid "Delete this forward?" +msgstr "Smazat toto přeposílání?" + +#: admin/static/admin/js/admin.js:259 +msgid "Delete this alias?" +msgstr "Smazat tento alias?" + +#: extensions/amavis/static/amavis/js/quarantine.js:126 +msgid "Release this selection?" +msgstr "Odblokovat tento výběr?" + +#: extensions/amavis/static/amavis/js/quarantine.js:130 +msgid "Delete this selection?" +msgstr "Smazat tento výběr?" + +#: extensions/amavis/static/amavis/js/quarantine.js:148 +#: extensions/amavis/static/amavis/js/selfservice.js:22 +msgid "Release this message?" +msgstr "Odblokovat tuto zprávu?" + +#: extensions/amavis/static/amavis/js/quarantine.js:152 +#: extensions/amavis/static/amavis/js/selfservice.js:26 +msgid "Delete this message?" +msgstr "Smazat tuto zprávu?" + +#: extensions/amavis/static/amavis/js/quarantine.js:169 +msgid "View full headers" +msgstr "Zobrazit úplné záhlaví" + +#: extensions/amavis/static/amavis/js/quarantine.js:174 +msgid "Hide full headers" +msgstr "Skrýt záhlaví" + +#: extensions/sievefilters/static/sievefilters/js/lib.js:14 +msgid "Remove this filter?" +msgstr "Odstranit tento filtr?" + +#: extensions/sievefilters/static/sievefilters/js/lib.js:117 +msgid "Save changes?" +msgstr "Uložit změny?" + +#: extensions/sievefilters/static/sievefilters/js/lib.js:144 +msgid "Remove filters set?" +msgstr "Smazat sadu filtrů?" + +#: extensions/sievefilters/static/sievefilters/js/lib.js:161 +msgid "Activate this filters set?" +msgstr "Aktivovat tuto sadu filtrů?" + +#: extensions/sievefilters/static/sievefilters/js/lib.js:169 +#: extensions/sievefilters/static/sievefilters/js/lib.js:224 +msgid "active" +msgstr "aktivní" + +#: extensions/stats/static/stats/js/stats.js:37 +msgid "Search a domain" +msgstr "Vyhledat doménu" + +#: extensions/webmail/static/webmail/js/webmail.js:485 +msgid "Remove the selected mailbox?" +msgstr "Odstranit vybranou schránku?" + +#: extensions/webmail/static/webmail/js/webmail.js:499 +msgid "Mailbox removed" +msgstr "Schránka odstraněna" + +#: extensions/webmail/static/webmail/js/webmail.js:823 +msgid "Message sent" +msgstr "Zpráva odeslána" + +#: extensions/webmail/static/webmail/js/webmail.js:856 +msgid "Message deleted" +msgstr "Zpráva smazána" + +#: extensions/webmail/static/webmail/js/webmail.js:981 +#, c-format +msgid "%s file" +msgid_plural "%s files" +msgstr[0] "%s soubor" +msgstr[1] "%s soubory" +msgstr[2] "%s souborů" + +#: extensions/webmail/static/webmail/js/webmail.js:1013 +#, c-format +msgid "Moving %s message" +msgid_plural "Moving %s messages" +msgstr[0] "Přesunuji %s zprávu" +msgstr[1] "Přesunuji %s zprávy" +msgstr[2] "Přesunuji %s zpráv" + +#: static/js/confirmation.js:48 +msgid "Warning" +msgstr "Upozornění" + +#: static/js/confirmation.js:57 +msgid "Cancel" +msgstr "Zrušit" + +#: static/js/confirmation.js:99 static/js/history.js:239 +msgid "Internal Error" +msgstr "Interní chyba" + +#: static/js/searchbar.js:20 +msgid "Search..." +msgstr "Hledat..." diff --git a/modoboa/locale/cs/LC_MESSAGES/djangopo.po b/modoboa/locale/cs/LC_MESSAGES/djangopo.po new file mode 100644 index 000000000..fef7d5376 --- /dev/null +++ b/modoboa/locale/cs/LC_MESSAGES/djangopo.po @@ -0,0 +1,2605 @@ +# Modoboa Czech translation +# Copyright (C) 2013 +# This file is distributed under the same license as the Modoboa package. +# +# Miroslav Abrahám , 2013. +msgid "" +msgstr "" +"Project-Id-Version: modoboa-1.0.0\n" +"Report-Msgid-Bugs-To: miris@kunago.com\n" +"POT-Creation-Date: 2013-09-20 22:30+0200\n" +"PO-Revision-Date: 2013-09-29 22:08+0100\n" +"Last-Translator: Miroslav Abrahám \n" +"Language-Team: CS \n" +"Language: Čeština\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"X-Generator: Poedit 1.5.7\n" + +#: admin/__init__.py:9 +msgid "Administration console" +msgstr "Konzola správce" + +#: admin/__init__.py:11 +msgid "Web based console to manage domains, accounts and aliases" +msgstr "Webová konzola pro správu domén, účtů a aliasů" + +#: admin/__init__.py:16 admin/forms.py:211 admin/forms.py:652 +#: admin/views.py:94 admin/views.py:447 +#: extensions/postfix_autoreply/app_settings.py:11 +#: extensions/sievefilters/app_settings.py:50 +#: extensions/stats/app_settings.py:11 extensions/webmail/app_settings.py:11 +#: userprefs/__init__.py:15 +msgid "General" +msgstr "Obecné" + +#: admin/app_settings.py:31 +msgid "Authentication" +msgstr "Ověření" + +#: admin/app_settings.py:34 +msgid "Authentication type" +msgstr "Typ ověření" + +#: admin/app_settings.py:35 +msgid "Local" +msgstr "Lokální" + +#: admin/app_settings.py:38 +msgid "The backend used for authentication" +msgstr "Rozhraní pro ověřování přístupu" + +#: admin/app_settings.py:43 +msgid "Default password scheme" +msgstr "Výchozí schéma hesel" + +#: admin/app_settings.py:50 +msgid "Scheme used to crypt mailbox passwords" +msgstr "Použité schéma pro šifrování hesel schránek" + +#: admin/app_settings.py:54 +msgid "Secret key" +msgstr "Tajný klíč" + +#: admin/app_settings.py:56 +msgid "Key used to encrypt/decrypt passwords" +msgstr "Klíč používaný k šifrování/dešifrování hesel" + +#: admin/app_settings.py:60 +msgid "LDAP settings" +msgstr "Nastavení LDAP" + +#: admin/app_settings.py:63 extensions/sievefilters/app_settings.py:22 +#: extensions/webmail/app_settings.py:22 extensions/webmail/app_settings.py:42 +msgid "Server address" +msgstr "Adresa serveru" + +#: admin/app_settings.py:65 +msgid "The IP address of the DNS name of the LDAP server" +msgstr "IP adresa DNS jména LDAP serveru" + +#: admin/app_settings.py:69 extensions/sievefilters/app_settings.py:28 +#: extensions/webmail/app_settings.py:34 extensions/webmail/app_settings.py:58 +msgid "Server port" +msgstr "Port serveru" + +#: admin/app_settings.py:71 +msgid "The TCP port number used by the LDAP server" +msgstr "Port TCP, který používá LDAP server" + +#: admin/app_settings.py:75 extensions/webmail/app_settings.py:28 +msgid "Use a secured connection" +msgstr "Použít zabezpečené připojení" + +#: admin/app_settings.py:77 +msgid "Use an SSL/TLS connection to access the LDAP server" +msgstr "Použít připojení SSL/TLS pro přístup k LDAP serveru" + +#: admin/app_settings.py:81 +msgid "Authentication method" +msgstr "Metoda ověření" + +#: admin/app_settings.py:82 +msgid "Search and bind" +msgstr "Vyhledat a spojit" + +#: admin/app_settings.py:83 +msgid "Direct bind" +msgstr "Přímé spojení" + +#: admin/app_settings.py:85 +msgid "Choose the authentication method to use" +msgstr "Zvolte si metodu ověření, která se použije" + +#: admin/app_settings.py:90 +msgid "Bind DN" +msgstr "Spojení pomocí DN" + +#: admin/app_settings.py:92 +msgid "" +"The distinguished name to use when binding to the LDAP server. Leave empty " +"for an anonymous bind" +msgstr "" +"Rozlišovací jméno, které se použije při spojování s LDAP serverem. " +"Ponechejte prázdné pro anonymní spojení." + +#: admin/app_settings.py:97 +msgid "Bind password" +msgstr "Heslo spojení" + +#: admin/app_settings.py:99 +msgid "The password to use when binding to the LDAP server (with 'Bind DN')" +msgstr "" +"Heslo, které se použije při spojování s LDAP serverem (při výběru DN " +"spojení)." + +#: admin/app_settings.py:105 +msgid "Search base" +msgstr "Základna struktury" + +#: admin/app_settings.py:107 +msgid "The distinguished name of the search base" +msgstr "Rozlišovací jméno (DN) základny struktury" + +#: admin/app_settings.py:112 +msgid "Search filter" +msgstr "Vyhledávací filtr" + +#: admin/app_settings.py:114 +msgid "" +"An optional filter string (e.g. '(objectClass=person)'). In order to be " +"valid, it must be enclosed in parentheses." +msgstr "" +"Volitelný filtr (např. '(objectClass=osoba)'). Aby byl filtr platný, je " +"nezbytné jen uzavřít do závorek." + +#: admin/app_settings.py:119 +msgid "User DN template" +msgstr "Šablona uživatelského DN" + +#: admin/app_settings.py:121 +#, python-format +msgid "" +"The template used to construct a user's DN. It should contain one " +"placeholder (ie. %(user)s)" +msgstr "" +"Šablona použitá pro tvorbu uživatelského rozlišovacího jména (DN). Měla by " +"obsahovat jeden zástupný řetězec (tj. %(user)s)." + +#: admin/app_settings.py:126 +msgid "Password attribute" +msgstr "Atribut hesla" + +#: admin/app_settings.py:128 +msgid "The attribute used to store user passwords" +msgstr "Atribut používaný pro ukládání hesel uživatelů" + +#: admin/app_settings.py:132 +msgid "Active Directory" +msgstr "Active Directory" + +#: admin/app_settings.py:134 +msgid "Tell if the LDAP server is an Active Directory one" +msgstr "" +"Volba určující, jestli je nebo není LDAP server serverem Active Directory" + +#: admin/app_settings.py:137 admin/templates/admin/editdomainform.html:25 +#: extensions/limits/app_settings.py:31 extensions/limits/forms.py:24 +#: extensions/limits/models.py:14 extensions/webmail/app_settings.py:101 +#: extensions/webmail/templates/webmail/folders.html:4 +msgid "Mailboxes" +msgstr "Schránky" + +#: admin/app_settings.py:140 +msgid "Handle mailboxes on filesystem" +msgstr "Spravovat schránky v souborovém systému" + +#: admin/app_settings.py:142 +msgid "" +"Rename or remove mailboxes on the filesystem when they get renamed or " +"removed within Modoboa" +msgstr "" +"Přejmenovat nebo odstranit schránky v souborovém systému, pokud jsou " +"přejmenovány nebo odstraněny v Modoboa" + +#: admin/app_settings.py:146 +msgid "Mailboxes ower" +msgstr "Vlastník schránek" + +#: admin/app_settings.py:148 +msgid "The UNIX account who owns mailboxes on the filesystem" +msgstr "Účet UNIXu, který vlastní schránky v souborovém systému" + +#: admin/app_settings.py:152 +msgid "Automatic account removal" +msgstr "Automatické odstranění účtu" + +#: admin/app_settings.py:154 +msgid "When a mailbox is removed, also remove the associated account" +msgstr "Když je schránka odstraněná, odstranit také přiřazený účet uživatele" + +#: admin/app_settings.py:157 admin/templates/admin/editdomainform.html:7 +msgid "Miscellaneous" +msgstr "Různé" + +#: admin/app_settings.py:160 +msgid "Maximum log record age" +msgstr "Maximální stáří záznamu" + +#: admin/app_settings.py:162 +msgid "The maximum age in days of a log record" +msgstr "Maximální stáří záznamu ve dnech" + +#: admin/app_settings.py:166 +msgid "Items per page" +msgstr "Položek na stránce" + +#: admin/app_settings.py:168 +msgid "Number of displayed items per page" +msgstr "Počet zobrazených položek na stránce" + +#: admin/app_settings.py:172 +msgid "Default top redirection" +msgstr "Výchozí přesměrování aplikace" + +#: admin/app_settings.py:175 +msgid "The default redirection used when no application is specified" +msgstr "" +"Výchozí přesměrování, které se použije, pokud není žádná aplikace " +"specifikována" + +#: admin/app_settings.py:213 +msgid "Key must be either 16, 24, or 32 bytes long" +msgstr "Klíč musí mít délku 16, 24 nebo 32 znaků" + +#: admin/app_settings.py:222 +msgid "Invalid syntax" +msgstr "Neplatná syntaxe" + +#: admin/app_settings.py:245 +msgid "This field is required" +msgstr "Toto pole je vyžadováno" + +#: admin/forms.py:20 admin/forms.py:497 admin/tables.py:18 +msgid "Alias(es)" +msgstr "Alias(y)" + +#: admin/forms.py:22 +msgid "" +"Alias(es) of this domain. Indicate only one name per input, press ENTER to " +"add a new input." +msgstr "" +"Alias(y) této domény. Uveďte na řádek pouze jeden alias; pro vložení dalšího " +"aliasu stiskněte po vložení ENTER." + +#: admin/forms.py:59 +msgid "An alias with this name already exists" +msgstr "Alias s tímto názvem již existuje" + +#: admin/forms.py:73 +msgid "A domain with this name already exists" +msgstr "Doména s tímto názvem již existuje" + +#: admin/forms.py:146 +msgid "Create a domain administrator" +msgstr "Vytvořit správce domény" + +#: admin/forms.py:148 +msgid "Automatically create an administrator for this domain" +msgstr "Automaticky vytvořit správce této domény" + +#: admin/forms.py:152 admin/tables.py:12 admin/tables.py:47 +#: admin/templates/admin/editdomainform.html:13 +#: admin/templates/admin/identities_table.html:5 +#: admin/templates/admin/information.html:8 +#: extensions/sievefilters/forms.py:53 +#: extensions/sievefilters/templates/sievefilters/guieditor.html:6 +msgid "Name" +msgstr "Jméno" + +#: admin/forms.py:154 +msgid "" +"The administrator's name. Don't include the domain's name here, it will be " +"automatically appended." +msgstr "" +"Jméno správce. Nevkládejte sem název domény, název bude automaticky doplněn." + +#: admin/forms.py:160 +msgid "Create aliases" +msgstr "Vytvořit aliasy" + +#: admin/forms.py:162 +msgid "Automatically create standard aliases for this domain" +msgstr "Automaticky vytvořit běžné aliasy pro tuto doménu" + +#: admin/forms.py:175 +msgid "Invalid format" +msgstr "Neplatný formát" + +#: admin/forms.py:187 +#, python-format +msgid "User '%s' already exists" +msgstr "Uživatel '%s' již existuje" + +#: admin/forms.py:235 +msgid "Email address" +msgstr "Emailová adresa" + +#: admin/forms.py:236 +msgid "" +"The distribution list address. Use the '*' character to create a 'catchall' " +"address (ex: *@domain.tld)." +msgstr "" +"Distribuční seznam adres. Pro vytvoření doménového koše vložte znak " +"'*' (např. *@domena.cz)." + +#: admin/forms.py:239 +msgid "Recipients" +msgstr "Příjemci" + +#: admin/forms.py:240 +msgid "" +"Mailbox(es) this alias will point to. Indicate only one address per input, " +"press ENTER to add a new input." +msgstr "" +"Schránka/Schránky, na kterou/které bude tento alias odkazovat. Uveďte na " +"řádek pouze jednu adresu; pro vložení další adresy stiskněte po vložení " +"ENTER." + +#: admin/forms.py:278 admin/forms.py:542 admin/forms.py:568 +msgid "Domain does not exist" +msgstr "Doména neexistuje" + +#: admin/forms.py:280 +msgid "You don't have access to this domain" +msgstr "Nemáte oprávnění k přístupu k této doméně" + +#: admin/forms.py:300 +msgid "Invalid mailbox" +msgstr "Neplatná schránka" + +#: admin/forms.py:316 admin/models.py:1202 +#, python-format +msgid "Local recipient %s not found" +msgstr "Místní příjemce %s nebyl nalezen" + +#: admin/forms.py:318 admin/forms.py:324 +#, python-format +msgid "Recipient %s already present" +msgstr "Příjemce %s je již vložen" + +#: admin/forms.py:329 +msgid "No recipient defined" +msgstr "Nebyl určen příjemce" + +#: admin/forms.py:343 extensions/webmail/forms.py:19 +msgid "Select a file" +msgstr "Vybrat soubor" + +#: admin/forms.py:345 admin/forms.py:373 +msgid "Separator" +msgstr "Oddělovač" + +#: admin/forms.py:348 +msgid "Continue on error" +msgstr "Při výskytu chyby pokračovat" + +#: admin/forms.py:349 +msgid "Don't treat duplicated objects as error" +msgstr "Nepovažovat duplikáty objektů za chybu" + +#: admin/forms.py:364 +msgid "Crypt passwords" +msgstr "Zašifrovat hesla" + +#: admin/forms.py:365 +msgid "Check this option if passwords contained in your file are not crypted" +msgstr "Zatrhněte toto pole, pokud hesla ve vašem souboru nejsou zašifrována" + +#: admin/forms.py:371 +msgid "File name" +msgstr "Název souboru" + +#: admin/forms.py:403 admin/templates/admin/editdomainform.html:13 +#: auth/forms.py:7 +msgid "Username" +msgstr "Uživatelské jméno" + +#: admin/forms.py:405 +msgid "Role" +msgstr "Role" + +#: admin/forms.py:406 admin/forms.py:433 +msgid "Choose" +msgstr "Vybrat" + +#: admin/forms.py:407 +msgid "What level of permission this user will have" +msgstr "Jaká úroveň oprávnění bude tomuto uživateli nastavena" + +#: admin/forms.py:409 auth/forms.py:11 +msgid "Password" +msgstr "Heslo" + +#: admin/forms.py:411 userprefs/forms.py:18 +msgid "Confirmation" +msgstr "Potvrzení" + +#: admin/forms.py:413 +msgid "Enter the same password as above, for verification." +msgstr "Vložte stejné heslo jako v poli výše, pro jeho ověření." + +#: admin/forms.py:424 +msgid "Enabled" +msgstr "Povoleno" + +#: admin/forms.py:471 +msgid "The two password fields didn't match." +msgstr "Obě pole s heslem se neshodují." + +#: admin/forms.py:477 +msgid "You can't disable your own account" +msgstr "Nemůžete zakázat váš vlastní účet" + +#: admin/forms.py:488 +msgid "E-mail" +msgstr "E-mail" + +#: admin/forms.py:490 +msgid "Quota" +msgstr "Kvóta" + +#: admin/forms.py:492 +msgid "" +"Quota in MB for this mailbox. Define a custom value or use domain's default " +"one. Leave empty to define an unlimited value (not allowed for domain " +"administrators)." +msgstr "" +"Kvóta pro tuto chránku v MB. Definujte vlastní hodnotu nebo použijte výchozí " +"hodnotu domény. Ponechejte prázdné pro neomezenou kvótu (není povoleno " +"správcům domény)." + +#: admin/forms.py:499 +msgid "" +"Alias(es) of this mailbox. Indicate only one address per input, press ENTER " +"to add a new input. Use the '*' character to create a 'catchall' alias (ex: " +"*@domain.tld)." +msgstr "" +"Alias(y) této schránky. Vložte pouze jeden alias na řádek, stiskněte ENTER " +"pro vložení dalšího aliasu. Pro vytvoření doménového koše vložte '*' (např. " +"*@domena.cz)." + +#: admin/forms.py:550 +#, python-format +msgid "Mailbox %s already exists" +msgstr "Schránka %s již existuje" + +#: admin/forms.py:610 +msgid "Domain(s)" +msgstr "Doména(y)" + +#: admin/forms.py:612 +msgid "Domain(s) that user administrates" +msgstr "Doména(y) pod správou uživatele" + +#: admin/forms.py:654 admin/views.py:450 +msgid "Mail" +msgstr "Mail" + +#: admin/forms.py:656 +msgid "Permissions" +msgstr "Oprávnění" + +#: admin/models.py:80 +msgid "You can't delete your own account" +msgstr "Nemůžete smazat vlastní účet" + +#: admin/models.py:161 +msgid "Failed to update password: LDAP module not installed" +msgstr "Nebylo možné změnit heslo: LDAP modul není instalován" + +#: admin/models.py:167 +#, python-format +msgid "Failed to update password: %s" +msgstr "Nebylo možné změnit heslo: %s" + +#: admin/models.py:194 +msgid "account" +msgstr "účet" + +#: admin/models.py:496 admin/models.py:733 admin/models.py:795 +msgid "Invalid line" +msgstr "Neplatný řádek" + +#: admin/models.py:500 +msgid "You can't import an account with a role greater than yours" +msgstr "Nemůžete importvat účet s vyšším oprávněním, než máte vy sám" + +#: admin/models.py:506 +#, python-format +msgid "The simple user '%s' must have a valid email address" +msgstr "Uživatel '%s' musí mít nastavenou platnou emailovou adresu" + +#: admin/models.py:510 +#, python-format +msgid "username and email fields must not differ for '%s'" +msgstr "pole uživatelského jména a emailu se nesmí pro '%s' lišit" + +#: admin/models.py:534 +#, python-format +msgid "Account import failed (%s): domain does not exist" +msgstr "Import účtu nebyl úspěšný (%s): doména neexistuje" + +#: admin/models.py:624 admin/models.py:746 +msgid "name" +msgstr "název" + +#: admin/models.py:625 +msgid "The domain name" +msgstr "Doménové jméno" + +#: admin/models.py:627 +msgid "Default quota in MB applied to mailboxes" +msgstr "Výchozí kvóta schránek v MB" + +#: admin/models.py:630 admin/models.py:753 admin/models.py:1045 +#: admin/models.py:1217 extensions/postfix_autoreply/models.py:27 +msgid "enabled" +msgstr "povoleno" + +#: admin/models.py:631 +msgid "Check to activate this domain" +msgstr "Zatrhněte pole pro povolení této domény" + +#: admin/models.py:747 +msgid "The alias name" +msgstr "Název aliasu" + +#: admin/models.py:749 +msgid "target" +msgstr "cíl" + +#: admin/models.py:750 +msgid "The domain this alias points to" +msgstr "Doména, na kterou tento alias odkazuje" + +#: admin/models.py:754 admin/models.py:1046 +msgid "Check to activate this alias" +msgstr "Zatrhněte pole pro povolení tohoto aliasu" + +#: admin/models.py:801 +#, python-format +msgid "Unknown domain %s" +msgstr "Neznámá doména %s" + +#: admin/models.py:818 admin/models.py:1031 +msgid "address" +msgstr "adresa" + +#: admin/models.py:819 +msgid "Mailbox address (without the @domain.tld part)" +msgstr "Adresa schránky (bez části @doména.tld)" + +#: admin/models.py:877 +#, python-format +msgid "Failed to retrieve mailbox location (%s)" +msgstr "Nebylo možné zjistit umístění schránky (%s)" + +#: admin/models.py:921 +#, python-format +msgid "Quota is greater than the allowed domain's limit (%dM)" +msgstr "Zvolená kvóta je větší než povolené omezení domény (%dM)" + +#: admin/models.py:926 +msgid "A quota is required" +msgstr "Kvóta je vyžadována" + +#: admin/models.py:1032 +msgid "" +"The alias address (without the domain part). For a 'catch-all' address, just " +"enter an * character." +msgstr "" +"Alias adresy (bez části označující doménu). Pro vytvoření doménového koše " +"vložte znak '*'." + +#: admin/models.py:1036 +msgid "mailboxes" +msgstr "schránky" + +#: admin/models.py:1037 +msgid "The mailboxes this alias points to" +msgstr "Schránky, na které tento alias odkazuje" + +#: admin/models.py:1041 +msgid "The aliases this alias points to" +msgstr "Aliasy, na které tento alias odkazuje" + +#: admin/models.py:1089 +msgid "distribution list" +msgstr "distribuční seznam" + +#: admin/models.py:1090 +msgid "forward" +msgstr "přeposlat" + +#: admin/models.py:1091 +msgid "alias" +msgstr "alias" + +#: admin/models.py:1170 +#, python-format +msgid "Invalid line: %s" +msgstr "Neplatný řádek: %s" + +#: admin/models.py:1175 +#, python-format +msgid "Domain '%s' does not exist" +msgstr "Doména '%s' neexistuje" + +#: admin/models.py:1218 +msgid "Check to enable this extension" +msgstr "Zatrhněte pole pro povolení tohoto rozšíření" + +#: admin/models.py:1318 +msgid "added" +msgstr "přidáno" + +#: admin/models.py:1321 +msgid "modified" +msgstr "upraveno" + +#: admin/models.py:1324 +msgid "deleted" +msgstr "smazáno" + +#: admin/models.py:1326 +#, python-format +msgid "%(object)s '%(name)s' %(action)s by user %(user)s" +msgstr "%(object)s '%(name)s' %(action)s uživatelem %(user)s" + +#: admin/tables.py:14 +msgid "Edit domain" +msgstr "Upravit doménu" + +#: admin/tables.py:21 admin/templates/admin/identities_table.html:8 +#: admin/templates/admin/listing.html:17 extensions/sievefilters/views.py:83 +#: extensions/sievefilters/templates/sievefilters/filter.html:17 +#: extensions/sievefilters/templates/sievefilters/guieditor.html:5 +#: extensions/webmail/templatetags/webextras.py:97 +msgid "Actions" +msgstr "Akce" + +#: admin/tables.py:48 +msgid "Version" +msgstr "Verze" + +#: admin/tables.py:49 +msgid "Description" +msgstr "Popis" + +#: admin/views.py:88 +msgid "New domain" +msgstr "Nová doména" + +#: admin/views.py:89 admin/views.py:98 admin/views.py:228 admin/views.py:444 +#: admin/views.py:451 extensions/sievefilters/views.py:129 +#: extensions/sievefilters/views.py:198 extensions/webmail/views.py:136 +msgid "Create" +msgstr "Vytvořit" + +#: admin/views.py:95 admin/views.py:448 +msgid "Next" +msgstr "Další" + +#: admin/views.py:97 +msgid "Options" +msgstr "Možnosti" + +#: admin/views.py:99 admin/views.py:452 +msgid "Previous" +msgstr "Předchozí" + +#: admin/views.py:112 +msgid "Domain created" +msgstr "Doména vytvořena" + +#: admin/views.py:146 admin/views.py:285 admin/views.py:498 +#: extensions/postfix_autoreply/templates/postfix_autoreply/autoreply.html:9 +#: extensions/sievefilters/views.py:148 extensions/webmail/views.py:168 +#: userprefs/templates/userprefs/forward.html:8 +#: userprefs/templates/userprefs/profile.html:8 +msgid "Update" +msgstr "Aktualizovat" + +#: admin/views.py:162 +msgid "Domain modified" +msgstr "Doména upravena" + +#: admin/views.py:189 +msgid "You can't delete your own domain" +msgstr "Nemůžete smazat vlastní doménu" + +#: admin/views.py:192 +msgid "Domain deleted" +msgid_plural "Domains deleted" +msgstr[0] "Doména smazána" +msgstr[1] "Domény smazány" +msgstr[2] "Domén smazáno" + +#: admin/views.py:207 +msgid "Alias with this name already exists" +msgstr "Alias s tímto názvem již existuje" + +#: admin/views.py:250 +msgid "New distribution list" +msgstr "Nový distribuční seznam" + +#: admin/views.py:251 +msgid "Distribution list created" +msgstr "Distribuční seznam vytvořen" + +#: admin/views.py:260 +msgid "New alias" +msgstr "Nový alias" + +#: admin/views.py:261 +msgid "Alias created" +msgstr "Alias vytvořen" + +#: admin/views.py:270 +msgid "New forward" +msgstr "Nové přeposílání" + +#: admin/views.py:271 +msgid "Forward created" +msgstr "Přeposílání vytvořeno" + +#: admin/views.py:289 +msgid "Distribution list modified" +msgstr "Distribuční seznam upraven" + +#: admin/views.py:291 +msgid "Forward modified" +msgstr "Přeposílání upraveno" + +#: admin/views.py:293 +msgid "Alias modified" +msgstr "Alias upraven" + +#: admin/views.py:402 admin/views.py:545 admin/views.py:550 +#: extensions/amavis/views.py:204 extensions/amavis/views.py:210 +#: extensions/amavis/views.py:243 extensions/amavis/views.py:247 +#: extensions/amavis/views.py:249 extensions/webmail/views.py:41 +#: extensions/webmail/views.py:68 extensions/webmail/views.py:81 +#: extensions/webmail/views.py:98 extensions/webmail/views.py:114 +#: extensions/webmail/views.py:200 extensions/webmail/views.py:427 +#: extensions/webmail/views.py:438 extensions/webmail/views.py:465 +#: lib/formutils.py:32 lib/formutils.py:37 +msgid "Invalid request" +msgstr "Neplatný požadavek" + +#: admin/views.py:441 +msgid "New account" +msgstr "Nový účet" + +#: admin/views.py:465 +msgid "Account created" +msgstr "Účet vytvořen" + +#: admin/views.py:513 +msgid "Account updated" +msgstr "Účet aktualizován" + +#: admin/views.py:535 +msgid "Account deleted" +msgid_plural "Accounts deleted" +msgstr[0] "Účet smazán" +msgstr[1] "Účty smazány" +msgstr[2] "Účtů smazáno" + +#: admin/views.py:590 +msgid "Parameters saved" +msgstr "Parametry uloženy" + +#: admin/views.py:636 +msgid "Modifications applied." +msgstr "Úpravy byly uloženy." + +#: admin/views.py:743 +#, python-format +msgid "Object already exists: %s" +msgstr "Objekt již existuje: %s" + +#: admin/views.py:745 +#, python-format +msgid "%d objects imported successfully" +msgstr "%d objektů úspěšně importováno" + +#: admin/views.py:763 +msgid "" +"Provide a CSV file where lines respect one of the following formats:\n" +"
                              \n" +"
                            • account; loginname; password; first name; last name; enabled; group; " +"address[, domain, ...]
                              • \n" +"
                            • alias; address; enabled; internal recipient
                              • \n" +"
                            • forward; address; enabled; external recipient
                              • \n" +"
                            • dlist; address; enabled; recipient; recipient; ...
                              • \n" +"
                            \n" +"

                            The first element of each line is mandatory and must be equal to one of " +"the previous values.

                            \n" +"\n" +"

                            You can use a different character as separator.

                            \n" +msgstr "" +"Nahrajte CSV soubor, který bude mít jednotlivé řádky v některém z uvedených " +"formátů:\n" +"
                              \n" +"
                            • account; přihlašovacíjméno; heslo; křestní jméno; příjmení; " +"povoleno; skupina; adresa[, doména, ...]
                              • \n" +"
                            • alias; adresa; povoleno; interní příjemce
                              • \n" +"
                            • forward; adresa; povoleno; externí příjemce
                              • \n" +"
                            • dlist; adresa; povoleno; příjemce; příjemce; ...
                              • \n" +"
                            \n" +"

                            První element každého řádku je povinný a musí být shodný s některou z " +"předchozích hodnot.

                            \n" +"\n" +"

                            Můžete také použít odlišný oddělovač hodnot.

                            \n" + +#: admin/views.py:775 +msgid "Import identities" +msgstr "Importovat identity" + +#: admin/views.py:776 admin/views.py:846 admin/templatetags/admin_extras.py:87 +#: admin/templatetags/admin_extras.py:144 +msgid "Import" +msgstr "Import" + +#: admin/views.py:806 +msgid "Export identities" +msgstr "Exportovat identity" + +#: admin/views.py:807 admin/views.py:863 admin/templatetags/admin_extras.py:93 +#: admin/templatetags/admin_extras.py:150 +msgid "Export" +msgstr "Export" + +#: admin/views.py:835 +msgid "" +"Provide a CSV file where lines respect one of the following formats:\n" +"
                              \n" +"
                            • domain; name; quota; enabled
                              • \n" +"
                            • domainalias; name; targeted domain; enabled
                              • \n" +"
                            \n" +"

                            The first element of each line is mandatory and must be equal to one of " +"the previous values.

                            \n" +"

                            You can use a different character as separator.

                            \n" +msgstr "" +"Nahrajte CSV soubor, který bude mít jednotlivé řádky v některém z uvedených " +"formátů:\n" +"
                              \n" +"
                            • domain; název; kvóta; povoleno
                              • \n" +"
                            • domainalias; název; cílová doména; povoleno
                              • \n" +"
                            \n" +"

                            První element každého řádku je povinný a musí být shodný s některou z " +"předchozích hodnot.

                            \n" +"

                            Můžete také použít odlišný oddělovač hodnot.

                            \n" + +#: admin/views.py:845 +msgid "Import domains" +msgstr "Importovat domény" + +#: admin/views.py:862 +msgid "Export domains" +msgstr "Exportovat domény" + +#: admin/templates/admin/domain_general_form.html:3 +#: admin/templates/admin/mailform.html:3 +#: admin/templates/admin/newdomainform.html:3 +msgid "MB" +msgstr "MB" + +#: admin/templates/admin/domains.html:2 admin/templatetags/admin_extras.py:23 +#: extensions/limits/app_settings.py:19 extensions/limits/forms.py:16 +#: extensions/limits/models.py:12 +msgid "Domains" +msgstr "Domény" + +#: admin/templates/admin/editdomainform.html:4 +msgid "Administrators" +msgstr "Správci" + +#: admin/templates/admin/editdomainform.html:19 +msgid "No domain administrator defined" +msgstr " Nebyl určen správce domény" + +#: admin/templates/admin/editdomainform.html:22 +msgid "Creation date" +msgstr "Datum vytvoření" + +#: admin/templates/admin/editdomainform.html:23 +msgid "Last modification date" +msgstr "Datum poslední změny" + +#: admin/templates/admin/editdomainform.html:24 +#: extensions/limits/app_settings.py:25 extensions/limits/forms.py:20 +#: extensions/limits/models.py:13 +msgid "Domain aliases" +msgstr "Doménové aliasy" + +#: admin/templates/admin/editdomainform.html:26 +#: extensions/limits/app_settings.py:37 extensions/limits/forms.py:28 +#: extensions/limits/models.py:15 +msgid "Mailbox aliases" +msgstr "Aliasy schránek" + +#: admin/templates/admin/extensions.html:2 +#: admin/templatetags/admin_extras.py:51 +msgid "Extensions" +msgstr "Rozšíření" + +#: admin/templates/admin/extensions.html:2 +msgid "Choose the extension(s) to use" +msgstr "Zvolte rozšíření, která chcete použít" + +#: admin/templates/admin/extensions.html:6 +#: admin/templates/admin/parameters.html:8 +#: userprefs/templates/userprefs/preferences.html:8 +msgid "Save" +msgstr "Uložit" + +#: admin/templates/admin/identities.html:2 +#: admin/templatetags/admin_extras.py:31 +msgid "Identities" +msgstr "Identity" + +#: admin/templates/admin/identities_table.html:6 +msgid "Fullname/Recipient" +msgstr "Celé jméno/Příjemce" + +#: admin/templates/admin/identities_table.html:7 +msgid "Tags" +msgstr "Značky" + +#: admin/templates/admin/importform.html:5 +#: admin/templatetags/admin_extras.py:290 +msgid "Help" +msgstr "Nápověda" + +#: admin/templates/admin/importform.html:12 +msgid "Importing..." +msgstr "Importuji..." + +#: admin/templates/admin/information.html:2 +#: admin/templatetags/admin_extras.py:56 +msgid "Information" +msgstr "Informace" + +#: admin/templates/admin/information.html:2 +msgid "Various information about Modoboa" +msgstr "Různé informace o Modoboa" + +#: admin/templates/admin/information.html:3 +msgid "is currently in use." +msgstr "se aktuálně používá." + +#: admin/templates/admin/information.html:5 +msgid "Active users" +msgstr "Aktivní uživatelé" + +#: admin/templates/admin/information.html:9 +msgid "Group name" +msgstr "Název skupiny" + +#: admin/templates/admin/information.html:10 +msgid "Last login" +msgstr "Poslední přihlášení" + +#: admin/templates/admin/listing.html:14 +#: extensions/stats/templates/stats/index.html:28 +msgid "Filter" +msgstr "Filtr" + +#: admin/templates/admin/logs.html:2 admin/templatetags/admin_extras.py:60 +msgid "Logs" +msgstr "Záznamy" + +#: admin/templates/admin/logs.html:2 +msgid "Previously on Modoboa..." +msgstr "Dříve v Modoboa..." + +#: admin/templates/admin/logs.html:6 extensions/amavis/sql_listing.py:25 +#: extensions/webmail/lib.py:38 extensions/webmail/lib.py:411 +msgid "Date" +msgstr "Datum" + +#: admin/templates/admin/logs.html:7 +msgid "Level" +msgstr "Úroveň" + +#: admin/templates/admin/logs.html:8 +msgid "Logger" +msgstr "Zaznamenal" + +#: admin/templates/admin/logs.html:9 +msgid "Message" +msgstr "Zpráva" + +#: admin/templates/admin/mailboxes_raw.html:3 +msgid "Choose a value" +msgstr "Zvolte hodnotu" + +#: admin/templates/admin/mailform.html:3 +msgid "Use domain default value" +msgstr "Použít výchozí hodnotu domény" + +#: admin/templates/admin/parameters.html:3 +#: admin/templatetags/admin_extras.py:65 +msgid "Parameters" +msgstr "Parametry" + +#: admin/templates/admin/parameters.html:3 +msgid "Configure Modoboa" +msgstr "Nastavit Modoboa" + +#: admin/templates/admin/quotas.html:5 +msgid "Address" +msgstr "Adresa" + +#: admin/templates/admin/quotas.html:6 +msgid "Value" +msgstr "Hodnota" + +#: admin/templates/admin/quotas.html:7 +msgid "Limit" +msgstr "Omezení" + +#: admin/templates/admin/quotas.html:8 +#, python-format +msgid "Usage (%%)" +msgstr "Využití (%%)" + +#: admin/templates/admin/searchform.html:6 +msgid "Search" +msgstr "Hledat" + +#: admin/templates/admin/settings_header.html:3 +msgid "Modoboa settings" +msgstr "Nastavení Modoboa" + +#: admin/templatetags/admin_extras.py:13 +msgid "enabled_m" +msgstr "Aktivovaný" + +#: admin/templatetags/admin_extras.py:13 +msgid "enabled_f" +msgstr "Aktivovaná" + +#: admin/templatetags/admin_extras.py:36 +msgid "Modoboa" +msgstr "Modoboa" + +#: admin/templatetags/admin_extras.py:81 +msgid "Add domain" +msgstr "Přidat doménu" + +#: admin/templatetags/admin_extras.py:110 +msgid "List identities" +msgstr "Seznam identit" + +#: admin/templatetags/admin_extras.py:115 +msgid "List quotas" +msgstr "Seznam kvót" + +#: admin/templatetags/admin_extras.py:120 +msgid "Add account" +msgstr "Přidat účet" + +#: admin/templatetags/admin_extras.py:126 +msgid "Add alias" +msgstr "Přidat alias" + +#: admin/templatetags/admin_extras.py:132 +msgid "Add forward" +msgstr "Přidat přeposílání" + +#: admin/templatetags/admin_extras.py:138 +msgid "Add distribution list" +msgstr "Přidat distribuční seznam" + +#: admin/templatetags/admin_extras.py:171 +msgid "View the domain's identities" +msgstr "Zobrazit seznam identit domény" + +#: admin/templatetags/admin_extras.py:178 +#: admin/templatetags/admin_extras.py:194 +#: admin/templatetags/admin_extras.py:201 +#, python-format +msgid "Delete %s?" +msgstr "Smazat %s?" + +#: admin/templatetags/admin_extras.py:223 +msgid "Remove this permission" +msgstr "Odstranit toto oprávnění" + +#: admin/templatetags/admin_extras.py:264 lib/formutils.py:206 +msgid "Yes" +msgstr "Ano" + +#: admin/templatetags/admin_extras.py:264 lib/formutils.py:206 +msgid "No" +msgstr "Ne" + +#: auth/views.py:32 +#, python-format +msgid "User '%s' successfully logged in" +msgstr "Uživatel '%s' se úspěšně přihlásil" + +#: auth/views.py:44 +msgid "Your username and password didn't match. Please try again." +msgstr "" +"Vaše uživatelské jméno nebo heslo se neshodují. Zkuste to prosím znovu." + +#: auth/views.py:67 +#, python-format +msgid "User '%s' logged out" +msgstr "Uživatel '%s' se odhlásil" + +#: demo/__init__.py:17 +msgid "Test messages" +msgstr "Testovací zprávy" + +#: demo/__init__.py:22 +msgid "Send virus" +msgstr "Poslat vir" + +#: demo/__init__.py:25 +msgid "Send spam" +msgstr "Poslat spam" + +#: demo/views.py:17 demo/views.py:41 +msgid "Message sent" +msgstr "Zpráva odeslána" + +#: demo/templates/demo/login_announcement.html:2 +msgid "" +"\n" +"

                            Welcome to the online demo!

                            \n" +"

                            Warning: the demo's concent is resetted every two hours.

                            \n" +"

                            To try the demo, the following users are available (username/password):

                            \n" +"
                              \n" +"
                            • A super administrator : admin/password
                              • \n" +"
                            • A domain administrator : admin@demo.local/admin
                              • \n" +"
                            • A simple user : user@demo.local/user
                              • \n" +"
                            \n" +"

                            Please report any issue or give any suggestion to \n" +" the " +"mailing list.

                            \n" +msgstr "" +"\n" +"

                            Vítejte v online demo verzi!

                            \n" +"

                            Upozornění: obsah této demo verze je automaticky obnoven každé 2 " +"hodiny.

                            \n" +"

                            Pro vyzkoušení demo verze jsou dostupní tito uživatelé (jméno/heslo):

                            \n" +"
                              \n" +"
                            • Super správce : admin/password
                              • \n" +"
                            • Správce domény: admin@demo.local/admin
                              • \n" +"
                            • Uživatel: user@demo.local/user
                              • \n" +"
                            \n" +"

                            Nahlašte prosím jakékoli objevené problémy nebo vaše návrhy přes\n" +" emailový " +"seznam.

                            \n" + +#: extensions/amavis/__init__.py:22 +msgid "Simple amavis management frontend" +msgstr "Jednoduché rozhraní pro správu amavis" + +#: extensions/amavis/__init__.py:45 extensions/amavis/__init__.py:61 +msgid "Quarantine" +msgstr "Karanténa" + +#: extensions/amavis/__init__.py:129 +msgid "pending requests" +msgstr "nevyřízené požadavky" + +#: extensions/amavis/__init__.py:149 +#, python-format +msgid "%d pending requests" +msgstr "%d nevyřízených požadavků" + +#: extensions/amavis/__init__.py:161 +msgid "Content filter" +msgstr "Filtr obsahu" + +#: extensions/amavis/app_settings.py:11 +msgid "Quarantine settings" +msgstr "Nastavení karantény" + +#: extensions/amavis/app_settings.py:14 +msgid "Maximum message age" +msgstr "Maximální stáří zprávy" + +#: extensions/amavis/app_settings.py:16 +msgid "Quarantine messages maximum age (in days) before deletion" +msgstr "Maximální doba karantény zpráv (ve dnech) před jejich smazáním" + +#: extensions/amavis/app_settings.py:19 +msgid "Messages releasing" +msgstr "Odblokování zpráv" + +#: extensions/amavis/app_settings.py:22 +msgid "Remove released messages" +msgstr "Odstranit odblokované zprávy" + +#: extensions/amavis/app_settings.py:24 +msgid "Remove messages marked as released while cleaning up the database" +msgstr "" +"Odstranit zprávy, které jsou označeny jako odblokované, při čištění databáze" + +#: extensions/amavis/app_settings.py:28 +msgid "Amavis connection mode" +msgstr "Režim připojení amavis" + +#: extensions/amavis/app_settings.py:31 +msgid "Mode used to access the PDP server" +msgstr "Používaný režim pro přístup k PDP serveru" + +#: extensions/amavis/app_settings.py:36 +msgid "PDP server address" +msgstr "adresa PDP serveru" + +#: extensions/amavis/app_settings.py:38 +msgid "PDP server address (if inet mode)" +msgstr "adresa PDP serveru (v režimu inet)" + +#: extensions/amavis/app_settings.py:42 +msgid "PDP server port" +msgstr "port PDP serveru" + +#: extensions/amavis/app_settings.py:44 +msgid "PDP server port (if inet mode)" +msgstr "port PDP serveru (v režimu inet)" + +#: extensions/amavis/app_settings.py:48 +msgid "PDP server socket" +msgstr "socket PDP serveru" + +#: extensions/amavis/app_settings.py:50 +msgid "Path to the PDP server socket (if unix mode)" +msgstr "Cesta k socketu PDP serveru (v režimu unix)" + +#: extensions/amavis/app_settings.py:54 +msgid "Check requests interval" +msgstr "Interval kontroly požadavků" + +#: extensions/amavis/app_settings.py:56 +msgid "Interval between two release requests checks" +msgstr "" +"Časový interval mezi jednotlivými kontrolami na požadavky pro odblokování" + +#: extensions/amavis/app_settings.py:60 +msgid "Allow direct release" +msgstr "Umožnit přímé odbokování" + +#: extensions/amavis/app_settings.py:62 +msgid "Allow users to directly release their messages" +msgstr "Umožnit napřímo uživatelům doblokovat jejich zprávy" + +#: extensions/amavis/app_settings.py:66 +msgid "Enable self-service mode" +msgstr "Povolit samoobslužný režim" + +#: extensions/amavis/app_settings.py:68 +msgid "Activate the 'self-service' mode" +msgstr "Aktivovat samoobslužný režim" + +#: extensions/amavis/app_settings.py:72 +msgid "Notifications sender" +msgstr "Odesílatel upozornění" + +#: extensions/amavis/app_settings.py:74 +msgid "The e-mail address used to send notitications" +msgstr "E-mailová adresa používaná k zasílání upozornění" + +#: extensions/amavis/app_settings.py:87 extensions/webmail/app_settings.py:73 +#: userprefs/app_settings.py:18 +msgid "Display" +msgstr "Zobrazení" + +#: extensions/amavis/app_settings.py:91 extensions/webmail/app_settings.py:91 +msgid "Number of displayed emails per page" +msgstr "Počet zobrazených zpráv na stránce" + +#: extensions/amavis/app_settings.py:92 +msgid "Set the maximum number of messages displayed in a page" +msgstr "Nastavit maximální počet zobrazených zpráv na stránce" + +#: extensions/amavis/lib.py:53 +#, python-format +msgid "Connection to amavis failed: %s" +msgstr "Spojení s amavis selhalo: %s" + +#: extensions/amavis/models.py:93 +msgid "Virus filter" +msgstr "Filtr virů" + +#: extensions/amavis/models.py:94 extensions/amavis/models.py:102 +#: extensions/amavis/models.py:110 extensions/sievefilters/views.py:281 +msgid "yes" +msgstr "ano" + +#: extensions/amavis/models.py:95 extensions/amavis/models.py:103 +#: extensions/amavis/models.py:111 extensions/sievefilters/views.py:285 +msgid "no" +msgstr "ne" + +#: extensions/amavis/models.py:96 extensions/amavis/models.py:104 +#: extensions/amavis/models.py:112 +#: extensions/amavis/templates/amavis/domain_content_filter.html:11 +msgid "default" +msgstr "výchozí" + +#: extensions/amavis/models.py:98 +msgid "Bypass virus checks or not. Choose 'default' to use global settings." +msgstr "" +"Obcházet nebo neobcházet kontrolu zpráv na viry. Pokud zvolíte 'výchozí', " +"bude se nastavení řídit globálním nastavením." + +#: extensions/amavis/models.py:101 +msgid "Spam filter" +msgstr "Filtr nevyžádané pošty" + +#: extensions/amavis/models.py:106 +msgid "Bypass spam checks or not. Choose 'default' to use global settings." +msgstr "" +"Obcházet nebo neobcházet kontrolu zpráv na nevyžádanou poštu. Pokud zvolíte " +"'výchozí', bude se nastavení řídit globálním nastavením." + +#: extensions/amavis/models.py:109 +msgid "Banned filter" +msgstr "Filtr zakázané pošty" + +#: extensions/amavis/models.py:114 +msgid "Bypass banned checks or not. Choose 'default' to use global settings." +msgstr "" +"Obcházet nebo neobcházet kontrolu zpráv na zakázanou poštu. Pokud zvolíte " +"'výchozí', bude se nastavení řídit globálním nastavením." + +#: extensions/amavis/models.py:144 +msgid "Spam marker" +msgstr "Označení spamu" + +#: extensions/amavis/models.py:146 +msgid "" +"Modify spam subject using the specified text. Choose 'default' to use global " +"settings." +msgstr "" +"Upravit předmět nevyžádané zprávy uvedeným textem. Pro zachování globálního " +"nastavení serveru zatrhněte 'výchozí'." + +#: extensions/amavis/sql_listing.py:23 extensions/webmail/lib.py:37 +msgid "From" +msgstr "Od" + +#: extensions/amavis/sql_listing.py:24 extensions/sievefilters/forms.py:68 +#: extensions/webmail/forms.py:10 extensions/webmail/lib.py:36 +#: extensions/webmail/lib.py:409 templates/common/email_searchbar.html:6 +msgid "Subject" +msgstr "Předmět" + +#: extensions/amavis/sql_listing.py:26 +#: extensions/amavis/templatetags/amextras.py:102 +#: extensions/webmail/forms.py:7 +msgid "To" +msgstr "Komu" + +#: extensions/amavis/views.py:43 +msgid "Empty quarantine" +msgstr "Vyprázdnit karanténu" + +#: extensions/amavis/views.py:211 +msgid "Message deleted" +msgstr "Zpráva smazána" + +#: extensions/amavis/views.py:232 +#, python-format +msgid "%(count)d message deleted successfully" +msgid_plural "%(count)d messages deleted successfully" +msgstr[0] "%(count)d zpráva úspěšně smazána" +msgstr[1] "%(count)d zprávy úspěšně smazány" +msgstr[2] "%(count)d zpráv úspěšně smazáno" + +#: extensions/amavis/views.py:252 +msgid "Request sent" +msgstr "Požadavek odeslán" + +#: extensions/amavis/views.py:258 +msgid "Message released" +msgstr "Zprávy odblokována" + +#: extensions/amavis/views.py:280 +#, python-format +msgid "%(count)d request sent" +msgid_plural "%(count)d requests sent" +msgstr[0] "%(count)d požadavek odeslán" +msgstr[1] "%(count)d požadavky odeslány" +msgstr[2] "%(count)d požadavků odesláno" + +#: extensions/amavis/views.py:304 +#, python-format +msgid "%(count)d message released successfully" +msgid_plural "%(count)d messages released successfully" +msgstr[0] "%(count)d zpráva úspěšně odblokována" +msgstr[1] "%(count)d zprávy úspěšně odblokovány" +msgstr[2] "%(count)d zpráv úspěšně odblokováno" + +#: extensions/amavis/management/commands/amnotify.py:57 +msgid "[modoboa] Pending release requests" +msgstr "[modoboa] Nevyřízené požadavky na odblokování" + +#: extensions/amavis/templates/amavis/domain_content_filter.html:5 +msgid "Thresholds" +msgstr "Mezní hodnoty" + +#: extensions/amavis/templates/amavis/domain_content_filter.html:7 +msgid "or more is spam" +msgstr "nebo více je spam" + +#: extensions/amavis/templates/amavis/domain_content_filter.html:8 +msgid "or more throw spam message away" +msgstr "nebo více zahodí spam zprávu" + +#: extensions/amavis/templates/amavis/index.html:2 +msgid "Quarantine management" +msgstr "Nastavení karantény" + +#: extensions/amavis/templates/amavis/notifications/pending_requests.html:1 +#, python-format +msgid "" +"\n" +"%(counter)s release request is pending for action.\n" +msgid_plural "" +"\n" +"%(counter)s release requests are pending for action.\n" +msgstr[0] "" +"\n" +"%(counter)s požadavek na odblokování čeká na vyřízení.\n" +msgstr[1] "" +"\n" +"%(counter)s požadavky na odblokování čekají na vyřízení.\n" +msgstr[2] "" +"\n" +"%(counter)s požadavků na odblokování čeká na vyřízení.\n" + +#: extensions/amavis/templates/amavis/notifications/pending_requests.html:6 +msgid "Sketch:" +msgstr "Náhled:" + +#: extensions/amavis/templates/amavis/notifications/pending_requests.html:8 +msgid "From:" +msgstr "Od:" + +#: extensions/amavis/templates/amavis/notifications/pending_requests.html:9 +msgid "To:" +msgstr "Komu:" + +#: extensions/amavis/templates/amavis/notifications/pending_requests.html:10 +msgid "Date:" +msgstr "Datum:" + +#: extensions/amavis/templates/amavis/notifications/pending_requests.html:11 +msgid "Subject:" +msgstr "Předmět" + +#: extensions/amavis/templates/amavis/notifications/pending_requests.html:12 +msgid "Act on this message:" +msgstr "Úkony na zprávě:" + +#: extensions/amavis/templates/amavis/notifications/pending_requests.html:14 +#, python-format +msgid "Please visit %(listingurl)s for a full listing." +msgstr "Navštivte stránku %(listingurl)s pro zobrazení kompletního seznamu." + +#: extensions/amavis/templatetags/amextras.py:20 +#: extensions/amavis/templatetags/amextras.py:52 +#: extensions/amavis/templatetags/amextras.py:72 +msgid "Release" +msgstr "Odblokovat" + +#: extensions/amavis/templatetags/amextras.py:26 +#: extensions/amavis/templatetags/amextras.py:59 +#: extensions/amavis/templatetags/amextras.py:77 +#: extensions/webmail/templatetags/webextras.py:31 +msgid "Delete" +msgstr "Smazat" + +#: extensions/amavis/templatetags/amextras.py:29 +msgid "View full headers" +msgstr "Zobrazit úplné záhlaví" + +#: extensions/amavis/templatetags/amextras.py:80 +msgid "Content Class" +msgstr "Třída obsahu" + +#: extensions/amavis/templatetags/amextras.py:84 +msgid "Nothing" +msgstr "Nic" + +#: extensions/amavis/templatetags/amextras.py:87 +msgid "Spam" +msgstr "Spam" + +#: extensions/amavis/templatetags/amextras.py:90 +msgid "Virus" +msgstr "Vir" + +#: extensions/amavis/templatetags/amextras.py:93 +msgid "Bad header" +msgstr "Chybné záhlaví" + +#: extensions/amavis/templatetags/amextras.py:96 +msgid "Bad MIME" +msgstr "Špatný MIME" + +#: extensions/limits/__init__.py:23 +msgid "" +"Per administrator resources to limit the number of objects they can create" +msgstr "" +"Každému správci dostupné zdroje omezující počet objektů, které mohou správci " +"vytvořit" + +#: extensions/limits/__init__.py:54 +msgid "Limits" +msgstr "Omezení" + +#: extensions/limits/__init__.py:65 +msgid "Reseller" +msgstr "Distributor" + +#: extensions/limits/__init__.py:94 +msgid "Resources" +msgstr "Zdroje" + +#: extensions/limits/app_settings.py:10 +msgid "Default limits" +msgstr "Výchozí omezení" + +#: extensions/limits/app_settings.py:13 extensions/limits/forms.py:12 +#: extensions/limits/models.py:11 +msgid "Domain admins" +msgstr "Správci domén" + +#: extensions/limits/app_settings.py:15 +msgid "Maximum number of allowed domain administrators for a new administrator" +msgstr "Maximální povolený počet správců domény (nastavení nového správce)" + +#: extensions/limits/app_settings.py:21 +msgid "Maximum number of allowed domains for a new administrator" +msgstr "Maximální povolený počet domén (nastavení nového správce)" + +#: extensions/limits/app_settings.py:27 +msgid "Maximum number of allowed domain aliases for a new administrator" +msgstr "Maximální povolený počet doménových aliasů (nastavení nového správce)" + +#: extensions/limits/app_settings.py:33 +msgid "Maximum number of allowed mailboxes for a new administrator" +msgstr "Maximální povolený počet schránek (nastavení nového správce)" + +#: extensions/limits/app_settings.py:39 +msgid "Maximum number of allowed aliases for a new administrator" +msgstr "Maximální povolený počet aliasů (nastavení nového správce)" + +#: extensions/limits/forms.py:13 +msgid "Maximum number of domain administrators this user can create" +msgstr "" +"Maximální povolený počet správců domény, které může tento uživatel vytvořit" + +#: extensions/limits/forms.py:17 +msgid "Maximum number of domains this user can create" +msgstr "Maximální povolený počet domén, které může tento uživatel vytvořit" + +#: extensions/limits/forms.py:21 +msgid "Maximum number of domain aliases this user can create" +msgstr "" +"Maximální povolený počet doménových aliasů, které může tento uživatel " +"vytvořit" + +#: extensions/limits/forms.py:25 +msgid "Maximum number of mailboxes this user can create" +msgstr "Maximální povolený počet schránek, které může tento uživatel vytvořit" + +#: extensions/limits/forms.py:29 +msgid "Maximum number of mailbox aliases this user can create" +msgstr "" +"Maximální povolený počet aliasů chránek, které může tento uživatel vytvořit" + +#: extensions/limits/forms.py:46 +msgid "Invalid limit" +msgstr "Neplatné omezení" + +#: extensions/limits/forms.py:74 +msgid "Your resources are not initialized yet" +msgstr "Vaše zdroje nebyly dosud definovány" + +#: extensions/limits/forms.py:78 +msgid "You're not allowed to define unlimited values" +msgstr "Nemáte oprávnění nastavovat neomezené hodnoty" + +#: extensions/limits/lib.py:16 +#, python-format +msgid "%s: limit reached" +msgstr "%s: limit byl dosažen" + +#: extensions/limits/lib.py:23 +msgid "Not enough resources" +msgstr "Nedostatek zdrojů" + +#: extensions/limits/models.py:103 +msgid "undefined" +msgstr "nedefinováno" + +#: extensions/limits/models.py:105 +msgid "unlimited" +msgstr "neomezeno" + +#: extensions/limits/templates/limits/poolusage.html:4 +msgid "Resources usage" +msgstr "Využití zdrojů" + +#: extensions/postfix_autoreply/__init__.py:20 +msgid "Auto-reply (vacation) functionality using Postfix" +msgstr "Funkce automatické odpovědi (vacation) Postfix" + +#: extensions/postfix_autoreply/__init__.py:41 +msgid "Automatic replies" +msgstr "Automatické odpovědi" + +#: extensions/postfix_autoreply/__init__.py:79 +#: extensions/postfix_autoreply/templates/postfix_autoreply/autoreply.html:2 +msgid "Auto-reply message" +msgstr "Automatická odpověď" + +#: extensions/postfix_autoreply/app_settings.py:14 +msgid "Automatic reply timeout" +msgstr "Interval automatické odpovědi" + +#: extensions/postfix_autoreply/app_settings.py:16 +msgid "Timeout in seconds between two auto-replies to the same recipient" +msgstr "" +"Interval v sekundách mezi dvěmi automatickými odpověďmi stejnému příjemci" + +#: extensions/postfix_autoreply/forms.py:9 +msgid "Until" +msgstr "Do" + +#: extensions/postfix_autoreply/forms.py:11 +msgid "Activate your auto reply until this date" +msgstr "Povolit automatické odpovědi až do uvedeného data" + +#: extensions/postfix_autoreply/forms.py:25 +msgid "This date is over" +msgstr "Zvolené datum je v minulosti" + +#: extensions/postfix_autoreply/models.py:19 +msgid "subject" +msgstr "předmět" + +#: extensions/postfix_autoreply/models.py:20 +msgid "The subject that will appear in sent emails" +msgstr "Předmět, který se vloží do odesílaných emailů" + +#: extensions/postfix_autoreply/models.py:23 +msgid "content" +msgstr "obsah" + +#: extensions/postfix_autoreply/models.py:24 +msgid "The content that will appear in sent emails" +msgstr "Obsah, který se vloží do odesílaných emailů" + +#: extensions/postfix_autoreply/models.py:28 +msgid "Activate/Deactivate your auto reply" +msgstr "Povolit/Zakázat automatickou odpověď" + +#: extensions/postfix_autoreply/views.py:37 +msgid "Auto reply message updated successfully." +msgstr "Automatická odpověď byla aktualizována." + +#: extensions/postfix_autoreply/templates/postfix_autoreply/autoreply.html:2 +msgid "Define a message to automatically send when you are off" +msgstr "Vložte zprávu, která se během vaší nepřítomnosti automaticky odešle" + +#: extensions/sievefilters/__init__.py:12 +msgid "Plugin to easily create server-side filters" +msgstr "Doplněk pro jednoduchou tvorbu filtrů zpráv na serveru" + +#: extensions/sievefilters/__init__.py:17 +msgid "Sieve filters" +msgstr "Sieve filtry" + +#: extensions/sievefilters/__init__.py:18 +#: extensions/sievefilters/__init__.py:36 +#: extensions/sievefilters/templates/sievefilters/index.html:2 +msgid "Message filters" +msgstr "Filtry zpráv" + +#: extensions/sievefilters/app_settings.py:19 +msgid "ManageSieve settings" +msgstr "Nastavení ManageSieve" + +#: extensions/sievefilters/app_settings.py:24 +msgid "Address of your MANAGESIEVE server" +msgstr "Adresa vašeho serveru ManegeSieve" + +#: extensions/sievefilters/app_settings.py:30 +msgid "Listening port of your MANAGESIEVE server" +msgstr "Port, na kterém naslouchá váš ManageSieve server" + +#: extensions/sievefilters/app_settings.py:34 +msgid "Connect using STARTTLS" +msgstr "Připojit pomocí STARTTLS" + +#: extensions/sievefilters/app_settings.py:36 +msgid "Use the STARTTLS extension" +msgstr "Použít rozšíření STARTTLS" + +#: extensions/sievefilters/app_settings.py:40 +msgid "Authentication mechanism" +msgstr "Režim ověření" + +#: extensions/sievefilters/app_settings.py:43 +msgid "Prefered authentication mechanism" +msgstr "Preferovaný režim ověření" + +#: extensions/sievefilters/app_settings.py:54 +msgid "Editor mode" +msgstr "Režim úpravy" + +#: extensions/sievefilters/app_settings.py:56 +msgid "Select the mode you want the editor to work in" +msgstr "Zvolte režim editoru textu, ve kterém si přejete pracovat" + +#: extensions/sievefilters/forms.py:14 +msgid "Check to activate this filters set" +msgstr "Zatrhněte pole pro povolení této sady filtrů" + +#: extensions/sievefilters/forms.py:55 +msgid "All of the following" +msgstr "Všechna pravidla" + +#: extensions/sievefilters/forms.py:56 +msgid "Any of the following" +msgstr "Alespoň jedno z pravidel" + +#: extensions/sievefilters/forms.py:57 +msgid "All messages" +msgstr "Všechny zprávy" + +#: extensions/sievefilters/forms.py:62 +msgid "contains" +msgstr "obsahuje" + +#: extensions/sievefilters/forms.py:63 +msgid "does not contain" +msgstr "neobsahuje" + +#: extensions/sievefilters/forms.py:64 +msgid "is" +msgstr "je" + +#: extensions/sievefilters/forms.py:65 +msgid "is not" +msgstr "není" + +#: extensions/sievefilters/forms.py:69 +msgid "Sender" +msgstr "Odesílatel" + +#: extensions/sievefilters/forms.py:70 +msgid "Recipient" +msgstr "Příjemce" + +#: extensions/sievefilters/forms.py:71 extensions/webmail/forms.py:8 +msgid "Cc" +msgstr "Kopie" + +#: extensions/sievefilters/forms.py:72 +msgid "Size" +msgstr "Velikost" + +#: extensions/sievefilters/forms.py:73 +msgid "is greater than" +msgstr "Je větší než" + +#: extensions/sievefilters/forms.py:74 +msgid "is less than" +msgstr "Je menší než" + +#: extensions/sievefilters/forms.py:78 +msgid "Move message to" +msgstr "Přesunout zprávu do" + +#: extensions/sievefilters/forms.py:80 +msgid "Redirect message to" +msgstr "Přesměrovat zprávu na" + +#: extensions/sievefilters/lib.py:37 +msgid "Connection to MANAGESIEVE server failed, check your configuration" +msgstr "Spojení se serverem ManageSieve selhalo, zkontrolujte nastavení" + +#: extensions/sievefilters/lib.py:82 +msgid "Not enough space on server" +msgstr "Nedostatek prostoru na serveru" + +#: extensions/sievefilters/views.py:68 +msgid "Failed to retrieve filters set" +msgstr "Nebylo možné získat sadu filtrů" + +#: extensions/sievefilters/views.py:126 +#: extensions/sievefilters/templatetags/sfilters_tags.py:33 +msgid "New filter" +msgstr "Nový filtr" + +#: extensions/sievefilters/views.py:133 +msgid "Filter created" +msgstr "Filtr vytvořen" + +#: extensions/sievefilters/views.py:145 +#: extensions/sievefilters/templatetags/sfilters_tags.py:77 +msgid "Edit filter" +msgstr "Upravit filtr" + +#: extensions/sievefilters/views.py:154 +msgid "Filter modified" +msgstr "Filtr upraven" + +#: extensions/sievefilters/views.py:176 +msgid "Filter removed" +msgstr "Filtr odstraněn" + +#: extensions/sievefilters/views.py:177 +msgid "Failed to remove filter" +msgstr "Nezdařilo se odstranit filtr" + +#: extensions/sievefilters/views.py:191 +msgid "Filters set saved" +msgstr "Sada filtrů uložena" + +#: extensions/sievefilters/views.py:196 +msgid "Create a new filters set" +msgstr "Vytvořit novou sadu filtrů" + +#: extensions/sievefilters/views.py:219 +msgid "Filters set created" +msgstr "Sada filtrů vytvořena" + +#: extensions/sievefilters/views.py:240 +msgid "Filters set deleted" +msgstr "Sada filtrů vymazána" + +#: extensions/sievefilters/views.py:252 +msgid "Filters set activated" +msgstr "Sada filtrů povolena" + +#: extensions/sievefilters/templates/sievefilters/filter.html:6 +msgid "Conditions" +msgstr "Podmínky" + +#: extensions/sievefilters/templates/sievefilters/guieditor.html:7 +msgid "Active" +msgstr "Aktivní" + +#: extensions/sievefilters/templates/sievefilters/guieditor.html:24 +msgid "No filter defined yet" +msgstr "Dosud nebyl vytvořen žádný filtr" + +#: extensions/sievefilters/templates/sievefilters/index.html:56 +msgid "Filter sets" +msgstr "Sady filtrů" + +#: extensions/sievefilters/templates/sievefilters/index.html:60 +msgid "active" +msgstr "aktivní" + +#: extensions/sievefilters/templates/sievefilters/index.html:74 +msgid "" +"No filters set defined yet. You must create one in order to define filters." +msgstr "" +"Dosud nebyla vytvořena žádná sada filtrů. Aby bylo možné vytvořit filtry, je " +"nejprve potřeba vytvořit sadu filtrů." + +#: extensions/sievefilters/templatetags/sfilters_tags.py:16 +msgid "New filters set" +msgstr "Nová sada filtrů" + +#: extensions/sievefilters/templatetags/sfilters_tags.py:44 +msgid "Save filters set" +msgstr "Uložit sadu filtrů" + +#: extensions/sievefilters/templatetags/sfilters_tags.py:52 +msgid "Activate filters set" +msgstr "Aktitovat sadu filtrů" + +#: extensions/sievefilters/templatetags/sfilters_tags.py:57 +msgid "Remove filters set" +msgstr "Odstranit sadu filtrů" + +#: extensions/sievefilters/templatetags/sfilters_tags.py:62 +msgid "Download" +msgstr "Stáhnout" + +#: extensions/sievefilters/templatetags/sfilters_tags.py:85 +msgid "Remove this filter" +msgstr "Odstranit tento filtr" + +#: extensions/sievefilters/templatetags/sfilters_tags.py:93 +msgid "Move this filter up" +msgstr "Posunout tento filtr nahoru" + +#: extensions/sievefilters/templatetags/sfilters_tags.py:101 +msgid "Move this filter down" +msgstr "Posunout tento filtr dolů" + +#: extensions/stats/__init__.py:20 +msgid "Graphical statistics about emails traffic using RRDtool" +msgstr "Grafické statistiky emailového provozu s použitím RRDtool" + +#: extensions/stats/__init__.py:26 +#: extensions/stats/templates/stats/index.html:2 +msgid "Graphical statistics" +msgstr "Grafické statistiky" + +#: extensions/stats/__init__.py:40 +msgid "Statistics" +msgstr "Statistiky" + +#: extensions/stats/app_settings.py:14 +msgid "Path to the log file" +msgstr "Cesta k souboru záznamů" + +#: extensions/stats/app_settings.py:16 +msgid "Path to log file used to collect statistics" +msgstr "" +"Cesta k souboru záznamů, který se používá pro sběr statistických informací" + +#: extensions/stats/app_settings.py:20 +msgid "Directory to store RRD files" +msgstr "Adresář pro ukládání RRD souborů" + +#: extensions/stats/app_settings.py:22 +msgid "Path to directory where RRD files are stored" +msgstr "Cesta k adresáři, ve kterém budou ukládány RRD soubory" + +#: extensions/stats/app_settings.py:26 +msgid "Directory to store PNG files" +msgstr "Adresář pro ukládání PNG souborů" + +#: extensions/stats/app_settings.py:28 +msgid "Path to directory where PNG files are stored" +msgstr "Cesta k adresáři, ve kterém budou ukládány PNG soubory" + +#: extensions/stats/graph_templates.py:20 +msgid "Average normal traffic" +msgstr "Průměrný běžný provoz" + +#: extensions/stats/graph_templates.py:21 +#: extensions/stats/graph_templates.py:33 +msgid "msgs/min" +msgstr "zpráv/min" + +#: extensions/stats/graph_templates.py:26 +msgid "sent messages" +msgstr "odeslané zprávy" + +#: extensions/stats/graph_templates.py:28 +msgid "received messages" +msgstr "přijaté zprávy" + +#: extensions/stats/graph_templates.py:32 +msgid "Average bad traffic" +msgstr "Průměrný závadný provoz" + +#: extensions/stats/graph_templates.py:38 +msgid "bounced messages" +msgstr "nedoručené zprávy" + +#: extensions/stats/graph_templates.py:40 +msgid "rejected messages" +msgstr "odmítnuté zprávy" + +#: extensions/stats/graph_templates.py:44 +msgid "Average normal traffic size" +msgstr "Průměrná velikost běžného provozu" + +#: extensions/stats/graph_templates.py:45 +msgid "bytes/min" +msgstr "Bajtů/min" + +#: extensions/stats/graph_templates.py:50 +msgid "received size" +msgstr "doručená velikost" + +#: extensions/stats/graph_templates.py:52 +msgid "sent size" +msgstr "odeslaná velikost" + +#: extensions/stats/graph_templates.py:73 +msgid "Mail traffic" +msgstr "Provoz emailů" + +#: extensions/stats/grapher.py:9 +msgid "Day" +msgstr "Den" + +#: extensions/stats/grapher.py:10 +msgid "Week" +msgstr "Týden" + +#: extensions/stats/grapher.py:11 +msgid "Month" +msgstr "Měsíc" + +#: extensions/stats/grapher.py:12 +msgid "Year" +msgstr "Rok" + +#: extensions/stats/grapher.py:59 +msgid "Total" +msgstr "Celkem" + +#: extensions/stats/views.py:21 extensions/stats/templates/stats/graphs.html:4 +msgid "No statistics available" +msgstr "Žádné statistiky nejsou dostupné" + +#: extensions/stats/views.py:39 +msgid "Unknown graphic set" +msgstr "Nastaveno neznámé zobrazení" + +#: extensions/stats/views.py:61 +msgid "Bad custom period" +msgstr "Neplatně nastavený vlastní časový interval" + +#: extensions/stats/templates/stats/index.html:33 +msgid "Search a domain" +msgstr "Hledat doménu" + +#: extensions/stats/templates/stats/index.html:37 +msgid "Predefined time ranges" +msgstr "Předdefinované časové intervaly" + +#: extensions/stats/templates/stats/index.html:44 +msgid "Custom time range" +msgstr "Vlastní časový interval" + +#: extensions/stats/templates/stats/index.html:55 +msgid "Apply" +msgstr "Uložit" + +#: extensions/webmail/__init__.py:12 +msgid "Simple IMAP webmail" +msgstr "Jednoduchý IMAP webmail" + +#: extensions/webmail/__init__.py:35 +msgid "Webmail" +msgstr "Webmail" + +#: extensions/webmail/app_settings.py:14 +msgid "Maximum attachment size" +msgstr "Maximální velikost přílohy" + +#: extensions/webmail/app_settings.py:16 +msgid "Maximum attachment size in bytes (or KB, MB, GB if specified)" +msgstr "" +"Maximální velikost přílohy v Bajtech (nebo KB, MB, GB, pokud je uvedeno)" + +#: extensions/webmail/app_settings.py:19 +msgid "IMAP settings" +msgstr "Nastavení IMAP" + +#: extensions/webmail/app_settings.py:24 +msgid "Address of your IMAP server" +msgstr "Adresa vašeho IMAP serveru" + +#: extensions/webmail/app_settings.py:30 +msgid "Use a secured connection to access IMAP server" +msgstr "Použít zabezpečené připojení pro přístup k IMAP serveru" + +#: extensions/webmail/app_settings.py:36 +msgid "Listening port of your IMAP server" +msgstr "Port, na kterém naslouchá váš IMAP server" + +#: extensions/webmail/app_settings.py:39 +msgid "SMTP settings" +msgstr "Nastavení SMTP" + +#: extensions/webmail/app_settings.py:44 +msgid "Address of your SMTP server" +msgstr "Adresa vašeho SMTP serveru" + +#: extensions/webmail/app_settings.py:48 +msgid "Secured connection mode" +msgstr "Režim zabezpečeného připojení" + +#: extensions/webmail/app_settings.py:49 +msgid "None" +msgstr "Nic" + +#: extensions/webmail/app_settings.py:53 +msgid "Use a secured connection to access SMTP server" +msgstr "Použít zabezpečené připojení pro přístup k SMTP serveru" + +#: extensions/webmail/app_settings.py:60 +msgid "Listening port of your SMTP server" +msgstr "Port, na kterém naslouchá váš SMTP server" + +#: extensions/webmail/app_settings.py:64 +msgid "Authentication required" +msgstr "Ověření vyžadováno" + +#: extensions/webmail/app_settings.py:66 +msgid "Server needs authentication" +msgstr "Server vyžaduje ověření" + +#: extensions/webmail/app_settings.py:77 +msgid "Default message display mode" +msgstr "Výchozí režim zobrazení zprávy" + +#: extensions/webmail/app_settings.py:79 +msgid "The default mode used when displaying a message" +msgstr "Výchozí režim, který se použije pro zobrazení zprávy" + +#: extensions/webmail/app_settings.py:85 +msgid "Enable HTML links display" +msgstr "Povolit zobrazení HTML odkazů" + +#: extensions/webmail/app_settings.py:86 +msgid "Enable/Disable HTML links display" +msgstr "Povolit/Zakázat zobrazení HTML odkazů" + +#: extensions/webmail/app_settings.py:92 +msgid "Sets the maximum number of messages displayed in a page" +msgstr "Nastavuje maximální počet zobrazených zpráv na stránce" + +#: extensions/webmail/app_settings.py:97 +msgid "Listing refresh rate" +msgstr "Automatické obnovení stránky" + +#: extensions/webmail/app_settings.py:98 +msgid "Automatic folder refresh rate (in seconds)" +msgstr "Automatické načítání obsahu složky (v sekundách)" + +#: extensions/webmail/app_settings.py:105 +msgid "Trash folder" +msgstr "Složka koše" + +#: extensions/webmail/app_settings.py:106 +msgid "Folder where deleted messages go" +msgstr "Složka pro smazané zprávy" + +#: extensions/webmail/app_settings.py:111 +msgid "Sent folder" +msgstr "Složka odeslané pošty" + +#: extensions/webmail/app_settings.py:112 +msgid "Folder where copies of sent messages go" +msgstr "Složka pro kopie odeslaných zpráv" + +#: extensions/webmail/app_settings.py:117 +msgid "Drafts folder" +msgstr "Složka konceptů" + +#: extensions/webmail/app_settings.py:118 +msgid "Folder where drafts go" +msgstr "Složka pro koncepty zpráv" + +#: extensions/webmail/app_settings.py:121 +msgid "Composing messages" +msgstr "Vytváření zpráv" + +#: extensions/webmail/app_settings.py:125 +msgid "Default editor" +msgstr "Výchozí editor" + +#: extensions/webmail/app_settings.py:127 +msgid "The default editor to use when composing a message" +msgstr "Výchozí editor textu, který se použije pro vytváření zpráv" + +#: extensions/webmail/app_settings.py:133 +msgid "Signature text" +msgstr "Text podpisu" + +#: extensions/webmail/app_settings.py:134 +msgid "User defined email signature" +msgstr "Emailový podpis uživatele" + +#: extensions/webmail/exceptions.py:19 +msgid "Server response" +msgstr "Odpověď serveru" + +#: extensions/webmail/forms.py:9 +msgid "Cci" +msgstr "BCC" + +#: extensions/webmail/imaputils.py:237 +msgid "Failed to retrieve hierarchy delimiter" +msgstr "Nebylo možné zjistit hierarchický oddělovač" + +#: extensions/webmail/imaputils.py:278 +#, python-format +msgid "Connection to IMAP server failed: %s" +msgstr "Spojení se serverem IMAP selhalo: %s" + +#: extensions/webmail/lib.py:358 +msgid "wrote:" +msgstr "napsal/a:" + +#: extensions/webmail/lib.py:423 extensions/webmail/lib.py:427 +msgid "Original message" +msgstr "Původní zpráva" + +#: extensions/webmail/views.py:86 +#, python-format +msgid "%(count)d message deleted" +msgid_plural "%(count)d messages deleted" +msgstr[0] "%(count)d zpráva smazána" +msgstr[1] "%(count)d zprávy smazány" +msgstr[2] "%(count)d zpráv smazáno" + +#: extensions/webmail/views.py:103 +msgid "Unknown action" +msgstr "Neznámá akce" + +#: extensions/webmail/views.py:116 lib/email_listing.py:137 +msgid "Empty mailbox" +msgstr "Vyprázdnit schránku" + +#: extensions/webmail/views.py:133 +#: extensions/webmail/templatetags/webextras.py:170 +msgid "Create a new mailbox" +msgstr "Vytvořit novou schránku" + +#: extensions/webmail/views.py:149 +msgid "Mailbox created" +msgstr "Schránka vytvořena" + +#: extensions/webmail/views.py:165 +msgid "Edit mailbox" +msgstr "Upravit schránku" + +#: extensions/webmail/views.py:180 +msgid "Mailbox updated" +msgstr "Schránka aktualizována" + +#: extensions/webmail/views.py:214 extensions/webmail/views.py:396 +#: extensions/webmail/views.py:505 +msgid "Bad request" +msgstr "Neplatný požadavek" + +#: extensions/webmail/views.py:246 +msgid "Failed to save attachment: " +msgstr "Nebylo možné uložit přílohu:" + +#: extensions/webmail/views.py:249 +#, python-format +msgid "Attachment is too big (limit: %s)" +msgstr "Příloha je příliš velká (omezení: %s)" + +#: extensions/webmail/views.py:255 +#: extensions/webmail/templates/webmail/compose.html:15 +#: extensions/webmail/templates/webmail/headers.html:4 +msgid "Attachments" +msgstr "Přílohy" + +#: extensions/webmail/views.py:271 +msgid "Bad query" +msgstr "Neplatný dotaz" + +#: extensions/webmail/views.py:281 +msgid "Failed to remove attachment: " +msgstr "Nebylo možné odstranit přílohu:" + +#: extensions/webmail/views.py:286 +msgid "Unknown attachment" +msgstr "Neznámá příloha" + +#: extensions/webmail/views.py:501 +msgid "Undefined action" +msgstr "Neznámá akce" + +#: extensions/webmail/templates/webmail/attachments.html:6 +msgid "Attach" +msgstr "Připojit" + +#: extensions/webmail/templates/webmail/attachments.html:9 +msgid "Uploading.." +msgstr "Nahrávám.." + +#: extensions/webmail/templates/webmail/compose.html:7 +msgid "Add Cc field" +msgstr "Přidat pole CC" + +#: extensions/webmail/templates/webmail/compose.html:7 +msgid "Add Cci field" +msgstr "Přidat pole BCC" + +#: extensions/webmail/templates/webmail/compose.html:18 +#, python-format +msgid "%(counter)s file" +msgid_plural "%(counter)s files" +msgstr[0] "%(counter)s soubor" +msgstr[1] "%(counter)s soubory" +msgstr[2] "%(counter)s souborů" + +#: extensions/webmail/templates/webmail/folder.html:6 +msgid "Parent mailbox" +msgstr "Nadřazená schránka" + +#: extensions/webmail/templates/webmail/index.html:38 +msgid "Mailbox quota" +msgstr "Kvóta schránky" + +#: extensions/webmail/templatetags/webextras.py:19 +msgid "Reply" +msgstr "Odpovědět" + +#: extensions/webmail/templatetags/webextras.py:23 +msgid "Reply all" +msgstr "Odpovědět všem" + +#: extensions/webmail/templatetags/webextras.py:27 +#: userprefs/templates/userprefs/forward.html:2 +#: userprefs/templatetags/uprefs_extras.py:27 +msgid "Forward" +msgstr "Přeposlat" + +#: extensions/webmail/templatetags/webextras.py:33 +msgid "Display options" +msgstr "Možnosti zobrazení" + +#: extensions/webmail/templatetags/webextras.py:36 +msgid "Activate links" +msgstr "Povolit odkazy" + +#: extensions/webmail/templatetags/webextras.py:38 +msgid "Disable links" +msgstr "Zakákaz odkazy" + +#: extensions/webmail/templatetags/webextras.py:47 +msgid "Close this message" +msgstr "Zavřít tuto zprávu" + +#: extensions/webmail/templatetags/webextras.py:60 +msgid "Back" +msgstr "Zpět" + +#: extensions/webmail/templatetags/webextras.py:64 +msgid "Send" +msgstr "Odeslat" + +#: extensions/webmail/templatetags/webextras.py:76 +msgid "New message" +msgstr "Nová zpráva" + +#: extensions/webmail/templatetags/webextras.py:85 +msgid "Mark messages" +msgstr "Označit zprávy" + +#: extensions/webmail/templatetags/webextras.py:89 +msgid "As read" +msgstr "Jako přečtené" + +#: extensions/webmail/templatetags/webextras.py:92 +msgid "As unread" +msgstr "Jako nepřečtené" + +#: extensions/webmail/templatetags/webextras.py:101 +msgid "Compress folder" +msgstr "Stlačit složku" + +#: extensions/webmail/templatetags/webextras.py:110 +msgid "Empty folder" +msgstr "Vyprázdnit složku" + +#: extensions/webmail/templatetags/webextras.py:178 +msgid "Edit the selected mailbox" +msgstr "Upravit vybranou schránku" + +#: extensions/webmail/templatetags/webextras.py:183 +msgid "Remove the selected mailbox" +msgstr "Odstranit označené schránky" + +#: lib/exceptions.py:18 +#, python-format +msgid "Permission denied: %s" +msgstr "Přístup zamítnut: %s" + +#: lib/exceptions.py:19 +msgid "Permission denied" +msgstr "Přístup zamítnut" + +#: lib/formutils.py:157 lib/formutils.py:165 +msgid "Enter a valid domain name" +msgstr "Vložte platné doménové jméno" + +#: lib/permissions.py:27 +msgid "Simple user" +msgstr "Uživatel" + +#: lib/permissions.py:29 +msgid "Super administrator" +msgstr "Super správce" + +#: lib/permissions.py:31 +msgid "Domain administrator" +msgstr "Správce domény" + +#: lib/permissions.py:75 +#, python-format +msgid "Failed to grant access (%s)" +msgstr "Nebylo možné povolit přístup (%s)" + +#: lib/tables.py:241 +msgid "No entries to display" +msgstr "Žádné položky k zobrazení" + +#: lib/templatetags/libextras.py:108 +msgid "activate" +msgstr "aktivovat" + +#: templates/404.html:4 templates/500.html:4 +msgid "Sorry" +msgstr "Omlouváme se" + +#: templates/404.html:5 +msgid "The requested page does not exist." +msgstr "Požadovaná stránka neexistuje." + +#: templates/500.html:5 +msgid "An internal error occured." +msgstr "Objevila se interní chyba." + +#: templates/nlayout.html:62 +msgid "Powered by Modoboa" +msgstr "Běží na systému Modoboa" + +#: templates/common/email_searchbar.html:5 +msgid "From address" +msgstr "Z adresy" + +#: templates/common/email_searchbar.html:10 +msgid "Both" +msgstr "Obojí" + +#: templates/common/email_searchbar.html:12 +msgid "Search..." +msgstr "Hledat..." + +#: templates/common/error.html:4 +msgid "Error:" +msgstr "Chyba:" + +#: templates/common/generic_field.html:3 +#: templates/common/generic_fields_group.html:3 +msgid "Help:" +msgstr "Nápověda:" + +#: templates/common/generic_modal.html:11 +#: templates/common/wizard_forms.html:29 +msgid "Close" +msgstr "Zavřít" + +#: templates/registration/login.html:5 +msgid "Welcome to Modoboa" +msgstr "Vítejte v Modoboa" + +#: templates/registration/login.html:34 +msgid "Remember me" +msgstr "Zapamatovat si" + +#: templates/registration/login.html:36 +msgid "Log in" +msgstr "Přihlásit" + +#: userprefs/__init__.py:8 +msgid "User preferences" +msgstr "Uživatelské možnosti" + +#: userprefs/__init__.py:10 +msgid "Per-user settings" +msgstr "Uživatelské nastavení" + +#: userprefs/app_settings.py:22 +msgid "Prefered language" +msgstr "Preferovaný jazyk" + +#: userprefs/app_settings.py:27 +msgid "Prefered language to display pages" +msgstr "Preferovaný jazyk pro zobrazení stránek" + +#: userprefs/forms.py:14 +msgid "Old password" +msgstr "Původní heslo" + +#: userprefs/forms.py:16 +msgid "New password" +msgstr "Nové heslo" + +#: userprefs/forms.py:40 +msgid "Old password mismatchs" +msgstr "Původní heslo se neshoduje" + +#: userprefs/forms.py:45 +msgid "Passwords mismatch" +msgstr "Hesla se neshodují" + +#: userprefs/forms.py:59 +msgid "Recipient(s)" +msgstr "Příjemce(i)" + +#: userprefs/forms.py:62 +msgid "Indicate one or more recipients separated by a ','" +msgstr "Uveďte jednoho nebo více příjemců oddělených pomocí ','" + +#: userprefs/forms.py:65 +msgid "Keep local copies" +msgstr "Ponechat místní kopie" + +#: userprefs/forms.py:67 +msgid "Forward messages and store copies into your local mailbox" +msgstr "Přeposílat zprávy a ukládat kopie do místní schránky" + +#: userprefs/forms.py:84 +msgid "" +"You can't define a forward to a local destination. Please ask your " +"administrator to create an alias instead." +msgstr "" +"Nemůžete nastavit přeposílání na místní adresu. Požádejte správce o " +"vytvoření aliasu." + +#: userprefs/views.py:32 +msgid "You need a mailbox in order to define a forward" +msgstr "Pro nastavení přeposílání nejprve potřebujete schránku" + +#: userprefs/views.py:56 +msgid "Forward updated" +msgstr "Přeposílání aktualizováno" + +#: userprefs/views.py:98 +msgid "Profile updated" +msgstr "Profil aktualizován" + +#: userprefs/views.py:127 +msgid "Preferences saved" +msgstr "Možnosti uloženy" + +#: userprefs/templates/userprefs/forward.html:2 +msgid "Automatically forward emails to another address" +msgstr "Automaticky přesměrovat emaily na jinou adresu" + +#: userprefs/templates/userprefs/index.html:2 +#: userprefs/templatetags/uprefs_extras.py:48 +msgid "Settings" +msgstr "Nastavení" + +#: userprefs/templates/userprefs/preferences.html:2 +#: userprefs/templatetags/uprefs_extras.py:21 +msgid "Preferences" +msgstr "Možnosti" + +#: userprefs/templates/userprefs/preferences.html:2 +msgid "Customize Modoboa" +msgstr "Nastavit Modoboa" + +#: userprefs/templates/userprefs/profile.html:2 +#: userprefs/templatetags/uprefs_extras.py:17 +msgid "Profile" +msgstr "Profil" + +#: userprefs/templates/userprefs/profile.html:2 +msgid "Update your personal information" +msgstr "Aktualizovat osobní informace" + +#: userprefs/templatetags/uprefs_extras.py:57 +msgid "Logout" +msgstr "Odhlásit se" diff --git a/modoboa/userprefs/app_settings.py b/modoboa/userprefs/app_settings.py index 7652fada0..2b5fb0d17 100644 --- a/modoboa/userprefs/app_settings.py +++ b/modoboa/userprefs/app_settings.py @@ -20,9 +20,9 @@ class UserSettings(UserParametersForm): lang = forms.ChoiceField( initial=translate_language_code(settings.LANGUAGE_CODE), label=ugettext_lazy("Prefered language"), - choices=[("de", "deutsch"), ("en", "english"), - ("es", "español"), ("fr", "français"), - ("it", "italiano"), ("pt", "português"), - ("sv", "svenska"),], + choices=[("cs", "čeština"), ("de", "deutsch"), + ("en", "english"), ("es", "español"), + ("fr", "français"), ("it", "italiano"), + ("pt", "português"), ("sv", "svenska"),], help_text=ugettext_lazy("Prefered language to display pages") ) From 399177d6873a6f3304003acffa9daf4c84168c67 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Wed, 2 Oct 2013 17:26:18 +0200 Subject: [PATCH 67/97] Rename files. --- .../{cs/LC_MESSAGES/djangopo.po => cs_CZ/LC_MESSAGES/django.po} | 0 .../LC_MESSAGES/djangojspo.po => cs_CZ/LC_MESSAGES/djangojs.po} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename modoboa/locale/{cs/LC_MESSAGES/djangopo.po => cs_CZ/LC_MESSAGES/django.po} (100%) rename modoboa/locale/{cs/LC_MESSAGES/djangojspo.po => cs_CZ/LC_MESSAGES/djangojs.po} (100%) diff --git a/modoboa/locale/cs/LC_MESSAGES/djangopo.po b/modoboa/locale/cs_CZ/LC_MESSAGES/django.po similarity index 100% rename from modoboa/locale/cs/LC_MESSAGES/djangopo.po rename to modoboa/locale/cs_CZ/LC_MESSAGES/django.po diff --git a/modoboa/locale/cs/LC_MESSAGES/djangojspo.po b/modoboa/locale/cs_CZ/LC_MESSAGES/djangojs.po similarity index 100% rename from modoboa/locale/cs/LC_MESSAGES/djangojspo.po rename to modoboa/locale/cs_CZ/LC_MESSAGES/djangojs.po From 4a29010be20516c0c3720e3cb51336ecc75c322d Mon Sep 17 00:00:00 2001 From: Patrick Ben Koetter Date: Wed, 2 Oct 2013 21:51:36 +0200 Subject: [PATCH 68/97] German translation needed update for next release Updated translation and fixed a few bad guesses --- modoboa/locale/de/LC_MESSAGES/django.po | 491 ++++++++++++------------ 1 file changed, 240 insertions(+), 251 deletions(-) diff --git a/modoboa/locale/de/LC_MESSAGES/django.po b/modoboa/locale/de/LC_MESSAGES/django.po index 2a5e03aa8..f79002853 100644 --- a/modoboa/locale/de/LC_MESSAGES/django.po +++ b/modoboa/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Modoboa-0.9\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-09-20 22:30+0200\n" -"PO-Revision-Date: 2013-05-24 22:37+0100\n" +"PO-Revision-Date: 2013-10-02 21:51+0100\n" "Last-Translator: Patrick Ben Koetter \n" "Language-Team: DE \n" "Language: de\n" @@ -28,11 +28,15 @@ msgstr "Verwaltungskonsole" msgid "Web based console to manage domains, accounts and aliases" msgstr "Webinterface zur Verwaltung von Domains, Mailkonten und -aliasen" -#: admin/__init__.py:16 admin/forms.py:211 admin/forms.py:652 -#: admin/views.py:94 admin/views.py:447 +#: admin/__init__.py:16 +#: admin/forms.py:211 +#: admin/forms.py:652 +#: admin/views.py:94 +#: admin/views.py:447 #: extensions/postfix_autoreply/app_settings.py:11 #: extensions/sievefilters/app_settings.py:50 -#: extensions/stats/app_settings.py:11 extensions/webmail/app_settings.py:11 +#: extensions/stats/app_settings.py:11 +#: extensions/webmail/app_settings.py:11 #: userprefs/__init__.py:15 msgid "General" msgstr "Grundsätzlich" @@ -73,8 +77,10 @@ msgstr "Verwendeter Schlüssel, um Passworte zu ver-/entschlüsseln" msgid "LDAP settings" msgstr "LDAP-Einstellungen" -#: admin/app_settings.py:63 extensions/sievefilters/app_settings.py:22 -#: extensions/webmail/app_settings.py:22 extensions/webmail/app_settings.py:42 +#: admin/app_settings.py:63 +#: extensions/sievefilters/app_settings.py:22 +#: extensions/webmail/app_settings.py:22 +#: extensions/webmail/app_settings.py:42 msgid "Server address" msgstr "Server-Adresse" @@ -82,8 +88,10 @@ msgstr "Server-Adresse" msgid "The IP address of the DNS name of the LDAP server" msgstr "Die IP-Adresse des LDAP-Server Hostnamens" -#: admin/app_settings.py:69 extensions/sievefilters/app_settings.py:28 -#: extensions/webmail/app_settings.py:34 extensions/webmail/app_settings.py:58 +#: admin/app_settings.py:69 +#: extensions/sievefilters/app_settings.py:28 +#: extensions/webmail/app_settings.py:34 +#: extensions/webmail/app_settings.py:58 msgid "Server port" msgstr "Server-Port" @@ -91,7 +99,8 @@ msgstr "Server-Port" msgid "The TCP port number used by the LDAP server" msgstr "Der TCP Port des LDAP-Servers" -#: admin/app_settings.py:75 extensions/webmail/app_settings.py:28 +#: admin/app_settings.py:75 +#: extensions/webmail/app_settings.py:28 msgid "Use a secured connection" msgstr "Gesicherte Verbindung verwenden" @@ -120,11 +129,8 @@ msgid "Bind DN" msgstr "Bind DN" #: admin/app_settings.py:92 -msgid "" -"The distinguished name to use when binding to the LDAP server. Leave empty " -"for an anonymous bind" -msgstr "" -"Der DN für einen Bind an den LDAP-Server. Nichts eingeben für anonymen Bind." +msgid "The distinguished name to use when binding to the LDAP server. Leave empty for an anonymous bind" +msgstr "Der DN für einen Bind an den LDAP-Server. Nichts eingeben für anonymen Bind." #: admin/app_settings.py:97 msgid "Bind password" @@ -147,12 +153,8 @@ msgid "Search filter" msgstr "Suchfilter" #: admin/app_settings.py:114 -msgid "" -"An optional filter string (e.g. '(objectClass=person)'). In order to be " -"valid, it must be enclosed in parentheses." -msgstr "" -"Ein optionaler Filter z.B. (objectClass=person). Das Filter muss " -"entsprechend der LDAP-Konvention in Klammern gesetzt werden." +msgid "An optional filter string (e.g. '(objectClass=person)'). In order to be valid, it must be enclosed in parentheses." +msgstr "Ein optionaler Filter z.B. (objectClass=person). Das Filter muss entsprechend der LDAP-Konvention in Klammern gesetzt werden." #: admin/app_settings.py:119 msgid "User DN template" @@ -160,12 +162,8 @@ msgstr "Vorlage für User DN" #: admin/app_settings.py:121 #, python-format -msgid "" -"The template used to construct a user's DN. It should contain one " -"placeholder (ie. %(user)s)" -msgstr "" -"Die Vorlage für einen User DN. Sie sollte einen Platzhalter z.B. %(user)s " -"enthalten." +msgid "The template used to construct a user's DN. It should contain one placeholder (ie. %(user)s)" +msgstr "Die Vorlage für einen User DN. Sie sollte einen Platzhalter z.B. %(user)s enthalten." #: admin/app_settings.py:126 msgid "Password attribute" @@ -183,9 +181,12 @@ msgstr "Active Directory" msgid "Tell if the LDAP server is an Active Directory one" msgstr "Auswählen wenn der LDAP-Server ein Active Directory ist." -#: admin/app_settings.py:137 admin/templates/admin/editdomainform.html:25 -#: extensions/limits/app_settings.py:31 extensions/limits/forms.py:24 -#: extensions/limits/models.py:14 extensions/webmail/app_settings.py:101 +#: admin/app_settings.py:137 +#: admin/templates/admin/editdomainform.html:25 +#: extensions/limits/app_settings.py:31 +#: extensions/limits/forms.py:24 +#: extensions/limits/models.py:14 +#: extensions/webmail/app_settings.py:101 #: extensions/webmail/templates/webmail/folders.html:4 msgid "Mailboxes" msgstr "Mailboxen" @@ -195,12 +196,8 @@ msgid "Handle mailboxes on filesystem" msgstr "Mailbox im Dateisystem verwalten" #: admin/app_settings.py:142 -msgid "" -"Rename or remove mailboxes on the filesystem when they get renamed or " -"removed within Modoboa" -msgstr "" -"Mailboxen auch in Dateisystem umbenennen oder entfernen wenn sie in Modoboa " -"umbenannt oder entfernt werden" +msgid "Rename or remove mailboxes on the filesystem when they get renamed or removed within Modoboa" +msgstr "Mailboxen auch in Dateisystem umbenennen oder entfernen wenn sie in Modoboa umbenannt oder entfernt werden" #: admin/app_settings.py:146 msgid "Mailboxes ower" @@ -208,9 +205,7 @@ msgstr "Mailbox-Besitzer" #: admin/app_settings.py:148 msgid "The UNIX account who owns mailboxes on the filesystem" -msgstr "" -"UID des virtuellen Benutzers, der Besitzer der Domains, Mailboxen und " -"Nachrichten im Dateisystem ist." +msgstr "UID des virtuellen Benutzers, der Besitzer der Domains, Mailboxen und Nachrichten im Dateisystem ist." #: admin/app_settings.py:152 msgid "Automatic account removal" @@ -220,7 +215,8 @@ msgstr "Automatische Konto-Entfernung" msgid "When a mailbox is removed, also remove the associated account" msgstr "Beim Löschen der Mailbox auch das Konto entfernen." -#: admin/app_settings.py:157 admin/templates/admin/editdomainform.html:7 +#: admin/app_settings.py:157 +#: admin/templates/admin/editdomainform.html:7 msgid "Miscellaneous" msgstr "Verschiedenes" @@ -250,29 +246,25 @@ msgstr "Die Standardumleitung wenn kein Programm angegeben wurde" #: admin/app_settings.py:213 msgid "Key must be either 16, 24, or 32 bytes long" -msgstr "" +msgstr "Schlüssel muss 16, 24 oder 32 Byte lang sein" #: admin/app_settings.py:222 -#, fuzzy msgid "Invalid syntax" -msgstr "Ungültige Zeile" +msgstr "Ungültige Syntax" #: admin/app_settings.py:245 msgid "This field is required" msgstr "Dieses Feld ist erforderlich" -#: admin/forms.py:20 admin/forms.py:497 admin/tables.py:18 +#: admin/forms.py:20 +#: admin/forms.py:497 +#: admin/tables.py:18 msgid "Alias(es)" msgstr "Aliase" #: admin/forms.py:22 -msgid "" -"Alias(es) of this domain. Indicate only one name per input, press ENTER to " -"add a new input." -msgstr "" -"Alias(e) für diese Mailbox. Geben Sie jeweils nur eine Adresse pro " -"Eingabefeld an. Bestätigen Sie mit ENTER, um ein neues Eingabefeld zu " -"erhalten." +msgid "Alias(es) of this domain. Indicate only one name per input, press ENTER to add a new input." +msgstr "Alias(e) für diese Mailbox. Geben Sie jeweils nur eine Adresse pro Eingabefeld an. Bestätigen Sie mit ENTER, um ein neues Eingabefeld zu erhalten." #: admin/forms.py:59 msgid "An alias with this name already exists" @@ -290,7 +282,9 @@ msgstr "Domänen-Administrator erstellen" msgid "Automatically create an administrator for this domain" msgstr "Automatisch Administrator für diese Domain anlegen" -#: admin/forms.py:152 admin/tables.py:12 admin/tables.py:47 +#: admin/forms.py:152 +#: admin/tables.py:12 +#: admin/tables.py:47 #: admin/templates/admin/editdomainform.html:13 #: admin/templates/admin/identities_table.html:5 #: admin/templates/admin/information.html:8 @@ -300,12 +294,8 @@ msgid "Name" msgstr "Name" #: admin/forms.py:154 -msgid "" -"The administrator's name. Don't include the domain's name here, it will be " -"automatically appended." -msgstr "" -"Name des Administrators. Geben Sie nicht den Domainnamen mit an. Er wird " -"automatisch hinzugefügt." +msgid "The administrator's name. Don't include the domain's name here, it will be automatically appended." +msgstr "Name des Administrators. Geben Sie nicht den Domainnamen mit an. Er wird automatisch hinzugefügt." #: admin/forms.py:160 msgid "Create aliases" @@ -329,26 +319,20 @@ msgid "Email address" msgstr "E-Mail Adresse" #: admin/forms.py:236 -msgid "" -"The distribution list address. Use the '*' character to create a 'catchall' " -"address (ex: *@domain.tld)." -msgstr "" -"Adresse einer Verteilerliste. Geben Sie '*' an, um einen 'catchall'-Alias " -"(Bsp: *@example.com) zu erstellen." +msgid "The distribution list address. Use the '*' character to create a 'catchall' address (ex: *@domain.tld)." +msgstr "Adresse einer Verteilerliste. Geben Sie '*' an, um einen 'catchall'-Alias (Bsp: *@example.com) zu erstellen." #: admin/forms.py:239 msgid "Recipients" msgstr "Empfänger" #: admin/forms.py:240 -msgid "" -"Mailbox(es) this alias will point to. Indicate only one address per input, " -"press ENTER to add a new input." -msgstr "" -"Mailboxen auf die der Alias verweist. Geben Sie jeweils nur eine Adresse ein " -"und bestätigen Sie mit ENTER." +msgid "Mailbox(es) this alias will point to. Indicate only one address per input, press ENTER to add a new input." +msgstr "Mailboxen auf die der Alias verweist. Geben Sie jeweils nur eine Adresse ein und bestätigen Sie mit ENTER." -#: admin/forms.py:278 admin/forms.py:542 admin/forms.py:568 +#: admin/forms.py:278 +#: admin/forms.py:542 +#: admin/forms.py:568 msgid "Domain does not exist" msgstr "Domain existiert nicht" @@ -360,12 +344,14 @@ msgstr "Der Zugriff auf diese Domain ist ihnen nicht gestattet" msgid "Invalid mailbox" msgstr "Ungültige Mailbox" -#: admin/forms.py:316 admin/models.py:1202 +#: admin/forms.py:316 +#: admin/models.py:1202 #, python-format msgid "Local recipient %s not found" msgstr "Lokaler Empfänger %s nicht gefunden" -#: admin/forms.py:318 admin/forms.py:324 +#: admin/forms.py:318 +#: admin/forms.py:324 #, python-format msgid "Recipient %s already present" msgstr "Empfänger %s existiert bereits" @@ -374,11 +360,13 @@ msgstr "Empfänger %s existiert bereits" msgid "No recipient defined" msgstr "Keine Empfänger angegeben" -#: admin/forms.py:343 extensions/webmail/forms.py:19 +#: admin/forms.py:343 +#: extensions/webmail/forms.py:19 msgid "Select a file" msgstr "Wählen Sie eine Datei" -#: admin/forms.py:345 admin/forms.py:373 +#: admin/forms.py:345 +#: admin/forms.py:373 msgid "Separator" msgstr "Separator" @@ -402,7 +390,8 @@ msgstr "Auswählen wenn Kennwörter in Datei nicht verschlüsselt sind" msgid "File name" msgstr "Dateiname" -#: admin/forms.py:403 admin/templates/admin/editdomainform.html:13 +#: admin/forms.py:403 +#: admin/templates/admin/editdomainform.html:13 #: auth/forms.py:7 msgid "Username" msgstr "Benutzername" @@ -411,7 +400,8 @@ msgstr "Benutzername" msgid "Role" msgstr "Rolle" -#: admin/forms.py:406 admin/forms.py:433 +#: admin/forms.py:406 +#: admin/forms.py:433 msgid "Choose" msgstr "Auswählen" @@ -419,11 +409,13 @@ msgstr "Auswählen" msgid "What level of permission this user will have" msgstr "Rechte, die der Benutzer haben wird" -#: admin/forms.py:409 auth/forms.py:11 +#: admin/forms.py:409 +#: auth/forms.py:11 msgid "Password" msgstr "Passwort" -#: admin/forms.py:411 userprefs/forms.py:18 +#: admin/forms.py:411 +#: userprefs/forms.py:18 msgid "Confirmation" msgstr "Bestätigung" @@ -452,24 +444,12 @@ msgid "Quota" msgstr "Quota" #: admin/forms.py:492 -msgid "" -"Quota in MB for this mailbox. Define a custom value or use domain's default " -"one. Leave empty to define an unlimited value (not allowed for domain " -"administrators)." -msgstr "" -"Quota in MB für diese Mailbox. Geben Sie einen eigenen Wert an oder nutzen " -"Sie den Standardwert der Domain. Lassen Sie das Feld leer für unbegrenztes " -"Quota - Domänen-Administratoren ist dies nicht gestattet." +msgid "Quota in MB for this mailbox. Define a custom value or use domain's default one. Leave empty to define an unlimited value (not allowed for domain administrators)." +msgstr "Quota in MB für diese Mailbox. Geben Sie einen eigenen Wert an oder nutzen Sie den Standardwert der Domain. Lassen Sie das Feld leer für unbegrenztes Quota - Domänen-Administratoren ist dies nicht gestattet." #: admin/forms.py:499 -msgid "" -"Alias(es) of this mailbox. Indicate only one address per input, press ENTER " -"to add a new input. Use the '*' character to create a 'catchall' alias (ex: " -"*@domain.tld)." -msgstr "" -"Alias(e) für diese Mailbox. Geben Sie jeweils nur eine Adresse pro Eingabe " -"an. Bestätigen Sie mit ENTER um die Eingabe zu bestätigen. Geben Sie '*' an, " -"um einen 'catchall'-Alias (Bsp: *@example.com) zu erstellen." +msgid "Alias(es) of this mailbox. Indicate only one address per input, press ENTER to add a new input. Use the '*' character to create a 'catchall' alias (ex: *@domain.tld)." +msgstr "Alias(e) für diese Mailbox. Geben Sie jeweils nur eine Adresse pro Eingabe an. Bestätigen Sie mit ENTER um die Eingabe zu bestätigen. Geben Sie '*' an, um einen 'catchall'-Alias (Bsp: *@example.com) zu erstellen." #: admin/forms.py:550 #, python-format @@ -484,7 +464,8 @@ msgstr "Domain(s)" msgid "Domain(s) that user administrates" msgstr "Domänen, die dieser Anwender administriert" -#: admin/forms.py:654 admin/views.py:450 +#: admin/forms.py:654 +#: admin/views.py:450 msgid "Mail" msgstr "E-Mail" @@ -509,7 +490,9 @@ msgstr "Konnte Kennwort nicht aktualisieren: %s" msgid "account" msgstr "Konto" -#: admin/models.py:496 admin/models.py:733 admin/models.py:795 +#: admin/models.py:496 +#: admin/models.py:733 +#: admin/models.py:795 msgid "Invalid line" msgstr "Ungültige Zeile" @@ -520,19 +503,20 @@ msgstr "Sie können kein Konto einer höheren Rolle importieren" #: admin/models.py:506 #, python-format msgid "The simple user '%s' must have a valid email address" -msgstr "" +msgstr "Der normale Benutzer '%s' muss eine gültige E-Mail-Adresse besitzen" #: admin/models.py:510 #, python-format msgid "username and email fields must not differ for '%s'" -msgstr "" +msgstr "Die Felder für Benutzername und E-Mail für '%s' dürfen sich nicht unterscheiden" #: admin/models.py:534 #, python-format msgid "Account import failed (%s): domain does not exist" msgstr "Kann Konto nicht importieren (%s): Die Domain existiert nicht" -#: admin/models.py:624 admin/models.py:746 +#: admin/models.py:624 +#: admin/models.py:746 msgid "name" msgstr "Name" @@ -544,8 +528,11 @@ msgstr "Name der Domäne" msgid "Default quota in MB applied to mailboxes" msgstr "Standard-Quota für Mailboxen (in MB)" -#: admin/models.py:630 admin/models.py:753 admin/models.py:1045 -#: admin/models.py:1217 extensions/postfix_autoreply/models.py:27 +#: admin/models.py:630 +#: admin/models.py:753 +#: admin/models.py:1045 +#: admin/models.py:1217 +#: extensions/postfix_autoreply/models.py:27 msgid "enabled" msgstr "aktiviert" @@ -565,7 +552,8 @@ msgstr "Ziel" msgid "The domain this alias points to" msgstr "Domäne auf die dieser Alias verweist" -#: admin/models.py:754 admin/models.py:1046 +#: admin/models.py:754 +#: admin/models.py:1046 msgid "Check to activate this alias" msgstr "Auswählen um den Alias zu aktivieren" @@ -574,7 +562,8 @@ msgstr "Auswählen um den Alias zu aktivieren" msgid "Unknown domain %s" msgstr "Unbekannte Domain %s" -#: admin/models.py:818 admin/models.py:1031 +#: admin/models.py:818 +#: admin/models.py:1031 msgid "address" msgstr "Adresse" @@ -597,12 +586,8 @@ msgid "A quota is required" msgstr "Ein Quota ist erforderlich" #: admin/models.py:1032 -msgid "" -"The alias address (without the domain part). For a 'catch-all' address, just " -"enter an * character." -msgstr "" -"Die Alias-Adresse (ohne den Domain-Anteil). Geben sie für eine Adresse an, " -"die alles annimmt, * an." +msgid "The alias address (without the domain part). For a 'catch-all' address, just enter an * character." +msgstr "Die Alias-Adresse (ohne den Domain-Anteil). Geben sie für eine Adresse an, die alles annimmt, * an." #: admin/models.py:1036 msgid "mailboxes" @@ -634,9 +619,9 @@ msgid "Invalid line: %s" msgstr "Ungültige Zeile: %s" #: admin/models.py:1175 -#, fuzzy, python-format +#, python-format msgid "Domain '%s' does not exist" -msgstr "Domain existiert nicht" +msgstr "Domain '%s' existiert nicht" #: admin/models.py:1218 msgid "Check to enable this extension" @@ -663,8 +648,10 @@ msgstr "%(object)s '%(name)s' %(action)s der Identität %(user)s" msgid "Edit domain" msgstr "Domäne bearbeiten" -#: admin/tables.py:21 admin/templates/admin/identities_table.html:8 -#: admin/templates/admin/listing.html:17 extensions/sievefilters/views.py:83 +#: admin/tables.py:21 +#: admin/templates/admin/identities_table.html:8 +#: admin/templates/admin/listing.html:17 +#: extensions/sievefilters/views.py:83 #: extensions/sievefilters/templates/sievefilters/filter.html:17 #: extensions/sievefilters/templates/sievefilters/guieditor.html:5 #: extensions/webmail/templatetags/webextras.py:97 @@ -683,13 +670,19 @@ msgstr "Beschreibung" msgid "New domain" msgstr "Neue Domäne" -#: admin/views.py:89 admin/views.py:98 admin/views.py:228 admin/views.py:444 -#: admin/views.py:451 extensions/sievefilters/views.py:129 -#: extensions/sievefilters/views.py:198 extensions/webmail/views.py:136 +#: admin/views.py:89 +#: admin/views.py:98 +#: admin/views.py:228 +#: admin/views.py:444 +#: admin/views.py:451 +#: extensions/sievefilters/views.py:129 +#: extensions/sievefilters/views.py:198 +#: extensions/webmail/views.py:136 msgid "Create" msgstr "Erstellen" -#: admin/views.py:95 admin/views.py:448 +#: admin/views.py:95 +#: admin/views.py:448 msgid "Next" msgstr "Nächstes" @@ -697,7 +690,8 @@ msgstr "Nächstes" msgid "Options" msgstr "optionen" -#: admin/views.py:99 admin/views.py:452 +#: admin/views.py:99 +#: admin/views.py:452 msgid "Previous" msgstr "Vorheriges" @@ -705,9 +699,12 @@ msgstr "Vorheriges" msgid "Domain created" msgstr "Domäne erstellt." -#: admin/views.py:146 admin/views.py:285 admin/views.py:498 +#: admin/views.py:146 +#: admin/views.py:285 +#: admin/views.py:498 #: extensions/postfix_autoreply/templates/postfix_autoreply/autoreply.html:9 -#: extensions/sievefilters/views.py:148 extensions/webmail/views.py:168 +#: extensions/sievefilters/views.py:148 +#: extensions/webmail/views.py:168 #: userprefs/templates/userprefs/forward.html:8 #: userprefs/templates/userprefs/profile.html:8 msgid "Update" @@ -767,15 +764,25 @@ msgstr "Weiterleitung verändert" msgid "Alias modified" msgstr "Alias verändert" -#: admin/views.py:402 admin/views.py:545 admin/views.py:550 -#: extensions/amavis/views.py:204 extensions/amavis/views.py:210 -#: extensions/amavis/views.py:243 extensions/amavis/views.py:247 -#: extensions/amavis/views.py:249 extensions/webmail/views.py:41 -#: extensions/webmail/views.py:68 extensions/webmail/views.py:81 -#: extensions/webmail/views.py:98 extensions/webmail/views.py:114 -#: extensions/webmail/views.py:200 extensions/webmail/views.py:427 -#: extensions/webmail/views.py:438 extensions/webmail/views.py:465 -#: lib/formutils.py:32 lib/formutils.py:37 +#: admin/views.py:402 +#: admin/views.py:545 +#: admin/views.py:550 +#: extensions/amavis/views.py:204 +#: extensions/amavis/views.py:210 +#: extensions/amavis/views.py:243 +#: extensions/amavis/views.py:247 +#: extensions/amavis/views.py:249 +#: extensions/webmail/views.py:41 +#: extensions/webmail/views.py:68 +#: extensions/webmail/views.py:81 +#: extensions/webmail/views.py:98 +#: extensions/webmail/views.py:114 +#: extensions/webmail/views.py:200 +#: extensions/webmail/views.py:427 +#: extensions/webmail/views.py:438 +#: extensions/webmail/views.py:465 +#: lib/formutils.py:32 +#: lib/formutils.py:37 msgid "Invalid request" msgstr "Ungültige Anfrage" @@ -819,27 +826,23 @@ msgstr "%d Objekte erfolgreich importiert" msgid "" "Provide a CSV file where lines respect one of the following formats:\n" "
                              \n" -"
                            • account; loginname; password; first name; last name; enabled; group; " -"address[, domain, ...]
                              • \n" +"
                            • account; loginname; password; first name; last name; enabled; group; address[, domain, ...]
                              • \n" "
                            • alias; address; enabled; internal recipient
                              • \n" "
                            • forward; address; enabled; external recipient
                              • \n" "
                            • dlist; address; enabled; recipient; recipient; ...
                              • \n" "
                            \n" -"

                            The first element of each line is mandatory and must be equal to one of " -"the previous values.

                            \n" +"

                            The first element of each line is mandatory and must be equal to one of the previous values.

                            \n" "\n" "

                            You can use a different character as separator.

                            \n" msgstr "" "CSV-Datei in einem der folgenden Formate hinzufügen:\n" "
                              \n" -"
                            • account; loginname; password; first name; last name; enabled; group; " -"address[, domain, ...]
                              • \n" +"
                            • account; loginname; password; first name; last name; enabled; group; address[, domain, ...]
                              • \n" "
                            • alias; address; enabled; internal recipient
                              • \n" "
                            • forward; address; enabled; external recipient
                              • \n" "
                            • dlist; address; enabled; recipient; recipient; ...
                              • \n" "
                            \n" -"

                            Das erste Element einer Zeile ist zwingend und muss gleich mit einem der " -"vorhergehenden sein.

                            \n" +"

                            Das erste Element einer Zeile ist zwingend und muss gleich mit einem der vorhergehenden sein.

                            \n" "\n" "

                            Ein anderes Zeichen als Separator ist gestattet.

                            \n" @@ -847,7 +850,9 @@ msgstr "" msgid "Import identities" msgstr "Identitäten importieren" -#: admin/views.py:776 admin/views.py:846 admin/templatetags/admin_extras.py:87 +#: admin/views.py:776 +#: admin/views.py:846 +#: admin/templatetags/admin_extras.py:87 #: admin/templatetags/admin_extras.py:144 msgid "Import" msgstr "Importiere" @@ -856,7 +861,9 @@ msgstr "Importiere" msgid "Export identities" msgstr "Identitäten exportieren" -#: admin/views.py:807 admin/views.py:863 admin/templatetags/admin_extras.py:93 +#: admin/views.py:807 +#: admin/views.py:863 +#: admin/templatetags/admin_extras.py:93 #: admin/templatetags/admin_extras.py:150 msgid "Export" msgstr "Exportiere" @@ -868,8 +875,7 @@ msgid "" "
                          • domain; name; quota; enabled
                            • \n" "
                          • domainalias; name; targeted domain; enabled
                            • \n" "
                          \n" -"

                          The first element of each line is mandatory and must be equal to one of " -"the previous values.

                          \n" +"

                          The first element of each line is mandatory and must be equal to one of the previous values.

                          \n" "

                          You can use a different character as separator.

                          \n" msgstr "" "CSV-Datei in einem der folgenden Formate hinzufügen:\n" @@ -877,8 +883,7 @@ msgstr "" "
                        • domain; name; quota; enabled
                          • \n" "
                        • domainalias; name; targeted domain; enabled
                          • \n" "
                        \n" -"

                        Das erste Element einer Zeile ist zwinged und muss gleich zum " -"vorhergehenden sein.

                        \n" +"

                        Das erste Element einer Zeile ist zwinged und muss gleich zum vorhergehenden sein.

                        \n" "

                        Ein anderes Zeichen als Trenner ist gestattet.

                        \n" #: admin/views.py:845 @@ -895,8 +900,10 @@ msgstr "Domains exportieren" msgid "MB" msgstr "MB" -#: admin/templates/admin/domains.html:2 admin/templatetags/admin_extras.py:23 -#: extensions/limits/app_settings.py:19 extensions/limits/forms.py:16 +#: admin/templates/admin/domains.html:2 +#: admin/templatetags/admin_extras.py:23 +#: extensions/limits/app_settings.py:19 +#: extensions/limits/forms.py:16 #: extensions/limits/models.py:12 msgid "Domains" msgstr "Domänen" @@ -918,13 +925,15 @@ msgid "Last modification date" msgstr "Datum der letzten Änderung" #: admin/templates/admin/editdomainform.html:24 -#: extensions/limits/app_settings.py:25 extensions/limits/forms.py:20 +#: extensions/limits/app_settings.py:25 +#: extensions/limits/forms.py:20 #: extensions/limits/models.py:13 msgid "Domain aliases" msgstr "Domänen-Aliase" #: admin/templates/admin/editdomainform.html:26 -#: extensions/limits/app_settings.py:37 extensions/limits/forms.py:28 +#: extensions/limits/app_settings.py:37 +#: extensions/limits/forms.py:28 #: extensions/limits/models.py:15 msgid "Mailbox aliases" msgstr "Mailboxen-Aliase" @@ -996,7 +1005,8 @@ msgstr "Letzte Anmeldung" msgid "Filter" msgstr "Filter" -#: admin/templates/admin/logs.html:2 admin/templatetags/admin_extras.py:60 +#: admin/templates/admin/logs.html:2 +#: admin/templatetags/admin_extras.py:60 msgid "Logs" msgstr "Logs" @@ -1004,8 +1014,10 @@ msgstr "Logs" msgid "Previously on Modoboa..." msgstr "Vorher auf Modoboa…" -#: admin/templates/admin/logs.html:6 extensions/amavis/sql_listing.py:25 -#: extensions/webmail/lib.py:38 extensions/webmail/lib.py:411 +#: admin/templates/admin/logs.html:6 +#: extensions/amavis/sql_listing.py:25 +#: extensions/webmail/lib.py:38 +#: extensions/webmail/lib.py:411 msgid "Date" msgstr "Datum" @@ -1110,19 +1122,21 @@ msgstr "Domain-Identitäten anzeigen" #: admin/templatetags/admin_extras.py:178 #: admin/templatetags/admin_extras.py:194 #: admin/templatetags/admin_extras.py:201 -#, fuzzy, python-format +#, python-format msgid "Delete %s?" -msgstr "Löschen" +msgstr "%s löschen?" #: admin/templatetags/admin_extras.py:223 msgid "Remove this permission" msgstr "Berechtigung entfernen" -#: admin/templatetags/admin_extras.py:264 lib/formutils.py:206 +#: admin/templatetags/admin_extras.py:264 +#: lib/formutils.py:206 msgid "Yes" msgstr "Ja" -#: admin/templatetags/admin_extras.py:264 lib/formutils.py:206 +#: admin/templatetags/admin_extras.py:264 +#: lib/formutils.py:206 msgid "No" msgstr "Nein" @@ -1133,9 +1147,7 @@ msgstr "Identität '%s' hat sich erfolgreich angemeldet" #: auth/views.py:44 msgid "Your username and password didn't match. Please try again." -msgstr "" -"Ihr Benutzername und Passwort stimmen nicht überein. Bitte versuchen Sie es " -"noch einmal." +msgstr "Ihr Benutzername und Passwort stimmen nicht überein. Bitte versuchen Sie es noch einmal." #: auth/views.py:67 #, python-format @@ -1154,7 +1166,8 @@ msgstr "Virus senden" msgid "Send spam" msgstr "Spam senden" -#: demo/views.py:17 demo/views.py:41 +#: demo/views.py:17 +#: demo/views.py:41 msgid "Message sent" msgstr "Nachricht gesendet" @@ -1163,37 +1176,33 @@ msgid "" "\n" "

                        Welcome to the online demo!

                        \n" "

                        Warning: the demo's concent is resetted every two hours.

                        \n" -"

                        To try the demo, the following users are available (username/password):

                        \n" +"

                        To try the demo, the following users are available (username/password):

                        \n" "
                          \n" "
                        • A super administrator : admin/password
                          • \n" "
                        • A domain administrator : admin@demo.local/admin
                          • \n" "
                        • A simple user : user@demo.local/user
                          • \n" "
                        \n" "

                        Please report any issue or give any suggestion to \n" -" the " -"mailing list.

                        \n" +" the mailing list.

                        \n" msgstr "" "\n" "

                        Willkommen zur Online Demo!

                        \n" -"

                        Warnung: die Inhalte dieser Demo werden alle zwei Stunden gelöscht." -"

                        \n" -"

                        Folgende User (Benutzername/Kennwort) stehen zum Testen zur " -"Verfügung:

                        \n" +"

                        Warnung: die Inhalte dieser Demo werden alle zwei Stunden gelöscht.

                        \n" +"

                        Folgende User (Benutzername/Kennwort) stehen zum Testen zur Verfügung:

                        \n" "
                          \n" "
                        • Super-Administrator : admin/password
                          • \n" "
                        • Domänen-Administrator : admin@demo.local/admin
                          • \n" "
                        • Normaler Benutzer: user@demo.local/user
                          • \n" "
                        \n" "

                        Probleme und Anregungen bitte an die\n" -" Mailingliste berichten.

                        \n" +" Mailingliste berichten.

                        \n" #: extensions/amavis/__init__.py:22 msgid "Simple amavis management frontend" msgstr "Einfache amavis Management Oberfläche" -#: extensions/amavis/__init__.py:45 extensions/amavis/__init__.py:61 +#: extensions/amavis/__init__.py:45 +#: extensions/amavis/__init__.py:61 msgid "Quarantine" msgstr "Quarantäne" @@ -1220,9 +1229,7 @@ msgstr "Maximales Alter einer Nachricht" #: extensions/amavis/app_settings.py:16 msgid "Quarantine messages maximum age (in days) before deletion" -msgstr "" -"Maximales Alter (in Tagen) von Nachrichten in der Quarantäne bevor sie " -"gelöscht werden" +msgstr "Maximales Alter (in Tagen) von Nachrichten in der Quarantäne bevor sie gelöscht werden" #: extensions/amavis/app_settings.py:19 msgid "Messages releasing" @@ -1298,23 +1305,22 @@ msgstr "Absender von Benachrichtigungen" #: extensions/amavis/app_settings.py:74 msgid "The e-mail address used to send notitications" -msgstr "" -"Die Mailadresse, die verwendet wird, um Benachrichtigungen zu versenden" +msgstr "Die Mailadresse, die verwendet wird, um Benachrichtigungen zu versenden" -#: extensions/amavis/app_settings.py:87 extensions/webmail/app_settings.py:73 +#: extensions/amavis/app_settings.py:87 +#: extensions/webmail/app_settings.py:73 #: userprefs/app_settings.py:18 msgid "Display" msgstr "Darstellung" -#: extensions/amavis/app_settings.py:91 extensions/webmail/app_settings.py:91 +#: extensions/amavis/app_settings.py:91 +#: extensions/webmail/app_settings.py:91 msgid "Number of displayed emails per page" msgstr "Anzahl dargestellter Nachrichten pro Seite" #: extensions/amavis/app_settings.py:92 msgid "Set the maximum number of messages displayed in a page" -msgstr "" -"Legt die maximale Anzahl von Nachrichten fest, die in einer Seite " -"dargestellt werden" +msgstr "Legt die maximale Anzahl von Nachrichten fest, die in einer Seite dargestellt werden" #: extensions/amavis/lib.py:53 #, python-format @@ -1325,17 +1331,22 @@ msgstr "Verbindung zu amavis fehlgeschlagen: %s" msgid "Virus filter" msgstr "Virusfilter" -#: extensions/amavis/models.py:94 extensions/amavis/models.py:102 -#: extensions/amavis/models.py:110 extensions/sievefilters/views.py:281 +#: extensions/amavis/models.py:94 +#: extensions/amavis/models.py:102 +#: extensions/amavis/models.py:110 +#: extensions/sievefilters/views.py:281 msgid "yes" msgstr "Ja" -#: extensions/amavis/models.py:95 extensions/amavis/models.py:103 -#: extensions/amavis/models.py:111 extensions/sievefilters/views.py:285 +#: extensions/amavis/models.py:95 +#: extensions/amavis/models.py:103 +#: extensions/amavis/models.py:111 +#: extensions/sievefilters/views.py:285 msgid "no" msgstr "Nein" -#: extensions/amavis/models.py:96 extensions/amavis/models.py:104 +#: extensions/amavis/models.py:96 +#: extensions/amavis/models.py:104 #: extensions/amavis/models.py:112 #: extensions/amavis/templates/amavis/domain_content_filter.html:11 msgid "default" @@ -1343,9 +1354,7 @@ msgstr "Standard" #: extensions/amavis/models.py:98 msgid "Bypass virus checks or not. Choose 'default' to use global settings." -msgstr "" -"Virus-Prüfungen umgehen oder nicht. Geben Sie, um den Domain-Standard zu " -"nutzen, keinen individuellen Wert an." +msgstr "Virus-Prüfungen umgehen oder nicht. Geben Sie, um den Domain-Standard zu nutzen, keinen individuellen Wert an." #: extensions/amavis/models.py:101 msgid "Spam filter" @@ -1353,9 +1362,7 @@ msgstr "SPAM-Filter" #: extensions/amavis/models.py:106 msgid "Bypass spam checks or not. Choose 'default' to use global settings." -msgstr "" -"Spam-Prüfungen umgehen oder nicht. Geben Sie, um den Domain-Standard zu " -"nutzen, keinen individuellen Wert an." +msgstr "Spam-Prüfungen umgehen oder nicht. Geben Sie, um den Domain-Standard zu nutzen, keinen individuellen Wert an." #: extensions/amavis/models.py:109 msgid "Banned filter" @@ -1363,29 +1370,27 @@ msgstr "Filter für unerwünschte Dateien" #: extensions/amavis/models.py:114 msgid "Bypass banned checks or not. Choose 'default' to use global settings." -msgstr "" -"Unerwünschte Dateien umgehen oder nicht. Geben Sie, um den Domain-Standard " -"zu nutzen, keinen individuellen Wert an." +msgstr "Unerwünschte Dateien umgehen oder nicht. Geben Sie, um den Domain-Standard zu nutzen, keinen individuellen Wert an." #: extensions/amavis/models.py:144 msgid "Spam marker" msgstr "SPAM-Markierung" #: extensions/amavis/models.py:146 -msgid "" -"Modify spam subject using the specified text. Choose 'default' to use global " -"settings." -msgstr "" -"Betreff:-Zeile einer Spam-Nachricht mit dem angegebenen Text ergänzen. " -"Wählen Sie 'Standard' für den systemweiten Standard." +msgid "Modify spam subject using the specified text. Choose 'default' to use global settings." +msgstr "Betreff:-Zeile einer Spam-Nachricht mit dem angegebenen Text ergänzen. Wählen Sie 'Standard' für den systemweiten Standard." -#: extensions/amavis/sql_listing.py:23 extensions/webmail/lib.py:37 +#: extensions/amavis/sql_listing.py:23 +#: extensions/webmail/lib.py:37 msgid "From" msgstr "Von" -#: extensions/amavis/sql_listing.py:24 extensions/sievefilters/forms.py:68 -#: extensions/webmail/forms.py:10 extensions/webmail/lib.py:36 -#: extensions/webmail/lib.py:409 templates/common/email_searchbar.html:6 +#: extensions/amavis/sql_listing.py:24 +#: extensions/sievefilters/forms.py:68 +#: extensions/webmail/forms.py:10 +#: extensions/webmail/lib.py:36 +#: extensions/webmail/lib.py:409 +#: templates/common/email_searchbar.html:6 msgid "Subject" msgstr "Betreff" @@ -1494,8 +1499,7 @@ msgstr "Rektion auf diese Nachricht:" #: extensions/amavis/templates/amavis/notifications/pending_requests.html:14 #, python-format msgid "Please visit %(listingurl)s for a full listing." -msgstr "" -"Bitte besuchen sie %(listingurl)s um eine vollständige Ausgabe zu erhalten." +msgstr "Bitte besuchen sie %(listingurl)s um eine vollständige Ausgabe zu erhalten." #: extensions/amavis/templatetags/amextras.py:20 #: extensions/amavis/templatetags/amextras.py:52 @@ -1539,10 +1543,8 @@ msgid "Bad MIME" msgstr "Schlechtes MIME" #: extensions/limits/__init__.py:23 -msgid "" -"Per administrator resources to limit the number of objects they can create" -msgstr "" -"Administrator-Ressourcen, um die Anzahl erstellbarer Objekte einzuschränken" +msgid "Per administrator resources to limit the number of objects they can create" +msgstr "Administrator-Ressourcen, um die Anzahl erstellbarer Objekte einzuschränken" #: extensions/limits/__init__.py:54 msgid "Limits" @@ -1560,16 +1562,15 @@ msgstr "Ressourcen" msgid "Default limits" msgstr "Standard-Grenzwerte" -#: extensions/limits/app_settings.py:13 extensions/limits/forms.py:12 +#: extensions/limits/app_settings.py:13 +#: extensions/limits/forms.py:12 #: extensions/limits/models.py:11 msgid "Domain admins" msgstr "Domänen-Administratoren" #: extensions/limits/app_settings.py:15 msgid "Maximum number of allowed domain administrators for a new administrator" -msgstr "" -"Maximale Anzahl Domänenadministratoren, die ein neuer Administrator " -"erstellen darf" +msgstr "Maximale Anzahl Domänenadministratoren, die ein neuer Administrator erstellen darf" #: extensions/limits/app_settings.py:21 msgid "Maximum number of allowed domains for a new administrator" @@ -1577,8 +1578,7 @@ msgstr "Maximale Anzahl Domains, die ein neuer Administrator erstellen darf" #: extensions/limits/app_settings.py:27 msgid "Maximum number of allowed domain aliases for a new administrator" -msgstr "" -"Maximale Anzahl Domain Aliase, die ein neuer Administrator erstellen darf" +msgstr "Maximale Anzahl Domain Aliase, die ein neuer Administrator erstellen darf" #: extensions/limits/app_settings.py:33 msgid "Maximum number of allowed mailboxes for a new administrator" @@ -1618,8 +1618,7 @@ msgstr "Ihre Ressourcen wurde noch nicht initialisiert" #: extensions/limits/forms.py:78 msgid "You're not allowed to define unlimited values" -msgstr "" -"Sie verfügen nicht über ausreichend Rechte, um unbegrenzte Werte anzugeben" +msgstr "Sie verfügen nicht über ausreichend Rechte, um unbegrenzte Werte anzugeben" #: extensions/limits/lib.py:16 #, python-format @@ -1644,8 +1643,7 @@ msgstr "Ressourcen-Verbrauch" #: extensions/postfix_autoreply/__init__.py:20 msgid "Auto-reply (vacation) functionality using Postfix" -msgstr "" -"Automatische Antwort (Abwesenheitsbenachrichtigung) über Postfix-Programm" +msgstr "Automatische Antwort (Abwesenheitsbenachrichtigung) über Postfix-Programm" #: extensions/postfix_autoreply/__init__.py:41 msgid "Automatic replies" @@ -1662,9 +1660,7 @@ msgstr "Zeitüberschreitung für automatische Antworten" #: extensions/postfix_autoreply/app_settings.py:16 msgid "Timeout in seconds between two auto-replies to the same recipient" -msgstr "" -"Zeit in Sekunden zwischen zwei automatisierten Antworten an denselben " -"Empfänger" +msgstr "Zeit in Sekunden zwischen zwei automatisierten Antworten an denselben Empfänger" #: extensions/postfix_autoreply/forms.py:9 msgid "Until" @@ -1704,9 +1700,7 @@ msgstr "Automatische Antwort erfolgreich aktualisiert." #: extensions/postfix_autoreply/templates/postfix_autoreply/autoreply.html:2 msgid "Define a message to automatically send when you are off" -msgstr "" -"Gegen sie eine Nachricht an, die gesendet werden soll, wenn Sie nicht " -"erreichbar sind" +msgstr "Gegen sie eine Nachricht an, die gesendet werden soll, wenn Sie nicht erreichbar sind" #: extensions/sievefilters/__init__.py:12 msgid "Plugin to easily create server-side filters" @@ -1798,7 +1792,8 @@ msgstr "Sender" msgid "Recipient" msgstr "Empfänger" -#: extensions/sievefilters/forms.py:71 extensions/webmail/forms.py:8 +#: extensions/sievefilters/forms.py:71 +#: extensions/webmail/forms.py:8 msgid "Cc" msgstr "Cc" @@ -1824,9 +1819,7 @@ msgstr "Leite Nachricht um zu" #: extensions/sievefilters/lib.py:37 msgid "Connection to MANAGESIEVE server failed, check your configuration" -msgstr "" -"Verbindung zu MANAGESIEVE-Server fehlgeschlagen. Überprüfen Sie Ihre " -"Konfiguration." +msgstr "Verbindung zu MANAGESIEVE-Server fehlgeschlagen. Überprüfen Sie Ihre Konfiguration." #: extensions/sievefilters/lib.py:82 msgid "Not enough space on server" @@ -1903,11 +1896,8 @@ msgid "active" msgstr "aktiv" #: extensions/sievefilters/templates/sievefilters/index.html:74 -msgid "" -"No filters set defined yet. You must create one in order to define filters." -msgstr "" -"Nich keine Filter-Sätze definiert. Sie müssen einen erstellen, damit sie " -"Filter erstellen können." +msgid "No filters set defined yet. You must create one in order to define filters." +msgstr "Nich keine Filter-Sätze definiert. Sie müssen einen erstellen, damit sie Filter erstellen können." #: extensions/sievefilters/templatetags/sfilters_tags.py:16 msgid "New filters set" @@ -2047,7 +2037,8 @@ msgstr "Jahr" msgid "Total" msgstr "Gesamt" -#: extensions/stats/views.py:21 extensions/stats/templates/stats/graphs.html:4 +#: extensions/stats/views.py:21 +#: extensions/stats/templates/stats/graphs.html:4 msgid "No statistics available" msgstr "Keine Statistik-Daten verfügbar" @@ -2157,9 +2148,7 @@ msgstr "Aktiviere/Deaktiviere Darstellung von HTML-Links" #: extensions/webmail/app_settings.py:92 msgid "Sets the maximum number of messages displayed in a page" -msgstr "" -"Legt die maximale Anzahl von Nachrichten fest, die in einer Seite " -"dargestellt werden" +msgstr "Legt die maximale Anzahl von Nachrichten fest, die in einer Seite dargestellt werden" #: extensions/webmail/app_settings.py:97 msgid "Listing refresh rate" @@ -2222,9 +2211,8 @@ msgid "Cci" msgstr "Cci" #: extensions/webmail/imaputils.py:237 -#, fuzzy msgid "Failed to retrieve hierarchy delimiter" -msgstr "Konnte Filter-Satz nicht laden" +msgstr "Konnte Trenner für Hierarchie nicht in Erfahrung bringen" #: extensions/webmail/imaputils.py:278 #, python-format @@ -2235,7 +2223,8 @@ msgstr "Verbindung zu IMAP-Server fehlgeschlagen: %s" msgid "wrote:" msgstr "schrieb:" -#: extensions/webmail/lib.py:423 extensions/webmail/lib.py:427 +#: extensions/webmail/lib.py:423 +#: extensions/webmail/lib.py:427 msgid "Original message" msgstr "Gesendete Nachrichten" @@ -2250,7 +2239,8 @@ msgstr[1] "%(count)d Nachrichten gelöscht" msgid "Unknown action" msgstr "Unbekannte Aktion" -#: extensions/webmail/views.py:116 lib/email_listing.py:137 +#: extensions/webmail/views.py:116 +#: lib/email_listing.py:137 msgid "Empty mailbox" msgstr "Mailbox leer" @@ -2271,7 +2261,8 @@ msgstr "Mailbox bearbeiten" msgid "Mailbox updated" msgstr "Mailbox aktualisiert" -#: extensions/webmail/views.py:214 extensions/webmail/views.py:396 +#: extensions/webmail/views.py:214 +#: extensions/webmail/views.py:396 #: extensions/webmail/views.py:505 msgid "Bad request" msgstr "Fehlerhafte Anfrage" @@ -2417,7 +2408,8 @@ msgstr "Erlaubnis verweigert: %s" msgid "Permission denied" msgstr "Berechtigung verweigert" -#: lib/formutils.py:157 lib/formutils.py:165 +#: lib/formutils.py:157 +#: lib/formutils.py:165 msgid "Enter a valid domain name" msgstr "Geben Sie einen gültigen Domain-Namen an" @@ -2446,7 +2438,8 @@ msgstr "Keine Einträge darzustellen" msgid "activate" msgstr "aktivieren" -#: templates/404.html:4 templates/500.html:4 +#: templates/404.html:4 +#: templates/500.html:4 msgid "Sorry" msgstr "Entschuldigung" @@ -2549,12 +2542,8 @@ msgid "Forward messages and store copies into your local mailbox" msgstr "Nachricht weiterleiten und Kopie in Mailbox ablegen" #: userprefs/forms.py:84 -msgid "" -"You can't define a forward to a local destination. Please ask your " -"administrator to create an alias instead." -msgstr "" -"Sie können keine Weiterleitung auf ein lokales Ziel anlegen. Bitten Sie " -"Ihren Administrator stattdessen einen Alias anzulegen." +msgid "You can't define a forward to a local destination. Please ask your administrator to create an alias instead." +msgstr "Sie können keine Weiterleitung auf ein lokales Ziel anlegen. Bitten Sie Ihren Administrator stattdessen einen Alias anzulegen." #: userprefs/views.py:32 msgid "You need a mailbox in order to define a forward" From 595346e46b5ad844886281d35dc959b3d2e45a4d Mon Sep 17 00:00:00 2001 From: Patrick Ben Koetter Date: Wed, 2 Oct 2013 21:51:36 +0200 Subject: [PATCH 69/97] German translation needed update for next release Updated translation and fixed a few bad guesses --- modoboa/locale/de/LC_MESSAGES/django.po | 491 ++++++++++++------------ 1 file changed, 240 insertions(+), 251 deletions(-) diff --git a/modoboa/locale/de/LC_MESSAGES/django.po b/modoboa/locale/de/LC_MESSAGES/django.po index 2a5e03aa8..f79002853 100644 --- a/modoboa/locale/de/LC_MESSAGES/django.po +++ b/modoboa/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Modoboa-0.9\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-09-20 22:30+0200\n" -"PO-Revision-Date: 2013-05-24 22:37+0100\n" +"PO-Revision-Date: 2013-10-02 21:51+0100\n" "Last-Translator: Patrick Ben Koetter \n" "Language-Team: DE \n" "Language: de\n" @@ -28,11 +28,15 @@ msgstr "Verwaltungskonsole" msgid "Web based console to manage domains, accounts and aliases" msgstr "Webinterface zur Verwaltung von Domains, Mailkonten und -aliasen" -#: admin/__init__.py:16 admin/forms.py:211 admin/forms.py:652 -#: admin/views.py:94 admin/views.py:447 +#: admin/__init__.py:16 +#: admin/forms.py:211 +#: admin/forms.py:652 +#: admin/views.py:94 +#: admin/views.py:447 #: extensions/postfix_autoreply/app_settings.py:11 #: extensions/sievefilters/app_settings.py:50 -#: extensions/stats/app_settings.py:11 extensions/webmail/app_settings.py:11 +#: extensions/stats/app_settings.py:11 +#: extensions/webmail/app_settings.py:11 #: userprefs/__init__.py:15 msgid "General" msgstr "Grundsätzlich" @@ -73,8 +77,10 @@ msgstr "Verwendeter Schlüssel, um Passworte zu ver-/entschlüsseln" msgid "LDAP settings" msgstr "LDAP-Einstellungen" -#: admin/app_settings.py:63 extensions/sievefilters/app_settings.py:22 -#: extensions/webmail/app_settings.py:22 extensions/webmail/app_settings.py:42 +#: admin/app_settings.py:63 +#: extensions/sievefilters/app_settings.py:22 +#: extensions/webmail/app_settings.py:22 +#: extensions/webmail/app_settings.py:42 msgid "Server address" msgstr "Server-Adresse" @@ -82,8 +88,10 @@ msgstr "Server-Adresse" msgid "The IP address of the DNS name of the LDAP server" msgstr "Die IP-Adresse des LDAP-Server Hostnamens" -#: admin/app_settings.py:69 extensions/sievefilters/app_settings.py:28 -#: extensions/webmail/app_settings.py:34 extensions/webmail/app_settings.py:58 +#: admin/app_settings.py:69 +#: extensions/sievefilters/app_settings.py:28 +#: extensions/webmail/app_settings.py:34 +#: extensions/webmail/app_settings.py:58 msgid "Server port" msgstr "Server-Port" @@ -91,7 +99,8 @@ msgstr "Server-Port" msgid "The TCP port number used by the LDAP server" msgstr "Der TCP Port des LDAP-Servers" -#: admin/app_settings.py:75 extensions/webmail/app_settings.py:28 +#: admin/app_settings.py:75 +#: extensions/webmail/app_settings.py:28 msgid "Use a secured connection" msgstr "Gesicherte Verbindung verwenden" @@ -120,11 +129,8 @@ msgid "Bind DN" msgstr "Bind DN" #: admin/app_settings.py:92 -msgid "" -"The distinguished name to use when binding to the LDAP server. Leave empty " -"for an anonymous bind" -msgstr "" -"Der DN für einen Bind an den LDAP-Server. Nichts eingeben für anonymen Bind." +msgid "The distinguished name to use when binding to the LDAP server. Leave empty for an anonymous bind" +msgstr "Der DN für einen Bind an den LDAP-Server. Nichts eingeben für anonymen Bind." #: admin/app_settings.py:97 msgid "Bind password" @@ -147,12 +153,8 @@ msgid "Search filter" msgstr "Suchfilter" #: admin/app_settings.py:114 -msgid "" -"An optional filter string (e.g. '(objectClass=person)'). In order to be " -"valid, it must be enclosed in parentheses." -msgstr "" -"Ein optionaler Filter z.B. (objectClass=person). Das Filter muss " -"entsprechend der LDAP-Konvention in Klammern gesetzt werden." +msgid "An optional filter string (e.g. '(objectClass=person)'). In order to be valid, it must be enclosed in parentheses." +msgstr "Ein optionaler Filter z.B. (objectClass=person). Das Filter muss entsprechend der LDAP-Konvention in Klammern gesetzt werden." #: admin/app_settings.py:119 msgid "User DN template" @@ -160,12 +162,8 @@ msgstr "Vorlage für User DN" #: admin/app_settings.py:121 #, python-format -msgid "" -"The template used to construct a user's DN. It should contain one " -"placeholder (ie. %(user)s)" -msgstr "" -"Die Vorlage für einen User DN. Sie sollte einen Platzhalter z.B. %(user)s " -"enthalten." +msgid "The template used to construct a user's DN. It should contain one placeholder (ie. %(user)s)" +msgstr "Die Vorlage für einen User DN. Sie sollte einen Platzhalter z.B. %(user)s enthalten." #: admin/app_settings.py:126 msgid "Password attribute" @@ -183,9 +181,12 @@ msgstr "Active Directory" msgid "Tell if the LDAP server is an Active Directory one" msgstr "Auswählen wenn der LDAP-Server ein Active Directory ist." -#: admin/app_settings.py:137 admin/templates/admin/editdomainform.html:25 -#: extensions/limits/app_settings.py:31 extensions/limits/forms.py:24 -#: extensions/limits/models.py:14 extensions/webmail/app_settings.py:101 +#: admin/app_settings.py:137 +#: admin/templates/admin/editdomainform.html:25 +#: extensions/limits/app_settings.py:31 +#: extensions/limits/forms.py:24 +#: extensions/limits/models.py:14 +#: extensions/webmail/app_settings.py:101 #: extensions/webmail/templates/webmail/folders.html:4 msgid "Mailboxes" msgstr "Mailboxen" @@ -195,12 +196,8 @@ msgid "Handle mailboxes on filesystem" msgstr "Mailbox im Dateisystem verwalten" #: admin/app_settings.py:142 -msgid "" -"Rename or remove mailboxes on the filesystem when they get renamed or " -"removed within Modoboa" -msgstr "" -"Mailboxen auch in Dateisystem umbenennen oder entfernen wenn sie in Modoboa " -"umbenannt oder entfernt werden" +msgid "Rename or remove mailboxes on the filesystem when they get renamed or removed within Modoboa" +msgstr "Mailboxen auch in Dateisystem umbenennen oder entfernen wenn sie in Modoboa umbenannt oder entfernt werden" #: admin/app_settings.py:146 msgid "Mailboxes ower" @@ -208,9 +205,7 @@ msgstr "Mailbox-Besitzer" #: admin/app_settings.py:148 msgid "The UNIX account who owns mailboxes on the filesystem" -msgstr "" -"UID des virtuellen Benutzers, der Besitzer der Domains, Mailboxen und " -"Nachrichten im Dateisystem ist." +msgstr "UID des virtuellen Benutzers, der Besitzer der Domains, Mailboxen und Nachrichten im Dateisystem ist." #: admin/app_settings.py:152 msgid "Automatic account removal" @@ -220,7 +215,8 @@ msgstr "Automatische Konto-Entfernung" msgid "When a mailbox is removed, also remove the associated account" msgstr "Beim Löschen der Mailbox auch das Konto entfernen." -#: admin/app_settings.py:157 admin/templates/admin/editdomainform.html:7 +#: admin/app_settings.py:157 +#: admin/templates/admin/editdomainform.html:7 msgid "Miscellaneous" msgstr "Verschiedenes" @@ -250,29 +246,25 @@ msgstr "Die Standardumleitung wenn kein Programm angegeben wurde" #: admin/app_settings.py:213 msgid "Key must be either 16, 24, or 32 bytes long" -msgstr "" +msgstr "Schlüssel muss 16, 24 oder 32 Byte lang sein" #: admin/app_settings.py:222 -#, fuzzy msgid "Invalid syntax" -msgstr "Ungültige Zeile" +msgstr "Ungültige Syntax" #: admin/app_settings.py:245 msgid "This field is required" msgstr "Dieses Feld ist erforderlich" -#: admin/forms.py:20 admin/forms.py:497 admin/tables.py:18 +#: admin/forms.py:20 +#: admin/forms.py:497 +#: admin/tables.py:18 msgid "Alias(es)" msgstr "Aliase" #: admin/forms.py:22 -msgid "" -"Alias(es) of this domain. Indicate only one name per input, press ENTER to " -"add a new input." -msgstr "" -"Alias(e) für diese Mailbox. Geben Sie jeweils nur eine Adresse pro " -"Eingabefeld an. Bestätigen Sie mit ENTER, um ein neues Eingabefeld zu " -"erhalten." +msgid "Alias(es) of this domain. Indicate only one name per input, press ENTER to add a new input." +msgstr "Alias(e) für diese Mailbox. Geben Sie jeweils nur eine Adresse pro Eingabefeld an. Bestätigen Sie mit ENTER, um ein neues Eingabefeld zu erhalten." #: admin/forms.py:59 msgid "An alias with this name already exists" @@ -290,7 +282,9 @@ msgstr "Domänen-Administrator erstellen" msgid "Automatically create an administrator for this domain" msgstr "Automatisch Administrator für diese Domain anlegen" -#: admin/forms.py:152 admin/tables.py:12 admin/tables.py:47 +#: admin/forms.py:152 +#: admin/tables.py:12 +#: admin/tables.py:47 #: admin/templates/admin/editdomainform.html:13 #: admin/templates/admin/identities_table.html:5 #: admin/templates/admin/information.html:8 @@ -300,12 +294,8 @@ msgid "Name" msgstr "Name" #: admin/forms.py:154 -msgid "" -"The administrator's name. Don't include the domain's name here, it will be " -"automatically appended." -msgstr "" -"Name des Administrators. Geben Sie nicht den Domainnamen mit an. Er wird " -"automatisch hinzugefügt." +msgid "The administrator's name. Don't include the domain's name here, it will be automatically appended." +msgstr "Name des Administrators. Geben Sie nicht den Domainnamen mit an. Er wird automatisch hinzugefügt." #: admin/forms.py:160 msgid "Create aliases" @@ -329,26 +319,20 @@ msgid "Email address" msgstr "E-Mail Adresse" #: admin/forms.py:236 -msgid "" -"The distribution list address. Use the '*' character to create a 'catchall' " -"address (ex: *@domain.tld)." -msgstr "" -"Adresse einer Verteilerliste. Geben Sie '*' an, um einen 'catchall'-Alias " -"(Bsp: *@example.com) zu erstellen." +msgid "The distribution list address. Use the '*' character to create a 'catchall' address (ex: *@domain.tld)." +msgstr "Adresse einer Verteilerliste. Geben Sie '*' an, um einen 'catchall'-Alias (Bsp: *@example.com) zu erstellen." #: admin/forms.py:239 msgid "Recipients" msgstr "Empfänger" #: admin/forms.py:240 -msgid "" -"Mailbox(es) this alias will point to. Indicate only one address per input, " -"press ENTER to add a new input." -msgstr "" -"Mailboxen auf die der Alias verweist. Geben Sie jeweils nur eine Adresse ein " -"und bestätigen Sie mit ENTER." +msgid "Mailbox(es) this alias will point to. Indicate only one address per input, press ENTER to add a new input." +msgstr "Mailboxen auf die der Alias verweist. Geben Sie jeweils nur eine Adresse ein und bestätigen Sie mit ENTER." -#: admin/forms.py:278 admin/forms.py:542 admin/forms.py:568 +#: admin/forms.py:278 +#: admin/forms.py:542 +#: admin/forms.py:568 msgid "Domain does not exist" msgstr "Domain existiert nicht" @@ -360,12 +344,14 @@ msgstr "Der Zugriff auf diese Domain ist ihnen nicht gestattet" msgid "Invalid mailbox" msgstr "Ungültige Mailbox" -#: admin/forms.py:316 admin/models.py:1202 +#: admin/forms.py:316 +#: admin/models.py:1202 #, python-format msgid "Local recipient %s not found" msgstr "Lokaler Empfänger %s nicht gefunden" -#: admin/forms.py:318 admin/forms.py:324 +#: admin/forms.py:318 +#: admin/forms.py:324 #, python-format msgid "Recipient %s already present" msgstr "Empfänger %s existiert bereits" @@ -374,11 +360,13 @@ msgstr "Empfänger %s existiert bereits" msgid "No recipient defined" msgstr "Keine Empfänger angegeben" -#: admin/forms.py:343 extensions/webmail/forms.py:19 +#: admin/forms.py:343 +#: extensions/webmail/forms.py:19 msgid "Select a file" msgstr "Wählen Sie eine Datei" -#: admin/forms.py:345 admin/forms.py:373 +#: admin/forms.py:345 +#: admin/forms.py:373 msgid "Separator" msgstr "Separator" @@ -402,7 +390,8 @@ msgstr "Auswählen wenn Kennwörter in Datei nicht verschlüsselt sind" msgid "File name" msgstr "Dateiname" -#: admin/forms.py:403 admin/templates/admin/editdomainform.html:13 +#: admin/forms.py:403 +#: admin/templates/admin/editdomainform.html:13 #: auth/forms.py:7 msgid "Username" msgstr "Benutzername" @@ -411,7 +400,8 @@ msgstr "Benutzername" msgid "Role" msgstr "Rolle" -#: admin/forms.py:406 admin/forms.py:433 +#: admin/forms.py:406 +#: admin/forms.py:433 msgid "Choose" msgstr "Auswählen" @@ -419,11 +409,13 @@ msgstr "Auswählen" msgid "What level of permission this user will have" msgstr "Rechte, die der Benutzer haben wird" -#: admin/forms.py:409 auth/forms.py:11 +#: admin/forms.py:409 +#: auth/forms.py:11 msgid "Password" msgstr "Passwort" -#: admin/forms.py:411 userprefs/forms.py:18 +#: admin/forms.py:411 +#: userprefs/forms.py:18 msgid "Confirmation" msgstr "Bestätigung" @@ -452,24 +444,12 @@ msgid "Quota" msgstr "Quota" #: admin/forms.py:492 -msgid "" -"Quota in MB for this mailbox. Define a custom value or use domain's default " -"one. Leave empty to define an unlimited value (not allowed for domain " -"administrators)." -msgstr "" -"Quota in MB für diese Mailbox. Geben Sie einen eigenen Wert an oder nutzen " -"Sie den Standardwert der Domain. Lassen Sie das Feld leer für unbegrenztes " -"Quota - Domänen-Administratoren ist dies nicht gestattet." +msgid "Quota in MB for this mailbox. Define a custom value or use domain's default one. Leave empty to define an unlimited value (not allowed for domain administrators)." +msgstr "Quota in MB für diese Mailbox. Geben Sie einen eigenen Wert an oder nutzen Sie den Standardwert der Domain. Lassen Sie das Feld leer für unbegrenztes Quota - Domänen-Administratoren ist dies nicht gestattet." #: admin/forms.py:499 -msgid "" -"Alias(es) of this mailbox. Indicate only one address per input, press ENTER " -"to add a new input. Use the '*' character to create a 'catchall' alias (ex: " -"*@domain.tld)." -msgstr "" -"Alias(e) für diese Mailbox. Geben Sie jeweils nur eine Adresse pro Eingabe " -"an. Bestätigen Sie mit ENTER um die Eingabe zu bestätigen. Geben Sie '*' an, " -"um einen 'catchall'-Alias (Bsp: *@example.com) zu erstellen." +msgid "Alias(es) of this mailbox. Indicate only one address per input, press ENTER to add a new input. Use the '*' character to create a 'catchall' alias (ex: *@domain.tld)." +msgstr "Alias(e) für diese Mailbox. Geben Sie jeweils nur eine Adresse pro Eingabe an. Bestätigen Sie mit ENTER um die Eingabe zu bestätigen. Geben Sie '*' an, um einen 'catchall'-Alias (Bsp: *@example.com) zu erstellen." #: admin/forms.py:550 #, python-format @@ -484,7 +464,8 @@ msgstr "Domain(s)" msgid "Domain(s) that user administrates" msgstr "Domänen, die dieser Anwender administriert" -#: admin/forms.py:654 admin/views.py:450 +#: admin/forms.py:654 +#: admin/views.py:450 msgid "Mail" msgstr "E-Mail" @@ -509,7 +490,9 @@ msgstr "Konnte Kennwort nicht aktualisieren: %s" msgid "account" msgstr "Konto" -#: admin/models.py:496 admin/models.py:733 admin/models.py:795 +#: admin/models.py:496 +#: admin/models.py:733 +#: admin/models.py:795 msgid "Invalid line" msgstr "Ungültige Zeile" @@ -520,19 +503,20 @@ msgstr "Sie können kein Konto einer höheren Rolle importieren" #: admin/models.py:506 #, python-format msgid "The simple user '%s' must have a valid email address" -msgstr "" +msgstr "Der normale Benutzer '%s' muss eine gültige E-Mail-Adresse besitzen" #: admin/models.py:510 #, python-format msgid "username and email fields must not differ for '%s'" -msgstr "" +msgstr "Die Felder für Benutzername und E-Mail für '%s' dürfen sich nicht unterscheiden" #: admin/models.py:534 #, python-format msgid "Account import failed (%s): domain does not exist" msgstr "Kann Konto nicht importieren (%s): Die Domain existiert nicht" -#: admin/models.py:624 admin/models.py:746 +#: admin/models.py:624 +#: admin/models.py:746 msgid "name" msgstr "Name" @@ -544,8 +528,11 @@ msgstr "Name der Domäne" msgid "Default quota in MB applied to mailboxes" msgstr "Standard-Quota für Mailboxen (in MB)" -#: admin/models.py:630 admin/models.py:753 admin/models.py:1045 -#: admin/models.py:1217 extensions/postfix_autoreply/models.py:27 +#: admin/models.py:630 +#: admin/models.py:753 +#: admin/models.py:1045 +#: admin/models.py:1217 +#: extensions/postfix_autoreply/models.py:27 msgid "enabled" msgstr "aktiviert" @@ -565,7 +552,8 @@ msgstr "Ziel" msgid "The domain this alias points to" msgstr "Domäne auf die dieser Alias verweist" -#: admin/models.py:754 admin/models.py:1046 +#: admin/models.py:754 +#: admin/models.py:1046 msgid "Check to activate this alias" msgstr "Auswählen um den Alias zu aktivieren" @@ -574,7 +562,8 @@ msgstr "Auswählen um den Alias zu aktivieren" msgid "Unknown domain %s" msgstr "Unbekannte Domain %s" -#: admin/models.py:818 admin/models.py:1031 +#: admin/models.py:818 +#: admin/models.py:1031 msgid "address" msgstr "Adresse" @@ -597,12 +586,8 @@ msgid "A quota is required" msgstr "Ein Quota ist erforderlich" #: admin/models.py:1032 -msgid "" -"The alias address (without the domain part). For a 'catch-all' address, just " -"enter an * character." -msgstr "" -"Die Alias-Adresse (ohne den Domain-Anteil). Geben sie für eine Adresse an, " -"die alles annimmt, * an." +msgid "The alias address (without the domain part). For a 'catch-all' address, just enter an * character." +msgstr "Die Alias-Adresse (ohne den Domain-Anteil). Geben sie für eine Adresse an, die alles annimmt, * an." #: admin/models.py:1036 msgid "mailboxes" @@ -634,9 +619,9 @@ msgid "Invalid line: %s" msgstr "Ungültige Zeile: %s" #: admin/models.py:1175 -#, fuzzy, python-format +#, python-format msgid "Domain '%s' does not exist" -msgstr "Domain existiert nicht" +msgstr "Domain '%s' existiert nicht" #: admin/models.py:1218 msgid "Check to enable this extension" @@ -663,8 +648,10 @@ msgstr "%(object)s '%(name)s' %(action)s der Identität %(user)s" msgid "Edit domain" msgstr "Domäne bearbeiten" -#: admin/tables.py:21 admin/templates/admin/identities_table.html:8 -#: admin/templates/admin/listing.html:17 extensions/sievefilters/views.py:83 +#: admin/tables.py:21 +#: admin/templates/admin/identities_table.html:8 +#: admin/templates/admin/listing.html:17 +#: extensions/sievefilters/views.py:83 #: extensions/sievefilters/templates/sievefilters/filter.html:17 #: extensions/sievefilters/templates/sievefilters/guieditor.html:5 #: extensions/webmail/templatetags/webextras.py:97 @@ -683,13 +670,19 @@ msgstr "Beschreibung" msgid "New domain" msgstr "Neue Domäne" -#: admin/views.py:89 admin/views.py:98 admin/views.py:228 admin/views.py:444 -#: admin/views.py:451 extensions/sievefilters/views.py:129 -#: extensions/sievefilters/views.py:198 extensions/webmail/views.py:136 +#: admin/views.py:89 +#: admin/views.py:98 +#: admin/views.py:228 +#: admin/views.py:444 +#: admin/views.py:451 +#: extensions/sievefilters/views.py:129 +#: extensions/sievefilters/views.py:198 +#: extensions/webmail/views.py:136 msgid "Create" msgstr "Erstellen" -#: admin/views.py:95 admin/views.py:448 +#: admin/views.py:95 +#: admin/views.py:448 msgid "Next" msgstr "Nächstes" @@ -697,7 +690,8 @@ msgstr "Nächstes" msgid "Options" msgstr "optionen" -#: admin/views.py:99 admin/views.py:452 +#: admin/views.py:99 +#: admin/views.py:452 msgid "Previous" msgstr "Vorheriges" @@ -705,9 +699,12 @@ msgstr "Vorheriges" msgid "Domain created" msgstr "Domäne erstellt." -#: admin/views.py:146 admin/views.py:285 admin/views.py:498 +#: admin/views.py:146 +#: admin/views.py:285 +#: admin/views.py:498 #: extensions/postfix_autoreply/templates/postfix_autoreply/autoreply.html:9 -#: extensions/sievefilters/views.py:148 extensions/webmail/views.py:168 +#: extensions/sievefilters/views.py:148 +#: extensions/webmail/views.py:168 #: userprefs/templates/userprefs/forward.html:8 #: userprefs/templates/userprefs/profile.html:8 msgid "Update" @@ -767,15 +764,25 @@ msgstr "Weiterleitung verändert" msgid "Alias modified" msgstr "Alias verändert" -#: admin/views.py:402 admin/views.py:545 admin/views.py:550 -#: extensions/amavis/views.py:204 extensions/amavis/views.py:210 -#: extensions/amavis/views.py:243 extensions/amavis/views.py:247 -#: extensions/amavis/views.py:249 extensions/webmail/views.py:41 -#: extensions/webmail/views.py:68 extensions/webmail/views.py:81 -#: extensions/webmail/views.py:98 extensions/webmail/views.py:114 -#: extensions/webmail/views.py:200 extensions/webmail/views.py:427 -#: extensions/webmail/views.py:438 extensions/webmail/views.py:465 -#: lib/formutils.py:32 lib/formutils.py:37 +#: admin/views.py:402 +#: admin/views.py:545 +#: admin/views.py:550 +#: extensions/amavis/views.py:204 +#: extensions/amavis/views.py:210 +#: extensions/amavis/views.py:243 +#: extensions/amavis/views.py:247 +#: extensions/amavis/views.py:249 +#: extensions/webmail/views.py:41 +#: extensions/webmail/views.py:68 +#: extensions/webmail/views.py:81 +#: extensions/webmail/views.py:98 +#: extensions/webmail/views.py:114 +#: extensions/webmail/views.py:200 +#: extensions/webmail/views.py:427 +#: extensions/webmail/views.py:438 +#: extensions/webmail/views.py:465 +#: lib/formutils.py:32 +#: lib/formutils.py:37 msgid "Invalid request" msgstr "Ungültige Anfrage" @@ -819,27 +826,23 @@ msgstr "%d Objekte erfolgreich importiert" msgid "" "Provide a CSV file where lines respect one of the following formats:\n" "
                          \n" -"
                        • account; loginname; password; first name; last name; enabled; group; " -"address[, domain, ...]
                          • \n" +"
                        • account; loginname; password; first name; last name; enabled; group; address[, domain, ...]
                          • \n" "
                        • alias; address; enabled; internal recipient
                          • \n" "
                        • forward; address; enabled; external recipient
                          • \n" "
                        • dlist; address; enabled; recipient; recipient; ...
                          • \n" "
                        \n" -"

                        The first element of each line is mandatory and must be equal to one of " -"the previous values.

                        \n" +"

                        The first element of each line is mandatory and must be equal to one of the previous values.

                        \n" "\n" "

                        You can use a different character as separator.

                        \n" msgstr "" "CSV-Datei in einem der folgenden Formate hinzufügen:\n" "
                          \n" -"
                        • account; loginname; password; first name; last name; enabled; group; " -"address[, domain, ...]
                          • \n" +"
                        • account; loginname; password; first name; last name; enabled; group; address[, domain, ...]
                          • \n" "
                        • alias; address; enabled; internal recipient
                          • \n" "
                        • forward; address; enabled; external recipient
                          • \n" "
                        • dlist; address; enabled; recipient; recipient; ...
                          • \n" "
                        \n" -"

                        Das erste Element einer Zeile ist zwingend und muss gleich mit einem der " -"vorhergehenden sein.

                        \n" +"

                        Das erste Element einer Zeile ist zwingend und muss gleich mit einem der vorhergehenden sein.

                        \n" "\n" "

                        Ein anderes Zeichen als Separator ist gestattet.

                        \n" @@ -847,7 +850,9 @@ msgstr "" msgid "Import identities" msgstr "Identitäten importieren" -#: admin/views.py:776 admin/views.py:846 admin/templatetags/admin_extras.py:87 +#: admin/views.py:776 +#: admin/views.py:846 +#: admin/templatetags/admin_extras.py:87 #: admin/templatetags/admin_extras.py:144 msgid "Import" msgstr "Importiere" @@ -856,7 +861,9 @@ msgstr "Importiere" msgid "Export identities" msgstr "Identitäten exportieren" -#: admin/views.py:807 admin/views.py:863 admin/templatetags/admin_extras.py:93 +#: admin/views.py:807 +#: admin/views.py:863 +#: admin/templatetags/admin_extras.py:93 #: admin/templatetags/admin_extras.py:150 msgid "Export" msgstr "Exportiere" @@ -868,8 +875,7 @@ msgid "" "
                      • domain; name; quota; enabled
                        • \n" "
                      • domainalias; name; targeted domain; enabled
                        • \n" "
                      \n" -"

                      The first element of each line is mandatory and must be equal to one of " -"the previous values.

                      \n" +"

                      The first element of each line is mandatory and must be equal to one of the previous values.

                      \n" "

                      You can use a different character as separator.

                      \n" msgstr "" "CSV-Datei in einem der folgenden Formate hinzufügen:\n" @@ -877,8 +883,7 @@ msgstr "" "
                    • domain; name; quota; enabled
                      • \n" "
                    • domainalias; name; targeted domain; enabled
                      • \n" "
                    \n" -"

                    Das erste Element einer Zeile ist zwinged und muss gleich zum " -"vorhergehenden sein.

                    \n" +"

                    Das erste Element einer Zeile ist zwinged und muss gleich zum vorhergehenden sein.

                    \n" "

                    Ein anderes Zeichen als Trenner ist gestattet.

                    \n" #: admin/views.py:845 @@ -895,8 +900,10 @@ msgstr "Domains exportieren" msgid "MB" msgstr "MB" -#: admin/templates/admin/domains.html:2 admin/templatetags/admin_extras.py:23 -#: extensions/limits/app_settings.py:19 extensions/limits/forms.py:16 +#: admin/templates/admin/domains.html:2 +#: admin/templatetags/admin_extras.py:23 +#: extensions/limits/app_settings.py:19 +#: extensions/limits/forms.py:16 #: extensions/limits/models.py:12 msgid "Domains" msgstr "Domänen" @@ -918,13 +925,15 @@ msgid "Last modification date" msgstr "Datum der letzten Änderung" #: admin/templates/admin/editdomainform.html:24 -#: extensions/limits/app_settings.py:25 extensions/limits/forms.py:20 +#: extensions/limits/app_settings.py:25 +#: extensions/limits/forms.py:20 #: extensions/limits/models.py:13 msgid "Domain aliases" msgstr "Domänen-Aliase" #: admin/templates/admin/editdomainform.html:26 -#: extensions/limits/app_settings.py:37 extensions/limits/forms.py:28 +#: extensions/limits/app_settings.py:37 +#: extensions/limits/forms.py:28 #: extensions/limits/models.py:15 msgid "Mailbox aliases" msgstr "Mailboxen-Aliase" @@ -996,7 +1005,8 @@ msgstr "Letzte Anmeldung" msgid "Filter" msgstr "Filter" -#: admin/templates/admin/logs.html:2 admin/templatetags/admin_extras.py:60 +#: admin/templates/admin/logs.html:2 +#: admin/templatetags/admin_extras.py:60 msgid "Logs" msgstr "Logs" @@ -1004,8 +1014,10 @@ msgstr "Logs" msgid "Previously on Modoboa..." msgstr "Vorher auf Modoboa…" -#: admin/templates/admin/logs.html:6 extensions/amavis/sql_listing.py:25 -#: extensions/webmail/lib.py:38 extensions/webmail/lib.py:411 +#: admin/templates/admin/logs.html:6 +#: extensions/amavis/sql_listing.py:25 +#: extensions/webmail/lib.py:38 +#: extensions/webmail/lib.py:411 msgid "Date" msgstr "Datum" @@ -1110,19 +1122,21 @@ msgstr "Domain-Identitäten anzeigen" #: admin/templatetags/admin_extras.py:178 #: admin/templatetags/admin_extras.py:194 #: admin/templatetags/admin_extras.py:201 -#, fuzzy, python-format +#, python-format msgid "Delete %s?" -msgstr "Löschen" +msgstr "%s löschen?" #: admin/templatetags/admin_extras.py:223 msgid "Remove this permission" msgstr "Berechtigung entfernen" -#: admin/templatetags/admin_extras.py:264 lib/formutils.py:206 +#: admin/templatetags/admin_extras.py:264 +#: lib/formutils.py:206 msgid "Yes" msgstr "Ja" -#: admin/templatetags/admin_extras.py:264 lib/formutils.py:206 +#: admin/templatetags/admin_extras.py:264 +#: lib/formutils.py:206 msgid "No" msgstr "Nein" @@ -1133,9 +1147,7 @@ msgstr "Identität '%s' hat sich erfolgreich angemeldet" #: auth/views.py:44 msgid "Your username and password didn't match. Please try again." -msgstr "" -"Ihr Benutzername und Passwort stimmen nicht überein. Bitte versuchen Sie es " -"noch einmal." +msgstr "Ihr Benutzername und Passwort stimmen nicht überein. Bitte versuchen Sie es noch einmal." #: auth/views.py:67 #, python-format @@ -1154,7 +1166,8 @@ msgstr "Virus senden" msgid "Send spam" msgstr "Spam senden" -#: demo/views.py:17 demo/views.py:41 +#: demo/views.py:17 +#: demo/views.py:41 msgid "Message sent" msgstr "Nachricht gesendet" @@ -1163,37 +1176,33 @@ msgid "" "\n" "

                    Welcome to the online demo!

                    \n" "

                    Warning: the demo's concent is resetted every two hours.

                    \n" -"

                    To try the demo, the following users are available (username/password):

                    \n" +"

                    To try the demo, the following users are available (username/password):

                    \n" "
                      \n" "
                    • A super administrator : admin/password
                      • \n" "
                    • A domain administrator : admin@demo.local/admin
                      • \n" "
                    • A simple user : user@demo.local/user
                      • \n" "
                    \n" "

                    Please report any issue or give any suggestion to \n" -" the " -"mailing list.

                    \n" +" the mailing list.

                    \n" msgstr "" "\n" "

                    Willkommen zur Online Demo!

                    \n" -"

                    Warnung: die Inhalte dieser Demo werden alle zwei Stunden gelöscht." -"

                    \n" -"

                    Folgende User (Benutzername/Kennwort) stehen zum Testen zur " -"Verfügung:

                    \n" +"

                    Warnung: die Inhalte dieser Demo werden alle zwei Stunden gelöscht.

                    \n" +"

                    Folgende User (Benutzername/Kennwort) stehen zum Testen zur Verfügung:

                    \n" "
                      \n" "
                    • Super-Administrator : admin/password
                      • \n" "
                    • Domänen-Administrator : admin@demo.local/admin
                      • \n" "
                    • Normaler Benutzer: user@demo.local/user
                      • \n" "
                    \n" "

                    Probleme und Anregungen bitte an die\n" -" Mailingliste berichten.

                    \n" +" Mailingliste berichten.

                    \n" #: extensions/amavis/__init__.py:22 msgid "Simple amavis management frontend" msgstr "Einfache amavis Management Oberfläche" -#: extensions/amavis/__init__.py:45 extensions/amavis/__init__.py:61 +#: extensions/amavis/__init__.py:45 +#: extensions/amavis/__init__.py:61 msgid "Quarantine" msgstr "Quarantäne" @@ -1220,9 +1229,7 @@ msgstr "Maximales Alter einer Nachricht" #: extensions/amavis/app_settings.py:16 msgid "Quarantine messages maximum age (in days) before deletion" -msgstr "" -"Maximales Alter (in Tagen) von Nachrichten in der Quarantäne bevor sie " -"gelöscht werden" +msgstr "Maximales Alter (in Tagen) von Nachrichten in der Quarantäne bevor sie gelöscht werden" #: extensions/amavis/app_settings.py:19 msgid "Messages releasing" @@ -1298,23 +1305,22 @@ msgstr "Absender von Benachrichtigungen" #: extensions/amavis/app_settings.py:74 msgid "The e-mail address used to send notitications" -msgstr "" -"Die Mailadresse, die verwendet wird, um Benachrichtigungen zu versenden" +msgstr "Die Mailadresse, die verwendet wird, um Benachrichtigungen zu versenden" -#: extensions/amavis/app_settings.py:87 extensions/webmail/app_settings.py:73 +#: extensions/amavis/app_settings.py:87 +#: extensions/webmail/app_settings.py:73 #: userprefs/app_settings.py:18 msgid "Display" msgstr "Darstellung" -#: extensions/amavis/app_settings.py:91 extensions/webmail/app_settings.py:91 +#: extensions/amavis/app_settings.py:91 +#: extensions/webmail/app_settings.py:91 msgid "Number of displayed emails per page" msgstr "Anzahl dargestellter Nachrichten pro Seite" #: extensions/amavis/app_settings.py:92 msgid "Set the maximum number of messages displayed in a page" -msgstr "" -"Legt die maximale Anzahl von Nachrichten fest, die in einer Seite " -"dargestellt werden" +msgstr "Legt die maximale Anzahl von Nachrichten fest, die in einer Seite dargestellt werden" #: extensions/amavis/lib.py:53 #, python-format @@ -1325,17 +1331,22 @@ msgstr "Verbindung zu amavis fehlgeschlagen: %s" msgid "Virus filter" msgstr "Virusfilter" -#: extensions/amavis/models.py:94 extensions/amavis/models.py:102 -#: extensions/amavis/models.py:110 extensions/sievefilters/views.py:281 +#: extensions/amavis/models.py:94 +#: extensions/amavis/models.py:102 +#: extensions/amavis/models.py:110 +#: extensions/sievefilters/views.py:281 msgid "yes" msgstr "Ja" -#: extensions/amavis/models.py:95 extensions/amavis/models.py:103 -#: extensions/amavis/models.py:111 extensions/sievefilters/views.py:285 +#: extensions/amavis/models.py:95 +#: extensions/amavis/models.py:103 +#: extensions/amavis/models.py:111 +#: extensions/sievefilters/views.py:285 msgid "no" msgstr "Nein" -#: extensions/amavis/models.py:96 extensions/amavis/models.py:104 +#: extensions/amavis/models.py:96 +#: extensions/amavis/models.py:104 #: extensions/amavis/models.py:112 #: extensions/amavis/templates/amavis/domain_content_filter.html:11 msgid "default" @@ -1343,9 +1354,7 @@ msgstr "Standard" #: extensions/amavis/models.py:98 msgid "Bypass virus checks or not. Choose 'default' to use global settings." -msgstr "" -"Virus-Prüfungen umgehen oder nicht. Geben Sie, um den Domain-Standard zu " -"nutzen, keinen individuellen Wert an." +msgstr "Virus-Prüfungen umgehen oder nicht. Geben Sie, um den Domain-Standard zu nutzen, keinen individuellen Wert an." #: extensions/amavis/models.py:101 msgid "Spam filter" @@ -1353,9 +1362,7 @@ msgstr "SPAM-Filter" #: extensions/amavis/models.py:106 msgid "Bypass spam checks or not. Choose 'default' to use global settings." -msgstr "" -"Spam-Prüfungen umgehen oder nicht. Geben Sie, um den Domain-Standard zu " -"nutzen, keinen individuellen Wert an." +msgstr "Spam-Prüfungen umgehen oder nicht. Geben Sie, um den Domain-Standard zu nutzen, keinen individuellen Wert an." #: extensions/amavis/models.py:109 msgid "Banned filter" @@ -1363,29 +1370,27 @@ msgstr "Filter für unerwünschte Dateien" #: extensions/amavis/models.py:114 msgid "Bypass banned checks or not. Choose 'default' to use global settings." -msgstr "" -"Unerwünschte Dateien umgehen oder nicht. Geben Sie, um den Domain-Standard " -"zu nutzen, keinen individuellen Wert an." +msgstr "Unerwünschte Dateien umgehen oder nicht. Geben Sie, um den Domain-Standard zu nutzen, keinen individuellen Wert an." #: extensions/amavis/models.py:144 msgid "Spam marker" msgstr "SPAM-Markierung" #: extensions/amavis/models.py:146 -msgid "" -"Modify spam subject using the specified text. Choose 'default' to use global " -"settings." -msgstr "" -"Betreff:-Zeile einer Spam-Nachricht mit dem angegebenen Text ergänzen. " -"Wählen Sie 'Standard' für den systemweiten Standard." +msgid "Modify spam subject using the specified text. Choose 'default' to use global settings." +msgstr "Betreff:-Zeile einer Spam-Nachricht mit dem angegebenen Text ergänzen. Wählen Sie 'Standard' für den systemweiten Standard." -#: extensions/amavis/sql_listing.py:23 extensions/webmail/lib.py:37 +#: extensions/amavis/sql_listing.py:23 +#: extensions/webmail/lib.py:37 msgid "From" msgstr "Von" -#: extensions/amavis/sql_listing.py:24 extensions/sievefilters/forms.py:68 -#: extensions/webmail/forms.py:10 extensions/webmail/lib.py:36 -#: extensions/webmail/lib.py:409 templates/common/email_searchbar.html:6 +#: extensions/amavis/sql_listing.py:24 +#: extensions/sievefilters/forms.py:68 +#: extensions/webmail/forms.py:10 +#: extensions/webmail/lib.py:36 +#: extensions/webmail/lib.py:409 +#: templates/common/email_searchbar.html:6 msgid "Subject" msgstr "Betreff" @@ -1494,8 +1499,7 @@ msgstr "Rektion auf diese Nachricht:" #: extensions/amavis/templates/amavis/notifications/pending_requests.html:14 #, python-format msgid "Please visit %(listingurl)s for a full listing." -msgstr "" -"Bitte besuchen sie %(listingurl)s um eine vollständige Ausgabe zu erhalten." +msgstr "Bitte besuchen sie %(listingurl)s um eine vollständige Ausgabe zu erhalten." #: extensions/amavis/templatetags/amextras.py:20 #: extensions/amavis/templatetags/amextras.py:52 @@ -1539,10 +1543,8 @@ msgid "Bad MIME" msgstr "Schlechtes MIME" #: extensions/limits/__init__.py:23 -msgid "" -"Per administrator resources to limit the number of objects they can create" -msgstr "" -"Administrator-Ressourcen, um die Anzahl erstellbarer Objekte einzuschränken" +msgid "Per administrator resources to limit the number of objects they can create" +msgstr "Administrator-Ressourcen, um die Anzahl erstellbarer Objekte einzuschränken" #: extensions/limits/__init__.py:54 msgid "Limits" @@ -1560,16 +1562,15 @@ msgstr "Ressourcen" msgid "Default limits" msgstr "Standard-Grenzwerte" -#: extensions/limits/app_settings.py:13 extensions/limits/forms.py:12 +#: extensions/limits/app_settings.py:13 +#: extensions/limits/forms.py:12 #: extensions/limits/models.py:11 msgid "Domain admins" msgstr "Domänen-Administratoren" #: extensions/limits/app_settings.py:15 msgid "Maximum number of allowed domain administrators for a new administrator" -msgstr "" -"Maximale Anzahl Domänenadministratoren, die ein neuer Administrator " -"erstellen darf" +msgstr "Maximale Anzahl Domänenadministratoren, die ein neuer Administrator erstellen darf" #: extensions/limits/app_settings.py:21 msgid "Maximum number of allowed domains for a new administrator" @@ -1577,8 +1578,7 @@ msgstr "Maximale Anzahl Domains, die ein neuer Administrator erstellen darf" #: extensions/limits/app_settings.py:27 msgid "Maximum number of allowed domain aliases for a new administrator" -msgstr "" -"Maximale Anzahl Domain Aliase, die ein neuer Administrator erstellen darf" +msgstr "Maximale Anzahl Domain Aliase, die ein neuer Administrator erstellen darf" #: extensions/limits/app_settings.py:33 msgid "Maximum number of allowed mailboxes for a new administrator" @@ -1618,8 +1618,7 @@ msgstr "Ihre Ressourcen wurde noch nicht initialisiert" #: extensions/limits/forms.py:78 msgid "You're not allowed to define unlimited values" -msgstr "" -"Sie verfügen nicht über ausreichend Rechte, um unbegrenzte Werte anzugeben" +msgstr "Sie verfügen nicht über ausreichend Rechte, um unbegrenzte Werte anzugeben" #: extensions/limits/lib.py:16 #, python-format @@ -1644,8 +1643,7 @@ msgstr "Ressourcen-Verbrauch" #: extensions/postfix_autoreply/__init__.py:20 msgid "Auto-reply (vacation) functionality using Postfix" -msgstr "" -"Automatische Antwort (Abwesenheitsbenachrichtigung) über Postfix-Programm" +msgstr "Automatische Antwort (Abwesenheitsbenachrichtigung) über Postfix-Programm" #: extensions/postfix_autoreply/__init__.py:41 msgid "Automatic replies" @@ -1662,9 +1660,7 @@ msgstr "Zeitüberschreitung für automatische Antworten" #: extensions/postfix_autoreply/app_settings.py:16 msgid "Timeout in seconds between two auto-replies to the same recipient" -msgstr "" -"Zeit in Sekunden zwischen zwei automatisierten Antworten an denselben " -"Empfänger" +msgstr "Zeit in Sekunden zwischen zwei automatisierten Antworten an denselben Empfänger" #: extensions/postfix_autoreply/forms.py:9 msgid "Until" @@ -1704,9 +1700,7 @@ msgstr "Automatische Antwort erfolgreich aktualisiert." #: extensions/postfix_autoreply/templates/postfix_autoreply/autoreply.html:2 msgid "Define a message to automatically send when you are off" -msgstr "" -"Gegen sie eine Nachricht an, die gesendet werden soll, wenn Sie nicht " -"erreichbar sind" +msgstr "Gegen sie eine Nachricht an, die gesendet werden soll, wenn Sie nicht erreichbar sind" #: extensions/sievefilters/__init__.py:12 msgid "Plugin to easily create server-side filters" @@ -1798,7 +1792,8 @@ msgstr "Sender" msgid "Recipient" msgstr "Empfänger" -#: extensions/sievefilters/forms.py:71 extensions/webmail/forms.py:8 +#: extensions/sievefilters/forms.py:71 +#: extensions/webmail/forms.py:8 msgid "Cc" msgstr "Cc" @@ -1824,9 +1819,7 @@ msgstr "Leite Nachricht um zu" #: extensions/sievefilters/lib.py:37 msgid "Connection to MANAGESIEVE server failed, check your configuration" -msgstr "" -"Verbindung zu MANAGESIEVE-Server fehlgeschlagen. Überprüfen Sie Ihre " -"Konfiguration." +msgstr "Verbindung zu MANAGESIEVE-Server fehlgeschlagen. Überprüfen Sie Ihre Konfiguration." #: extensions/sievefilters/lib.py:82 msgid "Not enough space on server" @@ -1903,11 +1896,8 @@ msgid "active" msgstr "aktiv" #: extensions/sievefilters/templates/sievefilters/index.html:74 -msgid "" -"No filters set defined yet. You must create one in order to define filters." -msgstr "" -"Nich keine Filter-Sätze definiert. Sie müssen einen erstellen, damit sie " -"Filter erstellen können." +msgid "No filters set defined yet. You must create one in order to define filters." +msgstr "Nich keine Filter-Sätze definiert. Sie müssen einen erstellen, damit sie Filter erstellen können." #: extensions/sievefilters/templatetags/sfilters_tags.py:16 msgid "New filters set" @@ -2047,7 +2037,8 @@ msgstr "Jahr" msgid "Total" msgstr "Gesamt" -#: extensions/stats/views.py:21 extensions/stats/templates/stats/graphs.html:4 +#: extensions/stats/views.py:21 +#: extensions/stats/templates/stats/graphs.html:4 msgid "No statistics available" msgstr "Keine Statistik-Daten verfügbar" @@ -2157,9 +2148,7 @@ msgstr "Aktiviere/Deaktiviere Darstellung von HTML-Links" #: extensions/webmail/app_settings.py:92 msgid "Sets the maximum number of messages displayed in a page" -msgstr "" -"Legt die maximale Anzahl von Nachrichten fest, die in einer Seite " -"dargestellt werden" +msgstr "Legt die maximale Anzahl von Nachrichten fest, die in einer Seite dargestellt werden" #: extensions/webmail/app_settings.py:97 msgid "Listing refresh rate" @@ -2222,9 +2211,8 @@ msgid "Cci" msgstr "Cci" #: extensions/webmail/imaputils.py:237 -#, fuzzy msgid "Failed to retrieve hierarchy delimiter" -msgstr "Konnte Filter-Satz nicht laden" +msgstr "Konnte Trenner für Hierarchie nicht in Erfahrung bringen" #: extensions/webmail/imaputils.py:278 #, python-format @@ -2235,7 +2223,8 @@ msgstr "Verbindung zu IMAP-Server fehlgeschlagen: %s" msgid "wrote:" msgstr "schrieb:" -#: extensions/webmail/lib.py:423 extensions/webmail/lib.py:427 +#: extensions/webmail/lib.py:423 +#: extensions/webmail/lib.py:427 msgid "Original message" msgstr "Gesendete Nachrichten" @@ -2250,7 +2239,8 @@ msgstr[1] "%(count)d Nachrichten gelöscht" msgid "Unknown action" msgstr "Unbekannte Aktion" -#: extensions/webmail/views.py:116 lib/email_listing.py:137 +#: extensions/webmail/views.py:116 +#: lib/email_listing.py:137 msgid "Empty mailbox" msgstr "Mailbox leer" @@ -2271,7 +2261,8 @@ msgstr "Mailbox bearbeiten" msgid "Mailbox updated" msgstr "Mailbox aktualisiert" -#: extensions/webmail/views.py:214 extensions/webmail/views.py:396 +#: extensions/webmail/views.py:214 +#: extensions/webmail/views.py:396 #: extensions/webmail/views.py:505 msgid "Bad request" msgstr "Fehlerhafte Anfrage" @@ -2417,7 +2408,8 @@ msgstr "Erlaubnis verweigert: %s" msgid "Permission denied" msgstr "Berechtigung verweigert" -#: lib/formutils.py:157 lib/formutils.py:165 +#: lib/formutils.py:157 +#: lib/formutils.py:165 msgid "Enter a valid domain name" msgstr "Geben Sie einen gültigen Domain-Namen an" @@ -2446,7 +2438,8 @@ msgstr "Keine Einträge darzustellen" msgid "activate" msgstr "aktivieren" -#: templates/404.html:4 templates/500.html:4 +#: templates/404.html:4 +#: templates/500.html:4 msgid "Sorry" msgstr "Entschuldigung" @@ -2549,12 +2542,8 @@ msgid "Forward messages and store copies into your local mailbox" msgstr "Nachricht weiterleiten und Kopie in Mailbox ablegen" #: userprefs/forms.py:84 -msgid "" -"You can't define a forward to a local destination. Please ask your " -"administrator to create an alias instead." -msgstr "" -"Sie können keine Weiterleitung auf ein lokales Ziel anlegen. Bitten Sie " -"Ihren Administrator stattdessen einen Alias anzulegen." +msgid "You can't define a forward to a local destination. Please ask your administrator to create an alias instead." +msgstr "Sie können keine Weiterleitung auf ein lokales Ziel anlegen. Bitten Sie Ihren Administrator stattdessen einen Alias anzulegen." #: userprefs/views.py:32 msgid "You need a mailbox in order to define a forward" From a62f7882323c9e889739d8f5f2faa55de95be6cc Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Sat, 5 Oct 2013 14:03:27 +0200 Subject: [PATCH 70/97] Portuguese translation updated. --- modoboa/locale/pt_PT/LC_MESSAGES/django.po | 236 ++++++--------------- 1 file changed, 60 insertions(+), 176 deletions(-) diff --git a/modoboa/locale/pt_PT/LC_MESSAGES/django.po b/modoboa/locale/pt_PT/LC_MESSAGES/django.po index a160de8a6..d0e672cb5 100644 --- a/modoboa/locale/pt_PT/LC_MESSAGES/django.po +++ b/modoboa/locale/pt_PT/LC_MESSAGES/django.po @@ -1,8 +1,9 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: +# ddu17 , 2013 # mikec , 2012 # mikec , 2013 # Sandra Ribeiro , 2012-2013 @@ -10,16 +11,15 @@ msgid "" msgstr "" "Project-Id-Version: Modoboa\n" -"Report-Msgid-Bugs-To: \n" +"Report-Msgid-Bugs-To: http://dev.modoboa.org/\n" "POT-Creation-Date: 2013-09-20 22:30+0200\n" -"PO-Revision-Date: 2013-06-21 13:19+0000\n" -"Last-Translator: mikec \n" -"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/" -"modoboa/language/pt_PT/)\n" -"Language: pt_PT\n" +"PO-Revision-Date: 2013-10-04 21:10+0000\n" +"Last-Translator: ddu17 \n" +"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/modoboa/language/pt_PT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: pt_PT\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: admin/__init__.py:9 @@ -125,9 +125,7 @@ msgstr "\"Bind DN\"" msgid "" "The distinguished name to use when binding to the LDAP server. Leave empty " "for an anonymous bind" -msgstr "" -"O nome único usado para fazer o \"bind\" ao servidor LDAP. Deixar vario " -"para \"bind\" anónimo" +msgstr "O nome único usado para fazer o \"bind\" ao servidor LDAP. Deixar vario para \"bind\" anónimo" #: admin/app_settings.py:97 msgid "Bind password" @@ -135,8 +133,7 @@ msgstr "Password para bind" #: admin/app_settings.py:99 msgid "The password to use when binding to the LDAP server (with 'Bind DN')" -msgstr "" -"A password usada para fazer o \"bind\" ao servidor LDAP (com 'Bind DN')" +msgstr "A password usada para fazer o \"bind\" ao servidor LDAP (com 'Bind DN')" #: admin/app_settings.py:105 msgid "Search base" @@ -154,9 +151,7 @@ msgstr "Filtro de pesquisa" msgid "" "An optional filter string (e.g. '(objectClass=person)'). In order to be " "valid, it must be enclosed in parentheses." -msgstr "" -"Um filtro opcional (ex: '(objetClass=person)'). Tem de estar entre " -"parênteses para ser válido" +msgstr "Um filtro opcional (ex: '(objetClass=person)'). Tem de estar entre parênteses para ser válido" #: admin/app_settings.py:119 msgid "User DN template" @@ -167,9 +162,7 @@ msgstr "Template DN de utilizador" msgid "" "The template used to construct a user's DN. It should contain one " "placeholder (ie. %(user)s)" -msgstr "" -"O template usado para construir o DN (nome único). Deve apenas conter um " -"'placeholder' (ex: %(user)s) " +msgstr "O template usado para construir o DN (nome único). Deve apenas conter um 'placeholder' (ex: %(user)s) " #: admin/app_settings.py:126 msgid "Password attribute" @@ -202,9 +195,7 @@ msgstr "Lidar com caixas de correio no sistema de ficheiros" msgid "" "Rename or remove mailboxes on the filesystem when they get renamed or " "removed within Modoboa" -msgstr "" -"Renomear ou remover as caixas de correio no sistema de ficheiros quando " -"estas são renomeadas no Modoboa" +msgstr "Renomear ou remover as caixas de correio no sistema de ficheiros quando estas são renomeadas no Modoboa" #: admin/app_settings.py:146 msgid "Mailboxes ower" @@ -220,8 +211,7 @@ msgstr "Remoção automática de conta" #: admin/app_settings.py:154 msgid "When a mailbox is removed, also remove the associated account" -msgstr "" -"Ao remover uma caixa de correio estará também a remover a conta associada" +msgstr "Ao remover uma caixa de correio estará também a remover a conta associada" #: admin/app_settings.py:157 admin/templates/admin/editdomainform.html:7 msgid "Miscellaneous" @@ -249,18 +239,15 @@ msgstr "Redirecionamento pré-definido" #: admin/app_settings.py:175 msgid "The default redirection used when no application is specified" -msgstr "" -"O redirecionamento padrão usado quando nenhuma aplicação se encontra " -"especificada" +msgstr "O redirecionamento padrão usado quando nenhuma aplicação se encontra especificada" #: admin/app_settings.py:213 msgid "Key must be either 16, 24, or 32 bytes long" -msgstr "" +msgstr "A chave deve ter tamanho de 16, 24, ou 32 bytes" #: admin/app_settings.py:222 -#, fuzzy msgid "Invalid syntax" -msgstr "Linha inválida" +msgstr "Sintax inválida" #: admin/app_settings.py:245 msgid "This field is required" @@ -274,9 +261,7 @@ msgstr "Alias(es)" msgid "" "Alias(es) of this domain. Indicate only one name per input, press ENTER to " "add a new input." -msgstr "" -"Alias(es) deste domínio. Indicar apenas um nome por entrada, pressionar " -"ENTER para acrescentar uma nova entrada." +msgstr "Alias(es) deste domínio. Indicar apenas um nome por entrada, pressionar ENTER para acrescentar uma nova entrada." #: admin/forms.py:59 msgid "An alias with this name already exists" @@ -307,9 +292,7 @@ msgstr "Nome" msgid "" "The administrator's name. Don't include the domain's name here, it will be " "automatically appended." -msgstr "" -"O nome do administrador. Não inclua o nome do domínio já que este será " -"automaticamente anexado." +msgstr "O nome do administrador. Não inclua o nome do domínio já que este será automaticamente anexado." #: admin/forms.py:160 msgid "Create aliases" @@ -336,9 +319,7 @@ msgstr "Endereço de e-mail" msgid "" "The distribution list address. Use the '*' character to create a 'catchall' " "address (ex: *@domain.tld)." -msgstr "" -"Os endereços da lista de distribuição. Use o '*' para criar um endereço " -"'catchall' (Ex: *@domain.tld)." +msgstr "Os endereços da lista de distribuição. Use o '*' para criar um endereço 'catchall' (Ex: *@domain.tld)." #: admin/forms.py:239 msgid "Recipients" @@ -348,9 +329,7 @@ msgstr "Destinatários" msgid "" "Mailbox(es) this alias will point to. Indicate only one address per input, " "press ENTER to add a new input." -msgstr "" -"Caixa(s) de correio para o qual este 'alias' aponta. Indicar apenas um " -"endereço por entrada, pressionar ENTER para acrescentar uma nova entrada." +msgstr "Caixa(s) de correio para o qual este 'alias' aponta. Indicar apenas um endereço por entrada, pressionar ENTER para acrescentar uma nova entrada." #: admin/forms.py:278 admin/forms.py:542 admin/forms.py:568 msgid "Domain does not exist" @@ -460,20 +439,14 @@ msgid "" "Quota in MB for this mailbox. Define a custom value or use domain's default " "one. Leave empty to define an unlimited value (not allowed for domain " "administrators)." -msgstr "" -"Quota em MB para esta caixa de correio. Definir uma valor personalizado ou " -"usar o valor predefinido pelo domínio. Deixar em branco para definir uma " -"valor ilimitado (não permitido para administradores do domínio)." +msgstr "Quota em MB para esta caixa de correio. Definir uma valor personalizado ou usar o valor predefinido pelo domínio. Deixar em branco para definir uma valor ilimitado (não permitido para administradores do domínio)." #: admin/forms.py:499 msgid "" "Alias(es) of this mailbox. Indicate only one address per input, press ENTER " "to add a new input. Use the '*' character to create a 'catchall' alias (ex: " "*@domain.tld)." -msgstr "" -"Alias(es) desta caixa de correio. Indique apenas um endereço por entrada, " -"clique ENTER para adicionar uma nova entrada. Use o '*' para criar um alias " -"'catchall' (ex: *@domain.tld)." +msgstr "Alias(es) desta caixa de correio. Indique apenas um endereço por entrada, clique ENTER para adicionar uma nova entrada. Use o '*' para criar um alias 'catchall' (ex: *@domain.tld)." #: admin/forms.py:550 #, python-format @@ -524,12 +497,12 @@ msgstr "Não é possível importa uma conta com permissões superiores" #: admin/models.py:506 #, python-format msgid "The simple user '%s' must have a valid email address" -msgstr "" +msgstr "O simple utilizador '%s' deve ter endereço de e-mail válido" #: admin/models.py:510 #, python-format msgid "username and email fields must not differ for '%s'" -msgstr "" +msgstr "Os campos nome de utilizador e endereço de email não deve ser diferente para '%s'" #: admin/models.py:534 #, python-format @@ -602,11 +575,9 @@ msgstr "É necessário uma quota" #: admin/models.py:1032 msgid "" -"The alias address (without the domain part). For a 'catch-all' address, just " -"enter an * character." -msgstr "" -"O endereço do alias (sem a parte do domínio). Para um endereço 'cath-all', " -"digite apenas o caractere *" +"The alias address (without the domain part). For a 'catch-all' address, just" +" enter an * character." +msgstr "O endereço do alias (sem a parte do domínio). Para um endereço 'cath-all', digite apenas o caractere *" #: admin/models.py:1036 msgid "mailboxes" @@ -638,9 +609,9 @@ msgid "Invalid line: %s" msgstr "Linha inválida: %s" #: admin/models.py:1175 -#, fuzzy, python-format +#, python-format msgid "Domain '%s' does not exist" -msgstr "O domínio não existe" +msgstr "O domínio '%s' não existe" #: admin/models.py:1218 msgid "Check to enable this extension" @@ -823,29 +794,15 @@ msgstr "%d objetos importados com sucesso" msgid "" "Provide a CSV file where lines respect one of the following formats:\n" "
                      \n" -"
                    • account; loginname; password; first name; last name; enabled; group; " -"address[, domain, ...]
                      • \n" +"
                    • account; loginname; password; first name; last name; enabled; group; address[, domain, ...]
                      • \n" "
                    • alias; address; enabled; internal recipient
                      • \n" "
                    • forward; address; enabled; external recipient
                      • \n" "
                    • dlist; address; enabled; recipient; recipient; ...
                      • \n" "
                    \n" -"

                    The first element of each line is mandatory and must be equal to one of " -"the previous values.

                    \n" +"

                    The first element of each line is mandatory and must be equal to one of the previous values.

                    \n" "\n" "

                    You can use a different character as separator.

                    \n" -msgstr "" -"Forneça um ficheiro CSV cujas linhas respeitem um dos seguintes formatos:⏎\n" -"
                      ⏎\n" -"
                    • account; loginname; password; first name; last name; enabled; group; " -"address[, domain, ...]
                      • ⏎\n" -"
                    • alias; address; enabled; internal recipient
                      • ⏎\n" -"
                    • forward; address; enabled; external recipient
                      • ⏎\n" -"
                    • dlist; address; enabled; recipient; recipient; ...
                      • ⏎\n" -"
                    ⏎\n" -"

                    O primeiro elemento de cada linha é obrigatório e deve ser igual a um dos " -"valores anteriores..

                    ⏎\n" -"⏎\n" -"

                    Pode utilizar um caractere diferente como separador.

                    ⏎\n" +msgstr "Forneça um ficheiro CSV cujas linhas respeitem um dos seguintes formatos:⏎\n
                      ⏎\n
                    • account; loginname; password; first name; last name; enabled; group; address[, domain, ...]
                      • ⏎\n
                    • alias; address; enabled; internal recipient
                      • ⏎\n
                    • forward; address; enabled; external recipient
                      • ⏎\n
                    • dlist; address; enabled; recipient; recipient; ...
                      • ⏎\n
                    ⏎\n

                    O primeiro elemento de cada linha é obrigatório e deve ser igual a um dos valores anteriores..

                    ⏎\n⏎\n

                    Pode utilizar um caractere diferente como separador.

                    ⏎\n" #: admin/views.py:775 msgid "Import identities" @@ -872,15 +829,9 @@ msgid "" "
                  • domain; name; quota; enabled
                    • \n" "
                  • domainalias; name; targeted domain; enabled
                    • \n" "
                  \n" -"

                  The first element of each line is mandatory and must be equal to one of " -"the previous values.

                  \n" +"

                  The first element of each line is mandatory and must be equal to one of the previous values.

                  \n" "

                  You can use a different character as separator.

                  \n" -msgstr "" -"Forneça um ficheiro CSV cujas linhas respeitem um dos seguintes formatos:⏎ " -"
                    ⏎
                  • domain; name; quota; enabled
                    • ⏎
                  • domainalias; " -"name; targeted domain; enabled
                    • ⏎
                  ⏎

                  O primeiro elemento de " -"cada linha é obrigatório e deve ser igual a um dos valores anteriores.

                  ⏎ " -"

                  Pode utilizar um caractere diferente como separador.

                  ⏎\n" +msgstr "Forneça um ficheiro CSV cujas linhas respeitem um dos seguintes formatos:⏎
                    ⏎
                  • domain; name; quota; enabled
                    • ⏎
                  • domainalias; name; targeted domain; enabled
                    • ⏎
                  ⏎

                  O primeiro elemento de cada linha é obrigatório e deve ser igual a um dos valores anteriores.

                  ⏎

                  Pode utilizar um caractere diferente como separador.

                  ⏎\n" #: admin/views.py:845 msgid "Import domains" @@ -1111,9 +1062,9 @@ msgstr "Visualizar as identidades do domínio" #: admin/templatetags/admin_extras.py:178 #: admin/templatetags/admin_extras.py:194 #: admin/templatetags/admin_extras.py:201 -#, fuzzy, python-format +#, python-format msgid "Delete %s?" -msgstr "Eliminar" +msgstr "Eliminar %s?" #: admin/templatetags/admin_extras.py:223 msgid "Remove this permission" @@ -1162,31 +1113,15 @@ msgid "" "\n" "

                  Welcome to the online demo!

                  \n" "

                  Warning: the demo's concent is resetted every two hours.

                  \n" -"

                  To try the demo, the following users are available (username/password):

                  \n" +"

                  To try the demo, the following users are available (username/password):

                  \n" "
                    \n" "
                  • A super administrator : admin/password
                    • \n" "
                  • A domain administrator : admin@demo.local/admin
                    • \n" "
                  • A simple user : user@demo.local/user
                    • \n" "
                  \n" "

                  Please report any issue or give any suggestion to \n" -" the " -"mailing list.

                  \n" -msgstr "" -"\n" -"

                  Bem-vindo à demo online!

                  \n" -"

                  Aviso: os conteúdos desta demo são limpos a cada duas horas.

                  \n" -"

                  Para experimentar a demo, estão disponíveis os seguintes utilizadores " -"(username/password):

                  \n" -"
                    \n" -"
                  • Super administrador: admin/password
                    • \n" -"
                  • Administrador de domínio: admin@demo.local/admin
                    • \n" -"
                  • Utilizador básico: user@demo.local/user
                    • \n" -"
                  \n" -"

                  Para reportar qualquer problema ou apresentar uma sugestão, utilize o " -"seguinte link \n" -" mailing " -"list.

                  \n" +" the mailing list.

                  \n" +msgstr "\n

                  Bem-vindo à demo online!

                  \n

                  Aviso: os conteúdos desta demo são limpos a cada duas horas.

                  \n

                  Para experimentar a demo, estão disponíveis os seguintes utilizadores (username/password):

                  \n
                    \n
                  • Super administrador: admin/password
                    • \n
                  • Administrador de domínio: admin@demo.local/admin
                    • \n
                  • Utilizador básico: user@demo.local/user
                    • \n
                  \n

                  Para reportar qualquer problema ou apresentar uma sugestão, utilize o seguinte link \n mailing list.

                  \n" #: extensions/amavis/__init__.py:22 msgid "Simple amavis management frontend" @@ -1219,9 +1154,7 @@ msgstr "Idade maxima da messagem" #: extensions/amavis/app_settings.py:16 msgid "Quarantine messages maximum age (in days) before deletion" -msgstr "" -"Tempo máximo que as mensagens ficam na quarentena (em dias) até serem " -"eliminadas" +msgstr "Tempo máximo que as mensagens ficam na quarentena (em dias) até serem eliminadas" #: extensions/amavis/app_settings.py:19 msgid "Messages releasing" @@ -1233,9 +1166,7 @@ msgstr "Remover mensagens libertadas" #: extensions/amavis/app_settings.py:24 msgid "Remove messages marked as released while cleaning up the database" -msgstr "" -"Remova as mensagens, marcadas como enviadas, durante a limpeza da base de " -"dados" +msgstr "Remova as mensagens, marcadas como enviadas, durante a limpeza da base de dados" #: extensions/amavis/app_settings.py:28 msgid "Amavis connection mode" @@ -1341,9 +1272,7 @@ msgstr "predifinido" #: extensions/amavis/models.py:98 msgid "Bypass virus checks or not. Choose 'default' to use global settings." -msgstr "" -"Ignorar a verificação de vírus ou não. Escolher 'predefinido' para utilizar " -"as definições gerais." +msgstr "Ignorar a verificação de vírus ou não. Escolher 'predefinido' para utilizar as definições gerais." #: extensions/amavis/models.py:101 msgid "Spam filter" @@ -1351,9 +1280,7 @@ msgstr "Filtro de spam" #: extensions/amavis/models.py:106 msgid "Bypass spam checks or not. Choose 'default' to use global settings." -msgstr "" -"Ignorar filtros de spam ou não. Escolher 'predefinido' para utilizar as " -"definições gerais." +msgstr "Ignorar filtros de spam ou não. Escolher 'predefinido' para utilizar as definições gerais." #: extensions/amavis/models.py:109 msgid "Banned filter" @@ -1361,9 +1288,7 @@ msgstr "Ficheiros proibidos" #: extensions/amavis/models.py:114 msgid "Bypass banned checks or not. Choose 'default' to use global settings." -msgstr "" -"Ignorar a verificação de ficheiros proibidos. Escolher 'predefinido' para " -"utilizar as definições gerais." +msgstr "Ignorar a verificação de ficheiros proibidos. Escolher 'predefinido' para utilizar as definições gerais." #: extensions/amavis/models.py:144 msgid "Spam marker" @@ -1371,11 +1296,9 @@ msgstr "Marcador spam" #: extensions/amavis/models.py:146 msgid "" -"Modify spam subject using the specified text. Choose 'default' to use global " -"settings." -msgstr "" -"Modifique o assunto de spam usando o texto especificado. Escolha 'default' " -"para usar as configurações globais." +"Modify spam subject using the specified text. Choose 'default' to use global" +" settings." +msgstr "Modifique o assunto de spam usando o texto especificado. Escolha 'default' para usar as configurações globais." #: extensions/amavis/sql_listing.py:23 extensions/webmail/lib.py:37 msgid "From" @@ -1458,12 +1381,8 @@ msgid "" msgid_plural "" "\n" "%(counter)s release requests are pending for action.\n" -msgstr[0] "" -"\n" -"%(counter)s pedido de libertação pendente\n" -msgstr[1] "" -"\n" -"%(counter)s pedidos de libertação pendentes\n" +msgstr[0] "\n%(counter)s pedido de libertação pendente\n" +msgstr[1] "\n%(counter)s pedidos de libertação pendentes\n" #: extensions/amavis/templates/amavis/notifications/pending_requests.html:6 msgid "Sketch:" @@ -1562,10 +1481,9 @@ msgid "Domain admins" msgstr "Administradores de domínio" #: extensions/limits/app_settings.py:15 -msgid "Maximum number of allowed domain administrators for a new administrator" -msgstr "" -"Número máximo permitido de administradores de domínio para um novo " -"administrador" +msgid "" +"Maximum number of allowed domain administrators for a new administrator" +msgstr "Número máximo permitido de administradores de domínio para um novo administrador" #: extensions/limits/app_settings.py:21 msgid "Maximum number of allowed domains for a new administrator" @@ -1573,8 +1491,7 @@ msgstr "Número máximo permitido de domínios para novo administrador" #: extensions/limits/app_settings.py:27 msgid "Maximum number of allowed domain aliases for a new administrator" -msgstr "" -"Número máximo permitido de aliases de domínio para um novo administrador" +msgstr "Número máximo permitido de aliases de domínio para um novo administrador" #: extensions/limits/app_settings.py:33 msgid "Maximum number of allowed mailboxes for a new administrator" @@ -1586,8 +1503,7 @@ msgstr "Número máximo de aliases permitidas para um novo administrador" #: extensions/limits/forms.py:13 msgid "Maximum number of domain administrators this user can create" -msgstr "" -"Número máximo de administradores de domínio que este utilizador pode criar" +msgstr "Número máximo de administradores de domínio que este utilizador pode criar" #: extensions/limits/forms.py:17 msgid "Maximum number of domains this user can create" @@ -1603,8 +1519,7 @@ msgstr "Número máximo de caixas de correio que este utilizador por criar" #: extensions/limits/forms.py:29 msgid "Maximum number of mailbox aliases this user can create" -msgstr "" -"Número máximo de aliases para caixas de correio que este utilizador por criar" +msgstr "Número máximo de aliases para caixas de correio que este utilizador por criar" #: extensions/limits/forms.py:46 msgid "Invalid limit" @@ -1658,9 +1573,7 @@ msgstr "Tempo limite de resposta automática" #: extensions/postfix_autoreply/app_settings.py:16 msgid "Timeout in seconds between two auto-replies to the same recipient" -msgstr "" -"Tempo limite em segundos entre duas respostas automáticas para o mesmo " -"destinatário" +msgstr "Tempo limite em segundos entre duas respostas automáticas para o mesmo destinatário" #: extensions/postfix_autoreply/forms.py:9 msgid "Until" @@ -1897,8 +1810,7 @@ msgstr "ativo" #: extensions/sievefilters/templates/sievefilters/index.html:74 msgid "" "No filters set defined yet. You must create one in order to define filters." -msgstr "" -"Não existem grupos de filtros. Terá de criar um para poder definir filtros." +msgstr "Não existem grupos de filtros. Terá de criar um para poder definir filtros." #: extensions/sievefilters/templatetags/sfilters_tags.py:16 msgid "New filters set" @@ -2211,9 +2123,8 @@ msgid "Cci" msgstr "Cci" #: extensions/webmail/imaputils.py:237 -#, fuzzy msgid "Failed to retrieve hierarchy delimiter" -msgstr "Falha ao recuperar os filtros definidos" +msgstr "Falha ao recuperar hierarquia delimitador" #: extensions/webmail/imaputils.py:278 #, python-format @@ -2535,16 +2446,13 @@ msgstr "Conservar cópias locais" #: userprefs/forms.py:67 msgid "Forward messages and store copies into your local mailbox" -msgstr "" -"Reencaminhar mensagens e armazenar cópias na sua caixa de correio local" +msgstr "Reencaminhar mensagens e armazenar cópias na sua caixa de correio local" #: userprefs/forms.py:84 msgid "" "You can't define a forward to a local destination. Please ask your " "administrator to create an alias instead." -msgstr "" -"Não é possível definir um reencaminhamento para um destino local. Por favor " -"informe-se junto de um administrador para criar um alias." +msgstr "Não é possível definir um reencaminhamento para um destino local. Por favor informe-se junto de um administrador para criar um alias." #: userprefs/views.py:32 msgid "You need a mailbox in order to define a forward" @@ -2592,27 +2500,3 @@ msgstr "Atualizar o sua informação pessoal" #: userprefs/templatetags/uprefs_extras.py:57 msgid "Logout" msgstr "Sair" - -#~ msgid "Failed to rename mailbox: %s" -#~ msgstr "Falha ao renomear a caixa de correio: %s" - -#~ msgid "Failed to remove mailbox: %s" -#~ msgstr "Falha ao remover a caixa de correio:%s" - -#~ msgid "Mailbox %s does not exist" -#~ msgstr "Caixa de correio %s não existe" - -#~ msgid "Delete the domain" -#~ msgstr "Apagar o domínio" - -#~ msgid "Delete this account" -#~ msgstr "Apagar esta conta" - -#~ msgid "Delete this distribution list" -#~ msgstr "Apagar esta lista de distribuição" - -#~ msgid "Delete this forward" -#~ msgstr "Apagar este reencaminhamento" - -#~ msgid "Delete this alias" -#~ msgstr "Apagar este 'alias'" From 671618b8c8fbcc686b01028e47ad122ef9527a17 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Sat, 5 Oct 2013 14:52:55 +0200 Subject: [PATCH 71/97] Release 1.0.1. --- doc/conf.py | 2 +- doc/getting_started/upgrade.rst | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/conf.py b/doc/conf.py index cb4be0a42..13b3fddff 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -50,7 +50,7 @@ copyright = u'2013, Antoine Nguyen' # The short X.Y version. version = '1.0' # The full version, including alpha/beta/rc tags. -release = '1.0.0' +release = '1.0.1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/doc/getting_started/upgrade.rst b/doc/getting_started/upgrade.rst index 5fd9d30cd..c24117dfc 100644 --- a/doc/getting_started/upgrade.rst +++ b/doc/getting_started/upgrade.rst @@ -52,7 +52,7 @@ mailboxes has been improved. Make sure to consult :ref:`fs_operations` and :ref:`Postfix configuration `. Look at the ``smtpd_recipient_restrictions`` setting. -Run ``modoboa-admin.py postfix_maps --dbtype +Run ``modoboa-admin.py postfix_maps --dbtype `` and compare the files with those that postfix currently use. Make necessary updates in light of the differences diff --git a/setup.py b/setup.py index 70a476ecf..ab4bfa860 100644 --- a/setup.py +++ b/setup.py @@ -50,7 +50,7 @@ def read(fname): return open(os.path.join(ROOT, fname)).read() setup(name="modoboa", - version='1.0.0', + version='1.0.1', url='http://modoboa.org/', license='MIT', description="Mail hosting made simple", From 7e0fd03435dba715c2f5299ee665541953ce7af1 Mon Sep 17 00:00:00 2001 From: Tom Hendrikx Date: Sat, 5 Oct 2013 22:30:39 +0200 Subject: [PATCH 72/97] To fix a compilation error for lxml on ubuntu 13.04 --- doc/getting_started/install.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/getting_started/install.rst b/doc/getting_started/install.rst index 1c4f21d6e..c80629873 100644 --- a/doc/getting_started/install.rst +++ b/doc/getting_started/install.rst @@ -64,10 +64,11 @@ install the following requirements: * python development files * libxslt development files * libxml2 development files +* libz development files On a Debian like system, just run the following command:: - $ apt-get install python-dev libxml2-dev libxslt-dev + $ apt-get install python-dev libxml2-dev libxslt-dev zlib1g-dev .. _database: From 76c124e679f39d2a187aaff6511436f3ed9210e6 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Mon, 7 Oct 2013 21:18:21 +0200 Subject: [PATCH 73/97] Fixing migration scripts and the deploy command. It seems I misunderstood the way to migrate to a custom user model for 1.0.0. --- modoboa/core/commands/deploy.py | 10 +++- .../core/commands/templates/settings.py.tpl | 24 ++++----- modoboa/core/management.py | 20 ++++---- .../admin/migrations/0001_initial.py | 50 ++----------------- .../0002_auto__del_field_alias_mbox.py | 5 +- .../migrations/0003_auto__add_extension.py | 5 +- .../admin/migrations/0004_add_permissions.py | 21 ++++---- .../0005_increase_columns_length.py | 9 ++-- .../migrations/0006_auto__add_domainalias.py | 5 +- ...ess__chg_field_alias_address__del_field.py | 5 +- .../migrations/0008_update_mailbox_path.py | 5 +- .../0009_auto__add_field_alias_extmboxes.py | 5 +- .../migrations/0010_fill_alias_domain.py | 5 +- ...d_domain_dates__add_field_domainalias_d.py | 5 +- .../migrations/0012_fill_object_dates.py | 5 +- .../migrations/0013_update_mailbox_path.py | 5 +- .../0014_auto__add_unique_domain_name.py | 5 +- .../admin/migrations/0015_move_passwords.py | 5 +- ...que_objectaccess_user_content_type_obje.py | 9 ++-- .../admin/migrations/0017_set_permissions.py | 23 ++++----- ...8_auto__add_unique_alias_domain_address.py | 9 ++-- .../migrations/0019_set_default_group.py | 11 ++-- .../migrations/0020_rename_amavis_ext.py | 7 ++- .../0021_default_superadmin_ownership.py | 13 +++-- ...l_field_mailbox_gid__del_field_mailbox_.py | 7 ++- .../admin/migrations/0023_auto__add_quota.py | 7 ++- .../admin/migrations/0024_create_quotas.py | 7 ++- .../0025_auto__add_field_quota_mbox.py | 7 ++- .../admin/migrations/0026_set_quota_mbox.py | 7 ++- ...uto__add_field_mailbox_use_domain_quota.py | 7 ++- .../0028_auto__chg_field_mailbox_quota.py | 7 ++- ...ilbox_user__chg_field_objectaccess_user.py | 9 ++-- .../0034_auto__add_field_user_is_local.py | 6 +-- modoboa/extensions/limits/__init__.py | 5 -- .../limits/migrations/0001_initial.py | 7 ++- modoboa/lib/compat.py | 2 +- modoboa/lib/logutils.py | 11 ---- modoboa/lib/migrations/0001_initial.py | 7 ++- .../lib/migrations/0002_move_secret_key.py | 5 +- .../lib/migrations/0003_clean_parameters.py | 5 +- ...__add_log__chg_field_userparameter_user.py | 7 +-- 41 files changed, 144 insertions(+), 235 deletions(-) delete mode 100644 modoboa/lib/logutils.py diff --git a/modoboa/core/commands/deploy.py b/modoboa/core/commands/deploy.py index 297ee0509..bac58eab4 100644 --- a/modoboa/core/commands/deploy.py +++ b/modoboa/core/commands/deploy.py @@ -6,6 +6,7 @@ import getpass import subprocess from django.core import management from django.template import Context, Template +from modoboa.lib.sysutils import exec_cmd from modoboa.core.management import Command dbconn_tpl = """ @@ -135,7 +136,14 @@ class DeployCommand(Command): if parsed_args.syncdb: self._exec_django_command( - "syncdb", parsed_args.name, '--migrate', '--noinput' + "syncdb", parsed_args.name, '--noinput' + ) + exec_cmd('sed -ri "s|^#(\s+\'south)|\\1|" %s/settings.py' % path) + self._exec_django_command( + "syncdb", parsed_args.name, + ) + self._exec_django_command( + 'migrate', parsed_args.name, '--fake' ) self._exec_django_command( "loaddata", parsed_args.name, 'initial_users.json' diff --git a/modoboa/core/commands/templates/settings.py.tpl b/modoboa/core/commands/templates/settings.py.tpl index 4f926f712..c46ddd6f7 100644 --- a/modoboa/core/commands/templates/settings.py.tpl +++ b/modoboa/core/commands/templates/settings.py.tpl @@ -141,10 +141,8 @@ INSTALLED_APPS = ( # 'django.contrib.admin', # Uncomment the next line to enable admin documentation: # 'django.contrib.admindocs', - 'south', - - # Extra tools - # 'modoboa.tools.pfxadmin_migrate', +# 'south', + 'reversion', ) # A dedicated place to register Modoboa applications @@ -152,26 +150,22 @@ INSTALLED_APPS = ( # Do not change the order. MODOBOA_APPS = ( 'modoboa', - 'modoboa.auth', - 'modoboa.admin', + 'modoboa.core', 'modoboa.lib', - 'modoboa.userprefs', - + # Modoboa extensions here. + 'modoboa.extensions.admin', 'modoboa.extensions.limits', 'modoboa.extensions.postfix_autoreply', 'modoboa.extensions.webmail', 'modoboa.extensions.stats', - {% if not amavis_conn %}#{% endif %}'modoboa.extensions.amavis', 'modoboa.extensions.sievefilters', + 'modoboa.extensions.stats', + {% if not amavis_conn %}#{% endif %}'modoboa.extensions.amavis', ) INSTALLED_APPS += MODOBOA_APPS -INSTALLED_APPS += ( - 'reversion', -) - -AUTH_USER_MODEL = 'admin.User' +AUTH_USER_MODEL = 'core.User' #MODOBOA_CUSTOM_LOGO = os.path.join(MEDIA_URL, "custom_logo.png") @@ -209,7 +203,7 @@ LOGGING = { 'formatter': 'syslog' }, 'modoboa': { - 'class': 'modoboa.lib.logutils.SQLHandler', + 'class': 'modoboa.core.loggers.SQLHandler', } }, 'loggers': { diff --git a/modoboa/core/management.py b/modoboa/core/management.py index 82db79f11..10c9e60ef 100644 --- a/modoboa/core/management.py +++ b/modoboa/core/management.py @@ -1,10 +1,10 @@ # coding: utf-8 - -from django.conf import settings -from django.template import Context, Template -import argparse import os import sys +import argparse +from django.conf import settings +from django.template import Context, Template + class Command(object): """Base command class @@ -19,7 +19,7 @@ class Command(object): self._verbose = verbose if not settings.configured: settings.configure() - self._templates_dir = "%s/templates" % os.path.dirname(__file__) + self._templates_dir = "%s/commands/templates" % os.path.dirname(__file__) def _render_template(self, tplfile, env): fp = open(tplfile) @@ -36,7 +36,8 @@ class Command(object): :param parsed_args: """ - raise NotImplemented + raise NotImplementedError + def scan_for_commands(dirname="commands"): """Build a dictionnary containing all commands @@ -58,7 +59,7 @@ def scan_for_commands(dirname="commands"): [cmdname]) cmdmod = getattr(cmdmod, cmdname) if '_' in cmdname: - cmdclassname = ''.join(map(lambda s: s.capitalize(), cmdname.split('_'))) + cmdclassname = ''.join([s.capitalize() for s in cmdname.split('_')]) else: cmdclassname = cmdname.capitalize() try: @@ -68,13 +69,14 @@ def scan_for_commands(dirname="commands"): result[cmdname] = cmdclass return result + def handle_command_line(): commands = scan_for_commands() parser = argparse.ArgumentParser( description="A set of utilities to ease the installation of Modoboa.", epilog="""Available commands: %s -""" % "\n".join(map(lambda c: "\t" + c, sorted(commands)))) +""" % "\n".join(["\t%s" % c for c in sorted(commands)])) parser.add_argument('--verbose', action='store_true', help='Activate verbose output') parser.add_argument('command', type=str, @@ -82,7 +84,7 @@ def handle_command_line(): (args, remaining) = parser.parse_known_args() if not args.command in commands: - print >>sys.stderr, "Unknown command '%s'" % args.command + print >> sys.stderr, "Unknown command '%s'" % args.command sys.exit(1) commands[args.command](commands, verbose=args.verbose).run(remaining) diff --git a/modoboa/extensions/admin/migrations/0001_initial.py b/modoboa/extensions/admin/migrations/0001_initial.py index aea35074c..e36bb068f 100644 --- a/modoboa/extensions/admin/migrations/0001_initial.py +++ b/modoboa/extensions/admin/migrations/0001_initial.py @@ -3,7 +3,6 @@ import datetime from south.db import db from south.v2 import SchemaMigration from django.db import models -from modoboa.lib.compat import user_model_name class Migration(SchemaMigration): @@ -26,7 +25,7 @@ class Migration(SchemaMigration): ('quota', self.gf('django.db.models.fields.IntegerField')()), ('full_address', self.gf('django.db.models.fields.CharField')(max_length=150)), ('gid', self.gf('django.db.models.fields.IntegerField')()), - ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm[user_model_name])), + ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])), ('address', self.gf('django.db.models.fields.CharField')(max_length=100)), ('path', self.gf('django.db.models.fields.CharField')(max_length=255)), ('password', self.gf('django.db.models.fields.CharField')(max_length=100)), @@ -44,41 +43,6 @@ class Migration(SchemaMigration): ('address', self.gf('django.db.models.fields.CharField')(max_length=100)), )) db.send_create_signal('admin', ['Alias']) - - if user_model_name != 'admin.User': - return - # Adding model 'User' - db.create_table(u'admin_user', ( - (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('password', self.gf('django.db.models.fields.CharField')(max_length=128)), - ('last_login', self.gf('django.db.models.fields.DateTimeField')(default=datetime.datetime.now)), - ('is_superuser', self.gf('django.db.models.fields.BooleanField')(default=False)), - ('username', self.gf('django.db.models.fields.CharField')(unique=True, max_length=254)), - ('first_name', self.gf('django.db.models.fields.CharField')(max_length=30, blank=True)), - ('last_name', self.gf('django.db.models.fields.CharField')(max_length=30, blank=True)), - ('email', self.gf('django.db.models.fields.EmailField')(max_length=254, blank=True)), - ('is_staff', self.gf('django.db.models.fields.BooleanField')(default=False)), - ('is_active', self.gf('django.db.models.fields.BooleanField')(default=True)), - ('date_joined', self.gf('django.db.models.fields.DateTimeField')(default=datetime.datetime.now)), - )) - db.send_create_signal(u'admin', ['User']) - - # Adding M2M table for field groups on 'User' - db.create_table(u'admin_user_groups', ( - ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), - ('user', models.ForeignKey(orm[u'admin.user'], null=False)), - ('group', models.ForeignKey(orm[u'auth.group'], null=False)) - )) - db.create_unique(u'admin_user_groups', ['user_id', 'group_id']) - - # Adding M2M table for field user_permissions on 'User' - db.create_table(u'admin_user_user_permissions', ( - ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), - ('user', models.ForeignKey(orm[u'admin.user'], null=False)), - ('permission', models.ForeignKey(orm[u'auth.permission'], null=False)) - )) - db.create_unique(u'admin_user_user_permissions', ['user_id', 'permission_id']) - def backwards(self, orm): @@ -90,12 +54,6 @@ class Migration(SchemaMigration): # Deleting model 'Alias' db.delete_table('admin_alias') - - if user_model_name != 'admin.User': - return - db.delete_table('admin_user') - db.delete_table('admin_user_groups') - db.delete_table('admin_user_user_permissions') models = { @@ -126,7 +84,7 @@ class Migration(SchemaMigration): 'path': ('django.db.models.fields.CharField', [], {'max_length': '255'}), 'quota': ('django.db.models.fields.IntegerField', [], {}), 'uid': ('django.db.models.fields.IntegerField', [], {}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name}) + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) }, 'auth.group': { 'Meta': {'object_name': 'Group'}, @@ -141,8 +99,8 @@ class Migration(SchemaMigration): 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) }, - user_model_name: { - 'Meta': {'object_name': 'User', 'db_table': "'admin_user'"}, + 'auth.user': { + 'Meta': {'object_name': 'User', 'db_table': "'auth_user'"}, 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), diff --git a/modoboa/extensions/admin/migrations/0002_auto__del_field_alias_mbox.py b/modoboa/extensions/admin/migrations/0002_auto__del_field_alias_mbox.py index ae9f4d7c7..c9e11d33e 100644 --- a/modoboa/extensions/admin/migrations/0002_auto__del_field_alias_mbox.py +++ b/modoboa/extensions/admin/migrations/0002_auto__del_field_alias_mbox.py @@ -3,7 +3,6 @@ import datetime from south.db import db from south.v2 import SchemaMigration from django.db import models -from modoboa.lib.compat import user_model_name class Migration(SchemaMigration): @@ -63,7 +62,7 @@ class Migration(SchemaMigration): 'path': ('django.db.models.fields.CharField', [], {'max_length': '255'}), 'quota': ('django.db.models.fields.IntegerField', [], {}), 'uid': ('django.db.models.fields.IntegerField', [], {}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name}) + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) }, 'auth.group': { 'Meta': {'object_name': 'Group'}, @@ -78,7 +77,7 @@ class Migration(SchemaMigration): 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) }, - user_model_name: { + 'auth.user': { 'Meta': {'object_name': 'User'}, 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), diff --git a/modoboa/extensions/admin/migrations/0003_auto__add_extension.py b/modoboa/extensions/admin/migrations/0003_auto__add_extension.py index d33e44526..2d3b82afc 100644 --- a/modoboa/extensions/admin/migrations/0003_auto__add_extension.py +++ b/modoboa/extensions/admin/migrations/0003_auto__add_extension.py @@ -3,7 +3,6 @@ import datetime from south.db import db from south.v2 import SchemaMigration from django.db import models -from modoboa.lib.compat import user_model_name class Migration(SchemaMigration): @@ -59,7 +58,7 @@ class Migration(SchemaMigration): 'path': ('django.db.models.fields.CharField', [], {'max_length': '255'}), 'quota': ('django.db.models.fields.IntegerField', [], {}), 'uid': ('django.db.models.fields.IntegerField', [], {}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name}) + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) }, 'auth.group': { 'Meta': {'object_name': 'Group'}, @@ -74,7 +73,7 @@ class Migration(SchemaMigration): 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) }, - user_model_name: { + 'auth.user': { 'Meta': {'object_name': 'User'}, 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), diff --git a/modoboa/extensions/admin/migrations/0004_add_permissions.py b/modoboa/extensions/admin/migrations/0004_add_permissions.py index 962d1eed6..57fbea7d6 100644 --- a/modoboa/extensions/admin/migrations/0004_add_permissions.py +++ b/modoboa/extensions/admin/migrations/0004_add_permissions.py @@ -3,22 +3,23 @@ import datetime from south.db import db from south.v2 import DataMigration from django.db import models -from django.contrib.auth.models import Permission -from django.contrib.contenttypes.models import ContentType -from modoboa.lib.compat import user_model_name +#from django.contrib.auth.models import Permission +#from django.contrib.contenttypes.models import ContentType class Migration(DataMigration): def forwards(self, orm): - perm_ct = ContentType.objects.get(app_label="auth", model="permission") - #perm_ct = orm["contenttypes.ContentType"].objects.get(app_label="auth", model="permission") - view_perms = Permission(name="View permissions", codename="view_permissions", - content_type=perm_ct) + #perm_ct = ContentType.objects.get(app_label="auth", model="permission") + perm_ct = orm["contenttypes.ContentType"].objects.get(app_label="auth", model="permission") + view_perms = orm['auth.Permission']( + name="View permissions", codename="view_permissions", + content_type=perm_ct + ) view_perms.save() def backwards(self, orm): - p = orm.Permission.objects.get(codename="view_permissions") + p = orm['auth.Permission'].objects.get(codename="view_permissions") p.delete() @@ -56,7 +57,7 @@ class Migration(DataMigration): 'path': ('django.db.models.fields.CharField', [], {'max_length': '255'}), 'quota': ('django.db.models.fields.IntegerField', [], {}), 'uid': ('django.db.models.fields.IntegerField', [], {}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name}) + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) }, 'auth.group': { 'Meta': {'object_name': 'Group'}, @@ -71,7 +72,7 @@ class Migration(DataMigration): 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) }, - user_model_name: { + 'auth.user': { 'Meta': {'object_name': 'User'}, 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), diff --git a/modoboa/extensions/admin/migrations/0005_increase_columns_length.py b/modoboa/extensions/admin/migrations/0005_increase_columns_length.py index 8dd764764..be4adc771 100644 --- a/modoboa/extensions/admin/migrations/0005_increase_columns_length.py +++ b/modoboa/extensions/admin/migrations/0005_increase_columns_length.py @@ -3,14 +3,13 @@ import datetime from south.db import db from south.v2 import SchemaMigration from django.db import models -from modoboa.lib.compat import user_model_name, user_table_name class Migration(SchemaMigration): def forwards(self, orm): - db.alter_column(user_table_name, "username", models.CharField(unique=True, max_length=254)) - db.alter_column(user_table_name, "email", models.CharField(max_length=254)) + db.alter_column('auth_user', "username", models.CharField(unique=True, max_length=254)) + db.alter_column('auth_user', "email", models.CharField(max_length=254)) def backwards(self, orm): raise RuntimeError("Cannot revert this migration") @@ -49,7 +48,7 @@ class Migration(SchemaMigration): 'path': ('django.db.models.fields.CharField', [], {'max_length': '255'}), 'quota': ('django.db.models.fields.IntegerField', [], {}), 'uid': ('django.db.models.fields.IntegerField', [], {}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name}) + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) }, 'auth.group': { 'Meta': {'object_name': 'Group'}, @@ -64,7 +63,7 @@ class Migration(SchemaMigration): 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) }, - user_model_name: { + 'auth.user': { 'Meta': {'object_name': 'User'}, 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), diff --git a/modoboa/extensions/admin/migrations/0006_auto__add_domainalias.py b/modoboa/extensions/admin/migrations/0006_auto__add_domainalias.py index 283b9c4dd..d8652c116 100644 --- a/modoboa/extensions/admin/migrations/0006_auto__add_domainalias.py +++ b/modoboa/extensions/admin/migrations/0006_auto__add_domainalias.py @@ -3,7 +3,6 @@ import datetime from south.db import db from south.v2 import SchemaMigration from django.db import models -from modoboa.lib.compat import user_model_name class Migration(SchemaMigration): @@ -71,7 +70,7 @@ class Migration(SchemaMigration): 'path': ('django.db.models.fields.CharField', [], {'max_length': '255'}), 'quota': ('django.db.models.fields.IntegerField', [], {}), 'uid': ('django.db.models.fields.IntegerField', [], {}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name}) + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) }, 'auth.group': { 'Meta': {'object_name': 'Group'}, @@ -86,7 +85,7 @@ class Migration(SchemaMigration): 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) }, - user_model_name: { + 'auth.user': { 'Meta': {'object_name': 'User'}, 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), diff --git a/modoboa/extensions/admin/migrations/0007_auto__del_field_alias_full_address__chg_field_alias_address__del_field.py b/modoboa/extensions/admin/migrations/0007_auto__del_field_alias_full_address__chg_field_alias_address__del_field.py index 08870cbfc..5f1ff1c57 100644 --- a/modoboa/extensions/admin/migrations/0007_auto__del_field_alias_full_address__chg_field_alias_address__del_field.py +++ b/modoboa/extensions/admin/migrations/0007_auto__del_field_alias_full_address__chg_field_alias_address__del_field.py @@ -3,7 +3,6 @@ import datetime from south.db import db from south.v2 import SchemaMigration from django.db import models -from modoboa.lib.compat import user_model_name class Migration(SchemaMigration): @@ -71,7 +70,7 @@ class Migration(SchemaMigration): 'path': ('django.db.models.fields.CharField', [], {'max_length': '255'}), 'quota': ('django.db.models.fields.IntegerField', [], {}), 'uid': ('django.db.models.fields.IntegerField', [], {}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name}) + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) }, 'auth.group': { 'Meta': {'object_name': 'Group'}, @@ -86,7 +85,7 @@ class Migration(SchemaMigration): 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) }, - user_model_name: { + 'auth.user': { 'Meta': {'object_name': 'User'}, 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), diff --git a/modoboa/extensions/admin/migrations/0008_update_mailbox_path.py b/modoboa/extensions/admin/migrations/0008_update_mailbox_path.py index e69e3c455..d38f0f85c 100644 --- a/modoboa/extensions/admin/migrations/0008_update_mailbox_path.py +++ b/modoboa/extensions/admin/migrations/0008_update_mailbox_path.py @@ -3,7 +3,6 @@ import datetime from south.db import db from south.v2 import DataMigration from django.db import models -from modoboa.lib.compat import user_model_name class Migration(DataMigration): @@ -56,7 +55,7 @@ class Migration(DataMigration): 'path': ('django.db.models.fields.CharField', [], {'max_length': '255'}), 'quota': ('django.db.models.fields.IntegerField', [], {}), 'uid': ('django.db.models.fields.IntegerField', [], {}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name}) + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) }, 'auth.group': { 'Meta': {'object_name': 'Group'}, @@ -71,7 +70,7 @@ class Migration(DataMigration): 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) }, - user_model_name: { + 'auth.user': { 'Meta': {'object_name': 'User'}, 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), diff --git a/modoboa/extensions/admin/migrations/0009_auto__add_field_alias_extmboxes.py b/modoboa/extensions/admin/migrations/0009_auto__add_field_alias_extmboxes.py index c9dec14c6..0d3a8a02e 100644 --- a/modoboa/extensions/admin/migrations/0009_auto__add_field_alias_extmboxes.py +++ b/modoboa/extensions/admin/migrations/0009_auto__add_field_alias_extmboxes.py @@ -3,7 +3,6 @@ import datetime from south.db import db from south.v2 import SchemaMigration from django.db import models -from modoboa.lib.compat import user_model_name class Migration(SchemaMigration): @@ -62,7 +61,7 @@ class Migration(SchemaMigration): 'path': ('django.db.models.fields.CharField', [], {'max_length': '255'}), 'quota': ('django.db.models.fields.IntegerField', [], {}), 'uid': ('django.db.models.fields.IntegerField', [], {}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name}) + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) }, 'auth.group': { 'Meta': {'object_name': 'Group'}, @@ -77,7 +76,7 @@ class Migration(SchemaMigration): 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) }, - user_model_name: { + 'auth.user': { 'Meta': {'object_name': 'User'}, 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), diff --git a/modoboa/extensions/admin/migrations/0010_fill_alias_domain.py b/modoboa/extensions/admin/migrations/0010_fill_alias_domain.py index a1c800c2f..fc5ceeb34 100644 --- a/modoboa/extensions/admin/migrations/0010_fill_alias_domain.py +++ b/modoboa/extensions/admin/migrations/0010_fill_alias_domain.py @@ -3,7 +3,6 @@ import datetime from south.db import db from south.v2 import DataMigration from django.db import models -from modoboa.lib.compat import user_model_name class Migration(DataMigration): @@ -59,7 +58,7 @@ class Migration(DataMigration): 'path': ('django.db.models.fields.CharField', [], {'max_length': '255'}), 'quota': ('django.db.models.fields.IntegerField', [], {}), 'uid': ('django.db.models.fields.IntegerField', [], {}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name}) + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) }, 'auth.group': { 'Meta': {'object_name': 'Group'}, @@ -74,7 +73,7 @@ class Migration(DataMigration): 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) }, - user_model_name: { + 'auth.user': { 'Meta': {'object_name': 'User'}, 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), diff --git a/modoboa/extensions/admin/migrations/0011_auto__add_objectdates__add_field_domain_dates__add_field_domainalias_d.py b/modoboa/extensions/admin/migrations/0011_auto__add_objectdates__add_field_domain_dates__add_field_domainalias_d.py index 0362c44aa..52f8812c3 100644 --- a/modoboa/extensions/admin/migrations/0011_auto__add_objectdates__add_field_domain_dates__add_field_domainalias_d.py +++ b/modoboa/extensions/admin/migrations/0011_auto__add_objectdates__add_field_domain_dates__add_field_domainalias_d.py @@ -3,7 +3,6 @@ import datetime from south.db import db from south.v2 import SchemaMigration from django.db import models -from modoboa.lib.compat import user_model_name class Migration(SchemaMigration): @@ -94,7 +93,7 @@ class Migration(SchemaMigration): 'path': ('django.db.models.fields.CharField', [], {'max_length': '255'}), 'quota': ('django.db.models.fields.IntegerField', [], {}), 'uid': ('django.db.models.fields.IntegerField', [], {}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name}) + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) }, 'admin.objectdates': { 'Meta': {'object_name': 'ObjectDates'}, @@ -115,7 +114,7 @@ class Migration(SchemaMigration): 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) }, - user_model_name: { + 'auth.user': { 'Meta': {'object_name': 'User'}, 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), diff --git a/modoboa/extensions/admin/migrations/0012_fill_object_dates.py b/modoboa/extensions/admin/migrations/0012_fill_object_dates.py index face3337e..23fc740b8 100644 --- a/modoboa/extensions/admin/migrations/0012_fill_object_dates.py +++ b/modoboa/extensions/admin/migrations/0012_fill_object_dates.py @@ -3,7 +3,6 @@ import datetime from south.db import db from south.v2 import DataMigration from django.db import models -from modoboa.lib.compat import user_model_name def create_od(orm, obj): @@ -74,7 +73,7 @@ class Migration(DataMigration): 'path': ('django.db.models.fields.CharField', [], {'max_length': '255'}), 'quota': ('django.db.models.fields.IntegerField', [], {}), 'uid': ('django.db.models.fields.IntegerField', [], {}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name}) + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) }, 'admin.objectdates': { 'Meta': {'object_name': 'ObjectDates'}, @@ -95,7 +94,7 @@ class Migration(DataMigration): 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) }, - user_model_name: { + 'auth.user': { 'Meta': {'object_name': 'User'}, 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), diff --git a/modoboa/extensions/admin/migrations/0013_update_mailbox_path.py b/modoboa/extensions/admin/migrations/0013_update_mailbox_path.py index f0e85b688..1f4dc201e 100644 --- a/modoboa/extensions/admin/migrations/0013_update_mailbox_path.py +++ b/modoboa/extensions/admin/migrations/0013_update_mailbox_path.py @@ -3,7 +3,6 @@ import datetime from south.db import db from south.v2 import DataMigration from django.db import models -from modoboa.lib.compat import user_model_name class Migration(DataMigration): @@ -63,7 +62,7 @@ class Migration(DataMigration): 'path': ('django.db.models.fields.CharField', [], {'max_length': '255'}), 'quota': ('django.db.models.fields.IntegerField', [], {}), 'uid': ('django.db.models.fields.IntegerField', [], {}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name}) + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) }, 'admin.objectdates': { 'Meta': {'object_name': 'ObjectDates'}, @@ -84,7 +83,7 @@ class Migration(DataMigration): 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) }, - user_model_name: { + 'auth.user': { 'Meta': {'object_name': 'User'}, 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), diff --git a/modoboa/extensions/admin/migrations/0014_auto__add_unique_domain_name.py b/modoboa/extensions/admin/migrations/0014_auto__add_unique_domain_name.py index 7ba0b9249..829fc4a7b 100644 --- a/modoboa/extensions/admin/migrations/0014_auto__add_unique_domain_name.py +++ b/modoboa/extensions/admin/migrations/0014_auto__add_unique_domain_name.py @@ -3,7 +3,6 @@ import datetime from south.db import db from south.v2 import SchemaMigration from django.db import models -from modoboa.lib.compat import user_model_name class Migration(SchemaMigration): @@ -65,7 +64,7 @@ class Migration(SchemaMigration): 'path': ('django.db.models.fields.CharField', [], {'max_length': '255'}), 'quota': ('django.db.models.fields.IntegerField', [], {}), 'uid': ('django.db.models.fields.IntegerField', [], {}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name}) + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) }, 'admin.objectdates': { 'Meta': {'object_name': 'ObjectDates'}, @@ -86,7 +85,7 @@ class Migration(SchemaMigration): 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) }, - user_model_name: { + 'auth.user': { 'Meta': {'object_name': 'User'}, 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), diff --git a/modoboa/extensions/admin/migrations/0015_move_passwords.py b/modoboa/extensions/admin/migrations/0015_move_passwords.py index 3686fbaf7..ebf626a2e 100644 --- a/modoboa/extensions/admin/migrations/0015_move_passwords.py +++ b/modoboa/extensions/admin/migrations/0015_move_passwords.py @@ -4,7 +4,6 @@ from south.db import db from south.v2 import DataMigration from django.db import models from modoboa.lib.models import Parameter -from modoboa.lib.compat import user_model_name from modoboa.lib.dbutils import db_table_exists @@ -72,7 +71,7 @@ class Migration(DataMigration): 'path': ('django.db.models.fields.CharField', [], {'max_length': '255'}), 'quota': ('django.db.models.fields.IntegerField', [], {}), 'uid': ('django.db.models.fields.IntegerField', [], {}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name}) + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) }, 'admin.objectdates': { 'Meta': {'object_name': 'ObjectDates'}, @@ -93,7 +92,7 @@ class Migration(DataMigration): 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) }, - user_model_name: { + 'auth.user': { 'Meta': {'object_name': 'User'}, 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), diff --git a/modoboa/extensions/admin/migrations/0016_auto__add_objectaccess__add_unique_objectaccess_user_content_type_obje.py b/modoboa/extensions/admin/migrations/0016_auto__add_objectaccess__add_unique_objectaccess_user_content_type_obje.py index 2ad47dea5..81b6701c3 100644 --- a/modoboa/extensions/admin/migrations/0016_auto__add_objectaccess__add_unique_objectaccess_user_content_type_obje.py +++ b/modoboa/extensions/admin/migrations/0016_auto__add_objectaccess__add_unique_objectaccess_user_content_type_obje.py @@ -3,7 +3,6 @@ import datetime from south.db import db from south.v2 import SchemaMigration from django.db import models -from modoboa.lib.compat import user_model_name class Migration(SchemaMigration): @@ -13,7 +12,7 @@ class Migration(SchemaMigration): # Adding model 'ObjectAccess' db.create_table('admin_objectaccess', ( ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm[user_model_name])), + ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])), ('content_type', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['contenttypes.ContentType'])), ('object_id', self.gf('django.db.models.fields.PositiveIntegerField')()), ('is_owner', self.gf('django.db.models.fields.BooleanField')(default=False)), @@ -75,7 +74,7 @@ class Migration(SchemaMigration): 'path': ('django.db.models.fields.CharField', [], {'max_length': '255'}), 'quota': ('django.db.models.fields.IntegerField', [], {}), 'uid': ('django.db.models.fields.IntegerField', [], {}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name}) + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) }, 'admin.objectaccess': { 'Meta': {'unique_together': "(('user', 'content_type', 'object_id'),)", 'object_name': 'ObjectAccess'}, @@ -83,7 +82,7 @@ class Migration(SchemaMigration): 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'is_owner': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), 'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name}) + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']" }) }, 'admin.objectdates': { 'Meta': {'object_name': 'ObjectDates'}, @@ -104,7 +103,7 @@ class Migration(SchemaMigration): 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) }, - user_model_name: { + 'auth.user': { 'Meta': {'object_name': 'User'}, 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), diff --git a/modoboa/extensions/admin/migrations/0017_set_permissions.py b/modoboa/extensions/admin/migrations/0017_set_permissions.py index 0d011f6f6..9242f6838 100644 --- a/modoboa/extensions/admin/migrations/0017_set_permissions.py +++ b/modoboa/extensions/admin/migrations/0017_set_permissions.py @@ -4,7 +4,6 @@ from south.db import db from south.v2 import DataMigration from django.db import models from django.core.exceptions import ObjectDoesNotExist -from modoboa.lib.compat import user_model_name, user_table_name class Migration(DataMigration): @@ -17,7 +16,7 @@ class Migration(DataMigration): objaccess.save() def forwards(self, orm): - superusers = orm[user_model_name].objects.filter(is_superuser=True) + superusers = orm['auth.User'].objects.filter(is_superuser=True) if not len(superusers): # Empty db, nothing to do return @@ -26,14 +25,14 @@ class Migration(DataMigration): # object. (user, domain, domain alias, mailbox, alias) try: uct = orm['contenttypes.ContentType'].objects.get( - app_label='admin', model='user' - ) + app_label='auth', model='user' + ) except ObjectDoesNotExist: uct = orm['contenttypes.ContentType']( - name='user', app_label='admin', model='user' - ) + name='user', app_label='auth', model='user' + ) uct.save() - for account in orm[user_model_name].objects.all(): + for account in orm['auth.User'].objects.all(): for i, su in enumerate(superusers): self.grant_access(orm, su, uct, account, i == 0) domct = orm['contenttypes.ContentType'].objects.get( @@ -62,7 +61,7 @@ class Migration(DataMigration): self.grant_access(orm, su, alct, alias, i == 0) # 2: domain admins must have access to their domain's content - for da in orm[user_model_name].objects.filter(groups__name='DomainAdmins'): + for da in orm['auth.User'].objects.filter(groups__name='DomainAdmins'): dom = da.mailbox_set.all()[0].domain self.grant_access(orm, da, domct, dom) @@ -119,7 +118,7 @@ class Migration(DataMigration): 'path': ('django.db.models.fields.CharField', [], {'max_length': '255'}), 'quota': ('django.db.models.fields.IntegerField', [], {}), 'uid': ('django.db.models.fields.IntegerField', [], {}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name}) + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) }, 'admin.objectaccess': { 'Meta': {'unique_together': "(('user', 'content_type', 'object_id'),)", 'object_name': 'ObjectAccess'}, @@ -127,7 +126,7 @@ class Migration(DataMigration): 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'is_owner': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), 'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name}) + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) }, 'admin.objectdates': { 'Meta': {'object_name': 'ObjectDates'}, @@ -148,8 +147,8 @@ class Migration(DataMigration): 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) }, - user_model_name: { - 'Meta': {'object_name': 'User', 'db_table': "'admin_user'"}, + 'auth.user': { + 'Meta': {'object_name': 'User'}, 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), diff --git a/modoboa/extensions/admin/migrations/0018_auto__add_unique_alias_domain_address.py b/modoboa/extensions/admin/migrations/0018_auto__add_unique_alias_domain_address.py index bdf403947..b4f7c03cb 100644 --- a/modoboa/extensions/admin/migrations/0018_auto__add_unique_alias_domain_address.py +++ b/modoboa/extensions/admin/migrations/0018_auto__add_unique_alias_domain_address.py @@ -3,7 +3,6 @@ import datetime from south.db import db from south.v2 import SchemaMigration from django.db import models -from modoboa.lib.compat import user_model_name class Migration(SchemaMigration): @@ -63,7 +62,7 @@ class Migration(SchemaMigration): 'path': ('django.db.models.fields.CharField', [], {'max_length': '255'}), 'quota': ('django.db.models.fields.IntegerField', [], {}), 'uid': ('django.db.models.fields.IntegerField', [], {}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name}) + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) }, 'admin.objectaccess': { 'Meta': {'unique_together': "(('user', 'content_type', 'object_id'),)", 'object_name': 'ObjectAccess'}, @@ -71,7 +70,7 @@ class Migration(SchemaMigration): 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'is_owner': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), 'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name}) + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) }, 'admin.objectdates': { 'Meta': {'object_name': 'ObjectDates'}, @@ -92,8 +91,8 @@ class Migration(SchemaMigration): 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) }, - user_model_name: { - 'Meta': {'object_name': 'User', 'db_table': "'admin_user'"}, + 'auth.user': { + 'Meta': {'object_name': 'User'}, 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), diff --git a/modoboa/extensions/admin/migrations/0019_set_default_group.py b/modoboa/extensions/admin/migrations/0019_set_default_group.py index 479266596..7af4cd3fa 100644 --- a/modoboa/extensions/admin/migrations/0019_set_default_group.py +++ b/modoboa/extensions/admin/migrations/0019_set_default_group.py @@ -3,7 +3,6 @@ import datetime from south.db import db from south.v2 import DataMigration from django.db import models -from modoboa.lib.compat import user_model_name, user_table_name class Migration(DataMigration): @@ -15,7 +14,7 @@ class Migration(DataMigration): except orm["auth.Group"].DoesNotExist: sugroup = orm["auth.Group"](name="SimpleUsers") sugroup.save() - for account in orm[user_model_name].objects.all(): + for account in orm['auth.User'].objects.all(): if not len(account.groups.all()): account.groups.add(sugroup) account.save() @@ -68,7 +67,7 @@ class Migration(DataMigration): 'path': ('django.db.models.fields.CharField', [], {'max_length': '255'}), 'quota': ('django.db.models.fields.IntegerField', [], {}), 'uid': ('django.db.models.fields.IntegerField', [], {}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name}) + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) }, 'admin.objectaccess': { 'Meta': {'unique_together': "(('user', 'content_type', 'object_id'),)", 'object_name': 'ObjectAccess'}, @@ -76,7 +75,7 @@ class Migration(DataMigration): 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'is_owner': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), 'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name}) + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) }, 'admin.objectdates': { 'Meta': {'object_name': 'ObjectDates'}, @@ -97,8 +96,8 @@ class Migration(DataMigration): 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) }, - user_model_name: { - 'Meta': {'object_name': 'User', 'db_table': "'admin_user'"}, + 'auth.user': { + 'Meta': {'object_name': 'User'}, 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), diff --git a/modoboa/extensions/admin/migrations/0020_rename_amavis_ext.py b/modoboa/extensions/admin/migrations/0020_rename_amavis_ext.py index 60fe83450..c0d69f544 100644 --- a/modoboa/extensions/admin/migrations/0020_rename_amavis_ext.py +++ b/modoboa/extensions/admin/migrations/0020_rename_amavis_ext.py @@ -4,7 +4,6 @@ from south.db import db from south.v2 import DataMigration from django.db import models from django.core.exceptions import ObjectDoesNotExist -from modoboa.lib.compat import user_model_name class Migration(DataMigration): @@ -70,7 +69,7 @@ class Migration(DataMigration): 'path': ('django.db.models.fields.CharField', [], {'max_length': '255'}), 'quota': ('django.db.models.fields.IntegerField', [], {}), 'uid': ('django.db.models.fields.IntegerField', [], {}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name}) + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) }, 'admin.objectaccess': { 'Meta': {'unique_together': "(('user', 'content_type', 'object_id'),)", 'object_name': 'ObjectAccess'}, @@ -78,7 +77,7 @@ class Migration(DataMigration): 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'is_owner': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), 'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name}) + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) }, 'admin.objectdates': { 'Meta': {'object_name': 'ObjectDates'}, @@ -99,7 +98,7 @@ class Migration(DataMigration): 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) }, - user_model_name: { + 'auth.user': { 'Meta': {'object_name': 'User'}, 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), diff --git a/modoboa/extensions/admin/migrations/0021_default_superadmin_ownership.py b/modoboa/extensions/admin/migrations/0021_default_superadmin_ownership.py index 29fc45611..58f7aeedf 100644 --- a/modoboa/extensions/admin/migrations/0021_default_superadmin_ownership.py +++ b/modoboa/extensions/admin/migrations/0021_default_superadmin_ownership.py @@ -4,7 +4,6 @@ from south.db import db from south.v2 import DataMigration from django.db import models from django.core.exceptions import ObjectDoesNotExist -from modoboa.lib.compat import user_model_name, user_table_name class Migration(DataMigration): @@ -12,11 +11,11 @@ class Migration(DataMigration): def forwards(self, orm): "Write your forwards methods here." try: - su = orm[user_model_name].objects.get(pk=1) + su = orm['auth.User'].objects.get(pk=1) except ObjectDoesNotExist: return uct = orm['contenttypes.ContentType'].objects.get( - app_label='admin', model='user' + app_label='auth', model='user' ) su.objectaccess_set.filter(content_type=uct, object_id=1).update(is_owner=True) @@ -67,7 +66,7 @@ class Migration(DataMigration): 'path': ('django.db.models.fields.CharField', [], {'max_length': '255'}), 'quota': ('django.db.models.fields.IntegerField', [], {}), 'uid': ('django.db.models.fields.IntegerField', [], {}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name}) + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) }, 'admin.objectaccess': { 'Meta': {'unique_together': "(('user', 'content_type', 'object_id'),)", 'object_name': 'ObjectAccess'}, @@ -75,7 +74,7 @@ class Migration(DataMigration): 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'is_owner': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), 'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name}) + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) }, 'admin.objectdates': { 'Meta': {'object_name': 'ObjectDates'}, @@ -96,8 +95,8 @@ class Migration(DataMigration): 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) }, - user_model_name: { - 'Meta': {'object_name': 'User', 'db_table': "'admin_user'"}, + 'auth.user': { + 'Meta': {'object_name': 'User'}, 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), diff --git a/modoboa/extensions/admin/migrations/0022_auto__del_field_mailbox_uid__del_field_mailbox_gid__del_field_mailbox_.py b/modoboa/extensions/admin/migrations/0022_auto__del_field_mailbox_uid__del_field_mailbox_gid__del_field_mailbox_.py index c80960775..e83be9f87 100644 --- a/modoboa/extensions/admin/migrations/0022_auto__del_field_mailbox_uid__del_field_mailbox_gid__del_field_mailbox_.py +++ b/modoboa/extensions/admin/migrations/0022_auto__del_field_mailbox_uid__del_field_mailbox_gid__del_field_mailbox_.py @@ -3,7 +3,6 @@ import datetime from south.db import db from south.v2 import SchemaMigration from django.db import models -from modoboa.lib.compat import user_model_name class Migration(SchemaMigration): @@ -70,7 +69,7 @@ class Migration(SchemaMigration): 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['admin.Domain']"}), 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'quota': ('django.db.models.fields.IntegerField', [], {}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name}) + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) }, 'admin.objectaccess': { 'Meta': {'unique_together': "(('user', 'content_type', 'object_id'),)", 'object_name': 'ObjectAccess'}, @@ -78,7 +77,7 @@ class Migration(SchemaMigration): 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'is_owner': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), 'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name}) + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) }, 'admin.objectdates': { 'Meta': {'object_name': 'ObjectDates'}, @@ -99,7 +98,7 @@ class Migration(SchemaMigration): 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) }, - user_model_name: { + 'auth.user': { 'Meta': {'object_name': 'User'}, 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), diff --git a/modoboa/extensions/admin/migrations/0023_auto__add_quota.py b/modoboa/extensions/admin/migrations/0023_auto__add_quota.py index b6f95b699..f386d38a9 100644 --- a/modoboa/extensions/admin/migrations/0023_auto__add_quota.py +++ b/modoboa/extensions/admin/migrations/0023_auto__add_quota.py @@ -3,7 +3,6 @@ import datetime from south.db import db from south.v2 import SchemaMigration from django.db import models -from modoboa.lib.compat import user_model_name class Migration(SchemaMigration): @@ -63,7 +62,7 @@ class Migration(SchemaMigration): 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['admin.Domain']"}), 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'quota': ('django.db.models.fields.IntegerField', [], {}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name}) + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) }, 'admin.objectaccess': { 'Meta': {'unique_together': "(('user', 'content_type', 'object_id'),)", 'object_name': 'ObjectAccess'}, @@ -71,7 +70,7 @@ class Migration(SchemaMigration): 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'is_owner': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), 'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name}) + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) }, 'admin.objectdates': { 'Meta': {'object_name': 'ObjectDates'}, @@ -98,7 +97,7 @@ class Migration(SchemaMigration): 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) }, - user_model_name: { + 'auth.user': { 'Meta': {'object_name': 'User'}, 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), diff --git a/modoboa/extensions/admin/migrations/0024_create_quotas.py b/modoboa/extensions/admin/migrations/0024_create_quotas.py index 06480b9f4..308350b1d 100644 --- a/modoboa/extensions/admin/migrations/0024_create_quotas.py +++ b/modoboa/extensions/admin/migrations/0024_create_quotas.py @@ -3,7 +3,6 @@ import datetime from south.db import db from south.v2 import DataMigration from django.db import models -from modoboa.lib.compat import user_model_name class Migration(DataMigration): @@ -57,7 +56,7 @@ class Migration(DataMigration): 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['admin.Domain']"}), 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'quota': ('django.db.models.fields.IntegerField', [], {}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name}) + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) }, 'admin.objectaccess': { 'Meta': {'unique_together': "(('user', 'content_type', 'object_id'),)", 'object_name': 'ObjectAccess'}, @@ -65,7 +64,7 @@ class Migration(DataMigration): 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'is_owner': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), 'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name}) + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) }, 'admin.objectdates': { 'Meta': {'object_name': 'ObjectDates'}, @@ -92,7 +91,7 @@ class Migration(DataMigration): 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) }, - user_model_name: { + 'auth.user': { 'Meta': {'object_name': 'User'}, 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), diff --git a/modoboa/extensions/admin/migrations/0025_auto__add_field_quota_mbox.py b/modoboa/extensions/admin/migrations/0025_auto__add_field_quota_mbox.py index a97c68b81..2cc877617 100644 --- a/modoboa/extensions/admin/migrations/0025_auto__add_field_quota_mbox.py +++ b/modoboa/extensions/admin/migrations/0025_auto__add_field_quota_mbox.py @@ -3,7 +3,6 @@ import datetime from south.db import db from south.v2 import SchemaMigration from django.db import models -from modoboa.lib.compat import user_model_name class Migration(SchemaMigration): @@ -60,7 +59,7 @@ class Migration(SchemaMigration): 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['admin.Domain']"}), u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'quota': ('django.db.models.fields.IntegerField', [], {}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['%s']" % user_model_name}) + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}) }, u'admin.objectaccess': { 'Meta': {'unique_together': "(('user', 'content_type', 'object_id'),)", 'object_name': 'ObjectAccess'}, @@ -68,7 +67,7 @@ class Migration(SchemaMigration): u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'is_owner': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), 'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['%s']" % user_model_name}) + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}) }, u'admin.objectdates': { 'Meta': {'object_name': 'ObjectDates'}, @@ -96,7 +95,7 @@ class Migration(SchemaMigration): u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) }, - user_model_name: { + 'auth.user': { 'Meta': {'object_name': 'User'}, 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), diff --git a/modoboa/extensions/admin/migrations/0026_set_quota_mbox.py b/modoboa/extensions/admin/migrations/0026_set_quota_mbox.py index 351c35223..f25fcd261 100644 --- a/modoboa/extensions/admin/migrations/0026_set_quota_mbox.py +++ b/modoboa/extensions/admin/migrations/0026_set_quota_mbox.py @@ -3,7 +3,6 @@ import datetime from south.db import db from south.v2 import DataMigration from django.db import models -from modoboa.lib.compat import user_model_name class Migration(DataMigration): @@ -58,7 +57,7 @@ class Migration(DataMigration): 'domain': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['admin.Domain']"}), u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'quota': ('django.db.models.fields.IntegerField', [], {}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['%s']" % user_model_name}) + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}) }, u'admin.objectaccess': { 'Meta': {'unique_together': "(('user', 'content_type', 'object_id'),)", 'object_name': 'ObjectAccess'}, @@ -66,7 +65,7 @@ class Migration(DataMigration): u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'is_owner': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), 'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['%s']" % user_model_name}) + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}) }, u'admin.objectdates': { 'Meta': {'object_name': 'ObjectDates'}, @@ -94,7 +93,7 @@ class Migration(DataMigration): u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) }, - user_model_name: { + 'auth.user': { 'Meta': {'object_name': 'User'}, 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), diff --git a/modoboa/extensions/admin/migrations/0027_auto__add_field_mailbox_use_domain_quota.py b/modoboa/extensions/admin/migrations/0027_auto__add_field_mailbox_use_domain_quota.py index 03ffaabe7..9fc0d74af 100644 --- a/modoboa/extensions/admin/migrations/0027_auto__add_field_mailbox_use_domain_quota.py +++ b/modoboa/extensions/admin/migrations/0027_auto__add_field_mailbox_use_domain_quota.py @@ -3,7 +3,6 @@ import datetime from south.db import db from south.v2 import SchemaMigration from django.db import models -from modoboa.lib.compat import user_model_name class Migration(SchemaMigration): @@ -61,7 +60,7 @@ class Migration(SchemaMigration): u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'quota': ('django.db.models.fields.IntegerField', [], {}), 'use_domain_quota': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['%s']" % user_model_name}) + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}) }, u'admin.objectaccess': { 'Meta': {'unique_together': "(('user', 'content_type', 'object_id'),)", 'object_name': 'ObjectAccess'}, @@ -69,7 +68,7 @@ class Migration(SchemaMigration): u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'is_owner': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), 'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['%s']" % user_model_name}) + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}) }, u'admin.objectdates': { 'Meta': {'object_name': 'ObjectDates'}, @@ -97,7 +96,7 @@ class Migration(SchemaMigration): u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) }, - user_model_name: { + 'auth.user': { 'Meta': {'object_name': 'User'}, 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), diff --git a/modoboa/extensions/admin/migrations/0028_auto__chg_field_mailbox_quota.py b/modoboa/extensions/admin/migrations/0028_auto__chg_field_mailbox_quota.py index 90e924029..0461260cf 100644 --- a/modoboa/extensions/admin/migrations/0028_auto__chg_field_mailbox_quota.py +++ b/modoboa/extensions/admin/migrations/0028_auto__chg_field_mailbox_quota.py @@ -3,7 +3,6 @@ import datetime from south.db import db from south.v2 import SchemaMigration from django.db import models -from modoboa.lib.compat import user_model_name class Migration(SchemaMigration): @@ -59,7 +58,7 @@ class Migration(SchemaMigration): u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'quota': ('django.db.models.fields.PositiveIntegerField', [], {}), 'use_domain_quota': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['%s']" % user_model_name}) + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}) }, u'admin.objectaccess': { 'Meta': {'unique_together': "(('user', 'content_type', 'object_id'),)", 'object_name': 'ObjectAccess'}, @@ -67,7 +66,7 @@ class Migration(SchemaMigration): u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'is_owner': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), 'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['%s']" % user_model_name}) + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}) }, u'admin.objectdates': { 'Meta': {'object_name': 'ObjectDates'}, @@ -95,7 +94,7 @@ class Migration(SchemaMigration): u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) }, - user_model_name: { + 'auth.user': { 'Meta': {'object_name': 'User'}, 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), diff --git a/modoboa/extensions/admin/migrations/0029_auto__add_user__chg_field_mailbox_user__chg_field_objectaccess_user.py b/modoboa/extensions/admin/migrations/0029_auto__add_user__chg_field_mailbox_user__chg_field_objectaccess_user.py index 3adc88fee..d1934ef32 100644 --- a/modoboa/extensions/admin/migrations/0029_auto__add_user__chg_field_mailbox_user__chg_field_objectaccess_user.py +++ b/modoboa/extensions/admin/migrations/0029_auto__add_user__chg_field_mailbox_user__chg_field_objectaccess_user.py @@ -3,23 +3,20 @@ import datetime from south.db import db from south.v2 import SchemaMigration from django.db import models -from modoboa.lib.dbutils import db_table_exists -from modoboa.lib.compat import user_model_name class Migration(SchemaMigration): def forwards(self, orm): - if db_table_exists('admin_user'): - return db.rename_table('auth_user', 'admin_user') db.rename_table('auth_user_groups', 'admin_user_groups') db.rename_table('auth_user_user_permissions', 'admin_user_user_permissions') + db.send_create_signal('admin', ['User']) # Changing field 'Mailbox.user' - db.alter_column(u'admin_mailbox', 'user_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm[user_model_name])) + db.alter_column(u'admin_mailbox', 'user_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['admin.User'])) # Changing field 'ObjectAccess.user' - db.alter_column(u'admin_objectaccess', 'user_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm[user_model_name])) + db.alter_column(u'admin_objectaccess', 'user_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['admin.User'])) def backwards(self, orm): raise RuntimeError("Cannot revert this migration") diff --git a/modoboa/extensions/admin/migrations/0034_auto__add_field_user_is_local.py b/modoboa/extensions/admin/migrations/0034_auto__add_field_user_is_local.py index eddb9bd5e..5b4a89e50 100644 --- a/modoboa/extensions/admin/migrations/0034_auto__add_field_user_is_local.py +++ b/modoboa/extensions/admin/migrations/0034_auto__add_field_user_is_local.py @@ -9,14 +9,14 @@ class Migration(SchemaMigration): def forwards(self, orm): # Adding field 'User.is_local' - db.add_column(u'admin_user', 'is_local', + db.add_column('admin_user', 'is_local', self.gf('django.db.models.fields.BooleanField')(default=True), keep_default=False) def backwards(self, orm): # Deleting field 'User.is_local' - db.delete_column(u'admin_user', 'is_local') + db.delete_column('admin_user', 'is_local') models = { @@ -123,4 +123,4 @@ class Migration(SchemaMigration): } } - complete_apps = ['admin'] \ No newline at end of file + complete_apps = ['admin'] diff --git a/modoboa/extensions/limits/__init__.py b/modoboa/extensions/limits/__init__.py index 657e9a43e..0bbf995fb 100644 --- a/modoboa/extensions/limits/__init__.py +++ b/modoboa/extensions/limits/__init__.py @@ -35,11 +35,6 @@ class Limits(ModoExtension): grp.save() grp.permissions.add(*dagrp.permissions.all()) - ct = ContentType.objects.get_for_model(Permission) - for pname in ["view_permissions"]: - perm = Permission.objects.get(content_type=ct, codename=pname) - grp.permissions.add(perm) - ct = ContentType.objects.get_for_model(Domain) for pname in ["view_domains", "add_domain", "change_domain", "delete_domain"]: perm = Permission.objects.get(content_type=ct, codename=pname) diff --git a/modoboa/extensions/limits/migrations/0001_initial.py b/modoboa/extensions/limits/migrations/0001_initial.py index 3c4f34fe9..4a5762307 100644 --- a/modoboa/extensions/limits/migrations/0001_initial.py +++ b/modoboa/extensions/limits/migrations/0001_initial.py @@ -3,7 +3,6 @@ import datetime from south.db import db from south.v2 import SchemaMigration from django.db import models -from modoboa.lib.compat import user_model_name class Migration(SchemaMigration): @@ -13,7 +12,7 @@ class Migration(SchemaMigration): # Adding model 'LimitsPool' db.create_table('limits_limitspool', ( ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('user', self.gf('django.db.models.fields.related.OneToOneField')(to=orm[user_model_name], unique=True)), + ('user', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['auth.User'], unique=True)), )) db.send_create_signal('limits', ['LimitsPool']) @@ -57,7 +56,7 @@ class Migration(SchemaMigration): 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) }, - user_model_name: { + 'auth.user': { 'Meta': {'object_name': 'User'}, 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), @@ -91,7 +90,7 @@ class Migration(SchemaMigration): 'limits.limitspool': { 'Meta': {'object_name': 'LimitsPool'}, 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['%s']" % user_model_name, 'unique': 'True'}) + 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}) } } diff --git a/modoboa/lib/compat.py b/modoboa/lib/compat.py index ed54ea216..00bc93f27 100644 --- a/modoboa/lib/compat.py +++ b/modoboa/lib/compat.py @@ -1,4 +1,4 @@ from django.conf import settings user_model_name = getattr(settings, 'AUTH_USER_MODEL', 'auth.User') -user_table_name = "auth_user" if user_model_name == "auth.User" else "admin_user" +user_table_name = "auth_user" if user_model_name == "auth.User" else "core_user" diff --git a/modoboa/lib/logutils.py b/modoboa/lib/logutils.py deleted file mode 100644 index 210fd63eb..000000000 --- a/modoboa/lib/logutils.py +++ /dev/null @@ -1,11 +0,0 @@ -import logging -from models import Log - - -class SQLHandler(logging.Handler): - - def emit(self, record): - Log.objects.create( - message=record.getMessage(), level=record.levelname, - logger=record.name - ) diff --git a/modoboa/lib/migrations/0001_initial.py b/modoboa/lib/migrations/0001_initial.py index 95bb6d493..3f7087488 100644 --- a/modoboa/lib/migrations/0001_initial.py +++ b/modoboa/lib/migrations/0001_initial.py @@ -3,7 +3,6 @@ import datetime from south.db import db from south.v2 import SchemaMigration from django.db import models -from modoboa.lib.compat import user_model_name class Migration(SchemaMigration): @@ -23,7 +22,7 @@ class Migration(SchemaMigration): ('value', self.gf('django.db.models.fields.CharField')(max_length=255)), ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), ('name', self.gf('django.db.models.fields.CharField')(max_length=255)), - ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm[user_model_name])), + ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])), )) db.send_create_signal('lib', ['UserParameter']) @@ -51,7 +50,7 @@ class Migration(SchemaMigration): 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) }, - user_model_name: { + 'auth.user': { 'Meta': {'object_name': 'User'}, 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), @@ -84,7 +83,7 @@ class Migration(SchemaMigration): 'Meta': {'object_name': 'UserParameter'}, 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}), 'value': ('django.db.models.fields.CharField', [], {'max_length': '255'}) } } diff --git a/modoboa/lib/migrations/0002_move_secret_key.py b/modoboa/lib/migrations/0002_move_secret_key.py index b3e9e5d30..3f4feb3f0 100644 --- a/modoboa/lib/migrations/0002_move_secret_key.py +++ b/modoboa/lib/migrations/0002_move_secret_key.py @@ -3,7 +3,6 @@ import datetime from south.db import db from south.v2 import DataMigration from django.db import models -from modoboa.lib.compat import user_model_name class Migration(DataMigration): @@ -38,7 +37,7 @@ class Migration(DataMigration): 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) }, - user_model_name: { + 'auth.user': { 'Meta': {'object_name': 'User'}, 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), @@ -71,7 +70,7 @@ class Migration(DataMigration): 'Meta': {'object_name': 'UserParameter'}, 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}), 'value': ('django.db.models.fields.CharField', [], {'max_length': '255'}) } } diff --git a/modoboa/lib/migrations/0003_clean_parameters.py b/modoboa/lib/migrations/0003_clean_parameters.py index 277791d0e..2aa0edea5 100644 --- a/modoboa/lib/migrations/0003_clean_parameters.py +++ b/modoboa/lib/migrations/0003_clean_parameters.py @@ -4,7 +4,6 @@ from south.db import db from south.v2 import DataMigration from django.db import models from django.core.exceptions import ObjectDoesNotExist -from modoboa.lib.compat import user_model_name class Migration(DataMigration): @@ -50,7 +49,7 @@ class Migration(DataMigration): 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) }, - user_model_name: { + 'auth.user': { 'Meta': {'object_name': 'User'}, 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), @@ -83,7 +82,7 @@ class Migration(DataMigration): 'Meta': {'object_name': 'UserParameter'}, 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s']" % user_model_name}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}), 'value': ('django.db.models.fields.CharField', [], {'max_length': '255'}) } } diff --git a/modoboa/lib/migrations/0004_auto__add_log__chg_field_userparameter_user.py b/modoboa/lib/migrations/0004_auto__add_log__chg_field_userparameter_user.py index 89c681f5b..052538afd 100644 --- a/modoboa/lib/migrations/0004_auto__add_log__chg_field_userparameter_user.py +++ b/modoboa/lib/migrations/0004_auto__add_log__chg_field_userparameter_user.py @@ -3,8 +3,6 @@ import datetime from south.db import db from south.v2 import SchemaMigration from django.db import models -from modoboa.lib.dbutils import db_table_exists -from modoboa.lib.compat import user_model_name class Migration(SchemaMigration): @@ -20,11 +18,8 @@ class Migration(SchemaMigration): )) db.send_create_signal(u'lib', ['Log']) - - if db_table_exists('admin_user'): - return # Changing field 'UserParameter.user' - db.alter_column(u'lib_userparameter', 'user_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm[user_model_name])) + db.alter_column(u'lib_userparameter', 'user_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['admin.User'])) def backwards(self, orm): raise RuntimeError("Cannot revert this migration") From 74c82e7c8d25a9421d566a6386c7e464873d293e Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Tue, 8 Oct 2013 11:08:52 +0200 Subject: [PATCH 74/97] Fixing migrations. --- .../migrations/0002_update_permissions.py | 31 ++++--------------- .../admin/migrations/0037_rename_tables.py | 4 --- 2 files changed, 6 insertions(+), 29 deletions(-) diff --git a/modoboa/core/migrations/0002_update_permissions.py b/modoboa/core/migrations/0002_update_permissions.py index 8e8e4c481..31bc46068 100644 --- a/modoboa/core/migrations/0002_update_permissions.py +++ b/modoboa/core/migrations/0002_update_permissions.py @@ -11,34 +11,15 @@ class Migration(DataMigration): def forwards(self, orm): "Write your forwards methods here." - oldct = orm['contenttypes.ContentType'].objects.get( - app_label='admin', model='user' - ) - newct = orm['contenttypes.ContentType'].objects.get( - app_label='core', model='user' - ) - orm['core.ObjectAccess'].objects.filter(content_type=oldct).update( - content_type=newct - ) - orm['reversion.Version'].objects.filter(content_type=oldct).update( - content_type=newct - ) - oldct.delete() + orm['contenttypes.ContentType'].objects.filter( + app_label='admin', model__in=['user', 'extension', 'objectaccess'] + ).update(app_label='core') def backwards(self, orm): "Write your backwards methods here." - newct = orm['contenttypes.ContentType'].objects.create( - app_label='admin', model='user', name='user' - ) - oldct = orm['contenttypes.ContentType'].objects.get( - app_label='core', model='user' - ) - orm['core.ObjectAccess'].objects.filter(content_type=oldct).update( - content_type=newct - ) - orm['reversion.Version'].objects.filter(content_type=oldct).update( - content_type=newct - ) + orm['contenttypes.ContentType'].objects.filter( + app_label='core', model__in=['user', 'extension', 'objectaccess'] + ).update(app_label='admin') models = { u'auth.group': { diff --git a/modoboa/extensions/admin/migrations/0037_rename_tables.py b/modoboa/extensions/admin/migrations/0037_rename_tables.py index 01eac0d54..077918c22 100644 --- a/modoboa/extensions/admin/migrations/0037_rename_tables.py +++ b/modoboa/extensions/admin/migrations/0037_rename_tables.py @@ -24,8 +24,6 @@ class Migration(SchemaMigration): db.rename_table('admin_extension', 'core_extension') - db.send_create_signal('core', ['User', 'Extension', 'ObjectAccess']) - def backwards(self, orm): db.rename_table('core_user', 'admin_user') # Changing field 'Mailbox.user' @@ -39,8 +37,6 @@ class Migration(SchemaMigration): db.rename_table('core_extension', 'admin_extension') - db.send_create_signal('admin', ['User', 'Extension', 'ObjectAccess']) - models = { 'admin.alias': { 'Meta': {'ordering': "['domain__name', 'address']", 'unique_together': "(('address', 'domain'),)", 'object_name': 'Alias'}, From fca83ba439cde0b69b0e6662e2ff072ebdbbac5e Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Tue, 8 Oct 2013 21:12:20 +0200 Subject: [PATCH 75/97] Documentation + various fixes. --- doc/getting_started/upgrade.rst | 40 +++++++++++++++++++++++++++ modoboa/core/urls.py | 25 +++++++++++------ modoboa/extensions/limits/controls.py | 1 - modoboa/extensions/limits/tests.py | 12 ++++---- modoboa/lib/tests.py | 6 ++-- modoboa/urls.py | 32 ++++++++------------- 6 files changed, 78 insertions(+), 38 deletions(-) diff --git a/doc/getting_started/upgrade.rst b/doc/getting_started/upgrade.rst index c24117dfc..dfde23e49 100644 --- a/doc/getting_started/upgrade.rst +++ b/doc/getting_started/upgrade.rst @@ -33,6 +33,11 @@ install it. $ pip install --upgrade modoboa +.. warning:: + + If you migrate to **1.1.0**, please follow the :ref:`dedicated migration + procedure <1.1.0>` and skip the usual one. + Then, refer to this page to check if the version you're installing requires specific operations. If the version you're looking for is not present, it means nothing special is required. @@ -43,6 +48,41 @@ Finally, follow the common procedure:: $ python manage.py syncdb --migrate $ python manage.py collectstatic +.. _1.1.0: + +1.1.0: FIXME +============ + +Due to code refactoring, some modifications need to be done into +:file:`settings.py`: + +#. ``MODOBOA_APPS`` must contain the following applications:: + + MODOBOA_APPS = ( + 'modoboa', + 'modoboa.core', + 'modoboa.lib', + + 'modoboa.extensions.admin', + 'modoboa.extensions.limits', + 'modoboa.extensions.postfix_autoreply', + 'modoboa.extensions.webmail', + 'modoboa.extensions.stats', + 'modoboa.extensions.amavis', + 'modoboa.extensions.sievefilters', + ) + +#. ``AUTH_USER_MODEL`` must be set to ``core.User`` + +#. Into ``LOGGING``, replace ``modoboa.lib.logutils.SQLHandler`` by + ``modoboa.core.loggers.SQLHandler`` + +Then, run the following commands to migrate your installation:: + + $ python manage.py migrate core 0001 --fake + $ python manage.py migrate + $ python manage.py collectstatic + 1.0.1: operations on mailboxes ============================== diff --git a/modoboa/core/urls.py b/modoboa/core/urls.py index a4d1147f9..152d56229 100644 --- a/modoboa/core/urls.py +++ b/modoboa/core/urls.py @@ -2,13 +2,20 @@ from django.conf.urls import patterns, url urlpatterns = patterns( - 'modoboa.core.views', - - (r'^settings/$', 'viewsettings'), - (r'^settings/parameters/$', 'viewparameters'), - (r'^settings/parameters/save/$', 'saveparameters'), - (r'^settings/extensions/$', 'viewextensions'), - (r'^settings/extensions/save/$', 'saveextensions'), - (r'^settings/info/$', 'information'), - (r'^settings/logs/$', 'logs'), + '', + + (r'^accounts/login/$', 'modoboa.core.views.auth.dologin'), + (r'^accounts/logout/$', 'modoboa.core.views.auth.dologout'), + + (r'^core/$', 'modoboa.core.views.admin.viewsettings'), + (r'^core/parameters/$', 'modoboa.core.views.admin.viewparameters'), + (r'^core/parameters/save/$', 'modoboa.core.views.admin.saveparameters'), + (r'^core/extensions/$', 'modoboa.core.views.admin.viewextensions'), + (r'^core/extensions/save/$', 'modoboa.core.views.admin.saveextensions'), + (r'^core/info/$', 'modoboa.core.views.admin.information'), + (r'^core/logs/$', 'modoboa.core.views.admin.logs'), + + (r'^user/$', 'modoboa.core.views.user.index'), + (r'^user/preferences/$', 'modoboa.core.views.user.preferences'), + (r'^user/profile/$', 'modoboa.core.views.user.profile'), ) diff --git a/modoboa/extensions/limits/controls.py b/modoboa/extensions/limits/controls.py index f8174e666..c8c6829d1 100644 --- a/modoboa/extensions/limits/controls.py +++ b/modoboa/extensions/limits/controls.py @@ -133,7 +133,6 @@ def can_create_new_object(user, objtype): @events.observe("AccountCreated") def create_pool(user): - print "pouet" owner = get_object_owner(user) if not owner.is_superuser and \ not owner.belongs_to_group("Resellers"): diff --git a/modoboa/extensions/limits/tests.py b/modoboa/extensions/limits/tests.py index 23e4669e3..410b9f30c 100644 --- a/modoboa/extensions/limits/tests.py +++ b/modoboa/extensions/limits/tests.py @@ -1,7 +1,8 @@ from django.core.urlresolvers import reverse from modoboa.lib.tests import ExtTestCase +from modoboa.core.factories import UserFactory +from modoboa.extensions.admin.factories import DomainFactory, MailboxFactory from modoboa.core.models import User -from modoboa.admin import factories class PermissionsTestCase(ExtTestCase): @@ -10,10 +11,11 @@ class PermissionsTestCase(ExtTestCase): def setUp(self): super(PermissionsTestCase, self).setUp() - dom = factories.DomainFactory(name='test.com') - self.admin = factories.UserFactory( - username='admin@test.com', groups=('DomainAdmins',), mailbox__domain=dom + dom = DomainFactory(name='test.com') + self.admin = UserFactory( + username='admin@test.com', groups=('DomainAdmins',) ) + MailboxFactory(address='admin', domain=dom, user=self.admin) dom.add_admin(self.admin) def test_domainadmin_deletes_reseller(self): @@ -26,7 +28,7 @@ class PermissionsTestCase(ExtTestCase): password1="toto", password2="toto", role="Resellers", is_active=True, email="reseller@test.com", stepid=2 ) - self.check_ajax_post(reverse("modoboa.admin.views.newaccount"), values) + self.check_ajax_post(reverse("modoboa.extensions.admin.views.identity.newaccount"), values) account = User.objects.get(username="reseller@test.com") self.clt.logout() self.clt.login(username="admin@test.com", password="toto") diff --git a/modoboa/lib/tests.py b/modoboa/lib/tests.py index d99d2e6a1..986d7d7b2 100644 --- a/modoboa/lib/tests.py +++ b/modoboa/lib/tests.py @@ -35,8 +35,8 @@ class ExtTestCase(ModoTestCase): def setUp(self, *args, **kwargs): super(ExtTestCase, self).setUp(*args, **kwargs) - self.clt.get(reverse("modoboa.admin.views.viewextensions")) - self.clt.post(reverse("modoboa.admin.views.saveextensions"), + self.clt.get(reverse("modoboa.core.views.admin.viewextensions")) + self.clt.post(reverse("modoboa.core.views.admin.saveextensions"), {"select_%s" % self.name : "1"}) @@ -65,7 +65,7 @@ class ParameterTestCase(TestCase): """ def setUp(self): - from modoboa.admin.models import User + from modoboa.core.models import User parameters.register(TestParams, "Test") parameters.register(TestUserParams, "TestUser") self.user = User.objects.create(username="tester") diff --git a/modoboa/urls.py b/modoboa/urls.py index 8c85d6060..25d9a2ee9 100644 --- a/modoboa/urls.py +++ b/modoboa/urls.py @@ -6,39 +6,29 @@ from modoboa.core import load_settings load_settings() -urlpatterns = patterns('', +urlpatterns = patterns( + '', (r'^$', 'modoboa.lib.webutils.topredirection'), (r'^jsi18n/$', 'django.views.i18n.javascript_catalog', {'packages': ('modoboa', ), }), - - (r'^accounts/login/$', 'modoboa.core.views.auth.dologin'), - (r'^accounts/logout/$', 'modoboa.core.views.auth.dologout'), - - (r'^core/$', 'modoboa.core.views.admin.viewsettings'), - (r'^core/parameters/$', 'modoboa.core.views.admin.viewparameters'), - (r'^core/parameters/save/$', 'modoboa.core.views.admin.saveparameters'), - (r'^core/extensions/$', 'modoboa.core.views.admin.viewextensions'), - (r'^core/extensions/save/$', 'modoboa.core.views.admin.saveextensions'), - (r'^core/info/$', 'modoboa.core.views.admin.information'), - (r'^core/logs/$', 'modoboa.core.views.admin.logs'), - - (r'^user/$', 'modoboa.core.views.user.index'), - (r'^user/preferences/$', 'modoboa.core.views.user.preferences'), - (r'^user/profile/$', 'modoboa.core.views.user.profile'), + ('', include('modoboa.core.urls')), ) -urlpatterns += patterns('', +urlpatterns += patterns( + '', *events.raiseQueryEvent("ExtraUprefsRoutes") ) -urlpatterns += patterns('', +urlpatterns += patterns( + '', *exts_pool.load_all() ) parameters.apply_to_django_settings() if 'modoboa.demo' in settings.INSTALLED_APPS: - urlpatterns += patterns('', + urlpatterns += patterns( + '', (r'^demo/', include('modoboa.demo.urls')) ) @@ -46,4 +36,6 @@ if settings.DEBUG: from django.contrib.staticfiles.urls import staticfiles_urlpatterns from django.conf.urls.static import static urlpatterns += staticfiles_urlpatterns() - urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) + urlpatterns += static( + settings.MEDIA_URL, document_root=settings.MEDIA_ROOT + ) From 800c95aa57a3cada3c61f251aff910d86d60fc32 Mon Sep 17 00:00:00 2001 From: Tom Hendrikx Date: Tue, 8 Oct 2013 22:27:58 +0200 Subject: [PATCH 76/97] Add information about enabling Debug when using embedded HTTP server. --- doc/getting_started/install.rst | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/doc/getting_started/install.rst b/doc/getting_started/install.rst index c80629873..63dd59bfb 100644 --- a/doc/getting_started/install.rst +++ b/doc/getting_started/install.rst @@ -128,7 +128,10 @@ server:: $ python manage.py runserver -You should be able to access Modoboa at http://locahost:8000/. +You should be able to access Modoboa at http://localhost:8000/. -For a production environnement, we recommend using a stable webserver -like :ref:`apache2` or :ref:`nginx-label`. +For a fully working interface using the embedded HTTP server, you need to set the ``DEBUG`` +parameter in settings.py to ``True``. + +For a production environment, we recommend using a stable webserver +like :ref:`apache2` or :ref:`nginx-label`. Don't forget to set ``DEBUG`` back to ``False``. From eb43ee2c0ab091bbf425b2ba00cf8d4c74d0e700 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Wed, 9 Oct 2013 15:13:52 +0200 Subject: [PATCH 77/97] Cleanup. --- {modoboa/bin => bin}/modoboa-admin.py | 0 modoboa/core/__init__.py | 38 ++++- modoboa/{lib => core}/management/__init__.py | 0 .../management/commands/__init__.py | 0 .../management/commands/cleanlogs.py | 9 +- modoboa/core/models.py | 20 +++ modoboa/core/templates/core/information.html | 2 +- modoboa/core/templates/core/parameters.html | 1 - modoboa/core/templatetags/core_tags.py | 116 ++++++++++++++ modoboa/extensions/admin/__init__.py | 26 +++ modoboa/extensions/admin/models/alias.py | 8 - .../admin/templates/admin/extensions.html | 6 - .../admin/templates/admin/information.html | 17 -- .../admin/templates/admin/parameters.html | 8 - .../admin/templatetags/admin_tags.py | 76 --------- modoboa/extensions/admin/views/domain.py | 2 +- .../amavis/management/commands/amnotify.py | 11 +- .../stats/management/commands/logparser.py | 2 +- modoboa/extensions/webmail/middleware.py | 15 -- modoboa/lib/authbackends.py | 13 +- modoboa/lib/emailutils.py | 42 ++--- modoboa/lib/events.py | 34 +--- modoboa/lib/templatetags/libextras.py | 149 ++++-------------- modoboa/lib/webutils.py | 8 - modoboa/templates/common/generic_field.html | 2 +- modoboa/templates/registration/login.html | 2 +- setup.py | 46 +++--- 27 files changed, 299 insertions(+), 354 deletions(-) rename {modoboa/bin => bin}/modoboa-admin.py (100%) rename modoboa/{lib => core}/management/__init__.py (100%) rename modoboa/{lib => core}/management/commands/__init__.py (100%) rename modoboa/{lib => core}/management/commands/cleanlogs.py (91%) delete mode 100644 modoboa/extensions/admin/templates/admin/extensions.html delete mode 100644 modoboa/extensions/admin/templates/admin/information.html delete mode 100644 modoboa/extensions/admin/templates/admin/parameters.html delete mode 100644 modoboa/extensions/webmail/middleware.py diff --git a/modoboa/bin/modoboa-admin.py b/bin/modoboa-admin.py similarity index 100% rename from modoboa/bin/modoboa-admin.py rename to bin/modoboa-admin.py diff --git a/modoboa/core/__init__.py b/modoboa/core/__init__.py index cf4bc5c04..824c49add 100644 --- a/modoboa/core/__init__.py +++ b/modoboa/core/__init__.py @@ -1,11 +1,47 @@ from django.utils.translation import ugettext_lazy from modoboa.lib import parameters, events +base_events = [ + "CanCreate", + + "AccountCreated", + "AccountAutoCreated", + "AccountModified", + "AccountDeleted", + "AccountExported", + "AccountImported", + "PasswordUpdated", + "ExtraAccountActions", + "RoleChanged", + "GetExtraRoles", + "PasswordChange", + + "UserMenuDisplay", + "AdminMenuDisplay", + "GetStaticContent", + + "ExtEnabled", + "ExtDisabled", + + "UserLogin", + "UserLogout", + + "GetAnnouncement", + + "TopNotifications", + "ExtraAdminContent", + + "ExtraUprefsRoutes", + "ExtraUprefsJS" +] + def load_settings(): - from app_settings import GeneralParametersForm, UserSettings + from .app_settings import GeneralParametersForm, UserSettings + parameters.register(GeneralParametersForm, ugettext_lazy("General")) parameters.register(UserSettings, ugettext_lazy("General")) + events.declare(base_events) @events.observe("ExtDisabled") diff --git a/modoboa/lib/management/__init__.py b/modoboa/core/management/__init__.py similarity index 100% rename from modoboa/lib/management/__init__.py rename to modoboa/core/management/__init__.py diff --git a/modoboa/lib/management/commands/__init__.py b/modoboa/core/management/commands/__init__.py similarity index 100% rename from modoboa/lib/management/commands/__init__.py rename to modoboa/core/management/commands/__init__.py diff --git a/modoboa/lib/management/commands/cleanlogs.py b/modoboa/core/management/commands/cleanlogs.py similarity index 91% rename from modoboa/lib/management/commands/cleanlogs.py rename to modoboa/core/management/commands/cleanlogs.py index e25ba7604..3da28798f 100644 --- a/modoboa/lib/management/commands/cleanlogs.py +++ b/modoboa/core/management/commands/cleanlogs.py @@ -1,13 +1,12 @@ #!/usr/bin/env python # coding: utf-8 - import datetime from optparse import make_option from django.core.management.base import BaseCommand from django.utils import timezone +from modoboa.core import load_settings +from modoboa.core.models import Log from modoboa.lib import parameters -from modoboa.lib.models import Log -from modoboa.admin import AdminConsole class Command(BaseCommand): @@ -38,8 +37,8 @@ class Command(BaseCommand): l.addHandler(logging.StreamHandler()) self.verbose = options["verbose"] - AdminConsole().load() - log_maximum_age = int(parameters.get_admin("LOG_MAXIMUM_AGE", app="admin")) + load_settings() + log_maximum_age = int(parameters.get_admin("LOG_MAXIMUM_AGE")) self.__vprint("Deleting logs older than %d days..." % log_maximum_age) limit = timezone.now() - datetime.timedelta(log_maximum_age) Log.objects.filter(date_created__lt=limit).delete() diff --git a/modoboa/core/models.py b/modoboa/core/models.py index 71364982d..6d51a3aac 100644 --- a/modoboa/core/models.py +++ b/modoboa/core/models.py @@ -358,6 +358,26 @@ class User(AbstractBaseUser, PermissionsMixin): reversion.register(User) +def populate_callback(user): + """Populate callback + + If the LDAP authentication backend is in use, this callback will + be called each time a new user authenticates succesfuly to + Modoboa. This function is in charge of creating the mailbox + associated to the provided ``User`` object. + + :param user: a ``User`` instance + """ + from modoboa.lib.permissions import grant_access_to_object + + sadmins = User.objects.filter(is_superuser=True) + user.set_role("SimpleUsers") + user.post_create(sadmins[0]) + for su in sadmins[1:]: + grant_access_to_object(su, user) + events.raiseEvent("AccountAutoCreated", user) + + class ObjectAccess(models.Model): user = models.ForeignKey(User) content_type = models.ForeignKey(ContentType) diff --git a/modoboa/core/templates/core/information.html b/modoboa/core/templates/core/information.html index 80f7500a3..8dcdf1a52 100644 --- a/modoboa/core/templates/core/information.html +++ b/modoboa/core/templates/core/information.html @@ -1,4 +1,4 @@ -{% load i18n libextras %} +{% load i18n core_tags libextras %}

                  {% trans "Information" %} {% trans "Various information about Modoboa" %}

                  Modoboa {% get_version %} {% trans "is currently in use." %}
                  diff --git a/modoboa/core/templates/core/parameters.html b/modoboa/core/templates/core/parameters.html index c425d0e60..02e5e792d 100644 --- a/modoboa/core/templates/core/parameters.html +++ b/modoboa/core/templates/core/parameters.html @@ -1,5 +1,4 @@ {% load i18n libextras %}{% load url from future %} -{% url "modoboa.admin.views.saveparameters" as action %}

                  {% trans "Parameters" %} {% trans "Configure Modoboa" %}

                  {% csrf_token %} {% include "common/parameters.html" %} diff --git a/modoboa/core/templatetags/core_tags.py b/modoboa/core/templatetags/core_tags.py index 53ff25b7d..940aecff2 100644 --- a/modoboa/core/templatetags/core_tags.py +++ b/modoboa/core/templatetags/core_tags.py @@ -1,8 +1,10 @@ import re from django import template from django.template.loader import render_to_string +from django.utils import timezone from django.utils.translation import ugettext as _ from django.core.urlresolvers import reverse +from django.contrib.sessions.models import Session from modoboa.lib import events @@ -160,3 +162,117 @@ def colorize_level(level): @register.filter def tohtml(message): return re.sub("'(.*?)'", "\g<1>", message) + + +@register.simple_tag +def visirule(field): + if not hasattr(field.form, "visirules") or not field.html_name in field.form.visirules: + return "" + rule = field.form.visirules[field.html_name] + return " data-visibility-field='%s' data-visibility-value='%s' " \ + % (rule["field"], rule["value"]) + + +@register.simple_tag +def get_version(): + import pkg_resources + return pkg_resources.get_distribution("modoboa").version + + +class ConnectedUsers(template.Node): + def __init__(self, varname): + self.varname = varname + + def render(self, context): + from modoboa.core.models import User + + sessions = Session.objects.filter(expire_date__gte=timezone.now()) + uid_list = [] + # Build a list of user ids from that query + for session in sessions: + data = session.get_decoded() + uid = data.get('_auth_user_id', None) + if uid: + uid_list.append(uid) + + # Query all logged in users based on id list + context[self.varname] = [] + for uid in uid_list: + try: + context[self.varname].append(User.objects.get(pk=uid)) + except User.DoesNotExist: + pass + return '' + + +@register.tag +def connected_users(parser, token): + try: + tag, a, varname = token.split_contents() + except ValueError: + raise template.TemplateSyntaxError( + 'connected_users usage: {% connected_users as users %}' + ) + return ConnectedUsers(varname) + + +@register.simple_tag +def get_modoboa_logo(): + import os + from django.conf import settings + + try: + logo = settings.MODOBOA_CUSTOM_LOGO + except AttributeError: + logo = None + if logo is None: + return os.path.join(settings.STATIC_URL, "css/modoboa.png") + return logo + + +@register.simple_tag +def extra_head_content(user): + tpl = Template("{% for sc in static_content %}{{ sc|safe }}{% endfor %}") + return tpl.render( + Context( + dict(static_content=events.raiseQueryEvent("GetStaticContent", user)) + ) + ) + + +@register.simple_tag +def load_optionalmenu(user): + menu = events.raiseQueryEvent("UserMenuDisplay", "top_menu_middle", user) + return template.loader.render_to_string( + 'common/menulist.html', + {"entries" : menu, "user" : user} + ) + + +@register.simple_tag +def load_notifications(user): + content = events.raiseQueryEvent("TopNotifications", user) + return "".join(content) + + +@register.simple_tag +def display_messages(msgs): + text = "" + level = "info" + for m in msgs: + level = m.tags + text += unicode(m) + "\\\n" + + if level == "info": + level = "success" + timeout = "2000" + else: + timeout = "undefined" + + return """ + +""" % (level, text, timeout) diff --git a/modoboa/extensions/admin/__init__.py b/modoboa/extensions/admin/__init__.py index 763ff5054..79c8fad5d 100644 --- a/modoboa/extensions/admin/__init__.py +++ b/modoboa/extensions/admin/__init__.py @@ -157,6 +157,32 @@ def import_account_mailbox(user, account, row): dom.add_admin(account) +@events.observe("AccountAutoCreated") +def account_auto_created(user): + from modoboa.core.models import User + from modoboa.lib.permissions import grant_access_to_object + + sadmins = User.objects.filter(is_superuser=True) + localpart, domname = split_mailbox(user.username) + try: + domain = Domain.objects.get(name=domname) + except Domain.DoesNotExist: + domain = Domain(name=domname, enabled=True, quota=0) + domain.save(creator=sadmins[0]) + for su in sadmins[1:]: + grant_access_to_object(su, domain) + try: + mb = Mailbox.objects.get(domain=domain, address=localpart) + except Mailbox.DoesNotExist: + mb = Mailbox( + address=localpart, domain=domain, user=user, use_domain_quota=True + ) + mb.set_quota(override_rules=True) + mb.save(creator=sadmins[0]) + for su in sadmins[1:]: + grant_access_to_object(su, mb) + + @events.observe("UserLogin") def user_logged_in(request, username, password): from modoboa.lib.cryptutils import encrypt diff --git a/modoboa/extensions/admin/models/alias.py b/modoboa/extensions/admin/models/alias.py index ada1cfa19..c59b5b083 100644 --- a/modoboa/extensions/admin/models/alias.py +++ b/modoboa/extensions/admin/models/alias.py @@ -139,14 +139,6 @@ class Alias(DatesAware): total += len(self.extmboxes.split(',')) return total + self.aliases.count() + self.mboxes.count() - def ui_disabled(self, user): - if user.is_superuser: - return False - for mb in self.mboxes.all(): - if not user.is_owner(mb.domain): - return True - return False - def from_csv(self, user, row, expected_elements=5): """Create a new alias from a CSV file entry diff --git a/modoboa/extensions/admin/templates/admin/extensions.html b/modoboa/extensions/admin/templates/admin/extensions.html deleted file mode 100644 index a419d20ad..000000000 --- a/modoboa/extensions/admin/templates/admin/extensions.html +++ /dev/null @@ -1,6 +0,0 @@ -{% load i18n %}{% load url from future %} -

                  {% trans "Extensions" %} {% trans "Choose the extension(s) to use" %}

                  -{% csrf_token %} - {{ extensions|safe }} -
                  -{% trans 'Save' %} diff --git a/modoboa/extensions/admin/templates/admin/information.html b/modoboa/extensions/admin/templates/admin/information.html deleted file mode 100644 index 80f7500a3..000000000 --- a/modoboa/extensions/admin/templates/admin/information.html +++ /dev/null @@ -1,17 +0,0 @@ -{% load i18n libextras %} -

                  {% trans "Information" %} {% trans "Various information about Modoboa" %}

                  -
                  Modoboa {% get_version %} {% trans "is currently in use." %}
                  - -

                  {% trans "Active users" %}

                  - - - - - - - {% connected_users as users %}{% for u in users %} - - - - {% endfor %} -
                  {% trans "Name" %}{% trans "Group name" %}{% trans "Last login" %}
                  {{ u.username }}{{ u.group }}{{ u.last_login }}
                  diff --git a/modoboa/extensions/admin/templates/admin/parameters.html b/modoboa/extensions/admin/templates/admin/parameters.html deleted file mode 100644 index 0ae46dfc2..000000000 --- a/modoboa/extensions/admin/templates/admin/parameters.html +++ /dev/null @@ -1,8 +0,0 @@ -{% load i18n libextras %}{% load url from future %} -{% url "modoboa.admin.views.saveparameters" as action %} -

                  {% trans "Parameters" %} {% trans "Configure Modoboa" %}

                  -
                  {% csrf_token %} - {% include "common/parameters.html" %} -
                  -
                  -{% trans 'Save' %} diff --git a/modoboa/extensions/admin/templatetags/admin_tags.py b/modoboa/extensions/admin/templatetags/admin_tags.py index 59a68b63c..ed2747e22 100644 --- a/modoboa/extensions/admin/templatetags/admin_tags.py +++ b/modoboa/extensions/admin/templatetags/admin_tags.py @@ -177,82 +177,6 @@ def domadmin_actions(daid, domid): return render_actions(actions) -@register.simple_tag -def loadadminextmenu(user): - menu = events.raiseQueryEvent("AdminMenuDisplay", "admin_menu_box", user) - return render_to_string('common/menulist.html', - {"entries": menu, "user": user}) - - -@register.simple_tag -def param(app, definition): - name = "%s.%s" % (app, definition["name"]) - value = definition["value"] \ - if "value" in definition else definition["deflt"] - - if definition["type"] == "separator": - return "
                  %s
                  " % (unicode(definition["label"])) - - extratags = "" - if "visible_if" in definition: - vfield, vvalue = definition["visible_if"].split("=") - extratags = "data-visibility-field='%s.%s' data-visibility-value='%s'" \ - % (app, vfield, vvalue) - - result = """
                  - -""" % (extratags, name, - _(definition["label"]) if "label" in definition else definition["name"]) - - result += "
                  " - if definition["type"] in ["string", "int"]: - result += """ - """ % (name, name, value) - - if definition["type"] == "text": - result += "" \ - % (name, name, value) - - if definition["type"] == "list_yesno": - for idx, v in enumerate([("yes", _("Yes")), ("no", _("No"))]): - checked = "checked" if value == v[0] else "" - result += """ -""" % dict(id="%s_%d" % (name, idx), name=name, value=v[0], - label=v[1], checked=checked) - - if definition["type"] == "list": - result += """ - -""" - - if "help" in definition: - result += """ - -""" % (unicode(definition["help"]), _("Help")) -# result += """ -# %s -# """ % _(definition["help"]) - - result += """ -
                  -
                  -""" - return result - - @register.filter def gender(value, target): if value in genders: diff --git a/modoboa/extensions/admin/views/domain.py b/modoboa/extensions/admin/views/domain.py index 737d19bde..7989ebcb3 100644 --- a/modoboa/extensions/admin/views/domain.py +++ b/modoboa/extensions/admin/views/domain.py @@ -60,7 +60,7 @@ def domains(request, tplname="admin/domains.html"): if not request.user.has_perm("admin.view_domains"): if request.user.has_perm("admin.view_mailboxes"): return HttpResponseRedirect(reverse(identities)) - return HttpResponseRedirect(reverse("modoboa.userprefs.views.index")) + return HttpResponseRedirect(reverse("modoboa.core.views.user.index")) return render(request, tplname, {"selection": "domains"}) diff --git a/modoboa/extensions/amavis/management/commands/amnotify.py b/modoboa/extensions/amavis/management/commands/amnotify.py index 083cce65f..b90046869 100644 --- a/modoboa/extensions/amavis/management/commands/amnotify.py +++ b/modoboa/extensions/amavis/management/commands/amnotify.py @@ -8,9 +8,10 @@ from django.core.management.base import BaseCommand, CommandError from django.template.loader import render_to_string from django.core.urlresolvers import reverse from django.utils.translation import ugettext as _ +from modoboa.core.models import User from modoboa.lib import parameters from modoboa.lib.emailutils import sendmail_simple -from modoboa.admin.models import User, Domain +from modoboa.extensions.admin.models import Domain from modoboa.extensions.amavis import Amavis from modoboa.extensions.amavis.models import ( Msgrcpt @@ -68,13 +69,17 @@ class Command(BaseCommand): self.sender = parameters.get_admin("NOTIFICATIONS_SENDER", app="amavis") self.baseurl = self.options["baseurl"].strip("/") - self.listingurl = self.baseurl + reverse("modoboa.extensions.amavis.views._listing") + "?viewrequests=1" + self.listingurl = self.baseurl \ + + reverse("modoboa.extensions.amavis.views._listing") \ + + "?viewrequests=1" for da in User.objects.filter(groups__name="DomainAdmins"): if not da.mailbox_set.count(): continue rcpt = da.mailbox_set.all()[0].full_address - reqs = get_wrapper().get_domains_pending_requests(da.get_domains()) + reqs = get_wrapper().get_domains_pending_requests( + Domain.objects.get_for_admin(da) + ) if reqs.count(): self.send_pr_notification(rcpt, reqs) diff --git a/modoboa/extensions/stats/management/commands/logparser.py b/modoboa/extensions/stats/management/commands/logparser.py index cbc5c2151..b6df503c3 100644 --- a/modoboa/extensions/stats/management/commands/logparser.py +++ b/modoboa/extensions/stats/management/commands/logparser.py @@ -26,7 +26,7 @@ import string from django.core.management.base import BaseCommand, CommandError from optparse import make_option from modoboa.lib import parameters -from modoboa.admin.models import Domain +from modoboa.extensions.admin.models import Domain from modoboa.extensions.stats import Stats from modoboa.extensions.stats.grapher import str2Time, Grapher from modoboa.extensions.stats.graph_templates import MailTraffic diff --git a/modoboa/extensions/webmail/middleware.py b/modoboa/extensions/webmail/middleware.py deleted file mode 100644 index e5693f318..000000000 --- a/modoboa/extensions/webmail/middleware.py +++ /dev/null @@ -1,15 +0,0 @@ -# coding: utf-8 -from modoboa.lib.webutils import ajax_response, _render_error -from modoboa.extensions.webmail.exceptions import WebmailError, ImapError - - -class WebmailErrorMiddleware(object): - def process_exception(self, request, exception): - if not isinstance(exception, (WebmailError, ImapError)): - return None - json = request.GET.get("json", False) if request.method == "GET" \ - else request.POST.get("json", False) - if json: - return ajax_response(request, status="ko", - respmsg=str(exception), norefresh=True) - return _render_error(request, user_context=dict(error=str(exception))) diff --git a/modoboa/lib/authbackends.py b/modoboa/lib/authbackends.py index 325dc361d..3e9663604 100644 --- a/modoboa/lib/authbackends.py +++ b/modoboa/lib/authbackends.py @@ -25,21 +25,22 @@ try: from django_auth_ldap.backend import ( LDAPBackend as orig_LDAPBackend, _LDAPUser ) - from modoboa.admin.models import populate_callback + from modoboa.core.models import populate_callback class LDAPBackend(orig_LDAPBackend): def get_or_create_user(self, username, ldap_user): """ - This must return a (User, created) 2-tuple for the given LDAP user. - username is the Django-friendly username of the user. ldap_user.dn is - the user's DN and ldap_user.attrs contains all of their LDAP attributes. + This must return a (User, created) 2-tuple for the given + LDAP user. username is the Django-friendly username of + the user. ldap_user.dn is the user's DN and + ldap_user.attrs contains all of their LDAP attributes. """ lpart, domain = split_mailbox(username) if domain is None: return None user, created = User.objects.get_or_create( - username__iexact=username, + username__iexact=username, defaults={'username': username.lower(), 'is_local': False} ) if created: @@ -50,7 +51,7 @@ try: user = None try: user = User.objects.get(pk=user_id) - _LDAPUser(self, user=user) # This sets user.ldap_user + _LDAPUser(self, user=user) # This sets user.ldap_user except User.DoesNotExist: pass return user diff --git a/modoboa/lib/emailutils.py b/modoboa/lib/emailutils.py index a10381ffe..7a6795d8b 100644 --- a/modoboa/lib/emailutils.py +++ b/modoboa/lib/emailutils.py @@ -1,16 +1,16 @@ # coding: utf-8 - +import time import re import lxml -from django.template import Template, Context -from django.template.loader import render_to_string -from django.conf import settings -import u2u_decode import smtplib from email.header import Header, decode_header from email.mime.text import MIMEText from email.utils import make_msgid, formatdate, parseaddr -import time +from django.template import Template, Context +from django.template.loader import render_to_string +from django.conf import settings +import u2u_decode + class EmailAddress(object): def __init__(self, address): @@ -18,14 +18,15 @@ class EmailAddress(object): (self.name, self.address) = parseaddr(self.fulladdress) if self.name == "": self.fulladdress = self.address - + def __str__(self): return self.fulladdress + class Email(object): def __init__(self, msg, mformat="plain", dformat="plain", links=0): self.attached_map = {} - self.contents = {"html" : "", "plain" : ""} + self.contents = {"html": "", "plain": ""} self.headers = [] self.attachments = {} self.mformat = mformat @@ -34,7 +35,7 @@ class Email(object): self.__parse(msg) - if not self.contents.has_key(mformat) or self.contents[mformat] == "": + if not mformat in self.contents or self.contents[mformat] == "": # Fallback self.mformat = mformat == "html" and "plain" or "html" @@ -68,7 +69,7 @@ class Email(object): target = "plain" else: target = msg.get_content_subtype() - self.contents[target] += decode(msg.get_payload(decode=True), + self.contents[target] += decode(msg.get_payload(decode=True), charset=msg.get_content_charset()) def _parse_image(self, msg, level): @@ -97,7 +98,7 @@ class Email(object): self.attached_map[cid] = re.match("^http:", fname) and fname \ or self.__save_image(fname, msg) return - self.__parse_default(msg, level) + self.__parse_default(msg, level) def __parse(self, msg, level=None): """Recursive email parser @@ -121,7 +122,7 @@ class Email(object): cpt += 1 return - if level is None: + if level is None: level = "1" try: getattr(self, "_parse_%s" % msg.get_content_maintype())(msg, level) @@ -148,19 +149,17 @@ class Email(object): return path def map_cid(self, url): - import re - m = re.match(".*cid:(.+)", url) if m: - if self.attached_map.has_key(m.group(1)): + if m.group(1) in self.attached_map: return self.attached_map[m.group(1)] return url def render_headers(self, **kwargs): return render_to_string("common/mailheaders.html", { - "headers" : self.headers, - }) - + "headers": self.headers, + }) + def viewmail_plain(self, content, **kwargs): return "
                  %s
                  " % content @@ -181,6 +180,7 @@ class Email(object): body = re.sub("<(/?)body", lambda m: "<%sdiv" % m.group(1), body) return body + def split_mailbox(mailbox): """Tries to split a mailbox in two parts (local part and domain name) @@ -199,6 +199,7 @@ def split_mailbox(mailbox): address = "@".join(parts[:-1]) return (address, domain) + def decode(s, encodings=('utf8', 'latin1', 'windows-1252', 'ascii'), charset=None): if charset is not None: try: @@ -270,6 +271,7 @@ def __sendmail(sender, rcpt, msgstring, server='localhost', port=25): return False, "SMTP error: %s" % str(e) return True, None + def sendmail_simple(sender, rcpt, subject="Sample message", content="", **kwargs): """Simple way to send a text message @@ -288,9 +290,10 @@ def sendmail_simple(sender, rcpt, subject="Sample message", content="", **kwargs set_email_headers(msg, subject, sender, rcpt) return __sendmail(sender, rcpt, msg.as_string(), **kwargs) + def sendmail_fromfile(sender, rcpt, fname): """Send a message contained within a file - + The given file name must represent a valid message structure. It must not include the From: and To: headers, they are automatically added by the function. @@ -312,4 +315,3 @@ To: %s fp.close() return __sendmail(sender, rcpt, content) - diff --git a/modoboa/lib/events.py b/modoboa/lib/events.py index 85284b1f2..5abb9df6d 100644 --- a/modoboa/lib/events.py +++ b/modoboa/lib/events.py @@ -13,39 +13,7 @@ import inspect import re from django.conf import settings -events = [ - "CanCreate", - - "AccountCreated", - "AccountModified", - "AccountDeleted", - "AccountExported", - "AccountImported", - "PasswordUpdated", - "ExtraAccountActions", - "RoleChanged", - "GetExtraRoles", - "PasswordChange", - - "UserMenuDisplay", - "AdminMenuDisplay", - "GetStaticContent", - - "ExtEnabled", - "ExtDisabled", - - "UserLogin", - "UserLogout", - - "GetAnnouncement", - - "TopNotifications", - "ExtraAdminContent", - - "ExtraUprefsRoutes", - "ExtraUprefsJS" -] - +events = [] callbacks = {} diff --git a/modoboa/lib/templatetags/libextras.py b/modoboa/lib/templatetags/libextras.py index 7c8f9cc81..904f9d4a2 100644 --- a/modoboa/lib/templatetags/libextras.py +++ b/modoboa/lib/templatetags/libextras.py @@ -1,14 +1,10 @@ # coding: utf-8 -import os -from django.utils import timezone -from django.conf import settings +from datetime import datetime from django import template from django.contrib import messages from django.template import Template, Context from django.template.loader import render_to_string from django.core.urlresolvers import reverse -from django.contrib.sessions.models import Session -from datetime import datetime from django.utils.translation import ugettext as _, ugettext_lazy from modoboa.lib import events from modoboa.lib.sysutils import exec_cmd @@ -17,10 +13,6 @@ from modoboa.lib.formutils import SeparatorField register = template.Library() -@register.simple_tag -def get_version(): - import pkg_resources - return pkg_resources.get_distribution("modoboa").version @register.simple_tag def join(items, sep=','): @@ -31,53 +23,11 @@ def join(items, sep=','): res += "%s : '%s'" % (k, v) return res + @register.simple_tag def tolist(values): - return "[%s]" % ",".join(map(lambda v: '"%s"' % v, values)) + return "[%s]" % ",".join(['"%s"' % v for v in values]) -@register.simple_tag -def display_messages(msgs): - from django.contrib import messages - - text = "" - level = "info" - for m in msgs: - level = m.tags - text += unicode(m) + "\\\n" - - if level == "info": - level = "success" - timeout = "2000" - else: - timeout = "undefined" - - return """ - -""" % (level, text, timeout) - -@register.simple_tag -def extra_head_content(user): - tpl = Template("{% for sc in static_content %}{{ sc|safe }}{% endfor %}") - return tpl.render( - Context( - dict(static_content=events.raiseQueryEvent("GetStaticContent", user)) - ) - ) - -@register.simple_tag -def load_optionalmenu(user): - menu = events.raiseQueryEvent("UserMenuDisplay", "top_menu_middle", user) - return template.loader.render_to_string('common/menulist.html', - {"entries" : menu, "user" : user}) - -@register.simple_tag -def load_notifications(user): - content = events.raiseQueryEvent("TopNotifications", user) - return "".join(content) @register.simple_tag def render_form(form, tpl=None): @@ -89,20 +39,25 @@ def render_form(form, tpl=None): ret += "%s\n" % render_field(field) return ret + @register.simple_tag def render_field(field, help_display_mode="tooltip"): + from modoboa.core.templatetags.core_tags import visirule + if type(field.form.fields[field.name]) is SeparatorField: return "%s" % (visirule(field), unicode(field.label)) return render_to_string("common/generic_field.html", dict( - field=field, help_display_mode=help_display_mode - )) + field=field, help_display_mode=help_display_mode + )) + @register.simple_tag def render_field_appended(field, text): return render_to_string("common/generic_field.html", dict( - field=field, help_display_mode="tooltip", appended_text=text - )) + field=field, help_display_mode="tooltip", appended_text=text + )) + @register.simple_tag def render_field_with_activator(field, activator_label=ugettext_lazy("activate")): @@ -111,11 +66,13 @@ def render_field_with_activator(field, activator_label=ugettext_lazy("activate") "activator_label": activator_label, "deactivate_if_empty": True }) + @register.simple_tag def render_and_hide_field(field): return render_to_string("common/generic_field.html", dict( - field=field, hidden=True - )) + field=field, hidden=True + )) + @register.simple_tag def render_fields_group(form, pattern): @@ -128,7 +85,7 @@ def render_fields_group(form, pattern): haserror = len(first.errors) != 0 while True: fname = "%s_%d" % (pattern, cpt) - if not form.fields.has_key(fname): + if not fname in form.fields: break bfield = forms.BoundField(form, form.fields[fname], fname) if len(bfield.errors): @@ -137,14 +94,16 @@ def render_fields_group(form, pattern): cpt += 1 return render_to_string("common/generic_fields_group.html", dict( - label=label, help_text=first.help_text, group=group, haserror=haserror - )) + label=label, help_text=first.help_text, group=group, haserror=haserror + )) + @register.simple_tag def pagination_bar(page): return render_to_string("common/pagination_bar.html", dict( - page=page, baseurl="?" - )) + page=page, baseurl="?" + )) + @register.simple_tag def alert(msg, typ): @@ -154,6 +113,7 @@ def alert(msg, typ):
    """) return t.render(Context(dict(type=typ, msg=msg))) + @register.simple_tag def render_link(linkdef, mdclass=""): t = Template("""""") return t.render(Context(dict(link=linkdef, mdclass=mdclass))) + @register.simple_tag def progress_color(value): value = int(value) @@ -175,54 +136,12 @@ def progress_color(value): return "progress-warning" return "progress-danger" + @register.filter def fromunix(value): - return datetime.datetime.fromtimestamp(int(value)) + return datetime.fromtimestamp(int(value)) -@register.simple_tag -def visirule(field): - if not hasattr(field.form, "visirules") or not field.html_name in field.form.visirules: - return "" - rule = field.form.visirules[field.html_name] - return " data-visibility-field='%s' data-visibility-value='%s' " \ - % (rule["field"], rule["value"]) - - -class ConnectedUsers(template.Node): - def __init__(self, varname): - self.varname = varname - - def render(self, context): - from modoboa.core.models import User - - sessions = Session.objects.filter(expire_date__gte=timezone.now()) - uid_list = [] - - # Build a list of user ids from that query - for session in sessions: - data = session.get_decoded() - uid = data.get('_auth_user_id', None) - if uid: - uid_list.append(uid) - - # Query all logged in users based on id list - context[self.varname] = [] - for uid in uid_list: - try: - context[self.varname].append(User.objects.get(pk=uid)) - except User.DoesNotExist: - pass - return '' - -@register.tag -def connected_users(parser, token): - try: - tag, a, varname = token.split_contents() - except ValueError: - raise template.TemplateSyntaxError('connected_users usage: {% connected_users as users %}') - return ConnectedUsers(varname) - @register.simple_tag def render_tags(tags): t = Template("""{% for tag in tags %} @@ -231,16 +150,4 @@ def render_tags(tags): {% endfor %} """) - return t.render(Context({"tags" : tags})) - - -@register.simple_tag -def get_modoboa_logo(): - try: - logo = settings.MODOBOA_CUSTOM_LOGO - except AttributeError: - logo = None - if logo is None: - return os.path.join(settings.STATIC_URL, "css/modoboa.png") - return logo - + return t.render(Context({"tags": tags})) diff --git a/modoboa/lib/webutils.py b/modoboa/lib/webutils.py index c9977d244..a8eb58180 100644 --- a/modoboa/lib/webutils.py +++ b/modoboa/lib/webutils.py @@ -41,14 +41,6 @@ def render_actions(actions): return t.render(template.Context(dict(actions=actions))) -def _ctx_ok(url): - return {"status": "ok", "url": url} - - -def _ctx_ko(tpl, ctx): - return {"status": "ko", "content": render_to_string(tpl, ctx)} - - def getctx(status, level=1, callback=None, **kwargs): if not callback: callername = sys._getframe(level).f_code.co_name diff --git a/modoboa/templates/common/generic_field.html b/modoboa/templates/common/generic_field.html index 5c3ea7ec1..82acbf87b 100644 --- a/modoboa/templates/common/generic_field.html +++ b/modoboa/templates/common/generic_field.html @@ -1,4 +1,4 @@ -{% load i18n libextras %} +{% load i18n core_tags libextras %}