From 6b9be78eec30b40deb01c4e75f773dfe16a0c0d5 Mon Sep 17 00:00:00 2001 From: Loriens Date: Fri, 19 May 2017 02:39:42 +0300 Subject: [PATCH 1/9] Add localization to sign-in.tpl --- src/main/resources/templates/auth/sign-in.tpl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/resources/templates/auth/sign-in.tpl b/src/main/resources/templates/auth/sign-in.tpl index 0ed2149fa..40acb6f5c 100644 --- a/src/main/resources/templates/auth/sign-in.tpl +++ b/src/main/resources/templates/auth/sign-in.tpl @@ -5,7 +5,7 @@ content: contents { div(class :'center-align') { div (class:'section') { h5 { - span ('Sign In') + span (sign_in) } } div (class:'container') { @@ -22,7 +22,7 @@ content: contents { } input (class:'validate', type:'email', name:'login', id:'login', required:'', value:login) label (for:'email') { - span ('Enter your email') + span (enter_email) } } } @@ -33,12 +33,12 @@ content: contents { } input (class:'validate', type:'password', name:'password', id:'password', required:'') label (for:'password') { - span ('Enter your password') + span (enter_password) } } label (style:'float: right;') { a (class: 'grey-text', href:'#!') { - b ('Forgot Password?') + b (forgot_password) } } } @@ -46,7 +46,7 @@ content: contents { div(class :'center-align') { div (class:'row') { button (type:'submit', name:'btn_login', class:'col s12 btn btn-large waves-effect waves-light teal lighten-2') { - span ('Login') + span (login_text) } } } From 1d061a7e092f7ef199cb26db9cbebfa79e69311a Mon Sep 17 00:00:00 2001 From: Loriens Date: Fri, 19 May 2017 02:40:42 +0300 Subject: [PATCH 2/9] Create resource bundle for sign-up --- src/main/resources/locales/sign-in_en.properties | 5 +++++ src/main/resources/locales/sign-in_ru.properties | 5 +++++ 2 files changed, 10 insertions(+) create mode 100644 src/main/resources/locales/sign-in_en.properties create mode 100644 src/main/resources/locales/sign-in_ru.properties diff --git a/src/main/resources/locales/sign-in_en.properties b/src/main/resources/locales/sign-in_en.properties new file mode 100644 index 000000000..e21c236ca --- /dev/null +++ b/src/main/resources/locales/sign-in_en.properties @@ -0,0 +1,5 @@ +text=Sign In +enter_email=Enter your email +enter_password=Enter your password +forgot_password=Forgot Password? +login_text=Login \ No newline at end of file diff --git a/src/main/resources/locales/sign-in_ru.properties b/src/main/resources/locales/sign-in_ru.properties new file mode 100644 index 000000000..af14aab9f --- /dev/null +++ b/src/main/resources/locales/sign-in_ru.properties @@ -0,0 +1,5 @@ +text=Войдите +enter_email=Введите ваш емейл +enter_password=Введите ваш пароль +forgot_password=Забыли пароль? +login_text=Войти \ No newline at end of file From b3d6cc31e1c228daa5b473efb99ce16d62d3eb83 Mon Sep 17 00:00:00 2001 From: Loriens Date: Fri, 19 May 2017 02:41:33 +0300 Subject: [PATCH 3/9] Add localization to AuthController --- .../auth/controllers/AuthController.java | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/main/java/easytests/auth/controllers/AuthController.java b/src/main/java/easytests/auth/controllers/AuthController.java index bbc9a1adf..7c53c550b 100644 --- a/src/main/java/easytests/auth/controllers/AuthController.java +++ b/src/main/java/easytests/auth/controllers/AuthController.java @@ -2,6 +2,12 @@ import easytests.auth.helpers.SessionLoginStoreHelper; import javax.servlet.http.HttpServletRequest; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.MessageSource; +import org.springframework.context.MessageSourceResolvable; +import org.springframework.context.annotation.Bean; +import org.springframework.context.support.ReloadableResourceBundleMessageSource; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; @@ -10,13 +16,31 @@ /** * @author malinink + * @author Loriens */ @Controller @RequestMapping("/auth") public class AuthController { + @Bean + public ReloadableResourceBundleMessageSource messageSource() { + final ReloadableResourceBundleMessageSource resourseBundle = new + ReloadableResourceBundleMessageSource(); + resourseBundle.setBasename("classpath:/locales/sign-in"); + resourseBundle.setCacheSeconds(1); + resourseBundle.setDefaultEncoding("UTF-8"); + return resourseBundle; + } + @GetMapping("/sign-in") public String signIn(Model model, HttpServletRequest request) { + final ReloadableResourceBundleMessageSource msg = messageSource(); + model.addAttribute("login", new SessionLoginStoreHelper(request.getSession(false)).getLogin()); + model.addAttribute("sign_in", msg.getMessage("text", null, "sign-in_ru", null)); + model.addAttribute("enter_login", msg.getMessage("enter_login", null, "sign-in_ru", null)); + model.addAttribute("enter_password", msg.getMessage("enter_password", null, "sign-in_ru", null)); + model.addAttribute("forgot_password", msg.getMessage("forgot_password", null, "sign-in_ru", null)); + model.addAttribute("login_text", msg.getMessage("login_text", null, "sign-in_ru", null)); return "auth/sign-in"; } } From dbbd89cf2dbf74a72725b8058d099f725d2826d1 Mon Sep 17 00:00:00 2001 From: Loriens Date: Fri, 19 May 2017 02:56:33 +0300 Subject: [PATCH 4/9] fix errors of checkstyle --- .../auth/controllers/AuthController.java | 18 ++++++++++-------- .../resources/locales/sign-in_en.properties | 2 +- .../resources/locales/sign-in_ru.properties | 2 +- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/main/java/easytests/auth/controllers/AuthController.java b/src/main/java/easytests/auth/controllers/AuthController.java index 7c53c550b..f9fdde13b 100644 --- a/src/main/java/easytests/auth/controllers/AuthController.java +++ b/src/main/java/easytests/auth/controllers/AuthController.java @@ -3,9 +3,6 @@ import easytests.auth.helpers.SessionLoginStoreHelper; import javax.servlet.http.HttpServletRequest; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.MessageSource; -import org.springframework.context.MessageSourceResolvable; import org.springframework.context.annotation.Bean; import org.springframework.context.support.ReloadableResourceBundleMessageSource; import org.springframework.stereotype.Controller; @@ -34,13 +31,18 @@ public ReloadableResourceBundleMessageSource messageSource() { @GetMapping("/sign-in") public String signIn(Model model, HttpServletRequest request) { final ReloadableResourceBundleMessageSource msg = messageSource(); + final String enterLogin = new String("enter_login"); + final String enterPassword = new String("enter_password"); + final String forgotPassword = new String("forgot_password"); + final String loginText = new String("login_text"); + final String language = new String("sign-in_ru"); model.addAttribute("login", new SessionLoginStoreHelper(request.getSession(false)).getLogin()); - model.addAttribute("sign_in", msg.getMessage("text", null, "sign-in_ru", null)); - model.addAttribute("enter_login", msg.getMessage("enter_login", null, "sign-in_ru", null)); - model.addAttribute("enter_password", msg.getMessage("enter_password", null, "sign-in_ru", null)); - model.addAttribute("forgot_password", msg.getMessage("forgot_password", null, "sign-in_ru", null)); - model.addAttribute("login_text", msg.getMessage("login_text", null, "sign-in_ru", null)); + model.addAttribute("sign_in", msg.getMessage("text", null, language, null)); + model.addAttribute(enterLogin, msg.getMessage(enterLogin, null, language, null)); + model.addAttribute(enterPassword, msg.getMessage(enterPassword, null, language, null)); + model.addAttribute(forgotPassword, msg.getMessage(forgotPassword, null, language, null)); + model.addAttribute(loginText, msg.getMessage(loginText, null, language, null)); return "auth/sign-in"; } } diff --git a/src/main/resources/locales/sign-in_en.properties b/src/main/resources/locales/sign-in_en.properties index e21c236ca..01753315d 100644 --- a/src/main/resources/locales/sign-in_en.properties +++ b/src/main/resources/locales/sign-in_en.properties @@ -2,4 +2,4 @@ text=Sign In enter_email=Enter your email enter_password=Enter your password forgot_password=Forgot Password? -login_text=Login \ No newline at end of file +login_text=Login diff --git a/src/main/resources/locales/sign-in_ru.properties b/src/main/resources/locales/sign-in_ru.properties index af14aab9f..ec2ada9ed 100644 --- a/src/main/resources/locales/sign-in_ru.properties +++ b/src/main/resources/locales/sign-in_ru.properties @@ -2,4 +2,4 @@ text=Войдите enter_email=Введите ваш емейл enter_password=Введите ваш пароль forgot_password=Забыли пароль? -login_text=Войти \ No newline at end of file +login_text=Войти From 95a5fb78010aa41bcdf34315bbcd13966a9321ce Mon Sep 17 00:00:00 2001 From: Loriens Date: Fri, 19 May 2017 21:00:37 +0300 Subject: [PATCH 5/9] Transfer bean of localization to config from AuthController --- .../auth/controllers/AuthController.java | 20 +++++++----------- .../easytests/config/LocalizationConfig.java | 21 +++++++++++++++++++ 2 files changed, 29 insertions(+), 12 deletions(-) create mode 100644 src/main/java/easytests/config/LocalizationConfig.java diff --git a/src/main/java/easytests/auth/controllers/AuthController.java b/src/main/java/easytests/auth/controllers/AuthController.java index f9fdde13b..6b025f55c 100644 --- a/src/main/java/easytests/auth/controllers/AuthController.java +++ b/src/main/java/easytests/auth/controllers/AuthController.java @@ -3,7 +3,9 @@ import easytests.auth.helpers.SessionLoginStoreHelper; import javax.servlet.http.HttpServletRequest; +import easytests.config.LocalizationConfig; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Import; import org.springframework.context.support.ReloadableResourceBundleMessageSource; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -17,21 +19,15 @@ */ @Controller @RequestMapping("/auth") +@Import(LocalizationConfig.class) public class AuthController { - @Bean - public ReloadableResourceBundleMessageSource messageSource() { - final ReloadableResourceBundleMessageSource resourseBundle = new - ReloadableResourceBundleMessageSource(); - resourseBundle.setBasename("classpath:/locales/sign-in"); - resourseBundle.setCacheSeconds(1); - resourseBundle.setDefaultEncoding("UTF-8"); - return resourseBundle; - } + + final LocalizationConfig localization = new LocalizationConfig(); @GetMapping("/sign-in") public String signIn(Model model, HttpServletRequest request) { - final ReloadableResourceBundleMessageSource msg = messageSource(); - final String enterLogin = new String("enter_login"); + final ReloadableResourceBundleMessageSource msg = localization.messageSource(); + final String enterEmail = new String("enter_email"); final String enterPassword = new String("enter_password"); final String forgotPassword = new String("forgot_password"); final String loginText = new String("login_text"); @@ -39,7 +35,7 @@ public String signIn(Model model, HttpServletRequest request) { model.addAttribute("login", new SessionLoginStoreHelper(request.getSession(false)).getLogin()); model.addAttribute("sign_in", msg.getMessage("text", null, language, null)); - model.addAttribute(enterLogin, msg.getMessage(enterLogin, null, language, null)); + model.addAttribute(enterEmail, msg.getMessage(enterEmail, null, language, null)); model.addAttribute(enterPassword, msg.getMessage(enterPassword, null, language, null)); model.addAttribute(forgotPassword, msg.getMessage(forgotPassword, null, language, null)); model.addAttribute(loginText, msg.getMessage(loginText, null, language, null)); diff --git a/src/main/java/easytests/config/LocalizationConfig.java b/src/main/java/easytests/config/LocalizationConfig.java new file mode 100644 index 000000000..d8d1b38da --- /dev/null +++ b/src/main/java/easytests/config/LocalizationConfig.java @@ -0,0 +1,21 @@ +package easytests.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.support.ReloadableResourceBundleMessageSource; + +/** + * @author Loriens + */ +@Configuration +public class LocalizationConfig { + + @Bean + public ReloadableResourceBundleMessageSource messageSource() { + final ReloadableResourceBundleMessageSource resourseBundle = new + ReloadableResourceBundleMessageSource(); + resourseBundle.setBasename("classpath:/locales/sign-in"); + resourseBundle.setDefaultEncoding("UTF-8"); + return resourseBundle; + } +} From d4de343210892671f8edb295d538454afa7e15ae Mon Sep 17 00:00:00 2001 From: Loriens Date: Fri, 19 May 2017 21:03:20 +0300 Subject: [PATCH 6/9] Fix --- src/main/java/easytests/auth/controllers/AuthController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/easytests/auth/controllers/AuthController.java b/src/main/java/easytests/auth/controllers/AuthController.java index 6b025f55c..be023b3f2 100644 --- a/src/main/java/easytests/auth/controllers/AuthController.java +++ b/src/main/java/easytests/auth/controllers/AuthController.java @@ -22,7 +22,7 @@ @Import(LocalizationConfig.class) public class AuthController { - final LocalizationConfig localization = new LocalizationConfig(); + private final LocalizationConfig localization = new LocalizationConfig(); @GetMapping("/sign-in") public String signIn(Model model, HttpServletRequest request) { From 2f7e8e67bee4be057a4736c2e7b6f5b9e6f8e44d Mon Sep 17 00:00:00 2001 From: Loriens Date: Fri, 19 May 2017 21:14:13 +0300 Subject: [PATCH 7/9] fix errors of checkstyle --- src/main/java/easytests/auth/controllers/AuthController.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/easytests/auth/controllers/AuthController.java b/src/main/java/easytests/auth/controllers/AuthController.java index be023b3f2..fb20e32a5 100644 --- a/src/main/java/easytests/auth/controllers/AuthController.java +++ b/src/main/java/easytests/auth/controllers/AuthController.java @@ -1,10 +1,8 @@ package easytests.auth.controllers; import easytests.auth.helpers.SessionLoginStoreHelper; -import javax.servlet.http.HttpServletRequest; - import easytests.config.LocalizationConfig; -import org.springframework.context.annotation.Bean; +import javax.servlet.http.HttpServletRequest; import org.springframework.context.annotation.Import; import org.springframework.context.support.ReloadableResourceBundleMessageSource; import org.springframework.stereotype.Controller; From a57a67ae67643ccddf8d2cada1d15f62f9505099 Mon Sep 17 00:00:00 2001 From: Loriens Date: Sat, 20 May 2017 00:06:58 +0300 Subject: [PATCH 8/9] Fix --- src/main/java/easytests/auth/controllers/AuthController.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/easytests/auth/controllers/AuthController.java b/src/main/java/easytests/auth/controllers/AuthController.java index fb20e32a5..88f0cf194 100644 --- a/src/main/java/easytests/auth/controllers/AuthController.java +++ b/src/main/java/easytests/auth/controllers/AuthController.java @@ -17,7 +17,6 @@ */ @Controller @RequestMapping("/auth") -@Import(LocalizationConfig.class) public class AuthController { private final LocalizationConfig localization = new LocalizationConfig(); From eb5c8306c68c61473a2bd3dd56f02408cc6ec34b Mon Sep 17 00:00:00 2001 From: Loriens Date: Sat, 20 May 2017 00:44:02 +0300 Subject: [PATCH 9/9] Delete unused import --- src/main/java/easytests/auth/controllers/AuthController.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/easytests/auth/controllers/AuthController.java b/src/main/java/easytests/auth/controllers/AuthController.java index 88f0cf194..d54e5ad21 100644 --- a/src/main/java/easytests/auth/controllers/AuthController.java +++ b/src/main/java/easytests/auth/controllers/AuthController.java @@ -3,7 +3,6 @@ import easytests.auth.helpers.SessionLoginStoreHelper; import easytests.config.LocalizationConfig; import javax.servlet.http.HttpServletRequest; -import org.springframework.context.annotation.Import; import org.springframework.context.support.ReloadableResourceBundleMessageSource; import org.springframework.stereotype.Controller; import org.springframework.ui.Model;