diff --git a/src/mailmanweb/forms.py b/src/mailmanweb/forms.py index 00aa07b..e44359d 100644 --- a/src/mailmanweb/forms.py +++ b/src/mailmanweb/forms.py @@ -76,40 +76,6 @@ Form fields to add a new list. Languages are hard coded which should be replaced by a REST lookup of available languages. """ - languages = (("Arabic", "Arabic"), - ("Catalan", "Catalan"), - ("Chinese (China)", "Chinese (China)"), - ("Chinese (Taiwan)", "Chinese (Taiwan)"), - ("Croatian", "Croatian"), - ("Czech", "Czech"), - ("Danish", "Danish"), - ("Dutch", "Dutch"), - ("English (USA)", "English (USA)"), - ("Estonian", "Estonian"), - ("Estonian", "Estonian"), - ("Euskara", "Euskara"), - ("Finnish", "Finnish"), - ("French", "French"), - ("German", "German"), - ("Hungarian", "Hungarian"), - ("Interlingua", "Interlingua"), - ("Italian", "Italian"), - ("Japanese", "Japanese"), - ("Korean", "Korean"), - ("Lithuanian", "Lithuanian"), - ("Norwegian", "Norwegian"), - ("Polish", "Polish"), - ("Portuguese", "Portuguese"), - ("Portuguese (Brazil)", "Portuguese (Brazil)"), - ("Romanian", "Romanian"), - ("Russian", "Russian"), - ("Serbian", "Serbian"), - ("Slovenian", "Slovenian"), - ("Spanish (Spain)", "Spanish (Spain)"), - ("Swedish", "Swedish"), - ("Turkish", "Turkish"), - ("Ukrainian", "Ukrainian"), - ("Vietnamese", "Vietnamese")) listname = forms.CharField( label = _('List Name'), required = True, @@ -136,13 +102,6 @@ (True, _("Advertise this list in list index")), (False, _("Hide this list in list index")), )) - - languages = forms.MultipleChoiceField( - label = _('Language'), - widget = forms.CheckboxSelectMultiple(), - choices = languages, - required = False) - description = forms.CharField( label = _('Description'), required = True) @@ -173,8 +132,7 @@ the list should be the wished name of the fieldset, the following the fields that should be included in the fieldset. """ - layout = [["List Details", "listname", "mail_host", "list_owner", "description", "advertised"], - ["Available Languages", "languages"]] + layout = [["List Details", "listname", "mail_host", "list_owner", "description", "advertised"],] class ListSubscribe(FieldsetForm): """Form fields to join an existing list. @@ -182,7 +140,7 @@ email = forms.EmailField(label = _('Your email address'), error_messages = {'required': _('Please enter an email address.'), 'invalid': _('Please enter a valid email address.')}) - real_name = forms.CharField(label=_('Your name'), required=False) + display_name = forms.CharField(label=_('Your name'), required=False) class ListUnsubscribe(FieldsetForm): """Form fields to leave an existing list. @@ -588,8 +546,8 @@ #required = False, #label = _('Private roster'), #) - real_name = forms.CharField( - label = _('Real name'), + display_name = forms.CharField( + label = _('Display name'), ) #reject_these_nonmembers = forms.CharField( #label = _('Reject these nonmembers'), @@ -808,7 +766,7 @@ """ # just a really temporary layout to see that it works. -- Anna layout = [ - ["List Identity", "real_name", "mail_host", "description", + ["List Identity", "display_name", "mail_host", "description", "advertised"], #"info", "list_name", "host_name", "list_id", "fqdn_listname", #"http_etag", "volume", "web_host" @@ -1006,8 +964,8 @@ widget = forms.HiddenInput(), required = False, ) - real_name =forms.CharField( - label = _('Real name'), + display_name =forms.CharField( + label = _('Display name'), required = False, ) preferred_language = forms.ChoiceField( @@ -1044,7 +1002,7 @@ Class to define the name of the fieldsets and what should be included in each. """ - layout = [["User settings", "real_name", "password", + layout = [["User settings", "display_name", "password", "conf_password", "preferred_language", "address"],] class ListDeleteForm(forms.Form): diff --git a/src/mailmanweb/templates/mailmanweb/errors/generic.html b/src/mailmanweb/templates/mailmanweb/errors/generic.html index 9b297bb..774c8b3 100644 --- a/src/mailmanweb/templates/mailmanweb/errors/generic.html +++ b/src/mailmanweb/templates/mailmanweb/errors/generic.html @@ -1,10 +1,6 @@ {% extends "mailmanweb/base.html" %} {% load i18n %} -{% block heading %} -ERROR -{% endblock %} - {% block header %}
{% trans "Error-Site" %}
diff --git a/src/mailmanweb/templates/mailmanweb/lists/index.html b/src/mailmanweb/templates/mailmanweb/lists/index.html index 85f596d..e108b6a 100644 --- a/src/mailmanweb/templates/mailmanweb/lists/index.html +++ b/src/mailmanweb/templates/mailmanweb/lists/index.html @@ -15,20 +15,16 @@ {% trans 'List name' %} {% trans 'List address' %} {% trans 'Description' %} - {% trans 'Volume' %} - {% trans 'Members'%} {% for list in lists %} - {{ list.real_name }} + {{ list.display_name }} {{ list.fqdn_listname }} {{ list.settings.description }} - - {% endfor %} diff --git a/src/mailmanweb/templates/mailmanweb/user_mailmansettings.html b/src/mailmanweb/templates/mailmanweb/user_mailmansettings.html index 82fc48e..29a80b1 100644 --- a/src/mailmanweb/templates/mailmanweb/user_mailmansettings.html +++ b/src/mailmanweb/templates/mailmanweb/user_mailmansettings.html @@ -5,7 +5,7 @@ {% include 'mailmanweb/menu/user_nav.html' %}

{{ user }}'s List Settings

-

Mailman display name: {{ mm_user.real_name}}

+

Mailman display name: {{ mm_user.display_name}}

Django email: {{ user.email }}

Mailman primary email: {{ mm_user.email }}

Valid email addresses for this account:

diff --git a/src/mailmanweb/templates/mailmanweb/user_profile.html b/src/mailmanweb/templates/mailmanweb/user_profile.html index 60fd533..70966ae 100644 --- a/src/mailmanweb/templates/mailmanweb/user_profile.html +++ b/src/mailmanweb/templates/mailmanweb/user_profile.html @@ -5,5 +5,5 @@ {% include 'mailmanweb/menu/user_nav.html' %}

{{ user }}'s Profile

-

Mailman display name: {{ mm_user.real_name}}

+

Mailman display name: {{ mm_user.display_name}}

{% endblock main %} diff --git a/src/mailmanweb/templates/mailmanweb/user_settings.html b/src/mailmanweb/templates/mailmanweb/user_settings.html index 91fa63c..5b0e90a 100644 --- a/src/mailmanweb/templates/mailmanweb/user_settings.html +++ b/src/mailmanweb/templates/mailmanweb/user_settings.html @@ -39,7 +39,7 @@