From f6a77bc6b2b239acf8260329cb45e87fec5d9a89 Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Tue, 20 Dec 2016 10:55:00 +0300 Subject: juick-spring-www: i18n, cleanup --- .../src/main/resources/messages.properties | 4 ++- .../src/main/resources/messages_ru.properties | 4 ++- .../main/webapp/WEB-INF/templates/views/error.html | 32 +++++++--------------- .../main/webapp/WEB-INF/templates/views/index.html | 4 +-- .../templates/views/partial/blog_messages.html | 7 ++--- 5 files changed, 20 insertions(+), 31 deletions(-) (limited to 'juick-spring-www/src/main') diff --git a/juick-spring-www/src/main/resources/messages.properties b/juick-spring-www/src/main/resources/messages.properties index 469f05aa..0d98f7d0 100644 --- a/juick-spring-www/src/main/resources/messages.properties +++ b/juick-spring-www/src/main/resources/messages.properties @@ -46,4 +46,6 @@ title.index.anonym=Juick microblogs: popular posts title.index.user=Popular message.comment=Comment postForm.writeReply=Write a reply -messages.next=Next \ No newline at end of file +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-spring-www/src/main/resources/messages_ru.properties b/juick-spring-www/src/main/resources/messages_ru.properties index 00d9018c..20d53c8f 100644 --- a/juick-spring-www/src/main/resources/messages_ru.properties +++ b/juick-spring-www/src/main/resources/messages_ru.properties @@ -46,4 +46,6 @@ title.index.anonym=Микроблоги Juick: популярные записи title.index.user=Популярные message.comment=Комментировать postForm.writeReply=Написать ответ -messages.next=Читать далее \ No newline at end of file +messages.next=Читать далее +error.pageNotFound=Страница не найдена +error.pageNotFound.description=Сожалеем, но страницу с этим адресом удалил её автор, либо её никогда не существовало. \ No newline at end of file diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/error.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/error.html index 98ce70e4..0b22deb3 100644 --- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/error.html +++ b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/error.html @@ -1,27 +1,15 @@ - + - - - - - - - - - - - - Error page + Page not found - - -

404

- -

Error java.lang.NullPointerException

- - Back to Home Page + +
+
+

Page not found

+

Probably, user deleted this post, or this page never existed.

+
+
\ 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 e67dcd7f..24aa9472 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 @@ -7,11 +7,11 @@ -
+
-
+