diff --git a/modoboa/admin/tests/test_alias.py b/modoboa/admin/tests/test_alias.py index 9bdaf62cd..21397310f 100644 --- a/modoboa/admin/tests/test_alias.py +++ b/modoboa/admin/tests/test_alias.py @@ -1,3 +1,5 @@ +"""Admin test cases.""" + from django.urls import reverse from modoboa.core.models import User @@ -5,8 +7,6 @@ from modoboa.lib.tests import ModoTestCase from .. import factories from ..models import Alias, AliasRecipient, Domain -"""Admin test cases.""" - class AliasTestCase(ModoTestCase): diff --git a/modoboa/core/app_settings.py b/modoboa/core/app_settings.py index 427a62da9..3539e387d 100644 --- a/modoboa/core/app_settings.py +++ b/modoboa/core/app_settings.py @@ -82,6 +82,18 @@ class GeneralParametersForm(param_forms.AdminParametersForm): "Length of randomly generated passwords.") ) + update_password_url = forms.URLField( + label=ugettext_lazy("Update password service URL"), + initial="", + required=False, + help_text=ugettext_lazy( + "The URL of an external page where users will be able" + " to update their password. It applies only to non local" + " users, ie. those automatically created after a successful" + " external authentication (LDAP, SMTP)." + ) + ) + # LDAP specific settings ldap_sep = SeparatorField(label=ugettext_lazy("LDAP settings")) diff --git a/modoboa/core/commands/deploy.py b/modoboa/core/commands/deploy.py index ec2b88f66..d22ce1573 100644 --- a/modoboa/core/commands/deploy.py +++ b/modoboa/core/commands/deploy.py @@ -58,7 +58,7 @@ class DeployCommand(Command): "--domain", type=str, default=None, help="The domain under which you want to deploy modoboa") self._parser.add_argument( - "--lang", type=str, default="en-us", + "--lang", type=str, default="en", help="Set the default language" ) self._parser.add_argument( diff --git a/modoboa/core/templates/core/api_access.html b/modoboa/core/templates/core/api_access.html index b2bae6495..6215d0ca2 100644 --- a/modoboa/core/templates/core/api_access.html +++ b/modoboa/core/templates/core/api_access.html @@ -3,7 +3,7 @@