diff options
Diffstat (limited to 'juick-www/src/main/webapp')
7 files changed, 35 insertions, 27 deletions
diff --git a/juick-www/src/main/webapp/WEB-INF/views/blog.html b/juick-www/src/main/webapp/WEB-INF/views/blog.html index 8d241c82..87007ea8 100644 --- a/juick-www/src/main/webapp/WEB-INF/views/blog.html +++ b/juick-www/src/main/webapp/WEB-INF/views/blog.html @@ -5,13 +5,13 @@ <!--noindex--> {% endif %} {% if paramTag | default('') is not empty %} -<p class="page"><a href="/tag/{{ paramTag.name | urlencode }}">← Все записи с тегом <b>{{ paramTag.name | escape }}</b></a></p> +<p class="page"><a href="/tag/{{ paramTag.name | urlencode }}">← {{ i18n("messages","blog.allPostsWithTag") }} <b>{{ paramTag.name | escape }}</b></a></p> {% endif %} {% for msg in msgs %} {% include "views/partial/message" %} {% endfor %} -{% if (next | default('')) is not empty %} -{{ next | raw }} +{% if nextpage | default('') is not empty %} +<p class="page"><a href="{{ nextpage | raw }}" rel="prev">{{ i18n("messages","messages.next") }} →</a></p> {% endif %} {% endblock %} {% block "column" %} diff --git a/juick-www/src/main/webapp/WEB-INF/views/index.html b/juick-www/src/main/webapp/WEB-INF/views/index.html index 6bf81cac..506979b5 100644 --- a/juick-www/src/main/webapp/WEB-INF/views/index.html +++ b/juick-www/src/main/webapp/WEB-INF/views/index.html @@ -10,7 +10,9 @@ {% for msg in msgs %} {% include "views/partial/message" %} {% endfor %} -{{ next | default ('') | raw }} +{% if nextpage | default('') is not empty %} +<p class="page"><a href="{{ nextpage | raw }}" rel="prev">{{ i18n("messages","messages.next") }} →</a></p> +{% endif %} {% endblock %} {% block "column" %} {% include "views/partial/homecolumn" %} diff --git a/juick-www/src/main/webapp/WEB-INF/views/macros/tree.html b/juick-www/src/main/webapp/WEB-INF/views/macros/tree.html index b20e99fd..a5966e2b 100644 --- a/juick-www/src/main/webapp/WEB-INF/views/macros/tree.html +++ b/juick-www/src/main/webapp/WEB-INF/views/macros/tree.html @@ -37,13 +37,13 @@ {% endif %} <div class="msg-links">/{{ msg.rid }} {% if msg.replyto > 0 %} - в ответ на <a href="#{{ msg.replyto }}">/{{ msg.replyto }}</a> + {{ i18n("messages","reply.inReplyTo") }} <a href="#{{ msg.replyto }}">/{{ msg.replyto }}</a> {% endif %} {% if msg.VisitorCanComment %} - · <a href="/post?body=%23{{ msg.mid }}/{{ msg.rid }}%20" class="a-thread-comment">Ответить</a></div> + · <a href="/post?body=%23{{ msg.mid }}/{{ msg.rid }}%20" class="a-thread-comment">{{ i18n("messages","reply.reply") }}</a></div> <div class="msg-comment" style="display: none"></div> {% elseif visitor.uid == 0 %} - · <a href="#" class="a-login">Ответить</a></div> + · <a href="#" class="a-login">{{ i18n("messages","reply.reply") }}</a></div> {% endif %} {% if level == 0 and msg.childsCount > 1 and replies.size() > 10 %} diff --git a/juick-www/src/main/webapp/WEB-INF/views/partial/newmessage.html b/juick-www/src/main/webapp/WEB-INF/views/partial/newmessage.html index 1e43b92f..1333351b 100644 --- a/juick-www/src/main/webapp/WEB-INF/views/partial/newmessage.html +++ b/juick-www/src/main/webapp/WEB-INF/views/partial/newmessage.html @@ -1,10 +1,10 @@ <form action="/post" method="post" enctype="multipart/form-data"> <section id="newmessage"> - <textarea name="body" placeholder="Новое сообщение..."></textarea> + <textarea name="body" placeholder="{{ i18n("messages","postForm.newMessage") }}"></textarea> <div> - <input type="text" class="img" name="img" placeholder="Ссылка на изображение (JPG/PNG, до 10Мб)"/> или <a href="#">загрузить</a><br/> - <input type="text" class="tags" name="tags" placeholder="Теги (через пробел)"/><br/> - <input type="submit" class="subm" value="Отправить"/> + <input type="text" class="img" name="img" placeholder="{{ i18n("messages","postForm.imageLink") }} ({{ i18n("messages","postForm.imageFormats") }})"/> {{ i18n("messages","postForm.or") }} <a href="#">{{ i18n("messages","postForm.upload") }}</a><br/> + <input type="text" class="tags" name="tags" placeholder="{{ i18n("messages","postForm.tags") }}"/><br/> + <input type="submit" class="subm" value="{{ i18n("messages","postForm.submit") }}"/> </div> </section> </form>
\ No newline at end of file diff --git a/juick-www/src/main/webapp/WEB-INF/views/partial/thread_list.html b/juick-www/src/main/webapp/WEB-INF/views/partial/thread_list.html index af04e4fa..3ef9dd16 100644 --- a/juick-www/src/main/webapp/WEB-INF/views/partial/thread_list.html +++ b/juick-www/src/main/webapp/WEB-INF/views/partial/thread_list.html @@ -35,12 +35,15 @@ {% endif %} <div class="msg-links">/{{ msg.rid }} {% if msg.replyto > 0 %} - в ответ на <a href="#{{ msg.replyto }}">/{{ msg.replyto }}</a> + {{ i18n("messages","reply.inReplyTo") }} <a href="#{{ msg.replyto }}">/{{ msg.replyto }}</a> {% endif %} {% if msg.VisitorCanComment %} - · <a href="/post?body=%23{{ msg.mid }}/{{ msg.rid }}%20" class="a-thread-comment">Ответить</a> + · <a href="/post?body=%23{{ msg.mid }}/{{ msg.rid }}%20" class="a-thread-comment">{{ i18n("messages","reply.reply") }}</a> </div> <div class="msg-comment" style="display: none;"></div> + {% elseif visitor.uid == 0 %} + · <a href="#" class="a-login">{{ i18n("messages","reply.reply") }}</a> + </div> {% else %} </div> {% endif %} diff --git a/juick-www/src/main/webapp/WEB-INF/views/post.html b/juick-www/src/main/webapp/WEB-INF/views/post.html index 51b044da..56e48a55 100644 --- a/juick-www/src/main/webapp/WEB-INF/views/post.html +++ b/juick-www/src/main/webapp/WEB-INF/views/post.html @@ -2,11 +2,14 @@ {% import "views/macros/tags" %} {% block content %} <form action="/post2" method="post" id="postmsg" enctype="multipart/form-data"> - <p style="text-align: left"><b>Фото:</b> <span id="attachmentfile"> - <input type="file" name="attach"/> <i>(JPG, PNG, до 10Мб)</i></span></p> - - <p><textarea name="body" class="newmessage" rows="7" cols="10">{{ body }}</textarea><br/> - <input type="submit" class="subm" value=" Отправить "/></p> + <p style="text-align: left"> + <b>Фото:</b> <span id="attachmentfile"> + <input type="file" name="attach"/> <i>({{ i18n("messages","postForm.imageFormats") }})</i></span> + </p> + <p> + <textarea name="body" class="newmessage" rows="7" cols="10">{{ body }}</textarea><br/> + <input type="submit" class="subm" value=" {{ i18n("messages","postForm.submit") }} "/> + </p> </form> <p style="text-align: left"><b>Теги:</b></p> {{ tags(visitor.name, tags) }} diff --git a/juick-www/src/main/webapp/WEB-INF/views/thread.html b/juick-www/src/main/webapp/WEB-INF/views/thread.html index c0e37851..906ddf1f 100644 --- a/juick-www/src/main/webapp/WEB-INF/views/thread.html +++ b/juick-www/src/main/webapp/WEB-INF/views/thread.html @@ -34,13 +34,13 @@ <input type="hidden" name="mid" value="{{ msg.mid }}"/> <div class="msg-comment"> <div class="ta-wrapper"> - <textarea name="body" rows="1" class="reply" placeholder="Написать комментарий"></textarea> + <textarea name="body" rows="1" class="reply" placeholder="{{ i18n("messages","message.writeComment") }}"></textarea> </div> </div> </form> {% endif %} {% if recomm is not empty %} - <div class="msg-recomms">Рекомендовали ({{ recomm.size() }}): + <div class="msg-recomms">{{ i18n("messages","message.recommendedBy") }} ({{ recomm.size() }}): {% for rec in recomm %} <a href="/{{ rec }}/">@{{ rec }}</a>{% if loop.index < (loop.length - 1) %}, {% endif %} {% endfor %} @@ -60,21 +60,21 @@ {% if visitorSubscribed %} <li><a href="/post?body=U+%23{{ msg.mid }}"> <div style="background-position: -48px 0"></div> - Подписан</a></li> + {{ i18n("messages","message.subscribed") }}</a></li> {% else %} <li><a href="/post?body=S+%23{{ msg.mid }}"> <div style="background-position: -16px 0"></div> - Подписаться</a></li> + {{ i18n("messages","message.subscribe") }}</a></li> {% endif %} {% if not visitorInBL %} <li><a href="/post?body=%21+%23{{ msg.mid }}"> <div style="background-position: -32px 0"></div> - Рекомендовать</a></li> + {{ i18n("messages","message.recommend") }}</a></li> {% endif %} {% else %} <li><a href="/post?body=D+%23{{ msg.mid }}"> <div style="background-position: 0"></div> - Удалить</a></li> + {{ i18n("messages","message.delete") }}</a></li> {% endif %} {% endif %} </ul> @@ -83,12 +83,12 @@ <div class="title2"> <div class="title2-right"> {% if listview %} - <a href="?view=tree" rel="nofollow">Показать деревом</a> + <a href="?view=tree" rel="nofollow">{{ i18n("messages","replies.showAsTree") }}</a> {% else %} {% if foldable %} - <span id="unfoldall"><a href="#">Раскрыть все</a> · </span> + <span id="unfoldall"><a href="#">{{ i18n("messages","replies.unfoldAll") }}</a> · </span> {% endif %} - <a href="?view=list" rel="nofollow">Показать списком</a> + <a href="?view=list" rel="nofollow">{{ i18n("messages","replies.showAsList") }}</a> {% endif %} </div> <h2>Ответы ({{ replies.size() }})</h2> |