* fixed: TagField defaults (label, help_text)

* new: Localization ready
* new: Russian localization

taggit/locale/ru/LC_MESSAGES/django.po

+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Django Taggit\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-06-11 11:28+0700\n"
+"PO-Revision-Date: 2010-06-11 11:30+0700\n"
+"Last-Translator: Igor 'idle sign' Starikov <idlesign@yandex.ru>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Poedit-Language: Russian\n"
+
+#: forms.py:20
+msgid "Please provide a comma-separated list of tags."
+msgstr "Укажите метки через запятую."
+
+#: managers.py:41
+#: managers.py:101
+#: models.py:17
+msgid "Tags"
+msgstr "Метки"
+
+#: managers.py:102
+msgid "A comma-separated list of tags."
+msgstr "Список меток через запятую."
+
+#: models.py:9
+msgid "Name"
+msgstr "Название"
+
+#: models.py:10
+msgid "Slug"
+msgstr "Слаг"
+
+#: models.py:16
+msgid "Tag"
+msgstr "Метка"
+
+#: models.py:55
+#, python-format
+msgid "%(object)s tagged with %(tag)s"
+msgstr "элемент «%(object)s» с меткой «%(tag)s»"
+
+#: models.py:82
+msgid "Object id"
+msgstr "ID объекта"
+
+#: models.py:83
+msgid "Content type"
+msgstr "Тип содержимого"
+
+#: models.py:87
+msgid "Tagged Item"
+msgstr "Элемент с меткой"
+
+#: models.py:88
+msgid "Tagged Items"
+msgstr "Элементы с меткой"
+
+#: contrib/suggest/models.py:57
+msgid "Enter a valid Regular Expression. To make it case-insensitive include \"(?i)\" in your expression."
+msgstr "Введите регулярное выражение. Чтобы сделать его чувствительным к регистру укажите \"(?i)\"."
+

taggit/managers.py

@@ -102,7 +102,7 @@ class TaggableManager(object):
             "help_text": _("A comma-separated list of tags.")
             "help_text": _("A comma-separated list of tags.")
         }
         }
         defaults.update(kwargs)
         defaults.update(kwargs)
-        return form_class(**kwargs)
+        return form_class(**defaults)
 
 
     def value_from_object(self, instance):
     def value_from_object(self, instance):
         if instance.pk:
         if instance.pk:

taggit/models.py

@@ -3,15 +3,19 @@ from django.contrib.contenttypes.models import ContentType
 from django.contrib.contenttypes.generic import GenericForeignKey
 from django.contrib.contenttypes.generic import GenericForeignKey
 from django.db import models, IntegrityError, transaction
 from django.db import models, IntegrityError, transaction
 from django.template.defaultfilters import slugify
 from django.template.defaultfilters import slugify
-
+from django.utils.translation import ugettext_lazy as _
 
 
 class Tag(models.Model):
 class Tag(models.Model):
-    name = models.CharField(max_length=100)
-    slug = models.SlugField(unique=True, max_length=100)
+    name = models.CharField(verbose_name=_('Name'), max_length=100)
+    slug = models.SlugField(verbose_name=_('Slug'), unique=True, max_length=100)
     
     
     def __unicode__(self):
     def __unicode__(self):
         return self.name
         return self.name
     
     
+    class Meta:
+        verbose_name = _("Tag")
+        verbose_name_plural = _("Tags")
+    
     def save(self, *args, **kwargs):
     def save(self, *args, **kwargs):
         if not self.pk and not self.slug:
         if not self.pk and not self.slug:
             self.slug = slug = slugify(self.name)
             self.slug = slug = slugify(self.name)
@@ -48,7 +52,7 @@ class TaggedItemBase(models.Model):
         tag = models.ForeignKey(Tag, related_name="%(app_label)s_%(class)s_items")
         tag = models.ForeignKey(Tag, related_name="%(app_label)s_%(class)s_items")
 
 
     def __unicode__(self):
     def __unicode__(self):
-        return u"%s tagged with %s" % (self.content_object, self.tag)
+        return _("%(object)s tagged with %(tag)s") % { 'object': self.content_object, 'tag': self.tag }
     
     
     class Meta:
     class Meta:
         abstract = True
         abstract = True
@@ -75,10 +79,14 @@ class TaggedItemBase(models.Model):
 
 
 
 
 class TaggedItem(TaggedItemBase):
 class TaggedItem(TaggedItemBase):
-    object_id = models.IntegerField()
-    content_type = models.ForeignKey(ContentType, related_name="tagged_items")
+    object_id = models.IntegerField(verbose_name=_('Object id'))
+    content_type = models.ForeignKey(ContentType, verbose_name=_('Content type'), related_name="tagged_items")
     content_object = GenericForeignKey()
     content_object = GenericForeignKey()
 
 
+    class Meta:
+        verbose_name = _("Tagged Item")
+        verbose_name_plural = _("Tagged Items")
+        
     @classmethod
     @classmethod
     def lookup_kwargs(cls, instance):
     def lookup_kwargs(cls, instance):
         return {
         return {