From d35ba2c3d6c822b293e7d04baa934845d44bec99 Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Sun, 21 Aug 2016 22:22:34 +0200
Subject: Display text on baggy

Instead of using icons (which aren't available) display real text for reading time & creation date
---
 .../Resources/views/themes/baggy/Entry/entry.html.twig       | 12 ++++++++----
 .../Resources/views/themes/material/Entry/entry.html.twig    |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
index 87b4424c..6bf85725 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
@@ -29,15 +29,19 @@
             <li><a href="mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag&amp;body={{ entry.url|url_encode }}" title="{{ 'entry.view.left_menu.problem.label'|trans }}" class="tool bad-display icon icon-delete"><span>{{ 'entry.view.left_menu.problem.label'|trans }}</span></a></li>
         </ul>
     </div>
-        <div class="link mdi-action-today"> {{ entry.createdAt|date('Y-m-d') }}</div>
-        {% set readingTime = entry.readingTime / app.user.config.readingSpeed %}
+        <div class="link mdi-action-today">
+            {{ 'entry.view.created_at'|trans }}: {{ entry.createdAt|date('Y-m-d') }}
+        </div>
+
         <div class="link mdi-action-query-builder">
+            {% set readingTime = entry.readingTime / app.user.config.readingSpeed %}
             {% if readingTime > 0 %}
-                {{ 'entry.list.reading_time_minutes_short'|trans({'%readingTime%': readingTime|round}) }}
+                {{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': readingTime|round})|capitalize }}
             {% else %}
-                {{ 'entry.list.reading_time_less_one_minute_short'|trans|raw }}
+                {{ 'entry.list.reading_time_less_one_minute'|trans|raw }}
             {% endif %}
         </div>
+
         {% set nbAnnotations = entry.annotations | length %}
         <span class="tool link mdi-communication-comment"> {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span>
         <aside class="tags">
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
index 94a5dc31..4f58b692 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
@@ -193,7 +193,7 @@
             <h1>{{ entry.title|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" title="{{ 'entry.view.edit_title'|trans }}">✎</a></h1>
         </header>
         <aside>
-            <span class="link mdi-action-today"> {{ entry.createdAt|date('Y-m-d') }}</span>
+            <span class="link mdi-action-today" title="{{ 'entry.view.created_at'|trans }}"> {{ entry.createdAt|date('Y-m-d') }}</span>
             {% set readingTime = entry.readingTime / app.user.config.readingSpeed %}
             <span class="link mdi-action-query-builder">
                 {% if readingTime > 0 %}
-- 
cgit v1.2.3