##// END OF EJS Templates
Added a help page.
neko259 -
r152:402a3d7f default
parent child Browse files
Show More
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
@@ -7,7 +7,7 b' msgid ""'
7 msgstr ""
7 msgstr ""
8 "Project-Id-Version: PACKAGE VERSION\n"
8 "Project-Id-Version: PACKAGE VERSION\n"
9 "Report-Msgid-Bugs-To: \n"
9 "Report-Msgid-Bugs-To: \n"
10 "POT-Creation-Date: 2013-09-07 19:43+0300\n"
10 "POT-Creation-Date: 2013-09-09 21:00+0300\n"
11 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
11 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13 "Language-Team: LANGUAGE <LL@li.org>\n"
13 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -42,14 +42,6 b' msgstr "\xd0\xbb\xd0\xb8\xd1\x86\xd0\xb5\xd0\xbd\xd0\xb7\xd0\xb8\xd0\xb5\xd0\xb9"'
42 msgid "Repository"
42 msgid "Repository"
43 msgstr "Репозиторий"
43 msgstr "Репозиторий"
44
44
45 #: templates/boards/banned.html:6
46 msgid "Banned"
47 msgstr "Заблокирован"
48
49 #: templates/boards/banned.html:11
50 msgid "Your IP address has been banned. Contact the administrator"
51 msgstr "Ваш IP адрес был заблокирован. Свяжитесь с администратором"
52
53 #: templates/boards/base.html:12
45 #: templates/boards/base.html:12
54 msgid "Feed"
46 msgid "Feed"
55 msgstr "Лента"
47 msgstr "Лента"
@@ -58,16 +50,20 b' msgstr "\xd0\x9b\xd0\xb5\xd0\xbd\xd1\x82\xd0\xb0"'
58 msgid "All threads"
50 msgid "All threads"
59 msgstr "Все темы"
51 msgstr "Все темы"
60
52
61 #: templates/boards/base.html:35
53 #: templates/boards/base.html:34
54 msgid "Tag management"
55 msgstr "Управление тегами"
56
57 #: templates/boards/base.html:36
62 msgid "Settings"
58 msgid "Settings"
63 msgstr "Настройки"
59 msgstr "Настройки"
64
60
65 #: templates/boards/base.html:42 templates/boards/login.html:6
61 #: templates/boards/base.html:43 templates/boards/login.html:6
66 #: templates/boards/login.html.py:21
62 #: templates/boards/login.html.py:21
67 msgid "Login"
63 msgid "Login"
68 msgstr "Вход"
64 msgstr "Вход"
69
65
70 #: templates/boards/base.html:43
66 #: templates/boards/base.html:44
71 msgid "Up"
67 msgid "Up"
72 msgstr "Вверх"
68 msgstr "Вверх"
73
69
@@ -97,11 +93,11 b' msgstr "\xd0\x9e\xd1\x82\xd0\xb2\xd0\xb5\xd1\x82"'
97 msgid "Delete"
93 msgid "Delete"
98 msgstr "Удалить"
94 msgstr "Удалить"
99
95
100 #: templates/boards/posting_general.html:63 templates/boards/thread.html:113
96 #: templates/boards/posting_general.html:63 templates/boards/thread.html:107
101 msgid "replies"
97 msgid "replies"
102 msgstr "ответов"
98 msgstr "ответов"
103
99
104 #: templates/boards/posting_general.html:64 templates/boards/thread.html:114
100 #: templates/boards/posting_general.html:64 templates/boards/thread.html:108
105 msgid "images"
101 msgid "images"
106 msgstr "изображений"
102 msgstr "изображений"
107
103
@@ -141,8 +137,8 b' msgstr ""'
141 "Теги должны быть разделены пробелами. Текст или изображение обязательны."
137 "Теги должны быть разделены пробелами. Текст или изображение обязательны."
142
138
143 #: templates/boards/posting_general.html:154 templates/boards/thread.html:98
139 #: templates/boards/posting_general.html:154 templates/boards/thread.html:98
144 msgid "Basic markdown syntax."
140 msgid "Text syntax"
145 msgstr "Базовый синтаксис markdown."
141 msgstr "Синтаксис текста"
146
142
147 #: templates/boards/posting_general.html:164
143 #: templates/boards/posting_general.html:164
148 msgid "Pages:"
144 msgid "Pages:"
@@ -184,30 +180,63 b' msgstr "\xd0\xa2\xd0\xb5\xd0\xb3\xd0\xb8 \xd0\xbd\xd0\xb5 \xd0\xbd\xd0\xb0\xd0\xb9\xd0\xb4\xd0\xb5\xd0\xbd\xd1\x8b."'
184 msgid "Reply to thread"
180 msgid "Reply to thread"
185 msgstr "Ответить в тему"
181 msgstr "Ответить в тему"
186
182
187 #: templates/boards/thread.html:99
183 #: templates/boards/thread.html:109
188 msgid "Example: "
189 msgstr "Пример: "
190
191 #: templates/boards/thread.html:99
192 msgid "italic"
193 msgstr "курсив"
194
195 #: templates/boards/thread.html:100
196 msgid "bold"
197 msgstr "полужирный"
198
199 #: templates/boards/thread.html:101
200 msgid "Quotes can be inserted with"
201 msgstr "Цитаты могут быть вставлены при помощи"
202
203 #: templates/boards/thread.html:102
204 msgid "Links to answers can be inserted with"
205 msgstr "Ссылки на ответы могут быть вставлены с помощью"
206
207 #: templates/boards/thread.html:115
208 msgid "Last update: "
184 msgid "Last update: "
209 msgstr "Последнее обновление: "
185 msgstr "Последнее обновление: "
210
186
187 #: templates/boards/staticpages/banned.html:6
188 #: templates/boards/staticpages/help.html:6
189 msgid "Banned"
190 msgstr "Заблокирован"
191
192 #: templates/boards/staticpages/banned.html:10
193 msgid "Your IP address has been banned. Contact the administrator"
194 msgstr "Ваш IP адрес был заблокирован. Свяжитесь с администратором"
195
196 #: templates/boards/staticpages/help.html:10
197 msgid "Syntax"
198 msgstr "Синтаксис"
199
200 #: templates/boards/staticpages/help.html:11
201 msgid "2 line breaks for a new line."
202 msgstr "2 перевода строки создают новый абзац."
203
204 #: templates/boards/staticpages/help.html:12
205 msgid "Italic text"
206 msgstr "Курсивный текст"
207
208 #: templates/boards/staticpages/help.html:13
209 msgid "Bold text"
210 msgstr "Полужирный текст"
211
212 #: templates/boards/staticpages/help.html:14
213 msgid "Spoiler"
214 msgstr "Спойлер"
215
216 #: templates/boards/staticpages/help.html:15
217 msgid "Comment"
218 msgstr "Комментарий"
219
220 #: templates/boards/staticpages/help.html:16
221 msgid "Quote"
222 msgstr "Цитата"
223
224 #: templates/boards/staticpages/help.html:17
225 msgid "Link to a post"
226 msgstr "Ссылка на сообщение"
227
228 #~ msgid "Basic markdown syntax."
229 #~ msgstr "Базовый синтаксис markdown."
230
231 #~ msgid "Example: "
232 #~ msgstr "Пример: "
233
234 #~ msgid "italic"
235 #~ msgstr "курсив"
236
237 #~ msgid "bold"
238 #~ msgstr "полужирный"
239
211 #~ msgid "tags"
240 #~ msgid "tags"
212 #~ msgstr "тегов"
241 #~ msgstr "тегов"
213
242
@@ -150,8 +150,8 b''
150 <div>
150 <div>
151 {% trans 'Tags must be delimited by spaces. Text or image is required.' %}
151 {% trans 'Tags must be delimited by spaces. Text or image is required.' %}
152 </div>
152 </div>
153 <div><a href="http://daringfireball.net/projects/markdown/basics">
153 <div><a href="{% url "staticpage" name="help" %}">
154 {% trans 'Basic markdown syntax.' %}</a></div>
154 {% trans 'Text syntax' %}</a></div>
155 </div>
155 </div>
156 </form>
156 </form>
157
157
@@ -2,12 +2,9 b''
2
2
3 {% load i18n %}
3 {% load i18n %}
4
4
5 {% block head %}
6 <title>{% trans "Banned" %}</title>
7 {% endblock %}
8
9 {% block content %}
5 {% block content %}
10 <div class="post">
6 <div class="post">
11 {% trans 'Your IP address has been banned. Contact the administrator' %}
7 {% block staticcontent %}
8 {% endblock %}
12 </div>
9 </div>
13 {% endblock %} No newline at end of file
10 {% endblock %}
@@ -1,4 +1,4 b''
1 {% extends "boards/base.html" %}
1 {% extends "boards/static_base.html" %}
2
2
3 {% load i18n %}
3 {% load i18n %}
4
4
@@ -6,8 +6,6 b''
6 <title>{% trans "Banned" %}</title>
6 <title>{% trans "Banned" %}</title>
7 {% endblock %}
7 {% endblock %}
8
8
9 {% block content %}
9 {% block staticcontent %}
10 <div class="post">
10 {% trans 'Your IP address has been banned. Contact the administrator' %}
11 {% trans 'Your IP address has been banned. Contact the administrator' %}
12 </div>
13 {% endblock %} No newline at end of file
11 {% endblock %}
@@ -1,13 +1,18 b''
1 {% extends "boards/base.html" %}
1 {% extends "boards/static_base.html" %}
2
2
3 {% load i18n %}
3 {% load i18n %}
4
4
5 {% block head %}
5 {% block head %}
6 <title>{% trans "Banned" %}</title>
6 <title>{% trans "Syntax" %}</title>
7 {% endblock %}
7 {% endblock %}
8
8
9 {% block content %}
9 {% block staticcontent %}
10 <div class="post">
10 <h2>{% trans 'Syntax' %}</h2>
11 {% trans 'Your IP address has been banned. Contact the administrator' %}
11 <p>{% trans '2 line breaks for a new line.' %}</p>
12 </div>
12 <p>_<i>{% trans 'Italic text' %}</i>_</p>
13 <p>__<b>{% trans 'Bold text' %}</b>__</p>
14 <p>%%<span class="spoiler">{% trans 'Spoiler' %}</span>%%</p>
15 <p><span class="comment">//{% trans 'Comment' %}</span></p>
16 <p><span class="quote">> {% trans 'Quote' %}</span></p>
17 <p><a>>>123</a> -- {% trans 'Link to a post' %}</p>
13 {% endblock %} No newline at end of file
18 {% endblock %}
@@ -24,7 +24,7 b''
24 class="fancy"
24 class="fancy"
25 href="{{ post.image.url }}"><img
25 href="{{ post.image.url }}"><img
26 src="{{ post.image.url_200x150 }}"
26 src="{{ post.image.url_200x150 }}"
27 alt="{% trans 'Post image' %}"
27 alt="{% trans 'Post image' %}"v
28 data-width="{{ post.image_width }}"
28 data-width="{{ post.image_width }}"
29 data-height="{{ post.image_height }}"/>
29 data-height="{{ post.image_height }}"/>
30 </a>
30 </a>
@@ -94,14 +94,8 b''
94
94
95 <div class="form-submit"><input type="submit"
95 <div class="form-submit"><input type="submit"
96 value="{% trans "Post" %}"/></div>
96 value="{% trans "Post" %}"/></div>
97 <div><a href="http://daringfireball.net/projects/markdown/basics">
97 <div><a href="{% url "staticpage" name="help" %}">
98 {% trans 'Basic markdown syntax.' %}</a></div>
98 {% trans 'Text syntax' %}</a></div>
99 <div>{% trans 'Example: ' %}*<i>{% trans 'italic' %}</i>*,
100 **<b>{% trans 'bold' %}</b>**</div>
101 <div>{% trans 'Quotes can be inserted with' %} "&gt;"</div>
102 <div>{% trans 'Links to answers can be inserted with' %}
103 "&gt;&gt;123"
104 </div>
105 </div>
99 </div>
106 </form>
100 </form>
107
101
@@ -38,6 +38,7 b" urlpatterns = patterns('',"
38 url(r'^authors/$', views.authors, name='authors'),
38 url(r'^authors/$', views.authors, name='authors'),
39 url(r'^delete/(?P<post_id>\w+)/$', views.delete, name='delete'),
39 url(r'^delete/(?P<post_id>\w+)/$', views.delete, name='delete'),
40 url(r'^banned/$', views.you_are_banned, name='banned'),
40 url(r'^banned/$', views.you_are_banned, name='banned'),
41 url(r'^staticpage/(?P<name>\w+)/$', views.static_page, name='staticpage'),
41
42
42 # RSS feeds
43 # RSS feeds
43 url(r'^rss/$', AllThreadsFeed()),
44 url(r'^rss/$', AllThreadsFeed()),
@@ -236,7 +236,7 b' def delete(request, post_id):'
236
236
237 def you_are_banned(request):
237 def you_are_banned(request):
238 context = _init_default_context(request)
238 context = _init_default_context(request)
239 return render(request, 'boards/banned.html', context)
239 return render(request, 'boards/staticpages/banned.html', context)
240
240
241
241
242 def page_404(request):
242 def page_404(request):
@@ -264,6 +264,11 b' def tag_unsubscribe(request, tag_name):'
264 return redirect(all_tags)
264 return redirect(all_tags)
265
265
266
266
267 def static_page(request, name):
268 context = _init_default_context(request)
269 return render(request, 'boards/staticpages/' + name + '.html', context)
270
271
267 def _get_theme(request, user=None):
272 def _get_theme(request, user=None):
268 """Get user's CSS theme"""
273 """Get user's CSS theme"""
269
274
General Comments 0
You need to be logged in to leave comments. Login now