Made a single tag filter join_with

Author: Tim Davies

prefix_finder/frontend/templates/results.html

@@ -20,15 +20,15 @@ <h4><a href="{% url 'list' result.code %}" data-toggle="tooltip" data-placement=
     This is a <strong>{{ result.listType }}</strong> list.  
     {% if result.listType = "primary" %} 
       Organisations are generally entered into this list when they are registered 
-        {% if result.structure %} as a {{ result.structure_titles|join_or:True }} {% endif %}
+        {% if result.structure %} as a {{ result.structure_titles|join_with:'or'|lower }} {% endif %}
         {% if result.subnationalCoverage %}   
-          in {{ result.subnationalCoverage_titles|join_or }}.
+          in {{ result.subnationalCoverage_titles|join_with:'or' }}.
         {% else %} 
-          in {{ result.coverage_titles|join_or }}.
+          in {{ result.coverage_titles|join_with:'or' }}.
         {% endif %}
     {% endif %}
     {% if result.listType = "secondary" %} 
-      {% if result.structure %}{{ result.structure_titles|join_or }} organisations{% else %}{% if result.sector %}{{ result.sector_titles|join_or }} organisations{% else %} Organisations{% endif %}{% endif %} may be entered onto this offical list as a result of a transaction with the list owner. 
+      {% if result.structure %}{{ result.structure_titles|join_with:'or' }} organisations{% else %}{% if result.sector %}{{ result.sector_titles|join_with:'or' }} organisations{% else %} Organisations{% endif %}{% endif %} may be entered onto this offical list as a result of a transaction with the list owner. 
     {% endif %}
     {% if result.listType = "third_party" %} 
       This list is maintained by a third-party who may or may not have had interactions or transactions with the organiastions listed.
@@ -38,13 +38,13 @@ <h4><a href="{% url 'list' result.code %}" data-toggle="tooltip" data-placement=
     {% endif %}
     </p>
     {% if result.coverage %}<p>
-    This list covers the following countries: {{ result.coverage_titles|join_and }}
+    This list covers the following countries: {{ result.coverage_titles|join_with:'and' }}.
     </p>{% endif %}
     {% if result.structure %}<p>
-    It includes organisations of the following types: {{ result.structure_titles|join_or }}
+    It includes organisations of the following types: {{ result.structure_titles|join_with:'or' }}.
     </p>{% endif %}
     {% if result.sector %}<p>
-    It includes organisations working in the following sectors: {{ result.sector_titles|join_or }}
+    It includes organisations working in the following sectors: {{ result.sector_titles|join_with:'or' }}
     </p>{% endif %}
     <a class="pull-right" href="{% url 'list' result.code %}"><button class="btn" style="margin-top:25px;">More info</button></a>
     <hr/>
@@ -60,4 +60,4 @@ <h4><a href="{% url 'list' result.code %}" data-toggle="tooltip" data-placement=
   </div>
   {% if forloop.counter|divisibleby:2 %}</div><div class="row">{% endif %}
 {% endfor %}
-</div>
+</div>

prefix_finder/frontend/templatetags/results.py

@@ -80,49 +80,21 @@ def tidy_results(results, length=None):
 
 
 @register.filter
-def join_or(value,lowercase=False):
+def join_with(value, conj):
     """Given a list of strings, format them with commas and spaces, but
-    with 'and' at the end.
+    with 'and' or 'or' at the end.
 
-    >>> join_and(['apples', 'oranges', 'pears'])
+    >>> join_with(['apples', 'oranges', 'pears'], 'and')
     "apples, oranges, and pears"
-
     """
-    # convert numbers to strings
-    if(value):
-        if lowercase:
-            value = [str(item).lower() for item in value]
-        else: 
-            value = [str(item) for item in value]
-
-        if len(value) == 1:
-            return value[0]
-
-        # join all but the last element
-        all_but_last = ", ".join(value[:-1])
-        return "%s or %s" % (all_but_last, value[-1])
-    else:
+    if not value:
         return ""
+    if len(value) == 1:
+        return value[0]
 
-@register.filter
-def join_and(value):
-    """Given a list of strings, format them with commas and spaces, but
-    with 'and' at the end.
-
-    >>> join_and(['apples', 'oranges', 'pears'])
-    "apples, oranges, and pears"
-
-    """
     # convert numbers to strings
-    if(value):
-
-        value = [str(item) for item in value]
-
-        if len(value) == 1:
-            return value[0]
+    value = [str(item) for item in value]
 
-        # join all but the last element
-        all_but_last = ", ".join(value[:-1])
-        return "%s and %s" % (all_but_last, value[-1])
-    else:
-        return ""
+    # join all but the last element
+    all_but_last = ", ".join(value[:-1])
+    return "%s %s %s" % (all_but_last, conj, value[-1])