From 63557e344330b1973b0a5ac2d5843c76973c5ceb Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Tue, 13 Dec 2016 23:44:59 +0300
Subject: juick-spring-www: default language in resource bundles is en

---
 .../src/main/resources/errors.properties           |  4 +-
 .../src/main/resources/errors_en.properties        |  3 -
 .../src/main/resources/errors_ru.properties        |  3 +
 .../src/main/resources/messages.properties         | 92 +++++++++++-----------
 .../src/main/resources/messages_en.properties      | 45 -----------
 .../src/main/resources/messages_ru.properties      | 47 +++++++++++
 .../main/webapp/WEB-INF/templates/views/index.html |  4 +-
 .../templates/views/partial/blog_messages.html     | 25 +++---
 8 files changed, 116 insertions(+), 107 deletions(-)
 delete mode 100644 juick-spring-www/src/main/resources/errors_en.properties
 create mode 100644 juick-spring-www/src/main/resources/errors_ru.properties
 delete mode 100644 juick-spring-www/src/main/resources/messages_en.properties
 create mode 100644 juick-spring-www/src/main/resources/messages_ru.properties

(limited to 'juick-spring-www/src/main')

diff --git a/juick-spring-www/src/main/resources/errors.properties b/juick-spring-www/src/main/resources/errors.properties
index ca13b926..7ec8fbfd 100644
--- a/juick-spring-www/src/main/resources/errors.properties
+++ b/juick-spring-www/src/main/resources/errors.properties
@@ -1,3 +1,3 @@
-error.title = Произошла ошибка
+error.title = Error page
 
