discourse/discourse
1
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-06 03:09:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: filterPlaceholder is a computed property

Browse Source 
These cannot be overridden.
This commit is contained in:
Robin Ward 2020-07-15 13:22:58 -04:00
parent 16766a5d62
commit 72c5a389eb
5 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/app/templates/bulk-tag.hbs
View File

@ -1,5 +1,5 @@
<p>{{i18n (concat "topics.bulk." title)}}</p> <p>{{i18n (concat "topics.bulk." title)}}</p>
<p>{{tag-chooser filterPlaceholder=null tags=tags categoryId=categoryId}}</p> <p>{{tag-chooser tags=tags categoryId=categoryId}}</p>
{{d-button action=action disabled=emptyTags label=(concat "topics.bulk." label)}} {{d-button action=action disabled=emptyTags label=(concat "topics.bulk." label)}}

1
app/assets/javascripts/discourse/app/templates/components/search-advanced-options.hbs
View File

@ -48,7 +48,6 @@
{{tag-chooser {{tag-chooser
tags=searchedTerms.tags tags=searchedTerms.tags
allowCreate=false allowCreate=false
filterPlaceholder=null
everyTag=true everyTag=true
unlimitedTagCount=true unlimitedTagCount=true
onChange=(action (mut searchedTerms.tags)) onChange=(action (mut searchedTerms.tags))

4
app/assets/javascripts/discourse/app/templates/components/tag-groups-form.hbs
View File

@ -8,7 +8,6 @@
tags=buffered.tag_names tags=buffered.tag_names
everyTag=true everyTag=true
allowCreate=true allowCreate=true
filterPlaceholder="tagging.groups.tags_placeholder"
unlimitedTagCount=true unlimitedTagCount=true
excludeSynonyms=true}} excludeSynonyms=true}}
</section> </section>
@ -20,8 +19,7 @@
everyTag=true everyTag=true
maximum=1 maximum=1
allowCreate=true allowCreate=true
excludeSynonyms=true excludeSynonyms=true}}
filterPlaceholder="tagging.groups.parent_tag_placeholder"}}
<span class="description">{{i18n "tagging.groups.parent_tag_description"}}</span> <span class="description">{{i18n "tagging.groups.parent_tag_description"}}</span>
</section> </section>

4
app/assets/javascripts/discourse/app/templates/preferences/tags.hbs
View File

@ -7,7 +7,6 @@
{{tag-chooser {{tag-chooser
tags=model.watched_tags tags=model.watched_tags
blacklist=selectedTags blacklist=selectedTags
filterPlaceholder="select_kit.filter_placeholder"
allowCreate=false allowCreate=false
everyTag=true everyTag=true
unlimitedTagCount=true unlimitedTagCount=true
@ -21,7 +20,6 @@
{{tag-chooser {{tag-chooser
tags=model.tracked_tags tags=model.tracked_tags
blacklist=selectedTags blacklist=selectedTags
filterPlaceholder="select_kit.filter_placeholder"
allowCreate=false allowCreate=false
everyTag=true everyTag=true
unlimitedTagCount=true}} unlimitedTagCount=true}}
@ -34,7 +32,6 @@
{{tag-chooser {{tag-chooser
tags=model.watching_first_post_tags tags=model.watching_first_post_tags
blacklist=selectedTags blacklist=selectedTags
filterPlaceholder="select_kit.filter_placeholder"
allowCreate=false allowCreate=false
everyTag=true everyTag=true
unlimitedTagCount=true}} unlimitedTagCount=true}}
@ -49,7 +46,6 @@
{{tag-chooser {{tag-chooser
tags=model.muted_tags tags=model.muted_tags
blacklist=selectedTags blacklist=selectedTags
filterPlaceholder="select_kit.filter_placeholder"
allowCreate=false allowCreate=false
everyTag=true everyTag=true
unlimitedTagCount=true}} unlimitedTagCount=true}}

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

@ -3355,9 +3355,7 @@ en:
about: "Add tags to groups to manage them more easily." about: "Add tags to groups to manage them more easily."
new: "New Group" new: "New Group"
tags_label: "Tags in this group:" tags_label: "Tags in this group:"
tags_placeholder: "tags"
parent_tag_label: "Parent tag:" parent_tag_label: "Parent tag:"
parent_tag_placeholder: "Optional"
parent_tag_description: "Tags from this group can't be used unless the parent tag is present." parent_tag_description: "Tags from this group can't be used unless the parent tag is present."
one_per_topic_label: "Limit one tag per topic from this group" one_per_topic_label: "Limit one tag per topic from this group"
new_name: "New Tag Group" new_name: "New Tag Group"