From ca020224af9a58035012f96ddca499c78bc9982b Mon Sep 17 00:00:00 2001
From: piskvorky <radimrehurek@seznam.cz>
Date: Sat, 17 Dec 2011 08:41:14 +0100
Subject: added min settings to javascript

---
 askbot/forms.py                                      |  6 ++----
 askbot/skins/common/media/js/post.js                 | 17 ++++++-----------
 askbot/skins/default/templates/meta/editor_data.html |  2 ++
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/askbot/forms.py b/askbot/forms.py
index e0c24cfd..cc2a4ef3 100644
--- a/askbot/forms.py
+++ b/askbot/forms.py
@@ -107,8 +107,7 @@ class TitleField(forms.CharField):
 
     def clean(self, value):
         if len(value) < askbot_settings.MIN_TITLE_LENGTH:
-            msg = ungettext_lazy('title must be > %(min_len) characters'
-                  ) % {'min_len': askbot_settings.MIN_TITLE_LENGTH}
+            msg = _('title must be > %d characters') % askbot_settings.MIN_TITLE_LENGTH
             raise forms.ValidationError(msg)
 
         return value
@@ -124,8 +123,7 @@ class EditorField(forms.CharField):
 
     def clean(self, value):
         if len(value) < askbot_settings.MIN_EDITOR_LENGTH:
-            msg = ungettext_lazy('question content must be > %(min_len)d characters'
-                  ) % {'min_len': askbot_settings.MIN_EDITOR_LENGTH}
+            msg = _('question content must be > %d characters') % askbot_settings.MIN_EDITOR_LENGTH
             raise forms.ValidationError(msg)
         return value
 
diff --git a/askbot/skins/common/media/js/post.js b/askbot/skins/common/media/js/post.js
index 8f6461d0..958ccf0d 100644
--- a/askbot/skins/common/media/js/post.js
+++ b/askbot/skins/common/media/js/post.js
@@ -111,20 +111,15 @@ var CPValidator = function(){
                     limit_tag_count: true,
                     limit_tag_length: true
                 },
-		/* minimum character settings for the title and text can be set in livesettings (under data entry rules)
                 text: {
-                    required: true,
-                    minlength: 10
+                    minlength: askbot['settings']['minEditorLength']
+                },
+                title: {
+                    minlength: askbot['settings']['minTitleLength']
                 }
-		*/
-                /*title: {
-                    required: true,
-                    minlength: 10
-                }*/
             };
         },
         getQuestionFormMessages: function(){
-            var chars = 10
             return {
                 tags: {
                     required: " " + gettext('tags cannot be empty'),
@@ -134,11 +129,11 @@ var CPValidator = function(){
                 },
                 text: {
                     required: " " + gettext('content cannot be empty'),
-                    minlength: interpolate(gettext('%s content minchars'), [chars])
+                    minlength: interpolate(gettext('%s content minchars'), [askbot['settings']['minEditorLength']])
                 },
                 title: {
                     required: " " + gettext('please enter title'),
-                    minlength: interpolate(gettext('%s title minchars'), [chars])
+                    minlength: interpolate(gettext('%s title minchars'), [askbot['settings']['minTitleLength']])
                 }
             };
         }
diff --git a/askbot/skins/default/templates/meta/editor_data.html b/askbot/skins/default/templates/meta/editor_data.html
index 79ed96fb..7902fe8e 100644
--- a/askbot/skins/default/templates/meta/editor_data.html
+++ b/askbot/skins/default/templates/meta/editor_data.html
@@ -7,4 +7,6 @@
     askbot['messages']['maxTagsPerPost'] = '{% trans tag_count = settings.MAX_TAGS_PER_POST %}please use {{tag_count}} tag{% pluralize %}please use {{tag_count}} tags or less{% endtrans %}';
     askbot['messages']['tagLimits'] = '{% trans tag_count=settings.MAX_TAGS_PER_POST, max_chars=settings.MAX_TAG_LENGTH %}please use up to {{tag_count}} tags, less than {{max_chars}} characters each{% endtrans %}'; 
     askbot['urls']['upload'] = '{% url "upload" %}';
+    askbot['settings']['minTitleLength'] = {{settings.MIN_TITLE_LENGTH}}
+    askbot['settings']['minEditorLength'] = {{settings.MIN_EDITOR_LENGTH}}
 </script>
-- 
cgit v1.2.3-1-g7c22