Fixed some translation issues. Changed default captcha setting to "off" to pass tests. Removed the maximum page scale. This refs #36 and fixes #26, #2

boards/locale/ru/LC_MESSAGES/django.po

@@ -7,7 +7,7 b' msgid ""'
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-09 17:35+0300\n"
+"POT-Creation-Date: 2013-06-10 22:27+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -18,115 +18,119 b' msgstr ""'
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: templates/base.html:27
+#: templates/boards/base.html:27
 msgid "All threads"
 msgstr "Все темы"
 
-#: templates/base.html:33
+#: templates/boards/base.html:33
 msgid "Settings"
 msgstr "Настройки"
 
-#: templates/base.html:40
+#: templates/boards/base.html:40
 msgid "Up"
 msgstr "Вверх"
 
-#: templates/posting_general.html:18
+#: templates/boards/posting_general.html:18
 msgid "Tag: "
 msgstr "Тег: "
 
-#: templates/posting_general.html:35 templates/posting_general.html.py:79
-#: templates/thread.html:27
+#: templates/boards/posting_general.html:35
+#: templates/boards/posting_general.html:79 templates/boards/thread.html:27
 #, fuzzy
 msgid "Post image"
 msgstr "Изображение сообщения"
 
-#: templates/posting_general.html:46
+#: templates/boards/posting_general.html:46
 msgid "Reply"
 msgstr "Ответ"
 
-#: templates/posting_general.html:53 templates/thread.html:107
+#: templates/boards/posting_general.html:53 templates/boards/thread.html:107
 msgid "replies"
 msgstr "ответов"
 
-#: templates/posting_general.html:54 templates/thread.html:108
+#: templates/boards/posting_general.html:54 templates/boards/thread.html:108
 msgid "images"
 msgstr "изображений"
 
-#: templates/posting_general.html:56 templates/posting_general.html.py:127
-#: templates/thread.html:49
+#: templates/boards/posting_general.html:56
+#: templates/boards/posting_general.html:127 templates/boards/thread.html:49
 msgid "Tags"
 msgstr "Теги"
 
-#: templates/posting_general.html:109
+#: templates/boards/posting_general.html:109
 msgid "Create new thread"
 msgstr "Создать новую тему"
 
-#: templates/posting_general.html:112 templates/thread.html:71
+#: templates/boards/posting_general.html:112 templates/boards/thread.html:71
 msgid "Title"
 msgstr "Заголовок"
 
-#: templates/posting_general.html:117 templates/thread.html:76
+#: templates/boards/posting_general.html:117 templates/boards/thread.html:76
 msgid "Text"
 msgstr "Текст"
 
-#: templates/posting_general.html:122 templates/thread.html:81
+#: templates/boards/posting_general.html:122 templates/boards/thread.html:81
 msgid "Image"
 msgstr "Изображение"
 
-#: templates/posting_general.html:136 templates/thread.html:91
+#: templates/boards/posting_general.html:136 templates/boards/thread.html:91
 msgid "Post"
 msgstr "Отправить"
 
-#: templates/posting_general.html:152
-#, fuzzy
+#: templates/boards/posting_general.html:138
+msgid "Tags must be delimited by spaces. Text or image is required."
+msgstr ""
+"Теги должны быть разделены пробелами. Текст или изображение обязательны."
+
+#: templates/boards/posting_general.html:141 templates/boards/thread.html:93
+msgid "Basic markdown syntax."
+msgstr "Базовый синтаксис markdown."
+
+#: templates/boards/posting_general.html:152
 msgid "Pages:"
 msgstr "Страницы: "
 
-#: templates/settings.html:13
+#: templates/boards/settings.html:13
 msgid "Theme"
 msgstr "Тема"
 
-#: templates/settings.html:29
+#: templates/boards/settings.html:29
 msgid "Save"
 msgstr "Сохранить"
 
-#: templates/tags.html:7
+#: templates/boards/tags.html:7
 msgid "tags"
 msgstr "тегов"
 
-#: templates/thread.html:39
+#: templates/boards/thread.html:39
 msgid "Get!"
 msgstr "Гет!"
 
-#: templates/thread.html:68
+#: templates/boards/thread.html:68
 msgid "Reply to thread"
 msgstr "Ответить в тему"
 
