From f5285b6724ca0dee8dab876f097ac2b691dfe4a6 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Tue, 13 Dec 2016 23:58:16 +0300
Subject: juick-spring-www: more i18n

---
 .../src/main/java/com/juick/www/controllers/TagController.java        | 1 -
 juick-spring-www/src/main/resources/messages.properties               | 4 +++-
 juick-spring-www/src/main/resources/messages_ru.properties            | 4 +++-
 .../main/webapp/WEB-INF/templates/views/partial/blog_paginator.html   | 2 +-
 .../src/main/webapp/WEB-INF/templates/views/pm_inbox.html             | 3 ++-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/juick-spring-www/src/main/java/com/juick/www/controllers/TagController.java b/juick-spring-www/src/main/java/com/juick/www/controllers/TagController.java
index 67f38a35..bc524507 100644
--- a/juick-spring-www/src/main/java/com/juick/www/controllers/TagController.java
+++ b/juick-spring-www/src/main/java/com/juick/www/controllers/TagController.java
@@ -19,7 +19,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 import javax.inject.Inject;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
-import java.security.Principal;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
diff --git a/juick-spring-www/src/main/resources/messages.properties b/juick-spring-www/src/main/resources/messages.properties
index db3af931..469f05aa 100644
--- a/juick-spring-www/src/main/resources/messages.properties
+++ b/juick-spring-www/src/main/resources/messages.properties
@@ -44,4 +44,6 @@ title.help=Help
 title.loginOrSignup=Juick - Log In or Sign Up
 title.index.anonym=Juick microblogs: popular posts
 title.index.user=Popular
-message.comment=Comment
\ No newline at end of file
+message.comment=Comment
+postForm.writeReply=Write a reply
+messages.next=Next
\ No newline at end of file
diff --git a/juick-spring-www/src/main/resources/messages_ru.properties b/juick-spring-www/src/main/resources/messages_ru.properties
index 6d9c3161..00d9018c 100644
--- a/juick-spring-www/src/main/resources/messages_ru.properties
+++ b/juick-spring-www/src/main/resources/messages_ru.properties
@@ -44,4 +44,6 @@ title.help=Справка
 title.loginOrSignup=Juick - Войдите в систему или зарегистрируйтесь
 title.index.anonym=Микроблоги Juick: популярные записи
 title.index.user=Популярные
-message.comment=Комментировать
\ No newline at end of file
+message.comment=Комментировать
+postForm.writeReply=Написать ответ
+messages.next=Читать далее
\ No newline at end of file
diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_paginator.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_paginator.html
index 626f955c..188207b6 100644
--- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_paginator.html
+++ b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_paginator.html
@@ -1,3 +1,3 @@
 <p class="page" th:if="${nextpage != null}">
-    <a th:href="${nextpage}" rel="prev">Читать дальше →</a>
+    <a th:href="${nextpage}" rel="prev"><span th:text="#{messages.next}" th:remove="tag">Next</span>&nbsp;→</a>
 </p>
\ No newline at end of file
diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/pm_inbox.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/pm_inbox.html
index 7de997b8..80464e65 100644
--- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/pm_inbox.html
+++ b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/pm_inbox.html
@@ -27,7 +27,8 @@
                     <input type="hidden" name="uname" th:value="${msg.getUser().getName()}"/>
                     <div class="msg-comment">
                         <div class="ta-wrapper">
-                            <textarea name="body" rows="1" class="replypm" placeholder="Написать ответ"></textarea>
+                            <textarea name="body" rows="1" class="replypm" placeholder="Write a reply"
+                                      th:placeholder="#{postForm.writeReply}"></textarea>
                         </div>
                     </div>
                 </form>
-- 
cgit v1.2.3