X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/3ac9cb26acd9b7c5ba421dac123ba8f75b782bd2..7d9b407e014ef1b394ef52d678d67458cc460abf:/apps/catalogue/fields.py

diff --git a/apps/catalogue/fields.py b/apps/catalogue/fields.py
index 160167ef2..62ca29cb9 100644
--- a/apps/catalogue/fields.py
+++ b/apps/catalogue/fields.py
@@ -13,6 +13,8 @@ from django.forms.util import smart_unicode
 from django.utils import simplejson as json
 from django.utils.html import escape
 from django.utils.safestring import mark_safe
+from django.utils.translation import ugettext_lazy as _
+from south.modelsinspector import add_introspection_rules
 
 
 class JSONEncoder(json.JSONEncoder):
@@ -36,13 +38,13 @@ def loads(str):
 
 class JSONFormField(forms.CharField):
     widget = forms.Textarea
-    
+
     def clean(self, value):
         try:
             loads(value)
             return value
         except ValueError, e:
-            raise forms.ValidationError('Enter a valid JSON value. Error: %s' % e)
+            raise forms.ValidationError(_('Enter a valid JSON value. Error: %s') % e)
 
 
 class JSONField(models.TextField):
@@ -59,7 +61,7 @@ class JSONField(models.TextField):
 
     def contribute_to_class(self, cls, name):
         super(JSONField, self).contribute_to_class(cls, name)
-        
+
         def get_value(model_instance):
             return loads(getattr(model_instance, self.attname, None))
         setattr(cls, 'get_%s_value' % self.name, get_value)
@@ -68,6 +70,8 @@ class JSONField(models.TextField):
             return setattr(model_instance, self.attname, dumps(json))
         setattr(cls, 'set_%s_value' % self.name, set_value)
 
+add_introspection_rules([], ["^catalogue\.fields\.JSONField"])
+
 
 class JQueryAutoCompleteWidget(forms.TextInput):
     def __init__(self, source, options=None, *args, **kwargs):
@@ -76,23 +80,23 @@ class JQueryAutoCompleteWidget(forms.TextInput):
         if options:
             self.options = dumps(options)
         super(JQueryAutoCompleteWidget, self).__init__(*args, **kwargs)
-    
+
     def render_js(self, field_id):
         source = "'%s'" % escape(self.source)
         options = ''
         if self.options:
             options += ', %s' % self.options
-        
+
         return u'$(\'#%s\').autocomplete(%s%s).result(autocomplete_result_handler);' % (field_id, source, options)
-    
+
     def render(self, name, value=None, attrs=None):
         final_attrs = self.build_attrs(attrs, name=name)
         if value:
             final_attrs['value'] = smart_unicode(value)
-        
+
         if not self.attrs.has_key('id'):
             final_attrs['id'] = 'id_%s' % name
-        
+
         html = u'''<input type="text" %(attrs)s/>
             <script type="text/javascript">//<!--
             %(js)s//--></script>
@@ -100,7 +104,7 @@ class JQueryAutoCompleteWidget(forms.TextInput):
                 'attrs' : flatatt(final_attrs),
                 'js' : self.render_js(final_attrs['id']),
             }
-        
+
         return mark_safe(html)
 
 
@@ -108,6 +112,18 @@ class JQueryAutoCompleteField(forms.CharField):
     def __init__(self, source, options=None, *args, **kwargs):
         if 'widget' not in kwargs:
             kwargs['widget'] = JQueryAutoCompleteWidget(source, options)
-        
+
         super(JQueryAutoCompleteField, self).__init__(*args, **kwargs)
 
+try:
+    # check for south
+    from south.modelsinspector import add_introspection_rules
+
+    add_introspection_rules([
+    (
+        [JSONField], # Class(es) these apply to
+        [], # Positional arguments (not used)
+        {}, # Keyword argument
+    ), ], ["^catalogue\.fields\.JSONField"])
+except ImportError:
+    pass