From 9820abe11c0c037f50bb2f7ddbb0bd19646264dc Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Fri, 7 Apr 2017 10:29:52 +0300
Subject: juick-www: merge juick-spring-www i18n, drop thymeleaf

---
 juick-www/src/main/resources/errors.properties     |  3 ++
 juick-www/src/main/resources/errors_ru.properties  |  3 ++
 juick-www/src/main/resources/messages.properties   | 51 ++++++++++++++++++++++
 .../src/main/resources/messages_ru.properties      | 51 ++++++++++++++++++++++
 juick-www/src/main/webapp/WEB-INF/views/login.html | 13 +++---
 .../main/webapp/WEB-INF/views/partial/footer.html  | 10 ++---
 .../webapp/WEB-INF/views/partial/navigation.html   | 20 ++++-----
 .../WEB-INF/views/partial/settings_tabs.html       |  6 +--
 8 files changed, 134 insertions(+), 23 deletions(-)
 create mode 100644 juick-www/src/main/resources/errors.properties
 create mode 100644 juick-www/src/main/resources/errors_ru.properties
 create mode 100644 juick-www/src/main/resources/messages.properties
 create mode 100644 juick-www/src/main/resources/messages_ru.properties

(limited to 'juick-www/src')

diff --git a/juick-www/src/main/resources/errors.properties b/juick-www/src/main/resources/errors.properties
new file mode 100644
index 00000000..7ec8fbfd
--- /dev/null
+++ b/juick-www/src/main/resources/errors.properties
@@ -0,0 +1,3 @@
+error.title = Error page
+
+error.login=Wrong user or password
\ No newline at end of file
diff --git a/juick-www/src/main/resources/errors_ru.properties b/juick-www/src/main/resources/errors_ru.properties
new file mode 100644
index 00000000..ca13b926
--- /dev/null
+++ b/juick-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-www/src/main/resources/messages.properties b/juick-www/src/main/resources/messages.properties
new file mode 100644
index 00000000..6f587853
--- /dev/null
+++ b/juick-www/src/main/resources/messages.properties
@@ -0,0 +1,51 @@
+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}" class="a-login">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=Already 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
+postForm.writeReply=Write a reply
+messages.next=Next
+error.pageNotFound=Page not found
+error.pageNotFound.description=Probably, user deleted this post, or this page never existed.
\ No newline at end of file
diff --git a/juick-www/src/main/resources/messages_ru.properties b/juick-www/src/main/resources/messages_ru.properties
new file mode 100644
index 00000000..4d8c2c0f
--- /dev/null
+++ b/juick-www/src/main/resources/messages_ru.properties
@@ -0,0 +1,51 @@
+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}" class="a-login">представьтесь</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=Комментировать
+postForm.writeReply=Написать ответ
+messages.next=Читать далее
+error.pageNotFound=Страница не найдена
+error.pageNotFound.description=Сожалеем, но страницу с этим адресом удалил её автор, либо её никогда не существовало.
\ No newline at end of file
diff --git a/juick-www/src/main/webapp/WEB-INF/views/login.html b/juick-www/src/main/webapp/WEB-INF/views/login.html
index 4d870951..b534796a 100644
--- a/juick-www/src/main/webapp/WEB-INF/views/login.html
+++ b/juick-www/src/main/webapp/WEB-INF/views/login.html
@@ -120,17 +120,20 @@
 <div id="bottom1">juick.com &copy; 2008-2017 &nbsp; <a href="/help/ru/contacts" rel="nofollow">Контакты</a> &#183; <a href="/help/" rel="nofollow">Помощь</a></div>
 
 <div id="signup">
-      Зарегистрироваться:
+      {{ i18n("messages","label.register") }}:
       <div id="facebook"><a href="/_fblogin" rel="nofollow">Facebook</a></div>
       <div id="vk"><a href="/_vklogin" rel="nofollow">ВКонтакте</a></div>
       <div id="xmpp"><a href="#" onclick="$('#xmppinfo').toggle(); return false">XMPP</a>
-            <div id="xmppinfo">Отправьте <b>LOGIN</b> на <a href="xmpp:juick@juick.com?message;body=LOGIN">juick@juick.com</a></div>
+            <div id="xmppinfo">{{ i18n("messages","message.sendLoginToXmpp") }}</a></div>
           </div>
     </div>
-<div id="signin"><a href="#" onclick="$('#signinform').toggle(); $('#nickinput').focus(); return false">Уже зарегистрированы?</a>
+<div id="signin">
+      <a href="#" onclick="$('#signinform').toggle(); $('#nickinput').focus(); return false">
+            {{ i18n("messages","question.areRegistered") }}
+      </a>
     <div id="signinform"><form action="/login" method="POST">
-        <input class="txt" type="text" name="username" placeholder="Имя пользователя" id="nickinput"/>
-        <input class="txt" type="password" name="password" placeholder="Пароль"/>
+        <input class="txt" type="text" name="username" placeholder='{{ i18n("messages","label.username") }}' id="nickinput"/>
+        <input class="txt" type="password" name="password" placeholder='{{ i18n("messages","label.password") }}'/>
         <input class="submit" type="submit" value="OK"/>
         </form></div>
     </div>
