Ticket #8800: 8800.patch

djangodocs/templatetags/docs.py

@@ +1 @@
+from django.core import urlresolvers
 from django.template import Library
 
 from djangodocs.forms import SearchForm
@@ -8 +9 @@
 @register.inclusion_tag('docs/search_form.html', takes_context=True)
 def search_form(context, search_form_id='search'):
     request = context['request']
+    
+    search_url = context['search']
+    __, __, search_kwargs = urlresolvers.resolve(search_url)
+    
     auto_id = 'id_%s_%%s' % search_form_id
     return {
         'form': SearchForm(initial=request.GET, auto_id=auto_id),
         'search_form_id': search_form_id,
-        'action': context['search'],
-    }
- No newline at end of file
+        'action': search_url,
+        'lang': search_kwargs['lang'],
+    }

djangodocs/templates/docs/search_form.html

@@ -9 +9 @@
     {{ form.as_q }}
   </div>
 </form>
-<script type="text/javascript" src="http://www.google.com/coop/cse/brand?form={{ search_form_id|escape }}&lang={{ lang|escape }}"></script>
- No newline at end of file
+<script type="text/javascript" src="http://www.google.com/coop/cse/brand?form={{ search_form_id|escape }}&amp;lang={{ lang|escape }}"></script>