devol/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-12-16 10:22:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

translation fix finished for #871 and bring add tag from search feature to all themes

Browse Source
This commit is contained in:
tcit 2014-10-27 15:12:46 +01:00
parent 7ee1972599
commit 1b6e21d7a6
9 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inc/poche/Poche.class.php
View File

@ -388,7 +388,7 @@ class Poche
$this->pagination->page_links('?view=' . $view . '?search=' . $search . '&sort=' . $_SESSION['sort'] . '&' )); $this->pagination->page_links('?view=' . $view . '?search=' . $search . '&sort=' . $_SESSION['sort'] . '&' ));
$tpl_vars['page_links'] = $page_links; $tpl_vars['page_links'] = $page_links;
$tpl_vars['nb_results'] = $count; $tpl_vars['nb_results'] = $count;
$tpl_vars['search_term'] = $search; $tpl_vars['searchterm'] = $search;
} }
break; break;
case 'view': case 'view':

BIN
locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo
View File

Binary file not shown.

4
locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po
View File

@ -589,8 +589,8 @@ msgstr ""
msgid "Enter your search here" msgid "Enter your search here"
msgstr "Enter your search here" msgstr "Enter your search here"
msgid "Apply the tag %search_term% to this search" msgid "Tag these results as"
msgstr "Apply the tag %search_term% to this search" msgstr "Tag these results as"
# ebook # ebook
msgid "Fancy an E-Book ?" msgid "Fancy an E-Book ?"

BIN
locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo
View File

Binary file not shown.

4
locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po
View File

@ -674,8 +674,8 @@ msgstr "Cache effacé."
msgid "Oops, it seems you don't have PHP 5." msgid "Oops, it seems you don't have PHP 5."
msgstr "Oups, vous ne semblez pas avoir PHP 5." msgstr "Oups, vous ne semblez pas avoir PHP 5."
msgid "Apply the tag %search_term% to this search" msgid "Tag these results as"
msgstr "Appliquer le tag %search_term% à ces résultats" msgstr "Appliquer à ces résultats le tag"
# ebook # ebook
msgid "Fancy an E-Book ?" msgid "Fancy an E-Book ?"

3
themes/baggy/home.twig
View File

@ -59,7 +59,8 @@
{{ block('pager') }} {{ block('pager') }}
{% if view == 'home' %}{% if nb_results > 1 %}<a title="{% trans "Mark all the entries as read" %}" href="./?action=archive_all">{% trans "Mark all the entries as read" %}</a>{% endif %}{% endif %} {% if view == 'home' %}{% if nb_results > 1 %}<a title="{% trans "Mark all the entries as read" %}" href="./?action=archive_all">{% trans "Mark all the entries as read" %}</a>{% endif %}{% endif %}
{% if search_term is defined %}<a title="{% trans %}Apply the tag {{ search_term }} to this search{% endtrans %}" href="./?action=add_tag&search={{ search_term }}">{% trans %}Apply the tag {{ search_term }} to this search{% endtrans %}</a>{% endif %} {% if searchterm is defined %}<a title="{% trans "Tag these results as" %} {{ searchterm }}" href="./?action=add_tag&search={{ searchterm }}">
{% trans "Tag these results as" %} {{ searchterm }}</a>{% endif %}
{% if tag %}<a title="{% trans "Download the articles from this tag in an epub" %}" href="./?epub&amp;method=tag&amp;value={{ tag.value }}">{% trans "Download the articles from this tag in an epub" %}</a> {% if tag %}<a title="{% trans "Download the articles from this tag in an epub" %}" href="./?epub&amp;method=tag&amp;value={{ tag.value }}">{% trans "Download the articles from this tag in an epub" %}</a>
{% elseif search_term is defined %}<a title="{% trans "Download the articles from this search in an epub" %}" href="./?epub&amp;method=search&amp;value={{ search_term }}">{% trans "Download the articles from this search in an epub" %}</a> {% elseif search_term is defined %}<a title="{% trans "Download the articles from this search in an epub" %}" href="./?epub&amp;method=search&amp;value={{ search_term }}">{% trans "Download the articles from this search in an epub" %}</a>

14
themes/courgette/home.twig
View File

