aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorJérémy Benoist <j0k3r@users.noreply.github.com>2017-07-29 09:34:29 +0200
committerGitHub <noreply@github.com>2017-07-29 09:34:29 +0200
commitd69a66a58e958a5aa426085083bb93637ca3f61f (patch)
tree1a8b59bf66d244e07362df7dfabe9ff63f053de6 /src
parent233eb91be4bd381ff48de0a15aff94415a3f2797 (diff)
parent383215866f81139e50baff59073f8f0706564b9d (diff)
downloadwallabag-d69a66a58e958a5aa426085083bb93637ca3f61f.tar.gz
wallabag-d69a66a58e958a5aa426085083bb93637ca3f61f.tar.zst
wallabag-d69a66a58e958a5aa426085083bb93637ca3f61f.zip
Merge pull request #3290 from nclsHart/fix-3019
Add a dedicated title for all entries page
Diffstat (limited to 'src')
-rw-r--r--src/Wallabag/CoreBundle/Controller/EntryController.php1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.da.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.de.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.en.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.es.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.it.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_title.html.twig2
14 files changed, 14 insertions, 1 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php
index 845ebef6..3dcfbebe 100644
--- a/src/Wallabag/CoreBundle/Controller/EntryController.php
+++ b/src/Wallabag/CoreBundle/Controller/EntryController.php
@@ -573,6 +573,7 @@ class EntryController extends Controller
573 'entries' => $entries, 573 'entries' => $entries,
574 'currentPage' => $page, 574 'currentPage' => $page,
575 'searchTerm' => $searchTerm, 575 'searchTerm' => $searchTerm,
576 'isFiltered' => $form->isSubmitted(),
576 ] 577 ]
577 ); 578 );
578 } 579 }
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
index 5229ac73..5e5bbde2 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
@@ -169,6 +169,7 @@ entry:
169 # filtered_tags: 'Filtered by tags:' 169 # filtered_tags: 'Filtered by tags:'
170 # filtered_search: 'Filtered by search:' 170 # filtered_search: 'Filtered by search:'
171 # untagged: 'Untagged entries' 171 # untagged: 'Untagged entries'
172 # all: 'All entries'
172 list: 173 list:
173 # number_on_the_page: '{0} There is no entry.|{1} There is one entry.|]1,Inf[ There are %count% entries.' 174 # number_on_the_page: '{0} There is no entry.|{1} There is one entry.|]1,Inf[ There are %count% entries.'
174 reading_time: 'estimeret læsetid' 175 reading_time: 'estimeret læsetid'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
index 996f173a..48f8a535 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
@@ -169,6 +169,7 @@ entry:
169 filtered_tags: 'Gefiltert nach Tags:' 169 filtered_tags: 'Gefiltert nach Tags:'
170 filtered_search: 'Gefiltert nach Suche:' 170 filtered_search: 'Gefiltert nach Suche:'
171 untagged: 'Nicht getaggte Einträge' 171 untagged: 'Nicht getaggte Einträge'
172 all: 'Alle Einträge'
172 list: 173 list:
173 number_on_the_page: '{0} Es gibt keine Einträge.|{1} Es gibt einen Eintrag.|]1,Inf[ Es gibt %count% Einträge.' 174 number_on_the_page: '{0} Es gibt keine Einträge.|{1} Es gibt einen Eintrag.|]1,Inf[ Es gibt %count% Einträge.'
174 reading_time: 'geschätzte Lesezeit' 175 reading_time: 'geschätzte Lesezeit'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index aa1cd1a9..f41a7c85 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -169,6 +169,7 @@ entry:
169 filtered_tags: 'Filtered by tags:' 169 filtered_tags: 'Filtered by tags:'
170 filtered_search: 'Filtered by search:' 170 filtered_search: 'Filtered by search:'
171 untagged: 'Untagged entries' 171 untagged: 'Untagged entries'
172 all: 'All entries'
172 list: 173 list:
173 number_on_the_page: '{0} There are no entries.|{1} There is one entry.|]1,Inf[ There are %count% entries.' 174 number_on_the_page: '{0} There are no entries.|{1} There is one entry.|]1,Inf[ There are %count% entries.'
174 reading_time: 'estimated reading time' 175 reading_time: 'estimated reading time'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
index 96998f53..ea4d84ba 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
@@ -169,6 +169,7 @@ entry:
169 filtered_tags: 'Filtrado por etiquetas:' 169 filtered_tags: 'Filtrado por etiquetas:'
170 filtered_search: 'Filtrado por búsqueda:' 170 filtered_search: 'Filtrado por búsqueda:'
171 untagged: 'Artículos sin etiquetas' 171 untagged: 'Artículos sin etiquetas'
172 all: "Todos los artículos"
172 list: 173 list:
173 number_on_the_page: '{0} No hay artículos.|{1} Hay un artículo.|]1,Inf[ Hay %count% artículos.' 174 number_on_the_page: '{0} No hay artículos.|{1} Hay un artículo.|]1,Inf[ Hay %count% artículos.'
174 reading_time: 'tiempo estimado de lectura' 175 reading_time: 'tiempo estimado de lectura'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
index 57e6c029..11047e83 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
@@ -169,6 +169,7 @@ entry:
169 # filtered_tags: 'Filtered by tags:' 169 # filtered_tags: 'Filtered by tags:'
170 # filtered_search: 'Filtered by search:' 170 # filtered_search: 'Filtered by search:'
171 # untagged: 'Untagged entries' 171 # untagged: 'Untagged entries'
172 # all: 'All entries'
172 list: 173 list:
173 number_on_the_page: '{0} هیج مقاله‌ای نیست.|{1} یک مقاله هست.|]1,Inf[ %count% مقاله هست.' 174 number_on_the_page: '{0} هیج مقاله‌ای نیست.|{1} یک مقاله هست.|]1,Inf[ %count% مقاله هست.'
174 reading_time: 'زمان تخمینی برای خواندن' 175 reading_time: 'زمان تخمینی برای خواندن'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index 6eac4c36..246add86 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -169,6 +169,7 @@ entry:
169 filtered_tags: "Articles filtrés par tags :" 169 filtered_tags: "Articles filtrés par tags :"
170 filtered_search: "Articles filtrés par recherche :" 170 filtered_search: "Articles filtrés par recherche :"
171 untagged: "Article sans tag" 171 untagged: "Article sans tag"
172 all: "Tous les articles"
172 list: 173 list:
173 number_on_the_page: "{0} Il n’y a pas d’article.|{1} Il y a un article.|]1,Inf[ Il y a %count% articles." 174 number_on_the_page: "{0} Il n’y a pas d’article.|{1} Il y a un article.|]1,Inf[ Il y a %count% articles."
174 reading_time: "durée de lecture" 175 reading_time: "durée de lecture"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
index fa7ae0b2..0de8bed7 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
@@ -169,6 +169,7 @@ entry:
169 filtered_tags: 'Filtrati per etichetta:' 169 filtered_tags: 'Filtrati per etichetta:'
170 filtered_search: 'Filtrati per ricerca:' 170 filtered_search: 'Filtrati per ricerca:'
171 untagged: 'Articoli non etichettati' 171 untagged: 'Articoli non etichettati'
172 all: 'Tutti gli articoli'
172 list: 173 list:
173 number_on_the_page: "{0} Non ci sono contenuti.|{1} C'è un contenuto.|]1,Inf[ Ci sono %count% contenuti." 174 number_on_the_page: "{0} Non ci sono contenuti.|{1} C'è un contenuto.|]1,Inf[ Ci sono %count% contenuti."
174 reading_time: 'tempo di lettura stimato' 175 reading_time: 'tempo di lettura stimato'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
index be57e903..b2842ed2 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
@@ -169,6 +169,7 @@ entry:
169 filtered_tags: 'Articles filtrats per etiquetas :' 169 filtered_tags: 'Articles filtrats per etiquetas :'
170 filtered_search: 'Articles filtrats per recèrca :' 170 filtered_search: 'Articles filtrats per recèrca :'
171 untagged: 'Articles sens etiqueta' 171 untagged: 'Articles sens etiqueta'
172 all: 'Totes los articles'
172 list: 173 list:
173 number_on_the_page: "{0} I a pas cap d'article.|{1} I a un article.|]1,Inf[ I a %count% articles." 174 number_on_the_page: "{0} I a pas cap d'article.|{1} I a un article.|]1,Inf[ I a %count% articles."
174 reading_time: 'durada de lectura' 175 reading_time: 'durada de lectura'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
index 00c559ed..ab1b3d63 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
@@ -169,6 +169,7 @@ entry:
169 filtered_tags: 'Filtrowane po tagach:' 169 filtered_tags: 'Filtrowane po tagach:'
170 filtered_search: 'Filtrowanie po wyszukiwaniu:' 170 filtered_search: 'Filtrowanie po wyszukiwaniu:'
171 untagged: 'Odtaguj wpisy' 171 untagged: 'Odtaguj wpisy'
172 all: 'Wszystkie przedmioty'
172 list: 173 list:
173 number_on_the_page: '{0} Nie ma wpisów.|{1} Jest jeden wpis.|]1,Inf[ Są %count% wpisy.' 174 number_on_the_page: '{0} Nie ma wpisów.|{1} Jest jeden wpis.|]1,Inf[ Są %count% wpisy.'
174 reading_time: 'szacunkowy czas czytania' 175 reading_time: 'szacunkowy czas czytania'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
index 4ab5f144..5c1ae058 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
@@ -169,6 +169,7 @@ entry:
169 filtered_tags: 'Filtrar por tags:' 169 filtered_tags: 'Filtrar por tags:'
170 # filtered_search: 'Filtered by search:' 170 # filtered_search: 'Filtered by search:'
171 untagged: 'Entradas sem tags' 171 untagged: 'Entradas sem tags'
172 # all: 'All entries'
172 list: 173 list:
173 number_on_the_page: '{0} Não existem entradas.|{1} Existe uma entrada.|]1,Inf[ Existem %count% entradas.' 174 number_on_the_page: '{0} Não existem entradas.|{1} Existe uma entrada.|]1,Inf[ Existem %count% entradas.'
174 reading_time: 'tempo estimado de leitura' 175 reading_time: 'tempo estimado de leitura'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
index f16504ed..0d6f5f8e 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
@@ -169,6 +169,7 @@ entry:
169 # filtered_tags: 'Filtered by tags:' 169 # filtered_tags: 'Filtered by tags:'
170 # filtered_search: 'Filtered by search:' 170 # filtered_search: 'Filtered by search:'
171 # untagged: 'Untagged entries' 171 # untagged: 'Untagged entries'
172 # all: 'All entries'
172 list: 173 list:
173 # number_on_the_page: '{0} There is no entry.|{1} There is one entry.|]1,Inf[ There are %count% entries.' 174 # number_on_the_page: '{0} There is no entry.|{1} There is one entry.|]1,Inf[ There are %count% entries.'
174 reading_time: 'timp estimat de citire' 175 reading_time: 'timp estimat de citire'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
index 90a140cd..87b5e200 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
@@ -169,6 +169,7 @@ entry:
169 # filtered_tags: 'Filtered by tags:' 169 # filtered_tags: 'Filtered by tags:'
170 # filtered_search: 'Filtered by search:' 170 # filtered_search: 'Filtered by search:'
171 # untagged: 'Untagged entries' 171 # untagged: 'Untagged entries'
172 # all: 'All entries'
172 list: 173 list:
173 number_on_the_page: '{0} Herhangi bir makale yok.|{1} Burada bir adet makale var.|]1,Inf[ Burada %count% adet makale var.' 174 number_on_the_page: '{0} Herhangi bir makale yok.|{1} Burada bir adet makale var.|]1,Inf[ Burada %count% adet makale var.'
174 reading_time: 'tahmini okuma süresi' 175 reading_time: 'tahmini okuma süresi'
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_title.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_title.html.twig
index 654c1d2d..5c17e9f7 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_title.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_title.html.twig
@@ -5,7 +5,7 @@
5{% elseif currentRoute == 'archive' %} 5{% elseif currentRoute == 'archive' %}
6 {{ 'entry.page_titles.archived'|trans }} 6 {{ 'entry.page_titles.archived'|trans }}
7{% elseif currentRoute == 'all' %} 7{% elseif currentRoute == 'all' %}
8 {{ 'entry.page_titles.filtered'|trans }} 8 {{ isFiltered ? 'entry.page_titles.filtered'|trans : 'entry.page_titles.all'|trans }}
9{% elseif currentRoute == 'search' %} 9{% elseif currentRoute == 'search' %}
10 {{ 'entry.page_titles.filtered_search'|trans }} {{ filter }} 10 {{ 'entry.page_titles.filtered_search'|trans }} {{ filter }}
11{% elseif currentRoute == 'tag_entries' %} 11{% elseif currentRoute == 'tag_entries' %}