Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

FIX: typo in mixin and incorrect setting description #165

Merged
merged 1 commit into from Sep 18, 2021
Merged

FIX: typo in mixin and incorrect setting description #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/serializers/concerns/topic_answer_mixin.rb
View file
Open in desktop
Expand Up @@ -16,7 +16,7 @@ def include_has_accepted_answer?
def can_have_answer
return true if SiteSetting.allow_solved_on_all_topics
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

def include_can_have_answer?
Expand Down
4 changes: 2 additions & 2 deletions config/locales/server.en.yml
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@ en:

site_settings:
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)"
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"
Expand All @@ -13,7 +13,7 @@ en:
disable_solved_education_message: "Disable education message for solved topics."
accept_solutions_topic_author: "Allow the topic author to accept a solution."
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:
accepted_solutions:
Expand Down