mirror of https://github.com/wallabag/wallabag.git
Merge pull request #2504 from wallabag/change-page-title-filter-tags
Added tag label in the page title
This commit is contained in:
Nicolas Lœuillet
GitHub
commit
a5d6a7d8b5
|
|
@ -143,6 +143,7 @@ class TagController extends Controller
|
|||
'form' => null,
|
||||
'entries' => $entries,
|
||||
'currentPage' => $page,
|
||||
'tag' => $tag->getLabel(),
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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.'
|
||||
|
|
|
|||
|
|
@ -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.'
|
||||
|
|
|
|||
|
|
@ -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.'
|
||||
|
|
|
|||
|
|
@ -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.'
|
||||
|
|
|
|||
|
|
@ -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% مقاله هست.'
|
||||
|
|
|
|||
|
|
@ -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."
|
||||
|
|
|
|||
|
|
@ -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."
|
||||
|
|
|
|||
|
|
@ -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."
|
||||
|
|
|
|||
|
|
@ -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.'
|
||||
|
|
|
|||
|
|
@ -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.'
|
||||
|
|
|
|||
|
|
@ -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.'
|
||||
|
|
|
|||
|
|
@ -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.'
|
||||
|
|
|
|||
|
|
@ -1,7 +1,11 @@
|
|||
{% extends "WallabagCoreBundle::layout.html.twig" %}
|
||||
|
||||
{% block title %}
|
||||
{% include "@WallabagCore/themes/common/Entry/_title.html.twig" %}
|
||||
{% set currentTag = '' %}
|
||||
{% if tag is defined %}
|
||||
{% set currentTag = tag %}
|
||||
{% endif %}
|
||||
{% include "@WallabagCore/themes/common/Entry/_title.html.twig" with {'currentTag': currentTag} %}
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
|
|
|||
|
|
@ -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 }} {{ currentTag }}
|
||||
{% elseif currentRoute == 'untagged' %}
|
||||
{{ 'entry.page_titles.untagged'|trans }}
|
||||
{% else %}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,11 @@
|
|||
{% extends "WallabagCoreBundle::layout.html.twig" %}
|
||||
|
||||
{% block title %}
|
||||
{% include "@WallabagCore/themes/common/Entry/_title.html.twig" %}
|
||||
{% set currentTag = '' %}
|
||||
{% if tag is defined %}
|
||||
{% set currentTag = tag %}
|
||||
{% endif %}
|
||||
{% include "@WallabagCore/themes/common/Entry/_title.html.twig" with {'currentTag': currentTag} %}
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
|
|
|||
Loading…
Reference in New Issue