fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
some translation stuff
[wolnelektury.git]
/
apps
/
catalogue
/
fields.py
diff --git
a/apps/catalogue/fields.py
b/apps/catalogue/fields.py
index
160167e
..
2c0c765
100644
(file)
--- 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 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):
class JSONEncoder(json.JSONEncoder):
@@
-42,7
+44,7
@@
class JSONFormField(forms.CharField):
loads(value)
return value
except ValueError, e:
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):
class JSONField(models.TextField):
@@
-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)
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):
class JQueryAutoCompleteWidget(forms.TextInput):
def __init__(self, source, options=None, *args, **kwargs):