From 63432bdd2889cd9cbdea02cc1edf5e83c32ef013 Mon Sep 17 00:00:00 2001 From: Michael Ziegler Date: Sun, 7 Oct 2012 15:18:29 +0200 Subject: [PATCH] re-add registerpassword setting, document what's necessary for registration to succeed --- pyweb/mumble/forms.py | 10 +++++++--- pyweb/mumble/models.py | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pyweb/mumble/forms.py b/pyweb/mumble/forms.py index 59aa53f..d012db2 100644 --- a/pyweb/mumble/forms.py +++ b/pyweb/mumble/forms.py @@ -105,10 +105,11 @@ class MumbleForm( PropertyModelForm ): where everything can be configured freely. """ - url = forms.CharField( required=False ) + url = forms.CharField( required=False, help_text=_( + "Website URL. Required for the server to be listed in the server list.")) motd = forms.CharField( required=False, widget=forms.Textarea ) passwd = forms.CharField( required=False, help_text=_( - "Password required to join. Leave empty for public servers.") ) + "Password required to join. Leave empty for public servers. Private servers cannot be listed in the server list.") ) supw = forms.CharField( required=False, widget=forms.PasswordInput ) player = forms.CharField( required=False ) channel = forms.CharField( required=False ) @@ -132,9 +133,12 @@ class MumbleForm( PropertyModelForm ): "Location of the server as ISO_3166-1 country code. In order for this to work, you must have " "a strong server certificate that carries the same country code. Alternatively, the TLD " "specified in the Display Address field must contain the same location code.") ) + registerpassword = forms.CharField( required=False, help_text=_( + "Password used for the server list registration. Required for the server to be listed in the server list. " + "Note that you will never need to enter this password anywhere. It is solely used by Murmur to update the registration.") allowping = forms.BooleanField( required=False, initial=True, help_text=_( "Allow ping packets from the server (to show usercount and slots in the server browser). " - "This is required for the server to be listed in the server list.") ) + "Required for the server to be listed in the server list.") ) sendversion = forms.BooleanField( required=False, initial=True, help_text=_( "Allow server to send system version to the client.") ) diff --git a/pyweb/mumble/models.py b/pyweb/mumble/models.py index 216afc9..814fe9f 100644 --- a/pyweb/mumble/models.py +++ b/pyweb/mumble/models.py @@ -300,6 +300,7 @@ class Mumble( models.Model ): opusthreshold = mk_config_property( "opusthreshold", ugettext_noop("Opusthreshold") ) channelnestinglimit = mk_config_property( "channelnestinglimit", ugettext_noop("Channel nesting limit") ) registerlocation = mk_config_property( "registerlocation", ugettext_noop("Server location") ) + registerpassword = mk_config_property( "registerpassword", ugettext_noop("Registration password") ) certrequired = mk_config_bool_property( "certrequired", ugettext_noop("Require Certificate") ) allowhtml = mk_config_bool_property( "allowhtml", ugettext_noop("Allow HTML to be used in messages") )