Added placeholders to forms

boards/forms.py

@@ -11,8 +11,13 b' from neboard import settings'
 from boards import utils
 import boards.settings as board_settings
 
-LAST_POST_TIME = "last_post_time"
-LAST_LOGIN_TIME = "last_login_time"
+ATTRIBUTE_PLACEHOLDER = 'placeholder'
+
+LAST_POST_TIME = 'last_post_time'
+LAST_LOGIN_TIME = 'last_login_time'
+TEXT_PLACEHOLDER = _('''Type message here. You can reply to message >>123 like
+ this. 2 new lines are required to start new paragraph.''')
+TAGS_PLACEHOLDER = _('#tag1 #several_words_tag')
 
 
 class FormatPanel(forms.Textarea):
@@ -70,8 +75,9 b' class PostForm(NeboardForm):'
 
     title = forms.CharField(max_length=TITLE_MAX_LENGTH, required=False,
                             label=_('Title'))
-    text = forms.CharField(widget=FormatPanel, required=False,
-                           label=_('Text'))
+    text = forms.CharField(
+        widget=FormatPanel(attrs={ATTRIBUTE_PLACEHOLDER: TEXT_PLACEHOLDER}),
+        required=False, label=_('Text'))
     image = forms.ImageField(required=False, label=_('Image'))
 
     # This field is for spam prevention only
@@ -160,7 +166,9 b' class ThreadForm(PostForm):'
 
     regex_tags = re.compile(ur'^[\w\s\d]+$', re.UNICODE)
 
-    tags = forms.CharField(max_length=100, label=_('Tags'))
+    tags = forms.CharField(
+        widget=forms.TextInput(attrs={ATTRIBUTE_PLACEHOLDER: TAGS_PLACEHOLDER}),
+        max_length=100, label=_('Tags'))
 
     def clean_tags(self):
         tags = self.cleaned_data['tags']

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: 2014-01-06 23:43+0200\n"
+"POT-Creation-Date: 2014-01-12 21:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -34,71 +34,83 b' msgstr "\xd1\x80\xd0\xb0\xd0\xb7\xd1\x80\xd0\xb0\xd0\xb1\xd0\xbe\xd1\x82\xd1\x87\xd0\xb8\xd0\xba javascript"'
 msgid "designer"
 msgstr "дизайнер"
 
-#: forms.py:72
+#: forms.py:16
+msgid ""
+"Type message here. You can reply to message >>123 like\n"
+" this. 2 new lines are required to start new paragraph."
+msgstr ""
+"Введите сообщение здесь. Вы можете ответить на сообщение >>123 вот так. 2 "
+"переноса строки обязательны для создания нового абзаца."
+
+#: forms.py:18
+msgid "#tag1 #several_words_tag"
+msgstr "#тег1 #тег_из_нескольких_слов"
+
+#: forms.py:75
 msgid "Title"
 msgstr "Заголовок"
 
-#: forms.py:74
+#: forms.py:78
 msgid "Text"
 msgstr "Текст"
 
-#: forms.py:75
+#: forms.py:79
 msgid "Image"
 msgstr "Изображение"
 
-#: forms.py:78
+#: forms.py:82
 msgid "e-mail"
 msgstr ""
 
-#: forms.py:89
+#: forms.py:93
 #, python-format
 msgid "Title must have less than %s characters"
 msgstr "Заголовок должен иметь меньше %s символов"
 
-#: forms.py:98
+#: forms.py:102
 #, python-format
 msgid "Text must have less than %s characters"
 msgstr "Текст должен быть короче %s символов"
 
-#: forms.py:109
+#: forms.py:113
 #, python-format
 msgid "Image must be less than %s bytes"
 msgstr "Изображение должно быть менее %s байт"
 
-#: forms.py:136
+#: forms.py:140
 msgid "Either text or image must be entered."
 msgstr "Текст или картинка должны быть введены."
 
