diff --git a/src/main/java/easytests/auth/controllers/AuthController.java b/src/main/java/easytests/auth/controllers/AuthController.java index bbc9a1adf..d54e5ad21 100644 --- a/src/main/java/easytests/auth/controllers/AuthController.java +++ b/src/main/java/easytests/auth/controllers/AuthController.java @@ -1,7 +1,9 @@ package easytests.auth.controllers; import easytests.auth.helpers.SessionLoginStoreHelper; +import easytests.config.LocalizationConfig; import javax.servlet.http.HttpServletRequest; +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 +12,29 @@ /** * @author malinink + * @author Loriens */ @Controller @RequestMapping("/auth") public class AuthController { + + private final LocalizationConfig localization = new LocalizationConfig(); + @GetMapping("/sign-in") public String signIn(Model model, HttpServletRequest request) { + 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"); + 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, 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)); return "auth/sign-in"; } } 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; + } +} 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..01753315d --- /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 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..ec2ada9ed --- /dev/null +++ b/src/main/resources/locales/sign-in_ru.properties @@ -0,0 +1,5 @@ +text=Войдите +enter_email=Введите ваш емейл +enter_password=Введите ваш пароль +forgot_password=Забыли пароль? +login_text=Войти 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) } } }