@ -26,13 +26,13 @@
{% block pager %} {% block pager %}
{% if nb_results > 1 %} {% if nb_results > 1 %}
<div class="results"> <div class="results">
<div class="nb-results">{{ nb_results }} {% trans "results" %}{% if search_term is defined %}{% trans " found for « " %} {{ search_term }} »{% endif %}</div> <div class="nb-results">{{ nb_results }} {% trans "results" %}{% if searchterm is defined %}{% trans " found for « " %} {{ searchterm }} »{% endif %}</div>
{{ page_links | raw }} {{ page_links | raw }}
</div> </div>
{% elseif nb_results == 1 %} {% elseif nb_results == 1 %}
{% if search_term is defined %} {% if searchterm is defined %}
<div class="results"> <div class="results">
<div class="nb-results">{% trans "Only one result found for " %} « {{ search_term }} »</div> <div class="nb-results">{% trans "Only one result found for " %} « {{ searchterm }} »</div>
</div> </div>
{% endif %} {% endif %}
{% endif %} {% endif %}
@ -53,10 +53,12 @@
{{ block('pager') }} {{ block('pager') }}
{% if tag %}<a title="{% trans "Download the articles from this tag in an epub" %}" href="./?epub&amp;method=tag&amp;value={{ tag.value }}">{% trans "Download the articles from this tag in an epub" %}</a> {% if searchterm is defined %}<a title="{% trans "Tag these results as" %} {{ searchterm }}" href="./?action=add_tag&search={{ searchterm }}">{% trans "Tag these results as" %} {{ searchterm }}</a>{% endif %}
{% elseif search_term is defined %}<a title="{% trans "Download the articles from this search in an epub" %}" href="./?epub&amp;method=search&amp;value={{ search_term }}">{% trans "Download the articles from this search in an epub" %}</a>
{% if tag %}<a title="{% trans "Download the articles from this tag in an epub" %}" href="./?epub&amp;method=tag&amp;value={{ tag.value }}">{% trans "Download the articles from this tag in an epub" %}</a>
{% elseif searchterm is defined %}<a title="{% trans "Download the articles from this search in an epub" %}" href="./?epub&amp;method=search&amp;value={{ searchterm }}">{% trans "Download the articles from this search in an epub" %}</a>
{% else %}<a title="{% trans "Download the articles from this category in an epub" %}" href="./?epub&amp;method=category&amp;value={{ view }}">{% trans "Download the articles from this category in an epub" %}</a>{% endif %} {% else %}<a title="{% trans "Download the articles from this category in an epub" %}" href="./?epub&amp;method=category&amp;value={{ view }}">{% trans "Download the articles from this category in an epub" %}</a>{% endif %}
{% endif %} {% endif %}
{% endblock %} {% endblock %}

4
themes/default/_sorting.twig
View File

@ -1,6 +1,6 @@
{% if entries|length > 1 %} {% if entries|length > 1 %}
<ul id="sort"> <ul id="sort">
<li><a href="./?sort=ia&amp;view={{ view }}{% if search_term is defined %}&amp;search={{ search_term }}{% endif %}&amp;id={{ id }}"><img src="{{ poche_url }}themes/{{ theme }}/img/{{ theme }}/top.png" alt="{% trans "by date asc" %}" title="{% trans "by date asc" %}" /></a> {% trans "by date" %} <a href="./?sort=id&amp;view={{ view }}{% if search_term is defined %}&amp;search={{ search_term }}{% endif %}&amp;id={{ id }}"><img src="{{ poche_url }}themes/{{ theme }}/img/{{ theme }}/down.png" alt="{% trans "by date desc" %}" title="{% trans "by date desc" %}" /></a></li> <li><a href="./?sort=ia&amp;view={{ view }}{% if searchterm is defined %}&amp;search={{ searchterm }}{% endif %}&amp;id={{ id }}"><img src="{{ poche_url }}themes/{{ theme }}/img/{{ theme }}/top.png" alt="{% trans "by date asc" %}" title="{% trans "by date asc" %}" /></a> {% trans "by date" %} <a href="./?sort=id&amp;view={{ view }}{% if searchterm is defined %}&amp;search={{ searchterm }}{% endif %}&amp;id={{ id }}"><img src="{{ poche_url }}themes/{{ theme }}/img/{{ theme }}/down.png" alt="{% trans "by date desc" %}" title="{% trans "by date desc" %}" /></a></li>
<li><a href="./?sort=ta&amp;view={{ view }}{% if search_term is defined %}&amp;search={{ search_term }}{% endif %}&amp;id={{ id }}"><img src="{{ poche_url }}themes/{{ theme }}/img/{{ theme }}/top.png" alt="{% trans "by title asc" %}" title="{% trans "by title asc" %}" /></a> {% trans "by title" %} <a href="./?sort=td&amp;view={{ view }}{% if search_term is defined %}&amp;search={{ search_term }}{% endif %}&amp;id={{ id }}"><img src="{{ poche_url }}themes/{{ theme }}/img/{{ theme }}/down.png" alt="{% trans "by title desc" %}" title="{% trans "by title desc" %}" /></a></li> <li><a href="./?sort=ta&amp;view={{ view }}{% if searchterm is defined %}&amp;search={{ searchterm }}{% endif %}&amp;id={{ id }}"><img src="{{ poche_url }}themes/{{ theme }}/img/{{ theme }}/top.png" alt="{% trans "by title asc" %}" title="{% trans "by title asc" %}" /></a> {% trans "by title" %} <a href="./?sort=td&amp;view={{ view }}{% if searchterm is defined %}&amp;search={{ searchterm }}{% endif %}&amp;id={{ id }}"><img src="{{ poche_url }}themes/{{ theme }}/img/{{ theme }}/down.png" alt="{% trans "by title desc" %}" title="{% trans "by title desc" %}" /></a></li>
</ul> </ul>
{% endif %} {% endif %}

