Release commit for v.0.7.4

holgerd77 · Feb 18, 2017 · 7044888 · 7044888
1 parent 850a449
commit 7044888
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 16 deletions.
diff --git a/docs/developers.rst b/docs/developers.rst
@@ -105,6 +105,10 @@ Then translate the missing identifier strings and compile the message files with
 
 Release Notes
 =============
+**Changes in version 0.7.4-beta** (2017-02-18)
+
+* Bugfixes
+
 **Changes in version 0.7.3-beta** (2017-02-18)
 
 * Fix tag cloud links on start page for english version

diff --git a/public_project/locale/en/LC_MESSAGES/django.mo b/public_project/locale/en/LC_MESSAGES/django.mo
diff --git a/public_project/locale/en/LC_MESSAGES/django.po b/public_project/locale/en/LC_MESSAGES/django.po
@@ -139,7 +139,7 @@ msgstr "questions/"
 #: feeds.py:18 models.py:376 models.py:439 models.py:567
 #: templates/search.html:19
 msgid "Subject Areas"
-msgstr ""
+msgstr "Topics"
 
 #: feeds.py:19
 #, python-format
@@ -1456,9 +1456,8 @@ msgid "Agreement at"
 msgstr ""
 
 #: templates/info_box/project_parts.html:18
-#, fuzzy
 msgid "No project_parts available."
-msgstr "documents/"
+msgstr "No topics available."
 
 #: templates/info_box/questions.html:81
 #, fuzzy

diff --git a/public_project/models.py b/public_project/models.py
@@ -592,7 +592,7 @@ class Document(models.Model):
     activities = GenericRelation('ActivityLog')
 
     def __unicode__(self):
-        return self.title + " (" + datetime.strftime(self.date, '%d.%m.%Y') + ")"
+        return self.title + " (" + datetime.strftime(self.date, '%m/%d/%Y') + ")"
 
     def get_feed_description(self):
         html  = self.description

diff --git a/public_project/templates/participant.html b/public_project/templates/participant.html
@@ -68,17 +68,19 @@
     {% endwith %}
   {% endif %}
 
-  {% trans "Comments" as sh_title %}
-  {% trans "New" as sh_url_title %}
-  {% trans "comments_url" as comments_url %}
-  {% with sh_title=sh_title sh_icon="icon-comments" sh_url_title=sh_url_title sh_url="#CommentModal" modal_url="yes" rss_url=comments_url|add:"rss/" %}
-    {% include "layout_elements/section_header.html" %}
-  {% endwith %}
-  {% with form=comment_form form_valid=comment_form_valid commented_object1=participant %}
-  {% include "dialogs/comment.html" %}
-  {% endwith %}
-
-  {% include "info_box/comments.html" %}
+  {% if site_config.activate_comments %}
+    {% trans "Comments" as sh_title %}
+    {% trans "New" as sh_url_title %}
+    {% trans "comments_url" as comments_url %}
+    {% with sh_title=sh_title sh_icon="icon-comments" sh_url_title=sh_url_title sh_url="#CommentModal" modal_url="yes" rss_url=comments_url|add:"rss/" %}
+      {% include "layout_elements/section_header.html" %}
+    {% endwith %}
+    {% with form=comment_form form_valid=comment_form_valid commented_object1=participant %}
+    {% include "dialogs/comment.html" %}
+    {% endwith %}
+
+    {% include "info_box/comments.html" %}
+  {% endif %}
 
 </div>
 

diff --git a/setup.py b/setup.py
@@ -4,7 +4,7 @@
 
 setup(
     name='django-public-project',
-    version='0.7.3',
+    version='0.7.4',
     description='Custom CMS for making public projects, political processes or enquiry commission work more transparent',
     author='Holger Drewes',
     author_email='Holger.Drewes@gmail.com',