diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-01-10 01:18:28 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-01-10 01:18:28 +0100 |
| commit | a95e41815be353f717e5a9347166e0bbc486c687 (patch) | |
| tree | a4aec468c53ba6d5baa688df0dba3fbb8a588fb4 /ishtar_common/forms_common.py | |
| parent | 99f0621b864550817931a46850e5194f571c9d81 (diff) | |
| parent | 7475ae571619c3726e63c5cefc0215930cb83278 (diff) | |
| download | Ishtar-a95e41815be353f717e5a9347166e0bbc486c687.tar.bz2 Ishtar-a95e41815be353f717e5a9347166e0bbc486c687.zip | |
Merge branch 'v0.9' into wheezy
Diffstat (limited to 'ishtar_common/forms_common.py')
| -rw-r--r-- | ishtar_common/forms_common.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ishtar_common/forms_common.py b/ishtar_common/forms_common.py index c15999721..7ab09f9f7 100644 --- a/ishtar_common/forms_common.py +++ b/ishtar_common/forms_common.py @@ -40,7 +40,7 @@ from forms import FinalForm, FormSet, reverse_lazy, name_validator, \ def get_town_field(label=_(u"Town"), required=True): help_text = _( - u"<p>Type name, department code and/or postal code of the " + u"<p>Type name, department code of the " u"town you would like to select. The search is insensitive to case." u"</p>\n<p>Only the first twenty results are displayed but specifying " u"the department code is generally sufficient to get the appropriate " @@ -241,7 +241,7 @@ class ManualMerge(object): except ValueError: pass if len(values) < 2: - raise forms.ValidationError(_(u"At leat two items have to be " + raise forms.ValidationError(_(u"At least two items have to be " u"selected.")) self.cleaned_data['to_merge'] = values return values |