From 0b9ab6970cbfac0b72de379752d8422e4d89f083 Mon Sep 17 00:00:00 2001
From: Ben Sturmfels <ben@sturm.com.au>
Date: Tue, 19 Mar 2024 21:54:26 +1100
Subject: [PATCH] Remove deprecated `ifequal` and `ifnotequal` tags

These have been replaced by `{% if x == y %}` type tags.
---
 .../podjango/templates/podjango/cast/cast_list.html  |  2 +-
 conservancy/templates/blog/entry_list.html           |  6 +++---
 conservancy/templates/feeds/omnibus_description.html | 12 ++++++------
 conservancy/templates/news/pressrelease_list.html    |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/conservancy/podjango/templates/podjango/cast/cast_list.html b/conservancy/podjango/templates/podjango/cast/cast_list.html
index c15e0b72..f0b9e122 100644
--- a/conservancy/podjango/templates/podjango/cast/cast_list.html
+++ b/conservancy/podjango/templates/podjango/cast/cast_list.html
@@ -12,7 +12,7 @@
 
 {% if tags %}
 <p>Displaying casts
-tagged {% for tag in tags %}{% if not forloop.last %}{% if not forloop.first %}, {% endif %}{% endif %}<a href="{{ tag.get_absolute_url }}">{{ tag.label }}</a>{% ifequal forloop.revcounter 2 %} or {% endifequal %}{% endfor %}
+tagged {% for tag in tags %}{% if not forloop.last %}{% if not forloop.first %}, {% endif %}{% endif %}<a href="{{ tag.get_absolute_url }}">{{ tag.label }}</a>{% if forloop.revcounter == 2 %} or {% endif %}{% endfor %}
 </p>
 {% endif %}
 
diff --git a/conservancy/templates/blog/entry_list.html b/conservancy/templates/blog/entry_list.html
index 624133b8..ab09d2c5 100644
--- a/conservancy/templates/blog/entry_list.html
+++ b/conservancy/templates/blog/entry_list.html
@@ -12,8 +12,8 @@
 
 {% if authors or tags %}
 <p>Displaying posts
-{% if authors %}by {% for author in authors %}{% if not forloop.last %}{% if not forloop.first %}, {% endif %}{% endif %}<a href="{{ author.biography_url }}">{{ author.formal_name }}</a>{% ifequal forloop.revcounter 2 %} and {% endifequal %}{% endfor %}{% endif %}
-{% if tags %}tagged {% for tag in tags %}{% if not forloop.last %}{% if not forloop.first %}, {% endif %}{% endif %}<a href="{{ tag.get_absolute_url }}">{{ tag.label }}</a>{% ifequal forloop.revcounter 2 %} or {% endifequal %}{% endfor %}{% endif %}
+{% if authors %}by {% for author in authors %}{% if not forloop.last %}{% if not forloop.first %}, {% endif %}{% endif %}<a href="{{ author.biography_url }}">{{ author.formal_name }}</a>{% if forloop.revcounter == 2 %} and {% endif %}{% endfor %}{% endif %}
+{% if tags %}tagged {% for tag in tags %}{% if not forloop.last %}{% if not forloop.first %}, {% endif %}{% endif %}<a href="{{ tag.get_absolute_url }}">{{ tag.label }}</a>{% if forloop.revcounter == 2 %} or {% endif %}{% endfor %}{% endif %}
 </p>
 {% endif %}
 
@@ -25,7 +25,7 @@
 {% if blog_entries.has_next %}<a class="next_page_button" href="?page={{ blog_entries.next_page_number }}{% if query_string %}&amp;{{ query_string|escape }}{% endif %}">Next page (older) &raquo;</a>{% endif %}
 {% if blog_entries.has_previous %}<a href="?page={{ blog_entries.previous_page_number }}{% if query_string %}&amp;{{ query_string|escape }}{% endif %}">&laquo; Previous page (newer)</a>{% endif %}
 </p>
