Commit ee3fb3b8 authored by Abhilash Raj's avatar Abhilash Raj

Merge branch 'master' into 'master'

Don't strip trailing whitespace from subject_prefix.

Fixes #145 

This will also not strip leading whitespace, but I think that's OK

See merge request !162
parents 251d666b 6d3217c9
Pipeline #3953487 failed with stage
in 9 minutes and 13 seconds
......@@ -17,6 +17,7 @@
# Postorius. If not, see <http://www.gnu.org/licenses/>.
from django import forms
from django import __version__
from django.core.validators import validate_email
from django.utils.encoding import smart_text
from django.utils.translation import ugettext_lazy as _
......@@ -601,9 +602,15 @@ class ListIdentityForm(ListSettingsForm):
label=_('Display name'),
help_text=_('Display name is the name shown in the web interface.')
)
subject_prefix = forms.CharField(
label=_('Subject prefix'),
)
if __version__ < '1.9':
subject_prefix = forms.CharField(
label=_('Subject prefix'),
)
else:
subject_prefix = forms.CharField(
label=_('Subject prefix'),
strip=False,
)
class ListArchiverForm(forms.Form):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment