From d975159e9e0428afcacd31f733b5fadaf39f99f5 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Thu, 22 Sep 2016 15:49:59 +0200 Subject: [PATCH] Fix various blocks --- app/organization/projects/models.py | 2 +- app/templates/projects/project_detail.html | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/organization/projects/models.py b/app/organization/projects/models.py index 267b3d65..7ca69d69 100644 --- 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 0220a324..d98b55d5 100644 --- a/app/templates/projects/project_detail.html +++ b/app/templates/projects/project_detail.html @@ -53,7 +53,7 @@ {% block page_related_content %}
- {% trans "Project details" %} + {% trans "Project details" %}
{% if project.program %} {% trans "Program" %} {{ project.program }}
@@ -63,9 +63,9 @@ {% trans "Program type" %} {{ project.program_type }}
{% endif %} - {% trans "Beginning" % } {{ project.date_from }}
- {% trans "End" % } {{ project.date_to }}
- {% trans "Status" % } {{ project.project_status }}
+ {% trans "Beginning" %} {{ project.date_from }}
+ {% trans "End" %} {{ project.date_to }}
+ {% trans "Status" %} {{ project.project_status }}
{% if project.website %} {% trans "Website" %} {{ project.website }}
-- 2.39.5