-{% if blog_entries.paginator.num_pages > 1 %}<p class="pagination_list"> {% for pagenum in blog_entries.paginator.page_range %}{% ifequal pagenum blog_entries.number %}[{{ pagenum }}]{% else %}<a href="?page={{ pagenum }}">{{ pagenum }}</a>{% endifequal %} {% endfor %}</p>{% endif %}
+{% if blog_entries.paginator.num_pages > 1 %}<p class="pagination_list"> {% for pagenum in blog_entries.paginator.page_range %}{% if pagenum == blog_entries.number %}[{{ pagenum }}]{% else %}<a href="?page={{ pagenum }}">{{ pagenum }}</a>{% endif %} {% endfor %}</p>{% endif %}
 <div class="clear"></div>
 
 {% endblock %}
diff --git a/conservancy/templates/feeds/omnibus_description.html b/conservancy/templates/feeds/omnibus_description.html
index d612f7fe..e678fc0e 100644
--- a/conservancy/templates/feeds/omnibus_description.html
+++ b/conservancy/templates/feeds/omnibus_description.html
@@ -1,10 +1,10 @@
-{% ifequal obj.omnibus_type "news" %}
+{% if obj.omnibus_type == "news" %}
 <p><i>A <a href="https://{{ site }}/news/">news item</a> from Software Freedom Conservancy.</i></p>
-{% endifequal %}
-{% ifequal obj.omnibus_type "event" %}
+{% endif %}
+{% if obj.omnibus_type == "event" %}
 <p><i>An <a href="https://{{ site }}/events/">upcoming event</a> related to the Software Freedom Conservancy.</i></p>
-{% endifequal %}
-{% ifequal obj.omnibus_type "blog" %}
+{% endif %}
+{% if obj.omnibus_type == "blog" %}
 <p><i>A <a href="https://{{ site }}/blog/">blog post</a> from Software Freedom Conservancy.</i></p>
-{% endifequal %}
+{% endif %}
 {% include obj.omnibus_feed_description_template  %}
diff --git a/conservancy/templates/news/pressrelease_list.html b/conservancy/templates/news/pressrelease_list.html
index 05611f70..66a0fdff 100644
--- a/conservancy/templates/news/pressrelease_list.html
+++ b/conservancy/templates/news/pressrelease_list.html
@@ -12,7 +12,7 @@
          <h1><a href="/feeds/news/" class="feedlink"><img src="{% static 'img/feed-icon-14x14.png' %}" alt="[RSS]"/></a> Conservancy News</h1>
 
 
-{% ifnotequal news.number 1 %}<p>(Page {{ news.number }} of {{ news.paginator.num_pages }})</p>{% endifnotequal %}
+{% if news.number > 1 %}<p>(Page {{ news.number }} of {{ news.paginator.num_pages }})</p>{% endif %}
 
 {% for pressr in news %}
   {% if forloop.first %}
@@ -26,7 +26,7 @@
 {% if news.has_next %}<a class="next_page_button" href="?page={{ news.next_page_number }}">Next page (older) &raquo;</a>{% endif %}
 {% if news.has_previous %}<a href="?page={{ news.previous_page_number }}">&laquo; Previous page (newer)</a>{% endif %}
 </p>
-{% if news.paginator.num_pages > 1 %}<p class="pagination_list"> {% for pagenum in news.paginator.page_range %}{% ifequal pagenum news.number %}[{{ pagenum }}]{% else %}<a href="?page={{ pagenum }}">{{ pagenum }}</a>{% endifequal %} {% endfor %}</p>{% endif %}
+{% if news.paginator.num_pages > 1 %}<p class="pagination_list"> {% for pagenum in news.paginator.page_range %}{% if pagenum == news.number %}[{{ pagenum }}]{% else %}<a href="?page={{ pagenum }}">{{ pagenum }}</a>{% endif %} {% endfor %}</p>{% endif %}
          </div>
 
          <div id="sidebar" class="{% block submenuselection %}{% endblock %}">