aboutsummaryrefslogtreecommitdiff
path: root/juick-spring-www/src/main/resources
diff options
context:
space:
mode:
authorGravatar Alexander Alexeev2016-12-12 16:58:18 +0700
committerGravatar Vitaly Takmazov2016-12-12 22:49:47 +0300
commitd446ba75acc05ec331540d51348bdc2be5aecb42 (patch)
tree445814fcf456999e9955c3570c381bdced015eab /juick-spring-www/src/main/resources
parent02979491ee071371bdbcc1e6ed813ffd44b5834b (diff)
rtemplate refactoring: layout templates moved to layout directory;
show error message on login error
Diffstat (limited to 'juick-spring-www/src/main/resources')
-rw-r--r--juick-spring-www/src/main/resources/errors.properties4
-rw-r--r--juick-spring-www/src/main/resources/errors_en.properties4
2 files changed, 6 insertions, 2 deletions
diff --git a/juick-spring-www/src/main/resources/errors.properties b/juick-spring-www/src/main/resources/errors.properties
index e0e14c56..e000394e 100644
--- a/juick-spring-www/src/main/resources/errors.properties
+++ b/juick-spring-www/src/main/resources/errors.properties
@@ -1,4 +1,6 @@
error.pageNotFound = Страница не найдена
errors.pageNotFound.extended = Похоже, пользователь удалил пост #{0}, или пост не был создан.
error.userNotFound = Пользователь не найден
-errors.userNotFound.extended = Пользователь {0} не найден \ No newline at end of file
+errors.userNotFound.extended = Пользователь {0} не найден
+
+error.login=Произошла ошибка, проверьте имя пользователя и пароль \ 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
index 99e70b14..7824bbe1 100644
--- a/juick-spring-www/src/main/resources/errors_en.properties
+++ b/juick-spring-www/src/main/resources/errors_en.properties
@@ -1,4 +1,6 @@
error.pageNotFound = Page not found
errors.pageNotFound.extended = Probably, user deleted this post #{0}, or this post never existed.
error.userNotFound = User not found
-errors.userNotFound.extended = User {0} not found \ No newline at end of file
+errors.userNotFound.extended = User {0} not found
+
+error.login=Wrong user or password \ No newline at end of file