aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorNicolas Lœuillet <nicolas@loeuillet.org>2016-08-18 15:23:19 +0200
committerNicolas Lœuillet <nicolas@loeuillet.org>2016-08-18 15:23:19 +0200
commit4e1be104ab59201e3d482e4fd31b69b76697fb9e (patch)
tree490cd8cb70611f1086bf8c45373d8d35a7458ef1 /src
parente408d7e895e784271a55c3a200666034db0af80a (diff)
downloadwallabag-4e1be104ab59201e3d482e4fd31b69b76697fb9e.tar.gz
wallabag-4e1be104ab59201e3d482e4fd31b69b76697fb9e.tar.zst
wallabag-4e1be104ab59201e3d482e4fd31b69b76697fb9e.zip
Added creation date and reading time on article view
Fix #2034
Diffstat (limited to 'src')
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.da.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.de.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.en.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.es.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.it.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig5
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig5
13 files changed, 32 insertions, 0 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
index 213d5790..5e7d8949 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
@@ -144,6 +144,8 @@ entry:
144 reading_time: 'estimeret læsetid' 144 reading_time: 'estimeret læsetid'
145 reading_time_minutes: 'estimeret læsetid: %readingTime% min' 145 reading_time_minutes: 'estimeret læsetid: %readingTime% min'
146 reading_time_less_one_minute: 'estimeret læsetid: <small class="inferieur">&lt;</small> 1 min' 146 reading_time_less_one_minute: 'estimeret læsetid: <small class="inferieur">&lt;</small> 1 min'
147 reading_time_minutes_short: '%readingTime% min'
148 reading_time_less_one_minute_short: '<small class="inferieur">&lt;</small> 1 min'
147 original_article: 'original' 149 original_article: 'original'
148 toogle_as_read: 'Marker som læst' 150 toogle_as_read: 'Marker som læst'
149 toogle_as_star: 'Skift favoritstatus' 151 toogle_as_star: 'Skift favoritstatus'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
index c98cf0fc..cb1644de 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
@@ -144,6 +144,8 @@ entry:
144 reading_time: 'geschätzte Lesezeit' 144 reading_time: 'geschätzte Lesezeit'
145 reading_time_minutes: 'geschätzte Lesezeit: %readingTime% min' 145 reading_time_minutes: 'geschätzte Lesezeit: %readingTime% min'
146 reading_time_less_one_minute: 'geschätzte Lesezeit: <small class="inferieur">&lt;</small> 1 min' 146 reading_time_less_one_minute: 'geschätzte Lesezeit: <small class="inferieur">&lt;</small> 1 min'
147 reading_time_minutes_short: '%readingTime% min'
148 reading_time_less_one_minute_short: '<small class="inferieur">&lt;</small> 1 min'
147 original_article: 'original' 149 original_article: 'original'
148 toogle_as_read: 'Gelesen-Status ändern' 150 toogle_as_read: 'Gelesen-Status ändern'
149 toogle_as_star: 'Favoriten-Status ändern' 151 toogle_as_star: 'Favoriten-Status ändern'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index b65e4522..734f8533 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -144,6 +144,8 @@ entry:
144 reading_time: 'estimated reading time' 144 reading_time: 'estimated reading time'
145 reading_time_minutes: 'estimated reading time: %readingTime% min' 145 reading_time_minutes: 'estimated reading time: %readingTime% min'
146 reading_time_less_one_minute: 'estimated reading time: <small class="inferieur">&lt;</small> 1 min' 146 reading_time_less_one_minute: 'estimated reading time: <small class="inferieur">&lt;</small> 1 min'
147 reading_time_minutes_short: '%readingTime% min'
148 reading_time_less_one_minute_short: '<small class="inferieur">&lt;</small> 1 min'
147 original_article: 'original' 149 original_article: 'original'
148 toogle_as_read: 'Toggle mark as read' 150 toogle_as_read: 'Toggle mark as read'
149 toogle_as_star: 'Toggle favorite' 151 toogle_as_star: 'Toggle favorite'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
index 75978f16..582526ef 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
@@ -144,6 +144,8 @@ entry:
144 reading_time: 'tiempo estimado de lectura' 144 reading_time: 'tiempo estimado de lectura'
145 reading_time_minutes: 'tiempo estimado de lectura: %readingTime% min' 145 reading_time_minutes: 'tiempo estimado de lectura: %readingTime% min'
146 reading_time_less_one_minute: 'tiempo estimado de lectura: <small class="inferieur">&lt;</small> 1 min' 146 reading_time_less_one_minute: 'tiempo estimado de lectura: <small class="inferieur">&lt;</small> 1 min'
147 reading_time_minutes_short: '%readingTime% min'
148 reading_time_less_one_minute_short: '<small class="inferieur">&lt;</small> 1 min'
147 original_article: 'original' 149 original_article: 'original'
148 toogle_as_read: 'Marcar como leído/ no leído' 150 toogle_as_read: 'Marcar como leído/ no leído'
149 toogle_as_star: 'Marcar como favorito/ no favorito' 151 toogle_as_star: 'Marcar como favorito/ no favorito'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
index db6e5960..52b50ce9 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
@@ -144,6 +144,8 @@ entry:
144 reading_time: 'زمان تخمینی برای خواندن' 144 reading_time: 'زمان تخمینی برای خواندن'
145 reading_time_minutes: 'زمان تخمینی برای خواندن: %readingTime% min' 145 reading_time_minutes: 'زمان تخمینی برای خواندن: %readingTime% min'
146 reading_time_less_one_minute: 'زمان تخمینی برای خواندن: <small class="inferieur">&lt;</small> 1 min' 146 reading_time_less_one_minute: 'زمان تخمینی برای خواندن: <small class="inferieur">&lt;</small> 1 min'
147 reading_time_minutes_short: '%readingTime% min'
148 reading_time_less_one_minute_short: '<small class="inferieur">&lt;</small> 1 min'
147 original_article: 'original' 149 original_article: 'original'
148 toogle_as_read: 'خوانده‌شده/خوانده‌نشده' 150 toogle_as_read: 'خوانده‌شده/خوانده‌نشده'
149 toogle_as_star: 'برگزیده/نابرگزیده' 151 toogle_as_star: 'برگزیده/نابرگزیده'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index 94300596..cc460477 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -144,6 +144,8 @@ entry:
144 reading_time: 'durée de lecture' 144 reading_time: 'durée de lecture'
145 reading_time_minutes: 'durée de lecture: %readingTime% min' 145 reading_time_minutes: 'durée de lecture: %readingTime% min'
146 reading_time_less_one_minute: 'durée de lecture: <small class="inferieur">&lt;</small> 1 min' 146 reading_time_less_one_minute: 'durée de lecture: <small class="inferieur">&lt;</small> 1 min'
147 reading_time_minutes_short: '%readingTime% min'
148 reading_time_less_one_minute_short: '<small class="inferieur">&lt;</small> 1 min'
147 original_article: 'original' 149 original_article: 'original'
148 toogle_as_read: 'Marquer comme lu/non lu' 150 toogle_as_read: 'Marquer comme lu/non lu'
149 toogle_as_star: 'Marquer comme favori' 151 toogle_as_star: 'Marquer comme favori'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
index 00ed9c98..6d638e58 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
@@ -144,6 +144,8 @@ entry:
144 reading_time: 'tempo di lettura stimato' 144 reading_time: 'tempo di lettura stimato'
145 reading_time_minutes: 'tempo di lettura stimato: %readingTime% min' 145 reading_time_minutes: 'tempo di lettura stimato: %readingTime% min'
146 reading_time_less_one_minute: 'tempo di lettura stimato: <small class="inferieur">&lt;</small> 1 min' 146 reading_time_less_one_minute: 'tempo di lettura stimato: <small class="inferieur">&lt;</small> 1 min'
147 reading_time_minutes_short: '%readingTime% min'
148 reading_time_less_one_minute_short: '<small class="inferieur">&lt;</small> 1 min'
147 original_article: 'originale' 149 original_article: 'originale'
148 toogle_as_read: 'Segna come da leggere' 150 toogle_as_read: 'Segna come da leggere'
149 toogle_as_star: 'Segna come non preferito' 151 toogle_as_star: 'Segna come non preferito'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
index c81c852b..6fe2c4df 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
@@ -144,6 +144,8 @@ entry:
144 reading_time: 'durada de lectura' 144 reading_time: 'durada de lectura'
145 reading_time_minutes: 'durada de lectura : %readingTime% min' 145 reading_time_minutes: 'durada de lectura : %readingTime% min'
146 reading_time_less_one_minute: 'durada de lectura : <small class="inferieur">&lt;</small> 1 min' 146 reading_time_less_one_minute: 'durada de lectura : <small class="inferieur">&lt;</small> 1 min'
147 reading_time_minutes_short: '%readingTime% min'
148 reading_time_less_one_minute_short: '<small class="inferieur">&lt;</small> 1 min'
147 original_article: 'original' 149 original_article: 'original'
148 toogle_as_read: 'Marcar coma legit/pas legit' 150 toogle_as_read: 'Marcar coma legit/pas legit'
149 toogle_as_star: 'Marcar coma favorit' 151 toogle_as_star: 'Marcar coma favorit'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
index 3707a857..35108f22 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
@@ -144,6 +144,8 @@ entry:
144 reading_time: 'szacunkowy czas czytania' 144 reading_time: 'szacunkowy czas czytania'
145 reading_time_minutes: 'szacunkowy czas czytania: %readingTime% min' 145 reading_time_minutes: 'szacunkowy czas czytania: %readingTime% min'
146 reading_time_less_one_minute: 'szacunkowy czas czytania: <small class="inferieur">&lt;</small> 1 min' 146 reading_time_less_one_minute: 'szacunkowy czas czytania: <small class="inferieur">&lt;</small> 1 min'
147 reading_time_minutes_short: '%readingTime% min'
148 reading_time_less_one_minute_short: '<small class="inferieur">&lt;</small> 1 min'
147 original_article: 'oryginał' 149 original_article: 'oryginał'
148 toogle_as_read: 'Oznacz jako przeczytane' 150 toogle_as_read: 'Oznacz jako przeczytane'
149 toogle_as_star: 'Oznacz jako ulubione' 151 toogle_as_star: 'Oznacz jako ulubione'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
index 27be1edc..2210d9e6 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
@@ -144,6 +144,8 @@ entry:
144 reading_time: 'timp estimat de citire' 144 reading_time: 'timp estimat de citire'
145 reading_time_minutes: 'timp estimat de citire: %readingTime% min' 145 reading_time_minutes: 'timp estimat de citire: %readingTime% min'
146 reading_time_less_one_minute: 'timp estimat de citire: <small class="inferieur">&lt;</small> 1 min' 146 reading_time_less_one_minute: 'timp estimat de citire: <small class="inferieur">&lt;</small> 1 min'
147 reading_time_minutes_short: '%readingTime% min'
148 reading_time_less_one_minute_short: '<small class="inferieur">&lt;</small> 1 min'
147 original_article: 'original' 149 original_article: 'original'
148 toogle_as_read: 'Comută marcat ca citit' 150 toogle_as_read: 'Comută marcat ca citit'
149 toogle_as_star: 'Comută marcat ca favorit' 151 toogle_as_star: 'Comută marcat ca favorit'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
index 85ee7316..39f08ea3 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
@@ -144,6 +144,8 @@ entry:
144 reading_time: 'tahmini okuma süresi' 144 reading_time: 'tahmini okuma süresi'
145 reading_time_minutes: 'tahmini okuma süresi: %readingTime% min' 145 reading_time_minutes: 'tahmini okuma süresi: %readingTime% min'
146 reading_time_less_one_minute: 'tahmini okuma süresi: <small class="inferieur">&lt;</small> 1 min' 146 reading_time_less_one_minute: 'tahmini okuma süresi: <small class="inferieur">&lt;</small> 1 min'
147 reading_time_minutes_short: '%readingTime% min'
148 reading_time_less_one_minute_short: '<small class="inferieur">&lt;</small> 1 min'
147 original_article: 'orijinal' 149 original_article: 'orijinal'
148 toogle_as_read: 'Okundu/okunmadı olarak işaretle' 150 toogle_as_read: 'Okundu/okunmadı olarak işaretle'
149 toogle_as_star: 'Favorilere ekle/çıkar' 151 toogle_as_star: 'Favorilere ekle/çıkar'
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 5a800332..12b0bc53 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,6 +29,11 @@
29 <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> 29 <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>
30 </ul> 30 </ul>
31 </div> 31 </div>
32 <div class="link mdi-action-today"> {{ entry.createdAt|date('Y-m-d') }}</div>
33 {% set readingTime = entry.readingTime / app.user.config.readingSpeed %}
34 <div class="link mdi-action-query-builder"> {% if readingTime > 0 %}{{ 'entry.list.reading_time_minutes_short'|trans({'%readingTime%': readingTime|round}) }}
35 {% else %}{{ 'entry.list.reading_time_less_one_minute_short'|trans|raw }}
36 {% endif %}</div>
32 {% set nbAnnotations = entry.annotations | length %} 37 {% set nbAnnotations = entry.annotations | length %}
33 <span class="tool link mdi-communication-comment"> {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span> 38 <span class="tool link mdi-communication-comment"> {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span>
34 <aside class="tags"> 39 <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 e89aea3a..e76407b0 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,6 +193,11 @@
193 <h1>{{ entry.title|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" title="{{ 'entry.view.edit_title'|trans }}">✎</a></h1> 193 <h1>{{ entry.title|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" title="{{ 'entry.view.edit_title'|trans }}">✎</a></h1>
194 </header> 194 </header>
195 <aside> 195 <aside>
196 <span class="link mdi-action-today"> {{ entry.createdAt|date('Y-m-d') }}</span>
197 {% set readingTime = entry.readingTime / app.user.config.readingSpeed %}
198 <span class="link mdi-action-query-builder"> {% if readingTime > 0 %}{{ 'entry.list.reading_time_minutes_short'|trans({'%readingTime%': readingTime|round}) }}
199 {% else %}{{ 'entry.list.reading_time_less_one_minute_short'|trans|raw }}
200 {% endif %}</span>
196 <a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool link mdi-content-link"> <span>{{ entry.domainName|removeWww }}</span></a> 201 <a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool link mdi-content-link"> <span>{{ entry.domainName|removeWww }}</span></a>
197 <span class="tool link mdi-communication-comment"> {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span> 202 <span class="tool link mdi-communication-comment"> {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span>
198 <div id="list"> 203 <div id="list">