-error.login=Произошла ошибка, проверьте имя пользователя и пароль
\ No newline at end of file
+error.login=Wrong user or password
\ No newline at end of file
diff --git a/juick-spring-www/src/main/resources/errors_en.properties b/juick-spring-www/src/main/resources/errors_en.properties
deleted file mode 100644
index 7ec8fbfd..00000000
--- a/juick-spring-www/src/main/resources/errors_en.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-error.title = Error page
-
-error.login=Wrong user or password
\ No newline at end of file
diff --git a/juick-spring-www/src/main/resources/errors_ru.properties b/juick-spring-www/src/main/resources/errors_ru.properties
new file mode 100644
index 00000000..ca13b926
--- /dev/null
+++ b/juick-spring-www/src/main/resources/errors_ru.properties
@@ -0,0 +1,3 @@
+error.title = Произошла ошибка
+
+error.login=Произошла ошибка, проверьте имя пользователя и пароль
\ No newline at end of file
diff --git a/juick-spring-www/src/main/resources/messages.properties b/juick-spring-www/src/main/resources/messages.properties
index 1f594445..db3af931 100644
--- a/juick-spring-www/src/main/resources/messages.properties
+++ b/juick-spring-www/src/main/resources/messages.properties
@@ -1,45 +1,47 @@
-date.format=dd.MM.yyyy
-
-link.settings = Настройки
-link.returnToMain =Вернуться на главную
-link.contacts=Контакты
-link.help=Помощь
-link.adv=Реклама
-
-link.popular=Популярные
-link.allMessages=Все сообщения
-link.withPhotos=Фотографии
-link.my=Моя лента
-link.privateMessages=Приватные
-link.discuss=Обсуждения
-link.recommended=Рекомендации
-link.postMessage=Написать сообщение
-link.logout=Выйти
-
-link.settings.main=Главная
-link.settings.password=Пароль
-link.settings.about=О пользователе
-
-label.sponsor=Спонсор
-label.sponsors=Спонсоры
-label.search=Поиск
-label.register=Зарегистрироваться
-label.username=Имя пользователя
-label.password=Пароль
-
-postForm.newMessage=Новое сообщение
-postForm.imageLink=Ссылка на изображение (JPG/PNG, до 10Мб)
-postForm.orImageUpload=или <a href="#">загрузить</a><br/>
-postForm.tags=Теги (через пробел) 
-
-button.send=Отправить
-
-message.loginForSending=Чтобы добавлять сообщения и комментарии, <a href="{0}">представьтесь</a>
-message.sendLoginToXmpp=Отправьте <b>LOGIN</b> на <a href="xmpp:juick@juick.com?message;body=LOGIN">juick@juick.com</a>
-
-question.areRegistered=Уже зарегистрированы?
-
-title.help=Справка
-title.loginOrSignup=Juick - Войдите в систему или зарегистрируйтесь
-title.index.anonym=Микроблоги Juick: популярные записи
-title.index.user=Популярные
\ No newline at end of file
+date.format=MM/dd/yyyy
+
+link.settings=Settings
+link.returnToMain=Back to Home Page
+link.contacts=Contacts
+link.help=Help
+link.adv=Advertisement
+
+link.popular=Popular
+link.allMessages=All messages
+link.withPhotos=Photos
+link.my=My feed
+link.privateMessages=PM
+link.discuss=Discuss
+link.recommended=Recommended
+link.postMessage=Post
+link.logout=Logout
+
+link.settings.main=Main
+link.settings.password=Password
+link.settings.about=About
+
+label.sponsor=Sponsor
+label.sponsors=Sponsors
+label.search=Search
+label.register=Register
+label.username=User name
+label.password=Password
+
+postForm.newMessage=New message
+postForm.imageLink=Link to image (JPG/PNG, up to 10 MB)
+postForm.orImageUpload=or <a href="#">Upload</a><br/>
+postForm.tags=Tags (space separated)    
+
+button.send=Send
+
+message.loginForSending=<a href="{0}">Login</a> for post messages and comments
+message.recommend=Recommend
+message.sendLoginToXmpp=Send <b>LOGIN</b> to <a href="xmpp:juick@juick.com?message;body=LOGIN">juick@juick.com</a>
+
+question.areRegistered=Are you registered?
+
+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
diff --git a/juick-spring-www/src/main/resources/messages_en.properties b/juick-spring-www/src/main/resources/messages_en.properties
deleted file mode 100644
index a40ac2b2..00000000
--- a/juick-spring-www/src/main/resources/messages_en.properties
+++ /dev/null
@@ -1,45 +0,0 @@
-date.format=MM/dd/yyyy
-
-link.settings=Settings
-link.returnToMain=Back to Home Page
-link.contacts=Contacts
-link.help=Help
-link.adv=Advertisement
-
-link.popular=Popular
-link.allMessages=All messages
-link.withPhotos=Photos
-link.my=My feed
-link.privateMessages=PM
-link.discuss=Discuss
-link.recommended=Recommended
-link.postMessage=Post
-link.logout=Logout
-
-link.settings.main=Main
-link.settings.password=Password
-link.settings.about=About
-
-label.sponsor=Sponsor
-label.sponsors=Sponsors
-label.search=Search
-label.register=Register
-label.username=User name
-label.password=Password
-
-postForm.newMessage=New message
-postForm.imageLink=Link to image (JPG/PNG, up to 10 MB)
-postForm.orImageUpload=or <a href="#">Upload</a><br/>
-postForm.tags=Tags (space separated)    
-
-button.send=Send
-
-message.loginForSending=<a href="{0}">Login</a> for post messages and comments
-message.sendLoginToXmpp=Send <b>LOGIN</b> to <a href="xmpp:juick@juick.com?message;body=LOGIN">juick@juick.com</a>
-
-question.areRegistered=Are you registered?
-
-title.help=Help
-title.loginOrSignup=Juick - Log In or Sign Up
-title.index.anonym=Juick microblogs: popular posts
-title.index.user=Popular
\ 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
new file mode 100644
index 00000000..6d9c3161
--- /dev/null
+++ b/juick-spring-www/src/main/resources/messages_ru.properties
@@ -0,0 +1,47 @@
+date.format=dd.MM.yyyy
+
+link.settings = Настройки
+link.returnToMain =Вернуться на главную
+link.contacts=Контакты
+link.help=Помощь
+link.adv=Реклама
+
+link.popular=Популярные
+link.allMessages=Все сообщения
+link.withPhotos=Фотографии
+link.my=Моя лента
+link.privateMessages=Приватные
+link.discuss=Обсуждения
+link.recommended=Рекомендации
+link.postMessage=Написать сообщение
+link.logout=Выйти
+
+link.settings.main=Главная
+link.settings.password=Пароль
+link.settings.about=О пользователе
+
+label.sponsor=Спонсор
+label.sponsors=Спонсоры
+label.search=Поиск
+label.register=Зарегистрироваться
+label.username=Имя пользователя
+label.password=Пароль
+
+postForm.newMessage=Новое сообщение
+postForm.imageLink=Ссылка на изображение (JPG/PNG, до 10Мб)
+postForm.orImageUpload=или <a href="#">загрузить</a><br/>
+postForm.tags=Теги (через пробел) 
+
+button.send=Отправить
+
+message.loginForSending=Чтобы добавлять сообщения и комментарии, <a href="{0}">представьтесь</a>
+message.recommend=Рекомендовать
+message.sendLoginToXmpp=Отправьте <b>LOGIN</b> на <a href="xmpp:juick@juick.com?message;body=LOGIN">juick@juick.com</a>
+
+question.areRegistered=Уже зарегистрированы?
+
+title.help=Справка
+title.loginOrSignup=Juick - Войдите в систему или зарегистрируйтесь
+title.index.anonym=Микроблоги Juick: популярные записи
+title.index.user=Популярные
+message.comment=Комментировать
\ No newline at end of file
diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/index.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/index.html
index 2c5aab3b..d57d6791 100644
--- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/index.html
+++ b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/index.html
@@ -3,8 +3,8 @@
       xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
       layout:decorate="~{layout/mainLayout}">
 <head>
