merge notification-config -> trunk, previous commits 695, 751 (email debugging inform...

[osqa.git] / forum / settings / minrep.py

diff --git a/forum/settings/minrep.py b/forum/settings/minrep.py
index 579215dd6194ce2a57a16ba73dfb82615f7afa1d..820682345ace7bef79d8bd2e579807ebf52aec3b 100644 (file)
--- a/forum/settings/minrep.py
+++ b/forum/settings/minrep.py
@@ -3,6 +3,10 @@ from django.utils.translation import ugettext_lazy as _
 \r
 MIN_REP_SET = SettingSet('minrep', _('Minimum reputation config'), _("Configure the minimum reputation required to perform certain actions on your site."), 300)\r
 \r
 \r
 MIN_REP_SET = SettingSet('minrep', _('Minimum reputation config'), _("Configure the minimum reputation required to perform certain actions on your site."), 300)\r
 \r

+CAPTCHA_IF_REP_LESS_THAN = Setting('CAPTCHA_IF_REP_LESS_THAN', 0, MIN_REP_SET, dict(\r
+label = _("Show captcha if user with less reputation than"),\r
+help_text = _("If the user has less reputation, captcha is used to when adding new content.")))\r
+\r

 REP_TO_VOTE_UP = Setting('REP_TO_VOTE_UP', 15, MIN_REP_SET, dict(\r
 label = _("Minimum reputation to vote up"),\r
 help_text = _("The minimum reputation an user must have to be allowed to vote up.")))\r
 REP_TO_VOTE_UP = Setting('REP_TO_VOTE_UP', 15, MIN_REP_SET, dict(\r
 label = _("Minimum reputation to vote up"),\r
 help_text = _("The minimum reputation an user must have to be allowed to vote up.")))\r


@@ -27,6 +31,10 @@ REP_TO_UPLOAD = Setting('REP_TO_UPLOAD', 60, MIN_REP_SET, dict(
 label = _("Minimum reputation to upload"),\r
 help_text = _("The minimum reputation an user must have to be allowed to upload a file.")))\r
 \r
 label = _("Minimum reputation to upload"),\r
 help_text = _("The minimum reputation an user must have to be allowed to upload a file.")))\r
 \r

+REP_TO_CREATE_TAGS = Setting('REP_TO_CREATE_TAGS', 250, MIN_REP_SET, dict(\r
+label = _("Minimum reputation to create tags"),\r
+help_text = _("The minimum reputation an user must have to be allowed to create new tags.")))\r
+\r

 REP_TO_CLOSE_OWN = Setting('REP_TO_CLOSE_OWN', 250, MIN_REP_SET, dict(\r
 label = _("Minimum reputation to close own question"),\r
 help_text = _("The minimum reputation an user must have to be allowed to close his own question.")))\r
 REP_TO_CLOSE_OWN = Setting('REP_TO_CLOSE_OWN', 250, MIN_REP_SET, dict(\r
 label = _("Minimum reputation to close own question"),\r
 help_text = _("The minimum reputation an user must have to be allowed to close his own question.")))\r


@@ -63,6 +71,14 @@ REP_TO_CONVERT_TO_COMMENT = Setting('REP_TO_CONVERT_TO_COMMENT', 2000, MIN_REP_S
 label = _("Minimum reputation to convert answers to comment"),\r
 help_text = _("The minimum reputation an user must have to be allowed to convert an answer into a comment.")))\r
 \r
 label = _("Minimum reputation to convert answers to comment"),\r
 help_text = _("The minimum reputation an user must have to be allowed to convert an answer into a comment.")))\r
 \r

+REP_TO_CONVERT_COMMENTS_TO_ANSWERS = Setting('REP_TO_CONVERT_COMMENTS_TO_ANSWERS', 2000, MIN_REP_SET, dict(\r
+label = _("Minimum reputation to convert comments to answers"),\r
+help_text = _("The minimum reputation an user must have to be allowed to convert comments into an answer.")))\r
+\r
+REP_TO_CONVERT_TO_QUESTION = Setting('REP_TO_CONVERT_TO_QUESTION', 2000, MIN_REP_SET, dict(\r
+label = _("Minimum reputation to convert answers to questions"),\r
+help_text = _("The minimum reputation an user must have to be allowed to convert an answer into a question.")))\r
+\r

 REP_TO_VIEW_FLAGS = Setting('REP_TO_VIEW_FLAGS', 2000, MIN_REP_SET, dict(\r
 label = _("Minimum reputation to view offensive flags"),\r
 help_text = _("The minimum reputation an user must have to view offensive flags.")))\r
 REP_TO_VIEW_FLAGS = Setting('REP_TO_VIEW_FLAGS', 2000, MIN_REP_SET, dict(\r
 label = _("Minimum reputation to view offensive flags"),\r
 help_text = _("The minimum reputation an user must have to view offensive flags.")))\r


@@ -71,4 +87,4 @@ help_text = _("The minimum reputation an user must have to view offensive flags.
 #label = _("Minimum reputation to disable nofollow"),\r
 #help_text = _("""\r
 #The minimum reputation an user must have to be allowed to disable the nofollow attribute of a post link.\r
 #label = _("Minimum reputation to disable nofollow"),\r
 #help_text = _("""\r
 #The minimum reputation an user must have to be allowed to disable the nofollow attribute of a post link.\r

-#""")))
\ No newline at end of file
+#""")))\r