github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-23 22:51:06 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: too_few_topics_notice check and message should use basic_requires_read_posts site setting

Browse Source
This commit is contained in:
Neil Lalonde
2014-07-25 15:58:16 -04:00
parent 4101a396ad
commit 46bdd13491
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse.js
View File

@ -152,8 +152,8 @@ window.Discourse = Ember.Application.createWithMixins(Discourse.Ajax, {
post_count += c.get('post_count'); post_count += c.get('post_count');
} }
}); });
if (topic_count < 5 || post_count < 50) { if (topic_count < 5 || post_count < Discourse.SiteSettings.basic_requires_read_posts) {
notices.push(I18n.t("too_few_topics_notice")); notices.push(I18n.t("too_few_topics_notice", {posts: Discourse.SiteSettings.basic_requires_read_posts}));
} }
} }

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

@ -490,7 +490,7 @@ en:
read_only_mode: read_only_mode:
enabled: "An administrator enabled read-only mode. You can continue to browse the site but interactions may not work." enabled: "An administrator enabled read-only mode. You can continue to browse the site but interactions may not work."
login_disabled: "Login is disabled while the site is in read only mode." login_disabled: "Login is disabled while the site is in read only mode."
too_few_topics_notice: "Create at least 5 public topics and 30 public posts to get discussion started. New users will not be able to earn trust levels unless there's content for them to read." too_few_topics_notice: "Create at least 5 public topics and %{posts} public posts to get discussion started. New users will not be able to earn trust levels unless there's content for them to read."
learn_more: "learn more..." learn_more: "learn more..."

4
config/site_settings.yml
View File

@ -453,7 +453,9 @@ trust:
default: 1 default: 1
enum: 'TrustLevelSetting' enum: 'TrustLevelSetting'
basic_requires_topics_entered: 5 basic_requires_topics_entered: 5
basic_requires_read_posts: 30 basic_requires_read_posts:
default: 30
client: true
basic_requires_time_spent_mins: 10 basic_requires_time_spent_mins: 10
regular_requires_topics_entered: 20 regular_requires_topics_entered: 20
regular_requires_read_posts: 100 regular_requires_read_posts: 100