-#: forms.py:149
+#: forms.py:153
 #, python-format
 msgid "Wait %s seconds after last posting"
 msgstr "Подождите %s секунд после последнего постинга"
 
-#: forms.py:163 templates/boards/tags.html:6 templates/boards/rss/post.html:10
+#: forms.py:169 templates/boards/tags.html:6 templates/boards/rss/post.html:10
 msgid "Tags"
 msgstr "Теги"
 
-#: forms.py:171
+#: forms.py:177
 msgid "Inappropriate characters in tags."
 msgstr "Недопустимые символы в тегах."
 
-#: forms.py:199 forms.py:220
+#: forms.py:205 forms.py:226
 msgid "Captcha validation failed"
 msgstr "Проверка капчи провалена"
 
-#: forms.py:226
+#: forms.py:232
 msgid "Theme"
 msgstr "Тема"
 
-#: forms.py:231
+#: forms.py:237
 msgid "Enable moderation panel"
 msgstr "Включить панель модерации"
 
-#: forms.py:246
+#: forms.py:252
 msgid "No such user found"
 msgstr "Данный пользователь не найден"
 
-#: forms.py:260
+#: forms.py:266
 #, python-format
 msgid "Wait %s minutes after last login"
 msgstr "Подождите %s минут после последнего входа"
@@ -111,49 +123,53 b' msgstr "\xd0\x9d\xd0\xb5 \xd0\xbd\xd0\xb0\xd0\xb9\xd0\xb4\xd0\xb5\xd0\xbd\xd0\xbe"'
 msgid "This page does not exist"
 msgstr "Этой страницы не существует"
 
-#: templates/boards/archive.html:45 templates/boards/posting_general.html:64
+#: templates/boards/archive.html:9 templates/boards/base.html:51
+msgid "Archive"
+msgstr "Архив"
+
+#: templates/boards/archive.html:39 templates/boards/posting_general.html:64
 msgid "Previous page"
 msgstr "Предыдущая страница"
 
-#: templates/boards/archive.html:75
+#: templates/boards/archive.html:68
 msgid "Open"
 msgstr "Открыть"
 
-#: templates/boards/archive.html:81 templates/boards/post.html:37
+#: templates/boards/archive.html:74 templates/boards/post.html:37
 #: templates/boards/posting_general.html:103 templates/boards/thread.html:69
 msgid "Delete"
 msgstr "Удалить"
 
-#: templates/boards/archive.html:85 templates/boards/post.html:40
+#: templates/boards/archive.html:78 templates/boards/post.html:40
 #: templates/boards/posting_general.html:107 templates/boards/thread.html:72
 msgid "Ban IP"
 msgstr "Заблокировать IP"
 
-#: templates/boards/archive.html:94 templates/boards/post.html:53
+#: templates/boards/archive.html:87 templates/boards/post.html:53
 #: templates/boards/posting_general.html:116
 #: templates/boards/posting_general.html:180 templates/boards/thread.html:81
 msgid "Replies"
 msgstr "Ответы"
 
-#: templates/boards/archive.html:103 templates/boards/posting_general.html:125
+#: templates/boards/archive.html:96 templates/boards/posting_general.html:125
 #: templates/boards/thread.html:138 templates/boards/thread_gallery.html:58
 msgid "images"
 msgstr "изображений"
 
-#: templates/boards/archive.html:104 templates/boards/thread.html:137
+#: templates/boards/archive.html:97 templates/boards/thread.html:137
 #: templates/boards/thread_gallery.html:57
 msgid "replies"
 msgstr "ответов"
 
-#: templates/boards/archive.html:129 templates/boards/posting_general.html:203
+#: templates/boards/archive.html:116 templates/boards/posting_general.html:203
 msgid "Next page"
 msgstr "Следующая страница"
 
-#: templates/boards/archive.html:134 templates/boards/posting_general.html:208
+#: templates/boards/archive.html:121 templates/boards/posting_general.html:208
 msgid "No threads exist. Create the first one!"
 msgstr "Нет тем. Создайте первую!"
 
