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/main') 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 Upload
+postForm.tags=Tags (space separated) + +button.send=Send + +message.loginForSending=Login for post messages and comments +message.recommend=Recommend +message.sendLoginToXmpp=Send LOGIN to juick@juick.com + +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=или загрузить
+postForm.tags=Теги (через пробел) + +button.send=Отправить + +message.loginForSending=Чтобы добавлять сообщения и комментарии, представьтесь +message.recommend=Рекомендовать +message.sendLoginToXmpp=Отправьте LOGIN на juick@juick.com + +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 @@
juick.com © 2008-2017   Контакты · Помощь
- Зарегистрироваться: + {{ i18n("messages","label.register") }}:
Facebook
ВКонтакте
XMPP -
Отправьте LOGIN на juick@juick.com
+
{{ i18n("messages","message.sendLoginToXmpp") }}
-
Уже зарегистрированы? +
+ + {{ i18n("messages","question.areRegistered") }} +
- - + +
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 @@ 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 @@