aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJ08nY2017-08-18 15:42:58 +0200
committerJ08nY2017-08-18 15:44:40 +0200
commit4207a3f3ee3288b02c91808935976f0b8006eb14 (patch)
tree245e800b30da9d3790c0abbe9c56ee8e84d48a3a
parentadca27b8e26b9ee63912ab79c480d7dd8d0bb47c (diff)
downloaddjango-pgpmailman-4207a3f3ee3288b02c91808935976f0b8006eb14.tar.gz
django-pgpmailman-4207a3f3ee3288b02c91808935976f0b8006eb14.tar.zst
django-pgpmailman-4207a3f3ee3288b02c91808935976f0b8006eb14.zip
-rw-r--r--src/django_pgpmailman/forms.py26
1 files changed, 15 insertions, 11 deletions
diff --git a/src/django_pgpmailman/forms.py b/src/django_pgpmailman/forms.py
index 7fcd3a9..07761df 100644
--- a/src/django_pgpmailman/forms.py
+++ b/src/django_pgpmailman/forms.py
@@ -47,7 +47,7 @@ class ListSignatureSettingsForm(forms.Form):
required=False,
label=_('Sign outgoing messages'),
help_text=_(
- 'Whether to sign the outgoing postings of a mailing list'
+ 'Whether to sign the outgoing postings of a mailing list '
'by the list key.')
)
strip_original_sig = forms.NullBooleanField(
@@ -64,7 +64,7 @@ class ListSignatureSettingsForm(forms.Form):
label=_('Unsigned message action'),
help_text=_(
'An action to take on an unsigned message. `Defer` lets '
- 'the message pass-through to the next check.')
+ 'the message pass through to the next check.')
)
inline_pgp_action = forms.ChoiceField(
widget=forms.Select(),
@@ -73,7 +73,7 @@ class ListSignatureSettingsForm(forms.Form):
label=_('Inline PGP action'),
help_text=_(
'An action to take on a message that is signed using '
- 'inline PGP. `Defer` lets the message pass-through to the '
+ 'inline PGP. `Defer` lets the message pass through to the '
'next check.')
)
expired_sig_action = forms.ChoiceField(
@@ -82,7 +82,7 @@ class ListSignatureSettingsForm(forms.Form):
required=False,
label=_('Expired signature action'),
help_text=_('An action to take on a message that has an expired '
- 'signature. `Defer` lets the message pass-through to'
+ 'signature. `Defer` lets the message pass through to '
'the next check.')
)
revoked_sig_action = forms.ChoiceField(
@@ -91,7 +91,7 @@ class ListSignatureSettingsForm(forms.Form):
required=False,
label=_('Revoked signature action'),
help_text=_('An action to take on a message that has a revoked '
- 'signature. `Defer` lets the message pass-through to'
+ 'signature. `Defer` lets the message pass through to '
'the next check.')
)
invalid_sig_action = forms.ChoiceField(
@@ -100,7 +100,7 @@ class ListSignatureSettingsForm(forms.Form):
required=False,
label=_('Invalid signature action'),
help_text=_('An action to take on a message with an invalid '
- 'signature. `Defer` lets the message pass-through to'
+ 'signature. `Defer` lets the message pass through to '
'the next check.')
)
duplicate_sig_action = forms.ChoiceField(
@@ -111,7 +111,7 @@ class ListSignatureSettingsForm(forms.Form):
help_text=_('An action to take on a message which contains a '
'signature that was already posted to a PGP enabled '
'mailing list before. `Defer` lets the message '
- 'pass-through to the rest of the chain.')
+ 'pass through to the rest of the chain.')
)
@@ -120,8 +120,9 @@ class ListEncryptionSettingsForm(forms.Form):
widget=NullBooleanRadioSelect(choices=boolean_choices),
required=False,
label=_('Encrypt outgoing messages'),
- help_text=_('Whether to encrypt the outgoing postings of a mailing'
- 'list to the subscribers keys.')
+ help_text=_(
+ 'Whether to encrypt the outgoing postings of a mailing '
+ 'list to the subscribers keys.')
)
nonencrypted_msg_action = forms.ChoiceField(
widget=forms.Select(),
@@ -130,7 +131,7 @@ class ListEncryptionSettingsForm(forms.Form):
label=_('Nonencrypted message action'),
help_text=_('An action to take on a nonencrypted message, is '
'done before executing the signature checks. `Defer` '
- 'lets the message pass-through to signature checks.')
+ 'lets the message pass through to signature checks.')
)
@@ -149,7 +150,10 @@ class ListMiscSettingsForm(forms.Form):
choices=key_change_choices,
required=False,
label=_('Key change workflow'),
- help_text=_('A workflow to use for the key change operation.')
+ help_text=_('A workflow to use for the key change operation. The '
+ 'default workflow does the key confirmation the same '
+ 'way the subscription process does. With possible '
+ 'additional moderation.')
)
key_signing_allowed = forms.MultipleChoiceField(
widget=forms.SelectMultiple(),