Merge branch 'master' of git+ssh://github.com/fnp/wolnelektury

[wolnelektury.git] / apps / catalogue / fields.py

diff --git a/apps/catalogue/fields.py b/apps/catalogue/fields.py
index 1c0eb4a..0478f9d 100644 (file)
--- a/apps/catalogue/fields.py
+++ b/apps/catalogue/fields.py
@@ -13,6 +13,7 @@ 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 _

 
 
 class JSONEncoder(json.JSONEncoder):
 
 
 class JSONEncoder(json.JSONEncoder):


@@ -42,7 +43,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):


@@ -83,7 +84,7 @@ class JQueryAutoCompleteWidget(forms.TextInput):
         if self.options:
             options += ', %s' % self.options
         
         if self.options:
             options += ', %s' % self.options
         

-        return u'$(\'#%s\').autocomplete(%s%s);' % (field_id, source, 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)
     
     def render(self, name, value=None, attrs=None):
         final_attrs = self.build_attrs(attrs, name=name)