From 1b6e21d7a657c87a48efe02a1191d06682c64829 Mon Sep 17 00:00:00 2001 From: tcit Date: Mon, 27 Oct 2014 15:12:46 +0100 Subject: [PATCH] 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 8cebafa31..ecb2a51f8 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 2850b494c8014f7dfd0452efb12dbe897ce0bb7b..5aefe6c14e5a60bde5424a2dca146b3ab353baad 100644 GIT binary patch delta 3695 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 DnM{0y 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 ebde5681b..7a1c88da7 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 638c2135bca84c806f0d010920aebd0801c5d647..da087516d80aed792f03751f1ff39d968c4f8efe 100644 GIT binary patch delta 3998 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 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 811298eb5..ff27db435 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 ce3d38bc9..3ce9b949f 100755 --- a/themes/default/_sorting.twig +++ b/themes/default/_sorting.twig @@ -1,6 +1,6 @@ {% if entries|length > 1 %}
    -
  • {% trans {% trans "by date" %} {% trans
    • -
  • {% trans {% trans "by title" %} {% trans
    • +
  • {% trans {% trans "by date" %} {% trans
    • +
  • {% trans {% trans "by title" %} {% trans
{% endif %} diff --git a/themes/default/home.twig b/themes/default/home.twig index 093c2dc5e..6bc549e6c 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 %}