diff --git a/juick-www/src/main/webapp/WEB-INF/views/partial/footer.html b/juick-www/src/main/webapp/WEB-INF/views/partial/footer.html
index 19f22cbd..71d675de 100644
--- a/juick-www/src/main/webapp/WEB-INF/views/partial/footer.html
+++ b/juick-www/src/main/webapp/WEB-INF/views/partial/footer.html
@@ -1,9 +1,9 @@
 <div id="footer">
     <div id="footer-right">
-        <a href="/settings" rel="nofollow">Настройки</a> &#183;
-        <a href="/help/ru/contacts" rel="nofollow">Контакты</a> &#183;
-        <a href="/help/" rel="nofollow">Справка</a> &#183;
-        <a href="/help/ru/adv" rel="nofollow">Реклама</a>
+        <a href="/settings" rel="nofollow">{{ i18n("messages","link.settings") }}</a> &#183;
+        <a href="/help/ru/contacts" rel="nofollow">{{ i18n("messages","link.contacts") }}</a> &#183;
+        <a href="/help/" rel="nofollow">{{ i18n("messages","link.help") }}</a> &#183;
+        <a href="/help/ru/adv" rel="nofollow">{{ i18n("messages","link.adv") }}</a>
     </div>
     <div id="footer-social">
         <a href="https://twitter.com/Juick" rel="nofollow" class="ico32-twi">Twitter</a>
@@ -12,7 +12,7 @@
     </div>
     <div id="footer-left">juick.com &copy; 2008-2017
         {% if links %}
-        <br/>Спонсоры: {{ links }}
+        <br/>{{ i18n("messages","label.sponsors") }}: {{ links }}
         {% endif %}
     </div>
 </div>
diff --git a/juick-www/src/main/webapp/WEB-INF/views/partial/navigation.html b/juick-www/src/main/webapp/WEB-INF/views/partial/navigation.html
index 89115b87..64877723 100644
--- a/juick-www/src/main/webapp/WEB-INF/views/partial/navigation.html
+++ b/juick-www/src/main/webapp/WEB-INF/views/partial/navigation.html
@@ -2,9 +2,9 @@
     <div id="logo"><a href="/">Juick</a></div>
     <nav id="global">
         <ul>
-            <li><a href="/">Популярные</a></li>
-            <li><a href="/?show=all" rel="nofollow">Все сообщения</a></li>
-            <li><a href="/?show=photos" rel="nofollow">Фотографии</a></li>
+            <li><a href="/">{{ i18n("messages","link.popular") }}</a></li>
+            <li><a href="/?show=all" rel="nofollow">{{ i18n("messages","link.allMessages") }}</a></li>
+            <li><a href="/?show=photos" rel="nofollow">{{ i18n("messages","link.withPhotos") }}</a></li>
         </ul>
     </nav>
     <div id="search">
@@ -16,23 +16,23 @@
         {% if visitor.getUID() > 0 %}
         <nav id="user">
             <ul>
-                <li><a href="/?show=my">Моя лента</a></li>
-                <li><a href="/pm/inbox">Приватные</a></li>
-                <li><a href="/?show=discuss">Обсуждения</a></li>
-                <li><a href="/?show=recommended">Рекомендации</a></li>
+                <li><a href="/?show=my">{{ i18n("messages","link.my") }}</a></li>
+                <li><a href="/pm/inbox">{{ i18n("messages","link.privateMessages") }}</a></li>
+                <li><a href="/?show=discuss">{{ i18n("messages","link.discuss") }}</a></li>
+                <li><a href="/?show=recommended">{{ i18n("messages","link.recommended") }}</a></li>
             </ul>
         </nav>
         <nav id="actions">
             <ul>
                 {% if not readonly %}
-                <li><a href="/#post">Написать</a></li>
+                <li><a href="/#post">{{ i18n("messages","link.postMessage") }}</a></li>
                 {% endif %}
                 <li><a href="/{{ visitor.getName() }}">@{{ visitor.getName() }}</a></li>
-                <li><a href="/logout">Выйти</a></li>
+                <li><a href="/logout">{{ i18n("messages","link.logout") }}</a></li>
             </ul>
         </nav>
         {% else %}
-        <p>Чтобы добавлять сообщения и комментарии, <a href="/login" class="a-login">представьтесь</a>.
+        <p>{{ i18n("messages","link.loginForSending", "/login") }}</a>.
         </p>
         {% endif %}
     </section>
diff --git a/juick-www/src/main/webapp/WEB-INF/views/partial/settings_tabs.html b/juick-www/src/main/webapp/WEB-INF/views/partial/settings_tabs.html
index d7901d5e..35a5a98e 100644
--- a/juick-www/src/main/webapp/WEB-INF/views/partial/settings_tabs.html
+++ b/juick-www/src/main/webapp/WEB-INF/views/partial/settings_tabs.html
@@ -1,5 +1,5 @@
 <div id="pagetabs"><ul>
-    <li><a href="/settings">Main</a></li>
-    <li><a href="/settings?page=password">Password</a></li>
-    <li><a href="/settings?page=about">About</a></li>
+    <li><a href="/settings">{{ i18n("messages","link.settings.main") }}</a></li>
+    <li><a href="/settings?page=password">{{ i18n("messages","link.settings.password") }}</a></li>
+    <li><a href="/settings?page=about">{{ i18n("messages","link.settings.about") }}</a></li>
 </ul></div>
\ No newline at end of file
-- 
cgit v1.2.3