13
themes/default/home.twig
View File

@ -31,13 +31,13 @@
{% block pager %} {% block pager %}
{% if nb_results > 1 %} {% if nb_results > 1 %}
<div class="results"> <div class="results">
<div class="nb-results">{{ nb_results }} {% trans "results" %}{% if search_term is defined %}{% trans " found for « " %} {{ search_term }} »{% endif %}</div> <div class="nb-results">{{ nb_results }} {% trans "results" %}{% if searchterm is defined %}{% trans " found for « " %} {{ searchterm }} »{% endif %}</div>
{{ page_links | raw }} {{ page_links | raw }}
</div> </div>
{% elseif nb_results == 1 %} {% elseif nb_results == 1 %}
{% if search_term is defined %} {% if searchterm is defined %}
<div class="results"> <div class="results">
<div class="nb-results">{% trans "Only one result found for " %} « {{ search_term }} »</div> <div class="nb-results">{% trans "Only one result found for " %} « {{ searchterm }} »</div>
</div> </div>
{% endif %} {% endif %}
{% endif %} {% endif %}
@ -60,8 +60,11 @@
{% if view == 'home' %}{% if nb_results > 1 %}<a title="{% trans "mark all the entries as read" %}" href="./?action=archive_all">{% trans "mark all the entries as read" %}</a>{% endif %}{% endif %} {% if view == 'home' %}{% if nb_results > 1 %}<a title="{% trans "mark all the entries as read" %}" href="./?action=archive_all">{% trans "mark all the entries as read" %}</a>{% endif %}{% endif %}
{% if tag %}<a title="{% trans "Download the articles from this tag in an epub" %}" href="./?epub&amp;method=tag&amp;value={{ tag.value }}">{% trans "Download the articles from this tag in an epub" %}</a> {% if searchterm is defined %}<a title="{% trans "Tag these results as" %} {{ searchterm }}" href="./?action=add_tag&search={{ searchterm }}">
{% elseif search_term is defined %}<a title="{% trans "Download the articles from this search in an epub" %}" href="./?epub&amp;method=search&amp;value={{ search_term }}">{% trans "Download the articles from this search in an epub" %}</a> {% trans "Tag these results as" %} {{ searchterm }}</a>{% endif %}
{% if tag %}<a title="{% trans "Download the articles from this tag in an epub" %}" href="./?epub&amp;method=tag&amp;value={{ tag.value }}">{% trans "Download the articles from this tag in an epub" %}</a>
{% elseif searchterm is defined %}<a title="{% trans "Download the articles from this search in an epub" %}" href="./?epub&amp;method=search&amp;value={{ searchterm }}">{% trans "Download the articles from this search in an epub" %}</a>
{% else %}<a title="{% trans "Download the articles from this category in an epub" %}" href="./?epub&amp;method=category&amp;value={{ view }}">{% trans "Download the articles from this category in an epub" %}</a>{% endif %} {% else %}<a title="{% trans "Download the articles from this category in an epub" %}" href="./?epub&amp;method=category&amp;value={{ view }}">{% trans "Download the articles from this category in an epub" %}</a>{% endif %}
{% endif %} {% endif %}