Fix various blocks

diff --git a/app/organization/projects/models.py b/app/organization/projects/models.py
index 267b3d652d74dc20c8d12cf6273fb9f40b4d003b..7ca69d699ea1cfd4952318f58e810f83d693c75f 100644 (file)
--- a/app/organization/projects/models.py
+++ b/app/organization/projects/models.py
@@ -1,4 +1,5 @@
 from __future__ import unicode_literals
+import datetime
 
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
@@ -36,7 +37,6 @@ class Project(Displayable, Period, RichText):
     def get_absolute_url(self):
         return reverse("organization-project-detail", kwargs={"slug": self.slug})
 
-    @property
     def project_status(self):
         if datetime.date.today() >= self.date_from and datetime.date.today() <= self.date_to:
             return _('in progress')

diff --git a/app/templates/projects/project_detail.html b/app/templates/projects/project_detail.html
index 0220a324793a5da281672fa301f13728dcf3c384..d98b55d5d064c035050d25df0434509a1f5e5374 100644 (file)
--- a/app/templates/projects/project_detail.html
+++ b/app/templates/projects/project_detail.html
@@ -53,7 +53,7 @@
 {% block page_related_content %}
 <div>
   <div>
-    {% trans "Project details" %}
+    {% trans "Project details" %}<br>
 
     {% if project.program %}
       {% trans "Program" %} {{ project.program }}<br>
@@ -63,9 +63,9 @@
       {% trans "Program type" %} {{ project.program_type }}<br>
     {% endif %}
 
-    {% trans "Beginning" % } {{ project.date_from }}<br>
-    {% trans "End" % } {{ project.date_to }}<br>
-    {% trans "Status" % } {{ project.project_status }}<br>
+    {% trans "Beginning" %} {{ project.date_from }}<br>
+    {% trans "End" %} {{ project.date_to }}<br>
+    {% trans "Status" %} {{ project.project_status }}<br>
 
     {% if project.website %}
       {% trans "Website" %} {{ project.website }}<br>