Merge branch 'master' of ../django-tagging

Author: svetlyak40wt

tagging/admin.py

@@ -18,11 +18,13 @@ def _synonyms(tag):
     _synonyms.short_description = _('synonyms')
 
     class TagAdmin(multilingual.ModelAdmin):
+        form = TagAdminForm
         list_display = (_name, _synonyms)
 
     _synonym_tag_name = 'name_any'
 else:
     class TagAdmin(admin.ModelAdmin):
+        form = TagAdminForm
         list_display = ('name',)
 
     _synonym_tag_name = 'name'
@@ -41,4 +43,3 @@ def _tag_name(synonym):
 admin.site.register(Synonym,
     list_display = ('name', _tag_name),
 )
-

tagging/forms.py

@@ -8,15 +8,15 @@
 from tagging.models import Tag
 from tagging.utils import parse_tag_input
 
-class AdminTagForm(forms.ModelForm):
+class TagAdminForm(forms.ModelForm):
     class Meta:
         model = Tag
 
     def clean_name(self):
         value = self.cleaned_data['name']
         tag_names = parse_tag_input(value)
         if len(tag_names) > 1:
-            raise ValidationError(_('Multiple tags were given.'))
+            raise forms.ValidationError(_('Multiple tags were given.'))
         elif len(tag_names[0]) > settings.MAX_TAG_LENGTH:
             raise forms.ValidationError(
                 _('A tag may be no more than %s characters long.') %