Updated the search_result.html page to use modern template tags.

Author: sarahboyce

docs/templates/docs/search_results.html

@@ -1,7 +1,7 @@
 {% extends "docs/doc.html" %}
 {% load i18n docs %}
 
-{% block title %}{% trans "Search | Django documentation" %}{% endblock %}
+{% block title %}{% translate "Search | Django documentation" %}{% endblock %}
 
 {% block toc-wrapper %}{% endblock %}
 {% block breadcrumbs-wrapper %}{% endblock %}
@@ -13,21 +13,21 @@
   {% if query %}
     <h2>
       {% if release.is_dev %}
-        {% blocktrans count num_results=paginator.count trimmed %}
+        {% blocktranslate count num_results=paginator.count trimmed %}
           Only 1 result for <em>{{ query }}</em> in the development version
         {% plural %}
           {{ num_results }} results for <em>{{ query }}</em> in the development version
-        {% endblocktrans %}
+        {% endblocktranslate %}
       {% else %}
-        {% blocktrans count num_results=paginator.count trimmed %}
+        {% blocktranslate count num_results=paginator.count trimmed %}
           Only 1 result for <em>{{ query }}</em> in version {{ version }}
         {% plural %}
           {{ num_results }} results for <em>{{ query }}</em> in version {{ version }}
-        {% endblocktrans %}
+        {% endblocktranslate %}
       {% endif %}
     </h2>
   {% else %}
-    <h2>{% trans "No search query given" %}</h2>
+    <h2>{% translate "No search query given" %}</h2>
   {% endif %}
 
   {% if query %}
@@ -72,20 +72,20 @@ <h2 class="result-title">
       <div class="pagination">
         <ul class="nav-pagination" role="navigation">
           {% if page.has_previous %}
-            <li><a rel="prev" class="previous" href="?q={{ query }}&amp;release={{ release.version }}&amp;page={{ page.previous_page_number }}">
+            <li><a rel="prev" class="previous" href="{% querystring page=page.previous_page_number %}">
               <i class="icon icon-chevron-left"></i>
-              <span class="visuallyhidden">{% trans "Previous" %}</span>
+              <span class="visuallyhidden">{% translate "Previous" context "pagination" %}</span>
             </a></li>
           {% endif %}
           <span class="page-current">
-            {% blocktrans with page_number=page.number num_pages=page.paginator.num_pages trimmed %}
+            {% blocktranslate with page_number=page.number num_pages=page.paginator.num_pages trimmed %}
               Page {{ page_number }} of {{ num_pages }}
-            {% endblocktrans %}
+            {% endblocktranslate %}
           </span>
           {% if page.has_next %}
-            <li><a rel="next" class="next" href="?q={{ query }}&amp;release={{ release.version }}&amp;page={{ page.next_page_number }}">
+            <li><a rel="next" class="next" href="{% querystring page=page.next_page_number %}">
               <i class="icon icon-chevron-right"></i>
-              <span class="visuallyhidden">{% trans "Next" %}</span>
+              <span class="visuallyhidden">{% translate "Next" context "pagination" %}</span>
             </a></li>
           {% endif %}
         </ul>