diff --git a/src/postorius/forms.py b/src/postorius/forms.py index 22f4694..5b17d3d 100644 --- a/src/postorius/forms.py +++ b/src/postorius/forms.py @@ -184,9 +184,9 @@ required=False, label= _('Include RFC2369 headers')) autorespond_choices = ( - ("none", _("No automatic response")), + ("respond_and_continue", _("Respond and continue processing")), ("respond_and_discard", _("Respond and discard message")), - ("respond_and_continue", _("Respond and continue processing"))) + ("none", _("No automatic response"))) autorespond_owner = forms.ChoiceField( choices=autorespond_choices, widget=forms.RadioSelect, @@ -263,6 +263,7 @@ choices=action_choices) description = forms.CharField( label=_('Description'), + help_text=('This description is used when the mailing list is listed with other mailing lists, or in headers, and so forth. It should be as succinct as you can get it, while still identifying what the list is.'), widget=forms.Textarea()) digest_size_threshold = forms.DecimalField( label=_('Digest size threshold'), @@ -282,7 +283,8 @@ label=_('Mail Host'), error_messages={'required': _('Please a domain name'), 'invalid': _('Please enter a valid domain name.')}, - required=True) + required=True, + help_text="The \"host_name\" is the preferred name for email to mailman-related addresses on this host, and generally should be the mail host's exchanger address, if any. This setting can be useful for selecting among alternative names of a host that has multiple addresses.") next_digest_number = forms.IntegerField( label=_('Next digest number'), error_messages={ @@ -306,6 +308,7 @@ ) display_name = forms.CharField( label=_('Display name'), + help_text= ('Display name is the name shown in the web interface.') ) reply_goes_to_list = forms.ChoiceField( label=_('Reply goes to list'), @@ -339,7 +342,7 @@ admin_notify_mchanges = forms.BooleanField( widget=forms.RadioSelect(choices=choices), required=False, - label=_('Admin notify mchanges')) + label=_('Admin notify changes')) administrivia = forms.BooleanField( widget=forms.RadioSelect(choices=choices), required=False, @@ -477,6 +480,8 @@ widget=forms.Textarea, ) + verify_with_email = forms.BooleanField(required=False) + class Meta: """ Class to define the name of the fieldsets and what should be diff --git a/src/postorius/templates/postorius/lists/settings.html b/src/postorius/templates/postorius/lists/settings.html index aaf6a7d..82fcaa4 100644 --- a/src/postorius/templates/postorius/lists/settings.html +++ b/src/postorius/templates/postorius/lists/settings.html @@ -14,7 +14,7 @@ {% if visible_section %} - {% csrf_token %} + {% csrf_token %} {% for field in form %}
{{ field.errors }} diff --git a/src/postorius/templates/postorius/lists/summary.html b/src/postorius/templates/postorius/lists/summary.html index be01b8b..cbaf444 100644 --- a/src/postorius/templates/postorius/lists/summary.html +++ b/src/postorius/templates/postorius/lists/summary.html @@ -11,7 +11,7 @@

{% trans 'Description' %}

-

{{list.settings.description }} +

{{list.settings.description }}

{% trans 'Membership' %}

{% if user.is_authenticated %} @@ -22,6 +22,6 @@ {% else %}

To subscribe or unsubscribe this list you have to be logged in.

-

Log In

+

Login

{% endif %} {% endblock %} diff --git a/src/postorius/templates/postorius/menu/list_nav.html b/src/postorius/templates/postorius/menu/list_nav.html index 9ba570d..a0aec56 100644 --- a/src/postorius/templates/postorius/menu/list_nav.html +++ b/src/postorius/templates/postorius/menu/list_nav.html @@ -6,7 +6,7 @@
  • {% trans "Members" %}
  • {% trans "Held Messages" %}
  • {% trans "Metrics" %}
  • -
  • {% trans "Settings" %}
  • +
  • {% trans "List Settings" %}
  • {% trans "Mass Subscribe" %}
  • {% trans "Delete List" %}
  • {% trans "New List" %}
  • diff --git a/src/postorius/templates/postorius/user_mailmansettings.html b/src/postorius/templates/postorius/user_mailmansettings.html index 5c5057d..06b82d4 100644 --- a/src/postorius/templates/postorius/user_mailmansettings.html +++ b/src/postorius/templates/postorius/user_mailmansettings.html @@ -21,8 +21,7 @@ {% for pref in mm_user.preferences %}
  • {{ pref }}
  • {% endfor %} - - +

    List memberships:

    Sample output: not real

    -