From 7a5043f187a1f9aac37f359c8f407e5febea50f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Wed, 26 Oct 2016 13:53:23 +0200 Subject: Added tag label in the page title Fix #2472 --- src/Wallabag/CoreBundle/Controller/TagController.php | 1 + src/Wallabag/CoreBundle/Resources/translations/messages.da.yml | 2 +- src/Wallabag/CoreBundle/Resources/translations/messages.de.yml | 2 +- src/Wallabag/CoreBundle/Resources/translations/messages.en.yml | 2 +- src/Wallabag/CoreBundle/Resources/translations/messages.es.yml | 2 +- src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml | 2 +- src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml | 2 +- src/Wallabag/CoreBundle/Resources/translations/messages.it.yml | 2 +- src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml | 2 +- src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml | 2 +- src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml | 2 +- src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml | 2 +- src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml | 2 +- .../CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig | 6 +++++- .../CoreBundle/Resources/views/themes/common/Entry/_title.html.twig | 2 +- .../Resources/views/themes/material/Entry/entries.html.twig | 6 +++++- 16 files changed, 24 insertions(+), 15 deletions(-) (limited to 'src') 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 'form' => null, 'entries' => $entries, 'currentPage' => $page, + 'tag' => $tag->getLabel(), ]); } } 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: # starred: 'Starred entries' # archived: 'Archived entries' # filtered: 'Filtered entries' - # filtered_tags: 'Filtered by tags' + # filtered_tags: 'Filtered by tags:' # untagged: 'Untagged entries' list: # 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: starred: 'Favorisierte Einträge' archived: 'Archivierte Einträge' filtered: 'Gefilterte Einträge' - filtered_tags: 'Gefiltert nach Tags' + filtered_tags: 'Gefiltert nach Tags:' untagged: 'Nicht getaggte Einträge' list: 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: starred: 'Starred entries' archived: 'Archived entries' filtered: 'Filtered entries' - filtered_tags: 'Filtered by tags' + filtered_tags: 'Filtered by tags:' untagged: 'Untagged entries' list: 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: starred: 'Artículos favoritos' archived: 'Artículos archivados' filtered: 'Artículos filtrados' - # filtered_tags: 'Filtered by tags' + # filtered_tags: 'Filtered by tags:' # untagged: 'Untagged entries' list: 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: starred: 'مقاله‌های برگزیده' archived: 'مقاله‌های بایگانی‌شده' filtered: 'مقاله‌های فیلترشده' - # filtered_tags: 'Filtered by tags' + # filtered_tags: 'Filtered by tags:' # untagged: 'Untagged entries' list: 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: starred: 'Articles favoris' archived: 'Articles lus' filtered: 'Articles filtrés' - filtered_tags: 'Articles filtrés par tags' + filtered_tags: 'Articles filtrés par tags :' untagged: 'Article sans tag' list: 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: starred: 'Contenuti preferiti' archived: 'Contenuti archiviati' filtered: 'Contenuti filtrati' - # filtered_tags: 'Filtered by tags' + # filtered_tags: 'Filtered by tags:' # untagged: 'Untagged entries' list: 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: starred: 'Articles favorits' archived: 'Articles legits' filtered: 'Articles filtrats' - filtered_tags: 'Filtats per etiquetas' + filtered_tags: 'Filtats per etiquetas:' untagged: 'Articles sens etiqueta' list: 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: starred: 'Wpisy oznaczone gwiazdką' archived: 'Zarchiwizowane wpisy' filtered: 'Odfiltrowane wpisy' - filtered_tags: 'Filtrowane po tagach' + filtered_tags: 'Filtrowane po tagach:' untagged: 'Odtaguj wpisy' list: 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: starred: 'Entradas destacadas' archived: 'Entradas arquivadas' filtered: 'Entradas filtradas' - filtered_tags: 'Filtrar por tags' + filtered_tags: 'Filtrar por tags:' untagged: 'Entradas sem tags' list: 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: # starred: 'Starred entries' # archived: 'Archived entries' # filtered: 'Filtered entries' - # filtered_tags: 'Filtered by tags' + # filtered_tags: 'Filtered by tags:' # untagged: 'Untagged entries' list: # 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: # starred: 'Starred entries' # archived: 'Archived entries' # filtered: 'Filtered entries' - # filtered_tags: 'Filtered by tags' + # filtered_tags: 'Filtered by tags:' # untagged: 'Untagged entries' list: 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..f7c9392d 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 @@ {% extends "WallabagCoreBundle::layout.html.twig" %} {% block title %} - {% include "@WallabagCore/themes/common/Entry/_title.html.twig" %} + {% set params = {} %} + {% if tag is defined %} + {% set params = {'label': tag} %} + {% endif %} + {% include "@WallabagCore/themes/common/Entry/_title.html.twig" with {'params': params} %} {% endblock %} {% 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..42dfee58 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 @@ {% elseif currentRoute == 'all' %} {{ 'entry.page_titles.filtered'|trans }} {% elseif currentRoute == 'tag_entries' %} - {{ 'entry.page_titles.filtered_tags'|trans }} + {{ 'entry.page_titles.filtered_tags'|trans }} {{ params['label'] }} {% elseif currentRoute == 'untagged' %} {{ 'entry.page_titles.untagged'|trans }} {% 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..3e678a32 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 @@ {% extends "WallabagCoreBundle::layout.html.twig" %} {% block title %} - {% include "@WallabagCore/themes/common/Entry/_title.html.twig" %} + {% set params = {} %} + {% if tag is defined %} + {% set params = {'label': tag} %} + {% endif %} + {% include "@WallabagCore/themes/common/Entry/_title.html.twig" with {'params': params} %} {% endblock %} {% block content %} -- cgit v1.2.3 From 73e8df9e444c60b532d923b22e4dbe2efff18ede Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Wed, 26 Oct 2016 15:49:44 +0200 Subject: Renamed variable for page title --- .../Resources/views/themes/baggy/Entry/entries.html.twig | 6 +++--- .../Resources/views/themes/common/Entry/_title.html.twig | 2 +- .../Resources/views/themes/material/Entry/entries.html.twig | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src') 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 f7c9392d..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,11 +1,11 @@ {% extends "WallabagCoreBundle::layout.html.twig" %} {% block title %} - {% set params = {} %} + {% set currentTag = '' %} {% if tag is defined %} - {% set params = {'label': tag} %} + {% set currentTag = tag %} {% endif %} - {% include "@WallabagCore/themes/common/Entry/_title.html.twig" with {'params': params} %} + {% include "@WallabagCore/themes/common/Entry/_title.html.twig" with {'currentTag': currentTag} %} {% endblock %} {% 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 42dfee58..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 @@ {% elseif currentRoute == 'all' %} {{ 'entry.page_titles.filtered'|trans }} {% elseif currentRoute == 'tag_entries' %} - {{ 'entry.page_titles.filtered_tags'|trans }} {{ params['label'] }} + {{ 'entry.page_titles.filtered_tags'|trans }} {{ currentTag }} {% elseif currentRoute == 'untagged' %} {{ 'entry.page_titles.untagged'|trans }} {% 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 3e678a32..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,11 +1,11 @@ {% extends "WallabagCoreBundle::layout.html.twig" %} {% block title %} - {% set params = {} %} - {% if tag is defined %} - {% set params = {'label': tag} %} - {% endif %} - {% include "@WallabagCore/themes/common/Entry/_title.html.twig" with {'params': params} %} + {% set currentTag = '' %} + {% if tag is defined %} + {% set currentTag = tag %} + {% endif %} + {% include "@WallabagCore/themes/common/Entry/_title.html.twig" with {'currentTag': currentTag} %} {% endblock %} {% block content %} -- cgit v1.2.3