From 1fd3b5cc4ff7c6583afe9bedfd0a5d84d034bbea Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 24 Jan 2018 17:41:26 +0100
Subject: [PATCH] FIX: improvements to category-drop when used with a
 subcategory

---
 .../select-kit/templates/components/category-row.hbs       | 7 +++++--
 config/locales/client.en.yml                               | 2 +-
 config/locales/client.fr.yml                               | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/select-kit/templates/components/category-row.hbs b/app/assets/javascripts/select-kit/templates/components/category-row.hbs
index 980a43c306b..985fe9cd74a 100644
--- a/app/assets/javascripts/select-kit/templates/components/category-row.hbs
+++ b/app/assets/javascripts/select-kit/templates/components/category-row.hbs
@@ -1,8 +1,11 @@
 {{#if category}}
     {{#if hasParentCategory}}
       <div class="category-status">
-        {{badgeForParentCategory}} {{badgeForCategory}}
-        <span class="topic-count">&times; {{topicCount}}</span>
+        {{#unless hideParentCategory}}
+          {{badgeForParentCategory}}
+        {{/unless}}
+        {{badgeForCategory}}
+        <span class="topic-count">{{topicCount}}</span>
       </div>
     {{else}}
       <div class="category-status">
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index d3c2e529daf..6d8082a229e 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -520,7 +520,7 @@ en:
 
     categories:
       all: "all categories"
-      all_subcategories: "all"
+      all_subcategories: "all in %{categoryName}"
       no_subcategory: "none"
       category: "Category"
       category_list: "Display category list"
diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml
index 761149dec2a..a7f36511ad6 100644
--- a/config/locales/client.fr.yml
+++ b/config/locales/client.fr.yml
@@ -460,7 +460,7 @@ fr:
       '14': "En attente"
     categories:
       all: "toutes les catégories"
-      all_subcategories: "toutes"
+      all_subcategories: "toutes dans %{categoryName}"
       no_subcategory: "aucune"
       category: "Catégorie"
       category_list: "Afficher la liste des catégories"