Merge branch 'threadsafe_requestholder' into update_django

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

diff --git a/forum/settings/repgain.py b/forum/settings/repgain.py
index f78120d010ad8f6bd4824502e7a6e0ccd4e59dd0..8326757cf47bcdadc8ef2d59910fdb911a121d1b 100644 (file)
--- a/forum/settings/repgain.py
+++ b/forum/settings/repgain.py
@@ -1,64 +1,49 @@
-from base import Setting, SettingSet\r
-from django.utils.translation import ugettext_lazy as _\r
-\r
-REP_GAIN_SET = SettingSet('repgain', _('Reputation gains and losses config'), _("Configure the reputation points a user may gain or lose upon certain actions."), 200)\r
-\r
-INITIAL_REP = Setting('INITIAL_REP', 1, REP_GAIN_SET, dict(\r
-label = _("Initial reputation"),\r
-help_text = _("The initial reputation an user gets when he first signs in.")))\r
-\r
-MAX_REP_BY_UPVOTE_DAY = Setting('MAX_REP_BY_UPVOTE_DAY', 200, REP_GAIN_SET, dict(\r
-label = "Max rep by up votes / day",\r
-help_text = _("Maximum reputation a user can gain in one day for being upvoted.")))\r
-\r
-REP_GAIN_BY_UPVOTED = Setting('REP_GAIN_BY_UPVOTED', 10, REP_GAIN_SET, dict(\r
-label = _("Rep gain by upvoted"),\r
-help_text = _("Reputation a user gains for having one of his posts up voted.")))\r
-\r
-REP_LOST_BY_UPVOTE_CANCELED = Setting('REP_LOST_BY_UPVOTE_CANCELED', 10, REP_GAIN_SET, dict(\r
-label = _("Rep lost bu upvote canceled"),\r
-help_text = _("Reputation a user loses for having one of the upvotes on his posts canceled.")))\r
-\r
-REP_LOST_BY_DOWNVOTED = Setting('REP_LOST_BY_DOWNVOTED', 2, REP_GAIN_SET, dict(\r
-label = _("Rep lost by downvoted"),\r
-help_text = _("Reputation a user loses for having one of his posts down voted.")))\r
-\r
-REP_LOST_BY_DOWNVOTING = Setting('REP_LOST_BY_DOWNVOTING', 1, REP_GAIN_SET, dict(\r
-label = _("Rep lost by downvoting"),\r
-help_text = _("Reputation a user loses for down voting a post.")))\r
-\r
-REP_GAIN_BY_DOWNVOTE_CANCELED = Setting('REP_GAIN_BY_DOWNVOTE_CANCELED', 2, REP_GAIN_SET, dict(\r
-label = _("Rep gain by downvote canceled"),\r
-help_text = _("Reputation a user gains for having one of the downvotes on his posts canceled.")))\r
-\r
-REP_GAIN_BY_CANCELING_DOWNVOTE = Setting('REP_GAIN_BY_CANCELING_DOWNVOTE', 1, REP_GAIN_SET, dict(\r
-label = _("Rep gain by canceling downvote"),\r
-help_text = _("Reputation a user gains for canceling a downvote.")))\r
-\r
-REP_GAIN_BY_ACCEPTED = Setting('REP_GAIN_BY_ACCEPTED', 15, REP_GAIN_SET, dict(\r
-label = _("Rep gain by accepted answer"),\r
-help_text = _("Reputation a user gains for having one of his answers accepted.")))\r
-\r
-REP_LOST_BY_ACCEPTED_CANCELED = Setting('REP_LOST_BY_ACCEPTED_CANCELED', 15, REP_GAIN_SET, dict(\r
-label = _("Rep lost by accepted canceled"),\r
-help_text = _("Reputation a user loses for having one of his accepted answers canceled.")))\r
-\r
-REP_GAIN_BY_ACCEPTING = Setting('REP_GAIN_BY_ACCEPTING', 2, REP_GAIN_SET, dict(\r
-label = _("Rep gain by accepting answer"),\r
-help_text = _("Reputation a user gains for accepting an answer to one of his questions.")))\r
-\r
-REP_LOST_BY_CANCELING_ACCEPTED = Setting('REP_LOST_BY_CANCELING_ACCEPTED', 2, REP_GAIN_SET, dict(\r
-label = _("Rep lost by canceling accepted"),\r
-help_text = _("Reputation a user loses by canceling an accepted answer.")))\r
-\r
-REP_LOST_BY_FLAGGED = Setting('REP_LOST_BY_FLAGGED', 2, REP_GAIN_SET, dict(\r
-label = _("Rep lost by post flagged"),\r
-help_text = _("Reputation a user loses by having one of his posts flagged.")))\r
-\r
-REP_LOST_BY_FLAGGED_3_TIMES = Setting('REP_LOST_BY_FLAGGED_3_TIMES', 30, REP_GAIN_SET, dict(\r
-label = _("Rep lost by post flagged and hidden"),\r
-help_text = _("Reputation a user loses by having the last revision of one of his posts flagged the enough number of times to hide the post.")))\r
-\r
-REP_LOST_BY_FLAGGED_5_TIMES = Setting('REP_LOST_BY_FLAGGED_5_TIMES', 100, REP_GAIN_SET, dict(\r
-label = _("Rep lost by post flagged and deleted"),\r
+from base import Setting, SettingSet
+from django.utils.translation import ugettext_lazy as _
+
+REP_GAIN_SET = SettingSet('repgain', _('Reputation gains and losses config'), _("Configure the reputation points a user may gain or lose upon certain actions."), 200)
+
+INITIAL_REP = Setting('INITIAL_REP', 1, REP_GAIN_SET, dict(
+label = _("Initial reputation"),
+help_text = _("The initial reputation an user gets when he first signs in.")))
+
+MAX_REP_BY_UPVOTE_DAY = Setting('MAX_REP_BY_UPVOTE_DAY', 200, REP_GAIN_SET, dict(
+label = "Max rep by up votes / day",
+help_text = _("Maximum reputation a user can gain in one day for being upvoted.")))
+
+REP_GAIN_BY_EMAIL_VALIDATION = Setting('REP_GAIN_BY_EMAIL_VALIDATION', 10, REP_GAIN_SET, dict(
+label = _("Rep gain by e-mail validation"),
+help_text = _("Reputation a user gains for validating his e-mail.")))
+
+REP_GAIN_BY_UPVOTED = Setting('REP_GAIN_BY_UPVOTED', 10, REP_GAIN_SET, dict(
+label = _("Rep gain by upvoted"),
+help_text = _("Reputation a user gains for having one of his posts up voted.")))
+
+REP_LOST_BY_DOWNVOTED = Setting('REP_LOST_BY_DOWNVOTED', 2, REP_GAIN_SET, dict(
+label = _("Rep lost by downvoted"),
+help_text = _("Reputation a user loses for having one of his posts down voted.")))
+
+REP_LOST_BY_DOWNVOTING = Setting('REP_LOST_BY_DOWNVOTING', 1, REP_GAIN_SET, dict(
+label = _("Rep lost by downvoting"),
+help_text = _("Reputation a user loses for down voting a post.")))
+
+
+REP_GAIN_BY_ACCEPTED = Setting('REP_GAIN_BY_ACCEPTED', 15, REP_GAIN_SET, dict(
+label = _("Rep gain by accepted answer"),
+help_text = _("Reputation a user gains for having one of his answers accepted.")))
+
+REP_GAIN_BY_ACCEPTING = Setting('REP_GAIN_BY_ACCEPTING', 2, REP_GAIN_SET, dict(
+label = _("Rep gain by accepting answer"),
+help_text = _("Reputation a user gains for accepting an answer to one of his questions.")))
+
+REP_LOST_BY_FLAGGED = Setting('REP_LOST_BY_FLAGGED', 2, REP_GAIN_SET, dict(
+label = _("Rep lost by post flagged"),
+help_text = _("Reputation a user loses by having one of his posts flagged.")))
+
+REP_LOST_BY_FLAGGED_3_TIMES = Setting('REP_LOST_BY_FLAGGED_3_TIMES', 30, REP_GAIN_SET, dict(
+label = _("Rep lost by post flagged and hidden"),
+help_text = _("Reputation a user loses by having the last revision of one of his posts flagged the enough number of times to hide the post.")))
+
+REP_LOST_BY_FLAGGED_5_TIMES = Setting('REP_LOST_BY_FLAGGED_5_TIMES', 100, REP_GAIN_SET, dict(
+label = _("Rep lost by post flagged and deleted"),
 help_text = _("Reputation a user loses by having the last revision of one of his posts flagged the enough number of times to delete the post.")))
\ No newline at end of file