From 8fa9a684c8a06bed7235f58f79af2d88da13fede Mon Sep 17 00:00:00 2001 From: KillyMXI Date: Sun, 20 Aug 2017 18:15:09 +0300 Subject: www: i18n --- juick-www/src/main/webapp/WEB-INF/views/blog.html | 6 +++--- juick-www/src/main/webapp/WEB-INF/views/index.html | 4 +++- .../src/main/webapp/WEB-INF/views/macros/tree.html | 6 +++--- .../main/webapp/WEB-INF/views/partial/newmessage.html | 8 ++++---- .../main/webapp/WEB-INF/views/partial/thread_list.html | 7 +++++-- juick-www/src/main/webapp/WEB-INF/views/post.html | 13 ++++++++----- juick-www/src/main/webapp/WEB-INF/views/thread.html | 18 +++++++++--------- 7 files changed, 35 insertions(+), 27 deletions(-) (limited to 'juick-www/src/main/webapp/WEB-INF/views') 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 @@ {% endif %} {% if paramTag | default('') is not empty %} -

← Все записи с тегом {{ paramTag.name | escape }}

+

← {{ i18n("messages","blog.allPostsWithTag") }} {{ paramTag.name | escape }}

{% endif %} {% for msg in msgs %} {% include "views/partial/message" %} {% endfor %} -{% if (next | default('')) is not empty %} -{{ next | raw }} +{% if nextpage | default('') is not empty %} +

{% 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 %} +

+{% 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 %} + · {{ i18n("messages","reply.reply") }} {% elseif visitor.uid == 0 %} - · Ответить + · {{ i18n("messages","reply.reply") }} {% 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 @@
- +
- или загрузить
-
- + {{ i18n("messages","postForm.or") }} {{ i18n("messages","postForm.upload") }}
+
+
\ 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 %} + {% elseif visitor.uid == 0 %} + · {{ i18n("messages","reply.reply") }} + {% else %} {% 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 %}
-

Фото: - (JPG, PNG, до 10Мб)

- -


-

+

+ Фото: + ({{ i18n("messages","postForm.imageFormats") }}) +

+

+
+ +

Теги:

{{ 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 @@
- +
{% endif %} {% if recomm is not empty %} -
Рекомендовали ({{ recomm.size() }}): +
{{ i18n("messages","message.recommendedBy") }} ({{ recomm.size() }}): {% for rec in recomm %} @{{ rec }}{% if loop.index < (loop.length - 1) %}, {% endif %} {% endfor %} @@ -60,21 +60,21 @@ {% if visitorSubscribed %}
  • - Подписан
  • + {{ i18n("messages","message.subscribed") }} {% else %}
  • - Подписаться
  • + {{ i18n("messages","message.subscribe") }} {% endif %} {% if not visitorInBL %}
  • - Рекомендовать
  • + {{ i18n("messages","message.recommend") }} {% endif %} {% else %}
  • - Удалить
  • + {{ i18n("messages","message.delete") }} {% endif %} {% endif %} @@ -83,12 +83,12 @@

    Ответы ({{ replies.size() }})

    -- cgit v1.2.3