IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: improvements to category-drop when used with a subcategory

Browse Source
This commit is contained in:
Joffrey JAFFEUX 2018-01-24 17:41:26 +01:00 committed by GitHub
parent 262f795a4b
commit 1fd3b5cc4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/javascripts/select-kit/templates/components/category-row.hbs
View File

@ -1,8 +1,11 @@
{{#if category}} {{#if category}}
{{#if hasParentCategory}} {{#if hasParentCategory}}
<div class="category-status"> <div class="category-status">
{{badgeForParentCategory}} {{badgeForCategory}} {{#unless hideParentCategory}}
<span class="topic-count">&times; {{topicCount}}</span> {{badgeForParentCategory}}
{{/unless}}
{{badgeForCategory}}
<span class="topic-count">{{topicCount}}</span>
</div> </div>
{{else}} {{else}}
<div class="category-status"> <div class="category-status">

2
config/locales/client.en.yml
View File

@ -520,7 +520,7 @@ en:
categories: categories:
all: "all categories" all: "all categories"
all_subcategories: "all" all_subcategories: "all in %{categoryName}"
no_subcategory: "none" no_subcategory: "none"
category: "Category" category: "Category"
category_list: "Display category list" category_list: "Display category list"

2
config/locales/client.fr.yml
View File

@ -460,7 +460,7 @@ fr:
'14': "En attente" '14': "En attente"
categories: categories:
all: "toutes les catégories" all: "toutes les catégories"
all_subcategories: "toutes" all_subcategories: "toutes dans %{categoryName}"
no_subcategory: "aucune" no_subcategory: "aucune"
category: "Catégorie" category: "Catégorie"
category_list: "Afficher la liste des catégories" category_list: "Afficher la liste des catégories"