X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FResources%2Fviews%2Fthemes%2Fmaterial%2FEntry%2Fentries.html.twig;h=371992df41aad59aea17aebf337e06f475c52559;hb=bca5485946a72942c76dbb65c29e40818dca4976;hp=6de800b94fb57d94b4aabf3148f9b1f111c49aae;hpb=e43d27f8450dcdf79850e935b762ac390a19dd63;p=github%2Fwallabag%2Fwallabag.git
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 6de800b9..371992df 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
@@ -46,16 +46,21 @@
{% endif %}
- {{ entry.title|raw|striptags|slice(0, 42) }}
-
- {% if entry.readingTime > 0 %}
-
{% trans %}estimated reading time{% endtrans %}: {{ entry.readingTime }} min
- {% else %}
- {% trans %}estimated reading time{% endtrans %}: < 1 min
- {% endif %}
+ {{ entry.title|striptags|slice(0, 42)|raw }}
+
+
+
+ {% set readingTime = entry.readingTime / app.user.config.readingSpeed %}
+ {% if readingTime > 0 %}
+ {% trans with {'%readingTime%': readingTime } %}estimated reading time: %readingTime% min{% endtrans %}
+ {% else %}
+ {% trans with {'%inferior%': '<'} %}estimated reading time: %inferior% 1 min{% endtrans %}
+ {% endif %}
+
+
{% if entry.previewPicture is null %}
- {{ entry.content|striptags|slice(0, 300) }}…
+ {{ entry.content|striptags|slice(0, 300)|raw }}…
{% endif %}
@@ -65,13 +70,14 @@
{{ entry.title|raw }}
- {% if entry.readingTime > 0 %}
- {% trans %}estimated reading time{% endtrans %}: {{ entry.readingTime }} min
- {% else %}
- {% trans %}estimated reading time{% endtrans %}: < 1 min
- {% endif %}
+
+
+ {% trans %}estimated reading time{% endtrans %}:
+ {% if entry.readingTime > 0 %}{{ entry.readingTime }}{% else %}< 1{% endif %} min
+
+
- {{ entry.content|striptags|slice(0, 300) }}…
+ {{ entry.content|striptags|slice(0, 300)|raw }}…
{% endif %}
@@ -99,13 +105,13 @@
{% endif %}
{% trans %}Export{% endtrans %}
@@ -160,7 +166,7 @@
- {{ form_widget(form.domainName, {'type': 'text', 'attr' : {'placeholder': 'website.com'} }) }}
+ {{ form_widget(form.domainName, {'type': 'text', 'attr' : {'placeholder': 'website.com' | trans} }) }}