-#: templates/thread.html:93
-msgid "Basic markdown syntax."
-msgstr "Базовый синтаксис markdown."
-
-#: templates/thread.html:94
+#: templates/boards/thread.html:94
 msgid "Example: "
 msgstr "Пример: "
 
-#: templates/thread.html:94
+#: templates/boards/thread.html:94
 msgid "italic"
 msgstr "курсив"
 
-#: templates/thread.html:95
+#: templates/boards/thread.html:95
 msgid "bold"
 msgstr "полужирный"
 
-#: templates/thread.html:96
+#: templates/boards/thread.html:96
 msgid "Quotes can be inserted with"
 msgstr "Цитаты могут быть вставлены при помощи"
 
-#: templates/thread.html:97
+#: templates/boards/thread.html:97
 msgid "Links to answers can be inserted with"
 msgstr "Ссылки на ответы могут быть вставлены с помощью"
 
-#: templates/thread.html:109
+#: templates/boards/thread.html:109
 msgid "Last update: "
 msgstr "Последнее обновление: "
 
@@ -135,7 +139,3 b' msgstr "\xd0\x9f\xd0\xbe\xd1\x81\xd0\xbb\xd0\xb5\xd0\xb4\xd0\xbd\xd0\xb5\xd0\xb5 \xd0\xbe\xd0\xb1\xd0\xbd\xd0\xbe\xd0\xb2\xd0\xbb\xd0\xb5\xd0\xbd\xd0\xb8\xd0\xb5: "'
 
 #~ msgid "gets"
 #~ msgstr "гетов"
-
-#~ msgid "Tags must be delimited by spaces. Text or image is required."
-#~ msgstr ""
-#~ "Теги должны быть разделены пробелами. Текст или изображение обязательны."

boards/models.py

@@ -22,7 +22,7 b' NO_PARENT = -1'
 NO_IP = '0.0.0.0'
 UNKNOWN_UA = ''
 ALL_PAGES = -1
-OPENING_POST_WEIGHT = 5
+OPENING_POST_POPULARITY_WEIGHT = 2
 IMAGES_DIRECTORY = 'images/'
 FILE_EXTENSION_DELIMITER = '.'
 
@@ -187,7 +187,7 b' class Tag(models.Model):'
         reply_count = 0
         for post in posts_with_tag:
             reply_count += post.get_reply_count()
-            reply_count += OPENING_POST_WEIGHT
+            reply_count += OPENING_POST_POPULARITY_WEIGHT
 
         return reply_count
 

boards/templates/boards/base.html

@@ -8,7 +8,7 b''
           href="{{ STATIC_URL }}css/jquery.fancybox.css" media="all"/>
     <link rel="stylesheet" type="text/css"
           href="{{ STATIC_URL }}css/{{ theme }}/base_page.css" media="all"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1"/>
     {% block head %}{% endblock %}
 </head>
 <body>

boards/templates/boards/posting_general.html

@@ -134,11 +134,11 b''
         </div>
         <div class="form-submit">
             <input type="submit" value="{% trans "Post" %}"/></div>
-        <div>Tags must be delimited by spaces. Text or image is required
-            </div>
-        <div>Use <a
-                href="http://daringfireball.net/projects/markdown/basics">
-            markdown</a> syntax for posting.</div>
+        <div>
+            {% trans 'Tags must be delimited by spaces. Text or image is required.' %}
+        </div>
+        <div><a href="http://daringfireball.net/projects/markdown/basics">
+            {% trans 'Basic markdown syntax.' %}</a></div>
     </div>
     </form>
 
@@ -148,7 +148,7 b''
 
     <span class="metapanel">
         <b><a href="https://bitbucket.org/neko259/neboard/">Neboard</a>
-            2013-05 (dev)</b>
+            pre1.0</b>
         {% trans "Pages:" %}
         {% for page in pages %}
             [<a href="

neboard/settings.py

@@ -192,4 +192,4 b" DEFAULT_THEME = 'md'"
 POPULAR_TAGS = 10
 LAST_REPLIES_COUNT = 3
 
-ENABLE_CAPTCHA = True
  No newline at end of file
+ENABLE_CAPTCHA = False
  No newline at end of file