From 1e83fa29026ec20546ddf46252a6affc264e7da5 Mon Sep 17 00:00:00 2001
From: "Christopher C. Wells" <chris@chrxs.net>
Date: Sun, 14 Apr 2019 18:41:25 -0700
Subject: [PATCH] Remove functions/filters from blocktrans tags in templates.

---
 dashboard/templates/cards/diaperchange_last.html | 2 +-
 dashboard/templates/cards/feeding_last.html      | 2 +-
 dashboard/templates/cards/sleep_last.html        | 2 +-
 dashboard/templates/cards/sleep_naps_day.html    | 2 +-
 dashboard/templates/cards/timer_list.html        | 4 ++--
 dashboard/templates/cards/tummytime_day.html     | 2 +-
 dashboard/templates/cards/tummytime_last.html    | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dashboard/templates/cards/diaperchange_last.html b/dashboard/templates/cards/diaperchange_last.html
index 41134172..e5f833e3 100644
--- a/dashboard/templates/cards/diaperchange_last.html
+++ b/dashboard/templates/cards/diaperchange_last.html
@@ -5,7 +5,7 @@
 
 {% block title %}
     {% if change %}
-        {% blocktrans %}{{ change.time|timesince }} ago{% endblocktrans %}
+        {% blocktrans with time=change.time|timesince %}{{ time }} ago{% endblocktrans %}
     {% else %}
         {% trans "Never" %}
     {% endif %}
diff --git a/dashboard/templates/cards/feeding_last.html b/dashboard/templates/cards/feeding_last.html
index e81e3172..b1d2ca0b 100644
--- a/dashboard/templates/cards/feeding_last.html
+++ b/dashboard/templates/cards/feeding_last.html
@@ -5,7 +5,7 @@
 
 {% block title %}
     {% if feeding %}
-        {% blocktrans %}{{ feeding.end|timesince }} ago{% endblocktrans %}
+        {% blocktrans with time=feeding.end|timesince %}{{ time }} ago{% endblocktrans %}
     {% else %}
         {% trans "Never" %}
     {% endif %}
diff --git a/dashboard/templates/cards/sleep_last.html b/dashboard/templates/cards/sleep_last.html
index 85bd665f..cdd6be76 100644
--- a/dashboard/templates/cards/sleep_last.html
+++ b/dashboard/templates/cards/sleep_last.html
@@ -5,7 +5,7 @@
 
 {% block title %}
     {% if sleep %}
-        {% blocktrans %}{{ sleep.end|timesince }} ago{% endblocktrans %}
+        {% blocktrans with time=sleep.end|timesince %}{{ time }} ago{% endblocktrans %}
     {% else %}
         {% trans "Never" %}
     {% endif %}
diff --git a/dashboard/templates/cards/sleep_naps_day.html b/dashboard/templates/cards/sleep_naps_day.html
index 73e0ae9e..e8f08e62 100644
--- a/dashboard/templates/cards/sleep_naps_day.html
+++ b/dashboard/templates/cards/sleep_naps_day.html
@@ -5,7 +5,7 @@
 
 {% block title %}
     {% if count %}
-        {% blocktrans %}{{ count }} nap{{ count|pluralize }}{% endblocktrans %}
+        {% blocktrans with plural=count|pluralize %}{{ count }} nap{{ plural }}{% endblocktrans %}
     {% else %}
         <i class="icon icon-sad" aria-hidden="true"></i>
         {% trans "None yet today" %}
diff --git a/dashboard/templates/cards/timer_list.html b/dashboard/templates/cards/timer_list.html
index 41399731..71b32e1a 100644
--- a/dashboard/templates/cards/timer_list.html
+++ b/dashboard/templates/cards/timer_list.html
@@ -5,7 +5,7 @@
 
 {% block title %}
     {% with instances|length as count %}
-        {% blocktrans %}{{ count }} active timer{{ count|pluralize }}{% endblocktrans %}
+        {% blocktrans with plural=count|pluralize %}{{ count }} active timer{{ plural }}{% endblocktrans %}
     {% endwith %}
 {% endblock %}
 
@@ -16,7 +16,7 @@
            class="list-group-item list-group-item-action">
             <strong>{{ instance }}</strong>
             <p class="text-muted small m-0">
-                {% blocktrans %}Started by {{ instance.user }} at {{ instance.start|time }}{% endblocktrans %}
+                {% blocktrans with start=instance.start|time %}Started by {{ instance.user }} at {{ start }}{% endblocktrans %}
             </p>
         </a>
     {% endfor %}
diff --git a/dashboard/templates/cards/tummytime_day.html b/dashboard/templates/cards/tummytime_day.html
index e35dd5bb..fc677814 100644
--- a/dashboard/templates/cards/tummytime_day.html
+++ b/dashboard/templates/cards/tummytime_day.html
@@ -17,7 +17,7 @@
     <ul class="list-group list-group-flush text-muted small">
     {% for instance in instances %}
         <li class="list-group-item">
-            {% blocktrans %}{{ instance.duration|duration_string }} at {{ instance.end|time }}{% endblocktrans %}
+            {% blocktrans with duration=instance.duration|duration_string end=instance.end|time %}{{ duration }} at {{ end }}{% endblocktrans %}
         </li>
     {% endfor %}
     </ul>
diff --git a/dashboard/templates/cards/tummytime_last.html b/dashboard/templates/cards/tummytime_last.html
index c90881f0..a23de058 100644
--- a/dashboard/templates/cards/tummytime_last.html
+++ b/dashboard/templates/cards/tummytime_last.html
@@ -5,7 +5,7 @@
 
 {% block title %}
     {% if tummytime %}
-        {% blocktrans %}{{ tummytime.time|timesince }} ago{% endblocktrans %}
+        {% blocktrans with time=tummytime.time|timesince %}{{ time }} ago{% endblocktrans %}
     {% else %}
         {% trans "Never" %}
     {% endif %}