diff --git a/django/contrib/admin/templates/admin/pagination.html b/django/contrib/admin/templates/admin/pagination.html
index 358813290c..fc1e600805 100644
--- a/django/contrib/admin/templates/admin/pagination.html
+++ b/django/contrib/admin/templates/admin/pagination.html
@@ -6,7 +6,7 @@
{% paginator_number cl i %}
{% endfor %}
{% endif %}
-{{ cl.result_count }} {% ifequal cl.result_count 1 %}{{ cl.opts.verbose_name }}{% else %}{{ cl.opts.verbose_name_plural }}{% endifequal %}
+{{ cl.result_count }} {% if cl.result_count == 1 %}{{ cl.opts.verbose_name }}{% else %}{{ cl.opts.verbose_name_plural }}{% endif %}
{% if show_all_url %} {% trans 'Show all' %}{% endif %}
{% if cl.formset and cl.result_count %}{% endif %}
diff --git a/django/contrib/admin/templates/admin/search_form.html b/django/contrib/admin/templates/admin/search_form.html
index 4cc24604f7..a9bb014748 100644
--- a/django/contrib/admin/templates/admin/search_form.html
+++ b/django/contrib/admin/templates/admin/search_form.html
@@ -9,7 +9,7 @@
{% blocktrans count counter=cl.result_count %}{{ counter }} result{% plural %}{{ counter }} results{% endblocktrans %} ({% if cl.show_full_result_count %}{% blocktrans with full_result_count=cl.full_result_count %}{{ full_result_count }} total{% endblocktrans %}{% else %}{% trans "Show all" %}{% endif %})
{% endif %}
{% for pair in cl.params.items %}
- {% ifnotequal pair.0 search_var %}{% endifnotequal %}
+ {% if pair.0 != search_var %}{% endif %}
{% endfor %}
diff --git a/django/views/debug.py b/django/views/debug.py
index e7f2bbd6b2..4f96ac320c 100644
--- a/django/views/debug.py
+++ b/django/views/debug.py
@@ -747,9 +747,9 @@ TECHNICAL_500_TEMPLATE = ("""
In template {{ template_info.name }}
, error at line {{ template_info.line }}
{{ template_info.message }}
+ {% if template_info.bottom != template_info.total %} cut-bottom{% endif %}">
{% for source_line in template_info.source_lines %}
- {% ifequal source_line.0 template_info.line %}
+ {% if source_line.0 == template_info.line %}
{{ source_line.0 }} |
{{ template_info.before }}"""
"""{{ template_info.during }}"""
@@ -758,7 +758,7 @@ TECHNICAL_500_TEMPLATE = ("""
{% else %}
|
---|
{{ source_line.0 }} |
{{ source_line.1 }} |
- {% endifequal %}
+ {% endif %}
{% endfor %}
@@ -872,11 +872,11 @@ Template error:
In template {{ template_info.name }}, error at line {{ template_info.line }}
{{ template_info.message }}"""
"{% for source_line in template_info.source_lines %}"
-"{% ifequal source_line.0 template_info.line %}"
+"{% if source_line.0 == template_info.line %}"
" {{ source_line.0 }} : {{ template_info.before }} {{ template_info.during }} {{ template_info.after }}"
"{% else %}"
" {{ source_line.0 }} : {{ source_line.1 }}"
-"""{% endifequal %}{% endfor %}{% endif %}
+"""{% endif %}{% endfor %}{% endif %}
Traceback:{% for frame in frames %}
{% ifchanged frame.exc_cause %}{% if frame.exc_cause %}{% if frame.exc_cause_explicit %}
@@ -1072,11 +1072,11 @@ Template error:
In template {{ template_info.name }}, error at line {{ template_info.line }}
{{ template_info.message }}
{% for source_line in template_info.source_lines %}"""
-"{% ifequal source_line.0 template_info.line %}"
+"{% if source_line.0 == template_info.line %}"
" {{ source_line.0 }} : {{ template_info.before }} {{ template_info.during }} {{ template_info.after }}"
"{% else %}"
" {{ source_line.0 }} : {{ source_line.1 }}"
-"""{% endifequal %}{% endfor %}{% endif %}{% if frames %}
+"""{% endif %}{% endfor %}{% endif %}{% if frames %}
Traceback:"""
"{% for frame in frames %}"
diff --git a/django/views/static.py b/django/views/static.py
index 9959b96236..6187f6ffd9 100644
--- a/django/views/static.py
+++ b/django/views/static.py
@@ -87,9 +87,9 @@ DEFAULT_DIRECTORY_INDEX_TEMPLATE = """
{% blocktrans %}Index of {{ directory }}{% endblocktrans %}
- {% ifnotequal directory "/" %}
+ {% if directory != "/" %}
- ../
- {% endifnotequal %}
+ {% endif %}
{% for f in file_list %}
- {{ f }}
{% endfor %}
diff --git a/tests/template_tests/syntax_tests/test_extends.py b/tests/template_tests/syntax_tests/test_extends.py
index 3e65f4bf90..46600cb76c 100644
--- a/tests/template_tests/syntax_tests/test_extends.py
+++ b/tests/template_tests/syntax_tests/test_extends.py
@@ -42,7 +42,7 @@ inheritance_templates = {
'inheritance30': "1{% if optional %}{% block opt %}2{% endblock %}{% endif %}3",
'inheritance31': "{% extends 'inheritance30' %}{% block opt %}two{% endblock %}",
'inheritance32': "{% extends 'inheritance30' %}{% block opt %}two{% endblock %}",
- 'inheritance33': "1{% ifequal optional 1 %}{% block opt %}2{% endblock %}{% endifequal %}3",
+ 'inheritance33': "1{% if optional == 1 %}{% block opt %}2{% endblock %}{% endif %}3",
'inheritance34': "{% extends 'inheritance33' %}{% block opt %}two{% endblock %}",
'inheritance35': "{% extends 'inheritance33' %}{% block opt %}two{% endblock %}",
'inheritance36': "{% for n in numbers %}_{% block opt %}{{ n }}{% endblock %}{% endfor %}_",
@@ -322,7 +322,7 @@ class InheritanceTests(SimpleTestCase):
@setup(inheritance_templates)
def test_inheritance33(self):
"""
- Base template, putting block in a conditional {% ifequal %} tag
+ Base template, putting block in a conditional {% if %} tag
"""
output = self.engine.render_to_string('inheritance33', {'optional': 1})
self.assertEqual(output, '123')
@@ -330,7 +330,7 @@ class InheritanceTests(SimpleTestCase):
@setup(inheritance_templates)
def test_inheritance34(self):
"""
- Inherit from a template with block wrapped in an {% ifequal %} tag
+ Inherit from a template with block wrapped in an {% if %} tag
(in parent), still gets overridden
"""
output = self.engine.render_to_string('inheritance34', {'optional': 1})
@@ -339,7 +339,7 @@ class InheritanceTests(SimpleTestCase):
@setup(inheritance_templates)
def test_inheritance35(self):
"""
- Inherit from a template with block wrapped in an {% ifequal %} tag
+ Inherit from a template with block wrapped in an {% if %} tag
(in parent), still gets overridden
"""
output = self.engine.render_to_string('inheritance35', {'optional': 2})
diff --git a/tests/template_tests/syntax_tests/test_i18n.py b/tests/template_tests/syntax_tests/test_i18n.py
index 68b5793a57..6013251366 100644
--- a/tests/template_tests/syntax_tests/test_i18n.py
+++ b/tests/template_tests/syntax_tests/test_i18n.py
@@ -141,7 +141,7 @@ class I18nTagTests(SimpleTestCase):
@setup({'i18n12': '{% load i18n %}'
'{% get_available_languages as langs %}{% for lang in langs %}'
- '{% ifequal lang.0 "de" %}{{ lang.0 }}{% endifequal %}{% endfor %}'})
+ '{% if lang.0 == "de" %}{{ lang.0 }}{% endif %}{% endfor %}'})
def test_i18n12(self):
"""
usage of the get_available_languages tag