aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNicolas Lœuillet <nicolas@loeuillet.org>2016-10-26 16:09:37 +0200
committerGitHub <noreply@github.com>2016-10-26 16:09:37 +0200
commita5d6a7d8b5662539e82352b959a28531e5535721 (patch)
tree484e7e7ab173970d6a2fa7c3ff8d34daa9ef66d8
parentc68720d40eec94c80a316e8ffe04fb22768b3563 (diff)
parent73e8df9e444c60b532d923b22e4dbe2efff18ede (diff)
downloadwallabag-a5d6a7d8b5662539e82352b959a28531e5535721.tar.gz
wallabag-a5d6a7d8b5662539e82352b959a28531e5535721.tar.zst
wallabag-a5d6a7d8b5662539e82352b959a28531e5535721.zip
Merge pull request #2504 from wallabag/change-page-title-filter-tags
Added tag label in the page title
-rw-r--r--src/Wallabag/CoreBundle/Controller/TagController.php1
-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.pt.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/entries.html.twig6
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_title.html.twig2
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig6
16 files changed, 24 insertions, 15 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/TagController.php b/src/Wallabag/CoreBundle/Controller/TagController.php
index 5acc6852..707f3bbe 100644
--- a/src/Wallabag/CoreBundle/Controller/TagController.php
+++ b/src/Wallabag/CoreBundle/Controller/TagController.php
@@ -143,6 +143,7 @@ class TagController extends Controller
143 'form' => null, 143 'form' => null,
144 'entries' => $entries, 144 'entries' => $entries,
145 'currentPage' => $page, 145 'currentPage' => $page,
146 'tag' => $tag->getLabel(),
146 ]); 147 ]);
147 } 148 }
148} 149}
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
index 714ced14..6ca7e459 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
@@ -137,7 +137,7 @@ entry:
137 # starred: 'Starred entries' 137 # starred: 'Starred entries'
138 # archived: 'Archived entries' 138 # archived: 'Archived entries'
139 # filtered: 'Filtered entries' 139 # filtered: 'Filtered entries'
140 # filtered_tags: 'Filtered by tags' 140 # filtered_tags: 'Filtered by tags:'
141 # untagged: 'Untagged entries' 141 # untagged: 'Untagged entries'
142 list: 142 list:
143 # number_on_the_page: '{0} There is no entry.|{1} There is one entry.|]1,Inf[ There are %count% entries.' 143 # number_on_the_page: '{0} There is no entry.|{1} There is one entry.|]1,Inf[ There are %count% entries.'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
index 57e49f84..8fd1d82a 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
@@ -137,7 +137,7 @@ entry:
137 starred: 'Favorisierte Einträge' 137 starred: 'Favorisierte Einträge'
138 archived: 'Archivierte Einträge' 138 archived: 'Archivierte Einträge'
139 filtered: 'Gefilterte Einträge' 139 filtered: 'Gefilterte Einträge'
140 filtered_tags: 'Gefiltert nach Tags' 140 filtered_tags: 'Gefiltert nach Tags:'
141 untagged: 'Nicht getaggte Einträge' 141 untagged: 'Nicht getaggte Einträge'
142 list: 142 list:
143 number_on_the_page: '{0} Es gibt keine Einträge.|{1} Es gibt einen Eintrag.|]1,Inf[ Es gibt %count% Einträge.' 143 number_on_the_page: '{0} Es gibt keine Einträge.|{1} Es gibt einen Eintrag.|]1,Inf[ Es gibt %count% Einträge.'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index 4a59c75e..02f56535 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -137,7 +137,7 @@ entry:
137 starred: 'Starred entries' 137 starred: 'Starred entries'
138 archived: 'Archived entries' 138 archived: 'Archived entries'
139 filtered: 'Filtered entries' 139 filtered: 'Filtered entries'
140 filtered_tags: 'Filtered by tags' 140 filtered_tags: 'Filtered by tags:'
141 untagged: 'Untagged entries' 141 untagged: 'Untagged entries'
142 list: 142 list:
143 number_on_the_page: '{0} There are no entries.|{1} There is one entry.|]1,Inf[ There are %count% entries.' 143 number_on_the_page: '{0} There are no entries.|{1} There is one entry.|]1,Inf[ There are %count% entries.'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
index 1b1e0cb1..42ec8183 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
@@ -137,7 +137,7 @@ entry:
137 starred: 'Artículos favoritos' 137 starred: 'Artículos favoritos'
138 archived: 'Artículos archivados' 138 archived: 'Artículos archivados'
139 filtered: 'Artículos filtrados' 139 filtered: 'Artículos filtrados'
140 # filtered_tags: 'Filtered by tags' 140 # filtered_tags: 'Filtered by tags:'
141 # untagged: 'Untagged entries' 141 # untagged: 'Untagged entries'
142 list: 142 list:
143 number_on_the_page: '{0} No hay artículos.|{1} Hay un artículo.|]1,Inf[ Hay %count% artículos.' 143 number_on_the_page: '{0} No hay artículos.|{1} Hay un artículo.|]1,Inf[ Hay %count% artículos.'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
index 41dc8acf..f82167df 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
@@ -137,7 +137,7 @@ entry:
137 starred: 'مقاله‌های برگزیده' 137 starred: 'مقاله‌های برگزیده'
138 archived: 'مقاله‌های بایگانی‌شده' 138 archived: 'مقاله‌های بایگانی‌شده'
139 filtered: 'مقاله‌های فیلترشده' 139 filtered: 'مقاله‌های فیلترشده'
140 # filtered_tags: 'Filtered by tags' 140 # filtered_tags: 'Filtered by tags:'
141 # untagged: 'Untagged entries' 141 # untagged: 'Untagged entries'
142 list: 142 list:
143 number_on_the_page: '{0} هیج مقاله‌ای نیست.|{1} یک مقاله هست.|]1,Inf[ %count% مقاله هست.' 143 number_on_the_page: '{0} هیج مقاله‌ای نیست.|{1} یک مقاله هست.|]1,Inf[ %count% مقاله هست.'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index 7fb9681d..574cc1a7 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -137,7 +137,7 @@ entry:
137 starred: 'Articles favoris' 137 starred: 'Articles favoris'
138 archived: 'Articles lus' 138 archived: 'Articles lus'
139 filtered: 'Articles filtrés' 139 filtered: 'Articles filtrés'
140 filtered_tags: 'Articles filtrés par tags' 140 filtered_tags: 'Articles filtrés par tags :'
141 untagged: 'Article sans tag' 141 untagged: 'Article sans tag'
142 list: 142 list:
143 number_on_the_page: "{0} Il n'y a pas d'articles.|{1} Il y a un article.|]1,Inf[ Il y a %count% articles." 143 number_on_the_page: "{0} Il n'y a pas d'articles.|{1} Il y a un article.|]1,Inf[ Il y a %count% articles."
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
index b279ae40..d679ef00 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
@@ -137,7 +137,7 @@ entry:
137 starred: 'Contenuti preferiti' 137 starred: 'Contenuti preferiti'
138 archived: 'Contenuti archiviati' 138 archived: 'Contenuti archiviati'
139 filtered: 'Contenuti filtrati' 139 filtered: 'Contenuti filtrati'
140 # filtered_tags: 'Filtered by tags' 140 # filtered_tags: 'Filtered by tags:'
141 # untagged: 'Untagged entries' 141 # untagged: 'Untagged entries'
142 list: 142 list:
143 number_on_the_page: "{0} Non ci sono contenuti.|{1} C'è un contenuto.|]1,Inf[ Ci sono %count% contenuti." 143 number_on_the_page: "{0} Non ci sono contenuti.|{1} C'è un contenuto.|]1,Inf[ Ci sono %count% contenuti."
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
index a4659620..af0fba0d 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
@@ -137,7 +137,7 @@ entry:
137 starred: 'Articles favorits' 137 starred: 'Articles favorits'
138 archived: 'Articles legits' 138 archived: 'Articles legits'
139 filtered: 'Articles filtrats' 139 filtered: 'Articles filtrats'
140 filtered_tags: 'Filtats per etiquetas' 140 filtered_tags: 'Filtats per etiquetas:'
141 untagged: 'Articles sens etiqueta' 141 untagged: 'Articles sens etiqueta'
142 list: 142 list:
143 number_on_the_page: "{0} I a pas cap d'article.|{1} I a un article.|]1,Inf[ I a %count% articles." 143 number_on_the_page: "{0} I a pas cap d'article.|{1} I a un article.|]1,Inf[ I a %count% articles."
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
index 798b39c2..bf47b58a 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
@@ -137,7 +137,7 @@ entry:
137 starred: 'Wpisy oznaczone gwiazdką' 137 starred: 'Wpisy oznaczone gwiazdką'
138 archived: 'Zarchiwizowane wpisy' 138 archived: 'Zarchiwizowane wpisy'
139 filtered: 'Odfiltrowane wpisy' 139 filtered: 'Odfiltrowane wpisy'
140 filtered_tags: 'Filtrowane po tagach' 140 filtered_tags: 'Filtrowane po tagach:'
141 untagged: 'Odtaguj wpisy' 141 untagged: 'Odtaguj wpisy'
142 list: 142 list:
143 number_on_the_page: '{0} Nie ma wpisów.|{1} Jest jeden wpis.|]1,Inf[ Są %count% wpisy.' 143 number_on_the_page: '{0} Nie ma wpisów.|{1} Jest jeden wpis.|]1,Inf[ Są %count% wpisy.'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
index 45dc52c9..f10dc9aa 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
@@ -137,7 +137,7 @@ entry:
137 starred: 'Entradas destacadas' 137 starred: 'Entradas destacadas'
138 archived: 'Entradas arquivadas' 138 archived: 'Entradas arquivadas'
139 filtered: 'Entradas filtradas' 139 filtered: 'Entradas filtradas'
140 filtered_tags: 'Filtrar por tags' 140 filtered_tags: 'Filtrar por tags:'
141 untagged: 'Entradas sem tags' 141 untagged: 'Entradas sem tags'
142 list: 142 list:
143 number_on_the_page: '{0} Não existem entradas.|{1} Existe uma entrada.|]1,Inf[ Existem %count% entradas.' 143 number_on_the_page: '{0} Não existem entradas.|{1} Existe uma entrada.|]1,Inf[ Existem %count% entradas.'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
index 21f27e08..875c82e8 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
@@ -137,7 +137,7 @@ entry:
137 # starred: 'Starred entries' 137 # starred: 'Starred entries'
138 # archived: 'Archived entries' 138 # archived: 'Archived entries'
139 # filtered: 'Filtered entries' 139 # filtered: 'Filtered entries'
140 # filtered_tags: 'Filtered by tags' 140 # filtered_tags: 'Filtered by tags:'
141 # untagged: 'Untagged entries' 141 # untagged: 'Untagged entries'
142 list: 142 list:
143 # number_on_the_page: '{0} There is no entry.|{1} There is one entry.|]1,Inf[ There are %count% entries.' 143 # number_on_the_page: '{0} There is no entry.|{1} There is one entry.|]1,Inf[ There are %count% entries.'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
index f137ec99..f50f629a 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
@@ -136,7 +136,7 @@ entry:
136 # starred: 'Starred entries' 136 # starred: 'Starred entries'
137 # archived: 'Archived entries' 137 # archived: 'Archived entries'
138 # filtered: 'Filtered entries' 138 # filtered: 'Filtered entries'
139 # filtered_tags: 'Filtered by tags' 139 # filtered_tags: 'Filtered by tags:'
140 # untagged: 'Untagged entries' 140 # untagged: 'Untagged entries'
141 list: 141 list:
142 number_on_the_page: '{0} Herhangi bir makale yok.|{1} Burada bir adet makale var.|]1,Inf[ Burada %count% adet makale var.' 142 number_on_the_page: '{0} Herhangi bir makale yok.|{1} Burada bir adet makale var.|]1,Inf[ Burada %count% adet makale var.'
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 3af88b23..f19f2922 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
@@ -1,7 +1,11 @@
1{% extends "WallabagCoreBundle::layout.html.twig" %} 1{% extends "WallabagCoreBundle::layout.html.twig" %}
2 2
3{% block title %} 3{% block title %}
4 {% include "@WallabagCore/themes/common/Entry/_title.html.twig" %} 4 {% set currentTag = '' %}
5 {% if tag is defined %}
6 {% set currentTag = tag %}
7 {% endif %}
8 {% include "@WallabagCore/themes/common/Entry/_title.html.twig" with {'currentTag': currentTag} %}
5{% endblock %} 9{% endblock %}
6 10
7{% block content %} 11{% block content %}
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 d1c2f203..92cabdd9 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
@@ -7,7 +7,7 @@
7{% elseif currentRoute == 'all' %} 7{% elseif currentRoute == 'all' %}
8 {{ 'entry.page_titles.filtered'|trans }} 8 {{ 'entry.page_titles.filtered'|trans }}
9{% elseif currentRoute == 'tag_entries' %} 9{% elseif currentRoute == 'tag_entries' %}
10 {{ 'entry.page_titles.filtered_tags'|trans }} 10 {{ 'entry.page_titles.filtered_tags'|trans }} {{ currentTag }}
11{% elseif currentRoute == 'untagged' %} 11{% elseif currentRoute == 'untagged' %}
12 {{ 'entry.page_titles.untagged'|trans }} 12 {{ 'entry.page_titles.untagged'|trans }}
13{% else %} 13{% else %}
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 919f94ec..5c7cfd65 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
@@ -1,7 +1,11 @@
1{% extends "WallabagCoreBundle::layout.html.twig" %} 1{% extends "WallabagCoreBundle::layout.html.twig" %}
2 2
3{% block title %} 3{% block title %}
4 {% include "@WallabagCore/themes/common/Entry/_title.html.twig" %} 4 {% set currentTag = '' %}
5 {% if tag is defined %}
6 {% set currentTag = tag %}
7 {% endif %}
8 {% include "@WallabagCore/themes/common/Entry/_title.html.twig" with {'currentTag': currentTag} %}
5{% endblock %} 9{% endblock %}
6 10
7{% block content %} 11{% block content %}