From 16ea6b027a80fce2ddfe812917fefc147d769dbc Mon Sep 17 00:00:00 2001
From: Florian Charlier <flch@odoo.com>
Date: Mon, 9 Oct 2023 15:46:09 +0000
Subject: [PATCH] [FIX] website_forum: fix no_results_message translatability
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. The "unsolved", "unanswered", "answered" were not translatable.
  In another language, we would have "unsolved" appear in the middle
  of the "sentence"
2. The sentences were chunked. Like "There are no" and "results".
  This works in English, but in another language, maybe one needs
  to translate this differently from "there are no" + "unsolved" + "results'.
  If the grammar of that language is "There are no" + "results" + "unsolved"
  translating each chunk directly and keeping them at the same place won't
  be grammatically correct, if only it makes sense.

This will also have the beneficial side effect of making them more extensible.

Additionally, fix a typo.

task-3546506

closes odoo/odoo#138461

X-original-commit: 8eae73d806aec2f3b93c576ad4573b4d74510f2a
Signed-off-by: Warnon Aurélien (awa) <awa@odoo.com>
Signed-off-by: Florian Charlier (flch) <flch@odoo.com>
---
 addons/website_forum/i18n/website_forum.pot   | 20 +++++++++++++++++++
 .../views/forum_forum_templates.xml           |  2 +-
 .../views/forum_forum_templates_layout.xml    | 13 +++++++++++-
 3 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/addons/website_forum/i18n/website_forum.pot b/addons/website_forum/i18n/website_forum.pot
index fb529db7baa..d19e98722ea 100644
--- a/addons/website_forum/i18n/website_forum.pot
+++ b/addons/website_forum/i18n/website_forum.pot
@@ -3118,6 +3118,26 @@ msgstr ""
 msgid "Sorry, we could not find any <b>%s</b> result <b>%s</b> %s%s%s."
 msgstr ""
 
+#. module: website_forum
+#: model_terms:ir.ui.view,arch_db:website_forum.no_results_message
+msgid "Sorry, we could not find any <b>solved</b> results"
+msgstr ""
+
+#. module: website_forum
+#: model_terms:ir.ui.view,arch_db:website_forum.no_results_message
+msgid "Sorry, we could not find any <b>unanswered</b> results"
+msgstr ""
+
+#. module: website_forum
+#: model_terms:ir.ui.view,arch_db:website_forum.no_results_message
+msgid "Sorry, we could not find any <b>unsolved</b> results"
+msgstr ""
+
+#. module: website_forum
+#: model_terms:ir.ui.view,arch_db:website_forum.no_results_message
+msgid "Sorry, we could not find any results"
+msgstr ""
+
 #. module: website_forum
 #. odoo-javascript
 #: code:addons/website_forum/static/src/js/website_forum.js:0
diff --git a/addons/website_forum/views/forum_forum_templates.xml b/addons/website_forum/views/forum_forum_templates.xml
index 664f1e7df43..823b6eb86a1 100644
--- a/addons/website_forum/views/forum_forum_templates.xml
+++ b/addons/website_forum/views/forum_forum_templates.xml
@@ -236,7 +236,7 @@
                         <t t-set="btn_classes" t-value="'px-2'"/>
                     </t>
                     <a t-attf-class="#{ 'disabled' if len(tag.post_ids) == 0  else '' } btn-link #{ 'text-dark fw-bold' if tag.message_is_follower else '' }"
-                       t-attf-href="/forum/#{ slug(forum) }/tag/#{ slug(tag) }/questions?#{ keep_query(filters='tag') }}">
+                       t-attf-href="/forum/#{ slug(forum) }/tag/#{ slug(tag) }/questions?#{ keep_query(filters='tag') }">
                         <t t-out="tag.name"/>&amp;nbsp;
                         <span class="small">(<t t-out="tag.posts_count"/>)</span>
                     </a>
diff --git a/addons/website_forum/views/forum_forum_templates_layout.xml b/addons/website_forum/views/forum_forum_templates_layout.xml
index bb3f061a5c9..97a214a888f 100644
--- a/addons/website_forum/views/forum_forum_templates_layout.xml
+++ b/addons/website_forum/views/forum_forum_templates_layout.xml
@@ -382,7 +382,18 @@
             <h5 t-out="_no_results_title"/>
             <span t-if="result_msg" t-out="result_msg"/>
             <span t-else="">
-                Sorry, we could not find any <b t-if="filters in ['unanswered', 'solved', 'unsolved']" t-out="filters"/> results
+                <t t-if="filters == 'unanswered'">
+                    Sorry, we could not find any <b>unanswered</b> results
+                </t>
+                <t t-elif="filters == 'solved'">
+                    Sorry, we could not find any <b>solved</b> results
+                </t>
+                <t t-elif="filters == 'unsolved'">
+                    Sorry, we could not find any <b>unsolved</b> results
+                </t>
+                <t t-else="">
+                    Sorry, we could not find any results
+                </t>
                 <b t-if="my == 'favourites'"> in your favourites</b>
                 <b t-elif="my == 'mine'"> in your posts</b>
                 <span t-if="search">matching "<em class="fw-bold text-break" t-out="original_search or search"/>"</span>