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/webapp/WEB-INF/views/login.html   | 13 ++++++++-----
 .../main/webapp/WEB-INF/views/partial/footer.html    | 10 +++++-----
 .../webapp/WEB-INF/views/partial/navigation.html     | 20 ++++++++++----------
 .../webapp/WEB-INF/views/partial/settings_tabs.html  |  6 +++---
 4 files changed, 26 insertions(+), 23 deletions(-)

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

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