Discource-C
/
discourse-solved
mirror of https://github.com/discourse/discourse-solved.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: typo in mixin and incorrect setting description (#165) 

`allow_accepted_answer` should be `allow_accepted_answers` (with an `s` at the end) in the `TopicAnswerMixin`.

The `enable_solved_tags` setting description seemed to be using the description intended for `allow_solved_on_all_topics`. Both descriptions have been updated.
This commit is contained in:
tshenry 2021-09-17 18:07:01 -07:00 committed by GitHub
parent 66999ee3fb
commit 55c9fca212
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/serializers/concerns/topic_answer_mixin.rb
View File

@ -16,7 +16,7 @@ module TopicAnswerMixin
def can_have_answer def can_have_answer
return true if SiteSetting.allow_solved_on_all_topics return true if SiteSetting.allow_solved_on_all_topics
return false if object.closed || object.archived return false if object.closed || object.archived
scope.allow_accepted_answer?(object.category_id, object.tags.map(&:name)) scope.allow_accepted_answers?(object.category_id, object.tags.map(&:name))
end end
def include_can_have_answer? def include_can_have_answer?

4
config/locales/server.en.yml
View File

@ -3,7 +3,7 @@ en:
site_settings: site_settings:
solved_enabled: "Enable solved plugin, allow users to select solutions for topics" solved_enabled: "Enable solved plugin, allow users to select solutions for topics"
allow_solved_on_all_topics: "Allow users to select solutions on all topics (by default you control this by editing categories)" allow_solved_on_all_topics: "Allow users to select solutions on all topics (when unchecked, solutions can be enabled per category or tag)"
accept_all_solutions_trust_level: "Minimum trust level required to accept solutions on any topic (even when not OP)" accept_all_solutions_trust_level: "Minimum trust level required to accept solutions on any topic (even when not OP)"
empty_box_on_unsolved: "Display an empty box next to unsolved topics" empty_box_on_unsolved: "Display an empty box next to unsolved topics"
solved_quote_length: "Number of characters to quote when displaying the solution under the first post" solved_quote_length: "Number of characters to quote when displaying the solution under the first post"
@ -13,7 +13,7 @@ en:
disable_solved_education_message: "Disable education message for solved topics." disable_solved_education_message: "Disable education message for solved topics."
accept_solutions_topic_author: "Allow the topic author to accept a solution." accept_solutions_topic_author: "Allow the topic author to accept a solution."
solved_add_schema_markup: "Add QAPage schema markup to HTML." solved_add_schema_markup: "Add QAPage schema markup to HTML."
enable_solved_tags: "Allow users to select solutions on all topics (when unchecked, solutions can be enabled per category or tag)" enable_solved_tags: "Tags that will allow users to select solutions."
reports: reports:
accepted_solutions: accepted_solutions: