Merge pull request #2222 from wallabag/add-date-on-article-view

Added creation date and reading time on article view

diff --cc src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
Simple merge

diff --cc src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
Simple merge

diff --cc src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index 2cd37a4b60636a38aca8d43cbeda2b765647bd9d,19b592e031f9cb1c81d2d8e62c29c81614fb3cbb..c6633f5ba115e04204bb0c3f64df00cfe6349f91
--- 1/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
--- 2/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@@ -144,9 -144,11 +144,11 @@@ entry
          reading_time: 'estimated reading time'
          reading_time_minutes: 'estimated reading time: %readingTime% min'
          reading_time_less_one_minute: 'estimated reading time: <small class="inferieur">&lt;</small> 1 min'
+         reading_time_minutes_short: '%readingTime% min'
+         reading_time_less_one_minute_short: '<small class="inferieur">&lt;</small> 1 min'
          original_article: 'original'
          toogle_as_read: 'Toggle mark as read'
 -        toogle_as_star: 'Toggle favorite'
 +        toogle_as_star: 'Toggle starred'
          delete: 'Delete'
          export_title: 'Export'
      filters:

diff --cc src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
Simple merge

diff --cc src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
Simple merge

diff --cc src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
Simple merge

diff --cc src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
Simple merge

diff --cc src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
Simple merge

diff --cc src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
Simple merge

diff --cc src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
Simple merge

diff --cc src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
Simple merge

diff --cc src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
Simple merge

diff --cc src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
Simple merge