diff --git a/modoboa/core/app_settings.py b/modoboa/core/app_settings.py index a30b85772..38b711191 100644 --- a/modoboa/core/app_settings.py +++ b/modoboa/core/app_settings.py @@ -469,7 +469,7 @@ class GeneralParametersForm(param_forms.AdminParametersForm): initial=30, help_text=_( "An account with a last login date greater than this threshold " - "(in days) will be considered as inactive." + "(in days) will be considered as inactive" ), ) @@ -1092,7 +1092,7 @@ GLOBAL_PARAMETERS_STRUCT = collections.OrderedDict([ "display": "enable_inactive_accounts=true", "help_text": ugettext_lazy( "An account with a last login date greater than this " - "threshold (in days) will be considered as inactive. " + "threshold (in days) will be considered as inactive" ) }), ("top_notifications_check_interval", { diff --git a/modoboa/core/tests/test_views.py b/modoboa/core/tests/test_views.py index 488549915..bbd476391 100644 --- a/modoboa/core/tests/test_views.py +++ b/modoboa/core/tests/test_views.py @@ -60,6 +60,7 @@ SETTINGS_SAMPLE = { "core-default_password": "Toto1000", "limits-deflt_user_quota_limit": "0", "core-hide_features_widget": "False", + "core-enable_inactive_accounts": "True", "core-inactive_account_threshold": "30", "admin-domains_must_have_authorized_mx": False, "core-random_password_length": "8", diff --git a/modoboa/dmarc/management/commands/import_aggregated_report.py b/modoboa/dmarc/management/commands/import_aggregated_report.py index 28d211ee9..ec1d2b582 100644 --- a/modoboa/dmarc/management/commands/import_aggregated_report.py +++ b/modoboa/dmarc/management/commands/import_aggregated_report.py @@ -37,4 +37,4 @@ class Command(BaseCommand): elif options.get("imap"): lib.import_from_imap(options) else: - print("Nothing to do.") + print("Nothing to do.", file=self.stdout)