diff options
3 files changed, 17 insertions, 5 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml index 67750bee..c42ac6d3 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml | |||
@@ -88,7 +88,8 @@ Rule: "Règle" | |||
88 | FAQ: "FAQ" | 88 | FAQ: "FAQ" |
89 | 89 | ||
90 | # Entries | 90 | # Entries |
91 | 'estimated reading time': 'durée de lecture' | 91 | "estimated reading time: %readingTime% min": "durée de lecture : %readingTime% min" |
92 | "estimated reading time: %inferior% 1 min": "durée de lecture : %inferior% 1 min" | ||
92 | original: "original" | 93 | original: "original" |
93 | Toggle mark as read: 'Marquer comme lu/non lu' | 94 | Toggle mark as read: 'Marquer comme lu/non lu' |
94 | Toggle favorite: 'Marquer comme favori' | 95 | Toggle favorite: 'Marquer comme favori' |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig index abbcb389..7271bdaa 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig | |||
@@ -27,9 +27,17 @@ | |||
27 | <div id="entry-{{ entry.id|e }}" class="entry"> | 27 | <div id="entry-{{ entry.id|e }}" class="entry"> |
28 | <h2><a href="{{ path('view', { 'id': entry.id }) }}">{{ entry.title|raw }}</a></h2> | 28 | <h2><a href="{{ path('view', { 'id': entry.id }) }}">{{ entry.title|raw }}</a></h2> |
29 | {% if entry.readingTime > 0 %} | 29 | {% if entry.readingTime > 0 %} |
30 | <div class="estimatedTime"><span class="tool reading-time">{% trans %}estimated reading time :{% endtrans %} {{ entry.readingTime }} min</span></div> | 30 | <div class="estimatedTime"> |
31 | <span class="tool reading-time"> | ||
32 | {% trans with {'%readingTime%': entry.readingTime } %}estimated reading time: %readingTime% min{% endtrans %} | ||
33 | </span> | ||
34 | </div> | ||
31 | {% else %} | 35 | {% else %} |
32 | <div class="estimatedTime"><span class="tool reading-time">{% trans %}estimated reading time :{% endtrans %} <small class="inferieur"><</small> 1 min</span></div> | 36 | <div class="estimatedTime"> |
37 | <span class="tool reading-time"> | ||
38 | {% trans with {'%inferior%': '<small class="inferieur"><</small>'} %}estimated reading time: %inferior% 1 min{% endtrans %} | ||
39 | </span> | ||
40 | </div> | ||
33 | {% endif %} | 41 | {% endif %} |
34 | 42 | ||
35 | <ul class="tools links"> | 43 | <ul class="tools links"> |
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 ac17ccee..c3fd4d28 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 | |||
@@ -50,8 +50,11 @@ | |||
50 | 50 | ||
51 | <div class="estimatedTime grey-text"> | 51 | <div class="estimatedTime grey-text"> |
52 | <span class="tool reading-time"> | 52 | <span class="tool reading-time"> |
53 | {% trans %}estimated reading time{% endtrans %}: | 53 | {% if entry.readingTime > 0 %} |
54 | {% if entry.readingTime > 0 %}{{ entry.readingTime }}{% else %}<small class="inferieur"><</small> 1{% endif %} min | 54 | {% trans with {'%readingTime%': entry.readingTime } %}estimated reading time: %readingTime% min{% endtrans %} |
55 | {% else %} | ||
56 | {% trans with {'%inferior%': '<small class="inferieur"><</small>'} %}estimated reading time: %inferior% 1 min{% endtrans %} | ||
57 | {% endif %} | ||
55 | </span> | 58 | </span> |
56 | </div> | 59 | </div> |
57 | 60 | ||