# HG changeset patch
# User neko259 <neko259@gmail.com>
# Date 2015-11-06 14:17:07
# Node ID 52abbcdea7b72e0ee08f41e2e427f2f69aa694b3
# Parent  18a857a71a1dd954cd47b4551de07cdf11af44fa

Show max file size in the posting templates

diff --git a/boards/locale/ru/LC_MESSAGES/django.mo b/boards/locale/ru/LC_MESSAGES/django.mo
index f512f1dba9e9d8f0cfc8b35c50c24c967d65a3d3..c7d2699824dd79f7214793dbcf1ba68e67c6960c
GIT binary patch
literal 9275
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

diff --git a/boards/locale/ru/LC_MESSAGES/django.po b/boards/locale/ru/LC_MESSAGES/django.po
--- a/boards/locale/ru/LC_MESSAGES/django.po
+++ b/boards/locale/ru/LC_MESSAGES/django.po
@@ -499,3 +499,7 @@ msgstr[2] "Пожалуйста подождите %(delay)d секунд перед отправкой сообщения"
 
 msgid "New threads"
 msgstr "Новые темы"
+
+#, python-format
+msgid "Max file size is %(size)s."
+msgstr "Максимальный размер файла %(size)s."
diff --git a/boards/templates/boards/all_threads.html b/boards/templates/boards/all_threads.html
--- a/boards/templates/boards/all_threads.html
+++ b/boards/templates/boards/all_threads.html
@@ -148,6 +148,9 @@
             </div>
             <div>
                 {% trans 'Tags must be delimited by spaces. Text or image is required.' %}
+                {% with size=max_file_size|filesizeformat %}
+                    {% blocktrans %}Max file size is {{ size }}.{% endblocktrans %}
+                {% endwith %}
             </div>
             <div id="preview-text"></div>
             <div><a href="{% url "staticpage" name="help" %}">{% trans 'Text syntax' %}</a></div>
diff --git a/boards/templates/boards/thread_normal.html b/boards/templates/boards/thread_normal.html
--- a/boards/templates/boards/thread_normal.html
+++ b/boards/templates/boards/thread_normal.html
@@ -54,6 +54,11 @@
                     </form>
                 </div>
                 <div id="preview-text"></div>
+                <div>
+                    {% with size=max_file_size|filesizeformat %}
+                        {% blocktrans %}Max file size is {{ size }}.{% endblocktrans %}
+                    {% endwith %}
+                </div>
                 <div><a href="{% url "staticpage" name="help" %}">
                     {% trans 'Text syntax' %}</a></div>
                 <div><a id="form-close-button" href="#" onClick="resetFormPosition(); return false;">{% trans 'Close form' %}</a></div>
diff --git a/boards/views/all_threads.py b/boards/views/all_threads.py
--- a/boards/views/all_threads.py
+++ b/boards/views/all_threads.py
@@ -15,6 +15,7 @@ from boards.models import Post, Thread, 
 from boards.views.banned import BannedView
 from boards.views.base import BaseBoardView, CONTEXT_FORM
 from boards.views.posting_mixin import PostMixin
+from boards.views.mixins import FileUploadMixin
 
 
 FORM_TAGS = 'tags'
@@ -30,6 +31,7 @@ PARAMETER_PAGINATOR = 'paginator'
 PARAMETER_THREADS = 'threads'
 PARAMETER_BANNERS = 'banners'
 PARAMETER_ADDITIONAL = 'additional_params'
+PARAMETER_MAX_FILE_SIZE = 'max_file_size'
 
 PARAMETER_PREV_LINK = 'prev_page_link'
 PARAMETER_NEXT_LINK = 'next_page_link'
@@ -38,7 +40,7 @@ TEMPLATE = 'boards/all_threads.html'
 DEFAULT_PAGE = 1
 
 
-class AllThreadsView(PostMixin, BaseBoardView):
+class AllThreadsView(PostMixin, FileUploadMixin, BaseBoardView):
 
     def __init__(self):
         self.settings_manager = None
@@ -74,6 +76,7 @@ class AllThreadsView(PostMixin, BaseBoar
         params[PARAMETER_THREADS] = threads
         params[CONTEXT_FORM] = form
         params[PARAMETER_BANNERS] = Banner.objects.order_by('-id').all()
+        params[PARAMETER_MAX_FILE_SIZE] = self.get_max_upload_size()
 
         paginator.set_url(self.get_reverse_url(), request.GET.dict())
         self.get_page_context(paginator, params, page)
diff --git a/boards/views/mixins.py b/boards/views/mixins.py
--- a/boards/views/mixins.py
+++ b/boards/views/mixins.py
@@ -1,3 +1,6 @@
+import boards
+
+
 PARAM_NEXT = 'next'
 PARAMETER_METHOD = 'method'
 
@@ -24,3 +27,8 @@ class DispatcherMixin:
 
         if method_name:
             return getattr(self, method_name)(*args, **kwargs)
+
+
+class FileUploadMixin:
+    def get_max_upload_size(self):
+        return boards.settings.get_int('Forms', 'MaxFileSize')
diff --git a/boards/views/thread/normal.py b/boards/views/thread/normal.py
--- a/boards/views/thread/normal.py
+++ b/boards/views/thread/normal.py
@@ -1,13 +1,15 @@
 from boards.views.thread import ThreadView
+from boards.views.mixins import FileUploadMixin
 
 TEMPLATE_NORMAL = 'boards/thread_normal.html'
 
 CONTEXT_BUMPLIMIT_PRG = 'bumplimit_progress'
 CONTEXT_POSTS_LEFT = 'posts_left'
 CONTEXT_BUMPABLE = 'bumpable'
+PARAM_MAX_FILE_SIZE = 'max_file_size'
 
 
-class NormalThreadView(ThreadView):
+class NormalThreadView(ThreadView, FileUploadMixin):
 
     def get_template(self):
         return TEMPLATE_NORMAL
@@ -26,5 +28,6 @@ class NormalThreadView(ThreadView):
             params[CONTEXT_POSTS_LEFT] = left_posts
             params[CONTEXT_BUMPLIMIT_PRG] = str(
                 float(left_posts) / max_posts * 100)
+        params[PARAM_MAX_FILE_SIZE] = self.get_max_upload_size()
 
         return params