don't use 'and' anymore, if there is only one tag

diff --git a/mediagoblin/templates/mediagoblin/utils/tags.html b/mediagoblin/templates/mediagoblin/utils/tags.html
index 19ca8d2a4d34735e3e103a3ef10c3b4a88b5cf3b..20c50f6e0d78d08a5c2bbb38ef0386c8eac3c1b1 100644 (file)
--- a/mediagoblin/templates/mediagoblin/utils/tags.html
+++ b/mediagoblin/templates/mediagoblin/utils/tags.html
@@ -20,7 +20,10 @@
   <p>{% trans %}Tagged with{% endtrans %}
     {% for tag in media.tags %}
       {% if loop.last %}
-      {% trans %}and{% endtrans %} <a href="{{ request.urlgen(
+        {% if media.tags|length > 1 %}
+        {% trans %}and{% endtrans %}
+        {% endif %}
+      <a href="{{ request.urlgen(
                         'mediagoblin.listings.tags_listing',
                         tag=tag['slug']) }}">{{ tag['name'] }}</a>.
       {% elif loop.revindex==2 %}