mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-11-26 19:11:07 +00:00
Code Issues Projects Releases Wiki Activity

Added tag label in the page title

Browse source 
Fix #2472
This commit is contained in:
Nicolas Lœuillet 2016-10-26 13:53:23 +02:00
parent c68720d40e
commit 7a5043f187
No known key found for this signature in database
GPG key ID: BDC1EFB5CA0145F2
16 changed files with 24 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/Wallabag/CoreBundle/Controller/TagController.php
View file

@ -143,6 +143,7 @@ class TagController extends Controller
'form' => null,
'entries' => $entries,
'currentPage' => $page,
'tag' => $tag->getLabel(),
]);
}
}

2
src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
View file

@ -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.'

2
src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
View file

@ -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.'

2
src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
View file

@ -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.'

2
src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
View file

@ -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.'

2
src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
View file

@ -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% مقاله هست.'

2
src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
View file

@ -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."

2
src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
View file

@ -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."

2
src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
View file

@ -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."

2
src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
View file

@ -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.'

2
src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
View file

@ -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.'

2
src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
View file

@ -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.'

2
src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
View file

@ -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.'

6
src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
View file

@ -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 %}

2
src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_title.html.twig
View file

@ -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 %}

6
src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
View file

@ -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 %}