aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeremy Benoist <j0k3r@users.noreply.github.com>2016-04-10 14:12:13 +0200
committerJeremy Benoist <j0k3r@users.noreply.github.com>2016-04-10 14:12:13 +0200
commit54ecbb41d6318dbaaae00ea810cd5a13784ef82f (patch)
treeb43f315968dcc7dab1447dbdc46728c176569c0d
parent19a7ea2a44548f312ea132afa76a8e5503a2f5e2 (diff)
parent7ead8a0d9d4d758988c6d0755e0df2c4ee1b4f4b (diff)
downloadwallabag-54ecbb41d6318dbaaae00ea810cd5a13784ef82f.tar.gz
wallabag-54ecbb41d6318dbaaae00ea810cd5a13784ef82f.tar.zst
wallabag-54ecbb41d6318dbaaae00ea810cd5a13784ef82f.zip
Merge pull request #1898 from wallabag/v2-fix-readingtime-display-material
Fix estimated reading time in material view
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
index 8782d639..15eb16d4 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
@@ -74,8 +74,7 @@
74 74
75 <div class="estimatedTime grey-text"> 75 <div class="estimatedTime grey-text">
76 <span class="tool reading-time"> 76 <span class="tool reading-time">
77 {{ 'entry.list.reading_time'|trans }} 77 {% if readingTime > 0 %}{{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': readingTime|round}) }}{% else %}{{ 'entry.list.reading_time_less_one_minute'|trans|raw }}{% endif %}
78 {% if entry.readingTime > 0 %}{{ entry.readingTime }}{% else %}<small class="inferieur">&lt;</small> 1{% endif %} min
79 </span> 78 </span>
80 </div> 79 </div>
81 80