-#: templates/boards/archive.html:143 templates/boards/posting_general.html:235
+#: templates/boards/archive.html:130 templates/boards/posting_general.html:235
 msgid "Pages:"
 msgstr "Страницы: "
 
@@ -194,10 +210,6 b' msgstr "\xd0\x9d\xd0\xb0\xd1\x81\xd1\x82\xd1\x80\xd0\xbe\xd0\xb9\xd0\xba\xd0\xb8"'
 msgid "Login"
 msgstr "Вход"
 
-#: templates/boards/base.html:51
-msgid "Archive"
-msgstr "Архив"
-
 #: templates/boards/base.html:53
 #, python-format
 msgid "Speed: %(ppd)s posts per day"
@@ -265,11 +277,7 b' msgstr "\xd0\x9f\xd0\xbe\xd1\x81\xd0\xbb\xd0\xb5\xd0\xb4\xd0\xbd\xd0\xb8\xd0\xb9 \xd0\xb4\xd0\xbe\xd1\x81\xd1\x82\xd1\x83\xd0\xbf: "'
 msgid "Save"
 msgstr "Сохранить"
 
-#: templates/boards/tags.html:24
-msgid "threads"
-msgstr "тем"
-
-#: templates/boards/tags.html:37
+#: templates/boards/tags.html:27
 msgid "No tags found."
 msgstr "Теги не найдены."
 
@@ -326,67 +334,22 b' msgstr "\xd0\x9f\xd0\xbe\xd0\xbb\xd1\x83\xd0\xb6\xd0\xb8\xd1\x80\xd0\xbd\xd1\x8b\xd0\xb9 \xd1\x82\xd0\xb5\xd0\xba\xd1\x81\xd1\x82"'
 msgid "Spoiler"
 msgstr "Спойлер"
 
-#: templates/boards/staticpages/help.html:17
+#: templates/boards/staticpages/help.html:15
 msgid "Link to a post"
 msgstr "Ссылка на сообщение"
 
-#: templates/boards/staticpages/help.html:18
+#: templates/boards/staticpages/help.html:16
 msgid "Strikethrough text"
 msgstr "Зачеркнутый текст"
 
-#: templates/boards/staticpages/help.html:11
+#: templates/boards/staticpages/help.html:17
 msgid "You need to new line before:"
 msgstr "Перед этими тегами нужна новая строка:"
 
-#: templates/boards/staticpages/help.html:15
+#: templates/boards/staticpages/help.html:18
 msgid "Comment"
 msgstr "Комментарий"
 
-#: templates/boards/staticpages/help.html:16
+#: templates/boards/staticpages/help.html:19
 msgid "Quote"
 msgstr "Цитата"
-
-#~ msgid "Formatting"
-#~ msgstr "Форматирование"
-
-#~ msgid "quote"
-#~ msgstr "цитата"
-
-#~ msgid "italic"
-#~ msgstr "курсив"
-
-#~ msgid "bold"
-#~ msgstr "полужирный"
-
-#~ msgid "spoiler"
-#~ msgstr "спойлер"
-
-#~ msgid "comment"
-#~ msgstr "комментарий"
-
-#~ msgid "Tag: "
-#~ msgstr "Тег: "
-
-#~ msgid "Remove"
-#~ msgstr "Удалить"
-
-#~ msgid "Add"
-#~ msgstr "Добавить"
-
-#~ msgid "Basic markdown syntax."
-#~ msgstr "Базовый синтаксис markdown."
-
-#~ msgid "Example: "
-#~ msgstr "Пример: "
-
-#~ msgid "tags"
-#~ msgstr "тегов"
-
-#~ msgid "Get!"
-#~ msgstr "Гет!"
-
-#~ msgid "View"
-#~ msgstr "Просмотр"
-
-#~ msgid "gets"
-#~ msgstr "гетов"