From 1b6e21d7a657c87a48efe02a1191d06682c64829 Mon Sep 17 00:00:00 2001 From: tcit Date: Mon, 27 Oct 2014 15:12:46 +0100 Subject: translation fix finished for #871 and bring add tag from search feature to all themes --- inc/poche/Poche.class.php | 2 +- locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo | Bin 14376 -> 14331 bytes locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po | 4 ++-- locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo | Bin 17922 -> 17885 bytes locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po | 4 ++-- themes/baggy/home.twig | 3 ++- themes/courgette/home.twig | 14 ++++++++------ themes/default/_sorting.twig | 4 ++-- themes/default/home.twig | 13 ++++++++----- 9 files changed, 25 insertions(+), 19 deletions(-) diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index 8cebafa3..ecb2a51f 100755 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@ -388,7 +388,7 @@ class Poche $this->pagination->page_links('?view=' . $view . '?search=' . $search . '&sort=' . $_SESSION['sort'] . '&' )); $tpl_vars['page_links'] = $page_links; $tpl_vars['nb_results'] = $count; - $tpl_vars['search_term'] = $search; + $tpl_vars['searchterm'] = $search; } break; case 'view': diff --git a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo index 2850b494..5aefe6c1 100644 Binary files a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo and b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo differ diff --git a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po index ebde5681..7a1c88da 100644 --- a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po +++ b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po @@ -589,8 +589,8 @@ msgstr "" msgid "Enter your search here" msgstr "Enter your search here" -msgid "Apply the tag %search_term% to this search" -msgstr "Apply the tag %search_term% to this search" +msgid "Tag these results as" +msgstr "Tag these results as" # ebook msgid "Fancy an E-Book ?" diff --git a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo index 638c2135..da087516 100644 Binary files a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo and b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo differ diff --git a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po index 2ab9afef..3d031967 100644 --- a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po +++ b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po @@ -674,8 +674,8 @@ msgstr "Cache effacé." msgid "Oops, it seems you don't have PHP 5." msgstr "Oups, vous ne semblez pas avoir PHP 5." -msgid "Apply the tag %search_term% to this search" -msgstr "Appliquer le tag %search_term% à ces résultats" +msgid "Tag these results as" +msgstr "Appliquer à ces résultats le tag" # ebook msgid "Fancy an E-Book ?" diff --git a/themes/baggy/home.twig b/themes/baggy/home.twig index 157615ae..a870fc21 100755 --- a/themes/baggy/home.twig +++ b/themes/baggy/home.twig @@ -59,7 +59,8 @@ {{ block('pager') }} {% if view == 'home' %}{% if nb_results > 1 %}{% trans "Mark all the entries as read" %}{% endif %}{% endif %} - {% if search_term is defined %}{% trans %}Apply the tag {{ search_term }} to this search{% endtrans %}{% endif %} + {% if searchterm is defined %} +{% trans "Tag these results as" %} {{ searchterm }}{% endif %} {% if tag %}{% trans "Download the articles from this tag in an epub" %} {% elseif search_term is defined %}{% trans "Download the articles from this search in an epub" %} diff --git a/themes/courgette/home.twig b/themes/courgette/home.twig index 811298eb..ff27db43 100755 --- a/themes/courgette/home.twig +++ b/themes/courgette/home.twig @@ -26,13 +26,13 @@ {% block pager %} {% if nb_results > 1 %}
-
{{ nb_results }} {% trans "results" %}{% if search_term is defined %}{% trans " found for « " %} {{ search_term }} »{% endif %}
+
{{ nb_results }} {% trans "results" %}{% if searchterm is defined %}{% trans " found for « " %} {{ searchterm }} »{% endif %}
{{ page_links | raw }}
{% elseif nb_results == 1 %} - {% if search_term is defined %} + {% if searchterm is defined %}
-
{% trans "Only one result found for " %} « {{ search_term }} »
+
{% trans "Only one result found for " %} « {{ searchterm }} »
{% endif %} {% endif %} @@ -53,10 +53,12 @@ {{ block('pager') }} - {% if tag %}{% trans "Download the articles from this tag in an epub" %} - {% elseif search_term is defined %}{% trans "Download the articles from this search in an epub" %} + {% if searchterm is defined %}{% trans "Tag these results as" %} {{ searchterm }}{% endif %} + + {% if tag %}{% trans "Download the articles from this tag in an epub" %} + {% elseif searchterm is defined %}{% trans "Download the articles from this search in an epub" %} {% else %}{% trans "Download the articles from this category in an epub" %}{% endif %} {% endif %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/themes/default/_sorting.twig b/themes/default/_sorting.twig index ce3d38bc..3ce9b949 100755 --- a/themes/default/_sorting.twig +++ b/themes/default/_sorting.twig @@ -1,6 +1,6 @@ {% if entries|length > 1 %} {% endif %} diff --git a/themes/default/home.twig b/themes/default/home.twig index 093c2dc5..6bc549e6 100755 --- a/themes/default/home.twig +++ b/themes/default/home.twig @@ -31,13 +31,13 @@ {% block pager %} {% if nb_results > 1 %}
-
{{ nb_results }} {% trans "results" %}{% if search_term is defined %}{% trans " found for « " %} {{ search_term }} »{% endif %}
+
{{ nb_results }} {% trans "results" %}{% if searchterm is defined %}{% trans " found for « " %} {{ searchterm }} »{% endif %}
{{ page_links | raw }}
{% elseif nb_results == 1 %} - {% if search_term is defined %} + {% if searchterm is defined %}
-
{% trans "Only one result found for " %} « {{ search_term }} »
+
{% trans "Only one result found for " %} « {{ searchterm }} »
{% endif %} {% endif %} @@ -60,8 +60,11 @@ {% if view == 'home' %}{% if nb_results > 1 %}{% trans "mark all the entries as read" %}{% endif %}{% endif %} - {% if tag %}{% trans "Download the articles from this tag in an epub" %} - {% elseif search_term is defined %}{% trans "Download the articles from this search in an epub" %} + {% if searchterm is defined %} +{% trans "Tag these results as" %} {{ searchterm }}{% endif %} + + {% if tag %}{% trans "Download the articles from this tag in an epub" %} + {% elseif searchterm is defined %}{% trans "Download the articles from this search in an epub" %} {% else %}{% trans "Download the articles from this category in an epub" %}{% endif %} {% endif %} -- cgit v1.2.3