Fix repeat facets Published/Unpublished

diff --git a/telemeta/models/collection.py b/telemeta/models/collection.py
index 272e3ca11facb1bc4e419cbbc9e44f90455962f3..af421ebfac200884ee758d9bc0061b6f8814dd8b 100644 (file)
--- a/telemeta/models/collection.py
+++ b/telemeta/models/collection.py
@@ -194,9 +194,9 @@ class MediaCollection(MediaResource):
 
     def document_status(self):
         if '_I_' in self.public_id:
-            return ugettext('Unpublished')
+            return 'Unpublished'
         elif '_E_' in self.public_id:
-            return ugettext('Published')
+            return 'Published'
         else:
             return ''
 

diff --git a/telemeta/templates/search/filters.html b/telemeta/templates/search/filters.html
index c2495f7b014ef81d2d6940b042bc35d65a7ce218..1cdd3ded0159c6a73776fdaed0192cf12dd2339a 100644 (file)
--- a/telemeta/templates/search/filters.html
+++ b/telemeta/templates/search/filters.html
@@ -9,7 +9,7 @@
                     {% if facets.fields.item_status %}
                         <td>{% trans "Item Status" %}</td>
                         {% for item_status in facets.fields.item_status %}
-                            <td><a href="{{ request.get_full_path }}&amp;selected_facets=item_status_exact:{{ item_status.0|urlencode }}">{{ item_status.0 }}</a> <span style="background-color:#6a0307" class="badge">{{ item_status.1 }}</span></td>
+                            <td><a href="{{ request.get_full_path }}&amp;selected_facets=item_status_exact:{{ item_status.0|urlencode }}">{% trans item_status.0 %}</a> <span style="background-color:#6a0307" class="badge">{{ item_status.1 }}</span></td>
                         {% endfor %}
                         {% if Published_count == 0 %}
                             <td> {% trans "Published" %} <span class="badge">0</span></td><td></td>

diff --git a/telemeta/templates/telemeta/collection_detail.html b/telemeta/templates/telemeta/collection_detail.html
index ae5cbc8492acf5e2cb5739c549e0b8afeaf17cb4..b1231f57bd647bf7bfed4671a835716ea0d6b5ce 100644 (file)
--- a/telemeta/templates/telemeta/collection_detail.html
+++ b/telemeta/templates/telemeta/collection_detail.html
@@ -98,7 +98,7 @@
                 {% dl_field collection "creator" placeholder %}
                 {% endif %}
                 <dt>{% trans "Document status" %}</dt>
-                <dd>{{ collection.document_status }}</dd>
+                <dd>{% trans collection.document_status %}</dd>
                 {% if collection.description %}
                 <dt>{% trans "Description" %}</dt>
                 <dd>{{ collection.description|html_line_break|safe }}</dd>