-    <title th:if="${#authorization.expression('isAuthenticated()')}" th:text="#{title.index.user}">Популярные</title>
-    <title th:if="${#authorization.expression('isAnonymous()')}" th:text="#{title.index.anonym}">Микроблоги Juick: популярные записи</title>
+    <title th:if="${#authorization.expression('isAuthenticated()')}" th:text="#{title.index.user}">Popular</title>
+    <title th:if="${#authorization.expression('isAnonymous()')}" th:text="#{title.index.anonym}">Popular posts</title>
 </head>
 
 <body>
diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_messages.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_messages.html
index 6fe0e4ff..d1a91217 100644
--- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_messages.html
+++ b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_messages.html
@@ -1,3 +1,5 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
 <th:block th:each="msg:${msgs}">
     <article th:data-mid="${msg.getMid()}">
         <header class="u">
@@ -10,28 +12,30 @@
             </div>
             <div class="msg-ts">
                 <a th:href="|/${msg.getUser().getName()}/${msg.getMid()}|">
-                <time th:datetime="|${msg.getDate()}Z|"
-                      th:title="|${msg.getDate()} GMT|"
-                th:text="${msg.getDate()}">01.01.1970</time>
+                    <time th:datetime="|${msg.getDate()}Z|"
+                          th:title="|${msg.getDate()} GMT|"
+                          th:text="${msg.getDate()}">01.01.1970
+                    </time>
                 </a>
             </div>
             <div class="msg-tags" th:text="${msg.getTagsString()}"></div>
         </header>
         <p class="ir" th:if="${msg.getAttachmentType() != null}">
             <a href="|//i.juick.com/photos-512/${msg.getMid()}.${msg.getAttachmentType()}|">
-            <img src="|//i.juick.com/photos-512/${msg.getMid()}.${msg.getAttachmentType()}|"
-                 th:data-fname="|${msg.getMid()}.${msg.getAttachmentType()}|" alt=""/></a>
+                <img src="|//i.juick.com/photos-512/${msg.getMid()}.${msg.getAttachmentType()}|"
+                     th:data-fname="|${msg.getMid()}.${msg.getAttachmentType()}|" alt=""/></a>
         </p>
         <p th:utext="${msg.getText()}">Lorem ipsum</p>
         <div class="irbr" th:if="${msg.getAttachmentType() != null}"></div>
         <nav class="l">
             <th:block th:switch="${#authorization.expression('isAuthenticated()')}">
-                <a th:case="false" class="a-login" th:href="|/${msg.getMid()}/|">Рекомендовать</a>
-                <a th:case="true" class="a-like" th:href="|/post?body=!+%23${msg.getMid()}/|">Рекомендовать</a>
+                <a th:case="false" class="a-login" th:href="|/${msg.getMid()}/|" th:text="#{message.recommend}">Recommend</a>
+                <a th:case="true" class="a-like" th:href="|/post?body=!+%23${msg.getMid()}/|" th:text="#{message.comment}">Comment</a>
             </th:block>
-            <a th:if="${#authorization.expression('isAuthenticated()') == false && !msg.ReadOnly}" class="a-login" th:href="|/${msg.getMid()}/|">Комментировать</a>
+            <a th:if="${#authorization.expression('isAuthenticated()') == false && !msg.ReadOnly}" class="a-login"
+               th:href="|/${msg.getMid()}/|" th:text="#{message.comment}">Comment</a>
             <a th:if="${#authorization.expression('isAuthenticated()') == true && !msg.ReadOnly}"
-               class="a-comment" th:href="|/${msg.getMid()}/|">Комментировать</a>
+               class="a-comment" th:href="|/${msg.getMid()}/|" th:text="#{message.recommend}">Recommend</a>
 
             <th:block th:if="${#authorization.expression('hasRole(''ROLE_ADMIN'')')}">
                 <a href="#" class="a-popular-plus">+</a>
@@ -49,4 +53,5 @@
             </a>
         </nav>
     </article>
-</th:block>
\ No newline at end of file
+</th:block>
+</html>
\ No newline at end of file
-- 
cgit v1.2.3