localize e-mail messages

Author: taleksashina

src/main/java/authentication/FrameworkConfiguration.java

@@ -1,13 +1,18 @@
 package authentication;
 
 import java.io.IOException;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
 
 import javax.servlet.ServletContext;
 
 import org.apache.jena.riot.RiotException;
 
 import rdf.SecureRdfStoreManagerImpl;
 import util.EmailSender;
+import util.Localizer;
 import util.SSLEmailSender;
 import util.TLSEmailSender;
 import accounts.FrameworkUserManager;
@@ -50,6 +55,8 @@ public class FrameworkConfiguration {
 
   private static FrameworkConfiguration instance;
 
+    private HashMap<Locale, Localizer> localizers = new HashMap<Locale, Localizer>();
+
   /**
    * 
    * @param context
@@ -360,4 +367,30 @@ public void setFrameworkUri(String frameworkUri) {
     this.frameworkUri = frameworkUri;
   }
 
+    public Localizer getLocalizer(Locale locale) {
+        Localizer localizer = localizers.get(locale);
+        if (localizer==null) {
+            try {
+                final ResourceBundle bundle = ResourceBundle.getBundle("resources/locale/generator", locale);
+                localizer = new Localizer() {
+                    @Override
+                    public String localize(String str) {
+                        try {
+                            return bundle.getString(str);
+                        } catch (Exception e) {
+                            return str;
+                        }
+                    }
+                };
+            } catch (MissingResourceException e) {
+                localizer = new Localizer() {
+                    public String localize(String str) {
+                        return str;
+                    }
+                };
+            }
+            localizers.put(locale, localizer);
+        }
+        return localizer;
+    }
 }

src/main/java/authentication/web/AuthenticationServlet.java

@@ -5,6 +5,7 @@
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Locale;
 import java.util.UUID;
 
 import javax.mail.MessagingException;
@@ -19,6 +20,7 @@
 
 import util.EmailSender;
 import util.HttpUtils;
+import util.Localizer;
 import util.RandomStringGenerator;
 import accounts.FrameworkUserManager;
 import accounts.UserProfile;
@@ -67,6 +69,11 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
       throws ServletException, IOException {
     String mode = request.getParameter("mode");
 
+      String language = request.getParameter("lang");
+      if (language==null)
+          language = "en";
+      Locale locale = new Locale(language);
+
     PrintWriter out = response.getWriter();
 
     if ("login".equals(mode)) {
@@ -149,11 +156,11 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
       try {
         frameworkUserManager.createUser(username, password, email);
 
-        EmailSender emailSender = FrameworkConfiguration.getInstance(getServletContext())
-            .getDefaultEmailSender();
+        FrameworkConfiguration frameworkConfiguration = FrameworkConfiguration.getInstance(getServletContext());
+        Localizer localizer = frameworkConfiguration.getLocalizer(locale);
+        EmailSender emailSender = frameworkConfiguration.getDefaultEmailSender();
 
-        emailSender.send(email, "Ontos LDIW for ACC registration", "Your login: " + username + ", password: "
-            + password);
+        emailSender.send(email, localizer.localize("email.subject.registration"), localizer.localize("login") + ": " + username + "\n" + localizer.localize("password") + ": " + password);
         String responseStr = "{\"message\" : \"Your password will be sent to your e-mail address "
             + email + " \"}";
         response.getWriter().print(responseStr);
@@ -197,8 +204,10 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
                 response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "User profile " + username + " not found");
                 return;
             }
-            EmailSender emailSender = FrameworkConfiguration.getInstance(getServletContext()).getDefaultEmailSender();
-            emailSender.send(userProfile.getEmail(), "Ontos LDIW for ACC change password", "Your password for the Linked Data Information Workbench account "  + username + " was changed.");
+            FrameworkConfiguration frameworkConfiguration = FrameworkConfiguration.getInstance(getServletContext());
+            Localizer localizer = frameworkConfiguration.getLocalizer(locale);
+            EmailSender emailSender = frameworkConfiguration.getDefaultEmailSender();
+            emailSender.send(userProfile.getEmail(), localizer.localize("email.subject.passwordChanged"), localizer.localize("email.message.passwordChanged") + " " + username);
 
           String responseStr = "{\"message\" : \"Your password was changed\"}";
           response.getWriter().print(responseStr);
@@ -225,10 +234,11 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
         frameworkUserManager.setPassword(username, password);
 
         // send new password to user
-        EmailSender emailSender = FrameworkConfiguration.getInstance(getServletContext())
-            .getDefaultEmailSender();
-        emailSender.send(userProfile.getEmail(), "Ontos LDIW for ACC restore password", "Your login: "
-            + username + ", password: " + password);
+        FrameworkConfiguration frameworkConfiguration = FrameworkConfiguration.getInstance(getServletContext());
+        Localizer localizer = frameworkConfiguration.getLocalizer(locale);
+        EmailSender emailSender = frameworkConfiguration.getDefaultEmailSender();
+        emailSender.send(userProfile.getEmail(), localizer.localize("email.subject.passwordRestored"), localizer.localize("login") + ": "
+            + username + "\n" + localizer.localize("password") + ": " + password);
         String responseStr = "{\"message\" : \"New password will be sent to your e-mail address "
             + userProfile.getEmail() + " \"}";
         response.getWriter().print(responseStr);

src/main/java/authentication/web/UserManagerServlet.java

@@ -5,6 +5,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.Locale;
 
 import javax.mail.MessagingException;
 import javax.servlet.ServletConfig;
@@ -18,6 +19,7 @@
 
 import util.EmailSender;
 import util.HttpUtils;
+import util.Localizer;
 import util.RandomStringGenerator;
 import accounts.FrameworkUserManager;
 import accounts.UserProfileExtended;
@@ -137,10 +139,14 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws S
 
       EmailSender emailSender = null;
       try {
-        emailSender = FrameworkConfiguration.getInstance(getServletContext())
-            .getDefaultEmailSender();
-        emailSender.send(email, "Ontos LDIW for ACC registration", "Your login: " + username + ", password: "
-            + password);
+        String language = req.getParameter("lang");
+        if (language==null)
+            language = "en";
+        Locale locale = new Locale(language);
+        FrameworkConfiguration frameworkConfiguration = FrameworkConfiguration.getInstance(getServletContext());
+        Localizer localizer = frameworkConfiguration.getLocalizer(locale);
+        emailSender = frameworkConfiguration.getDefaultEmailSender();
+        emailSender.send(email, localizer.localize("email.subject.registration"), localizer.localize("login") + ": " + username + "\n" + localizer.localize("password") + ": " + password);
       } catch (MessagingException e) {
         throw new ServletException("Failed to send email to " + email + " using " + emailSender, e);
       } catch (Exception e) {

src/main/java/util/Localizer.java

@@ -0,0 +1,8 @@
+package util;
+
+/**
+ * Created by taleksaschina on 18.07.2014.
+ */
+public interface Localizer {
+    String localize(String str);
+}

src/main/resources/locale/generator.properties

@@ -0,0 +1,6 @@
+login=Login
+password=Password
+email.subject.registration=Ontos LDIW for ACC registration
+email.subject.passwordChanged=Ontos LDIW for ACC password changed
+email.message.passwordChanged=Password was changed for your Linked Data Information Workbench account
+email.subject.passwordRestored=Ontos LDIW for ACC restore password

src/main/resources/locale/generator_en.properties

@@ -0,0 +1,6 @@
+login=Login
+password=Password
+email.subject.registration=Ontos LDIW for ACC registration
+email.subject.passwordChanged=Ontos LDIW for ACC password changed
+email.message.passwordChanged=Password was changed for your Linked Data Information Workbench account
+email.subject.passwordRestored=Ontos LDIW for ACC restore password

src/main/resources/locale/generator_ru.properties

@@ -0,0 +1,6 @@
+login=Логин
+password=Пароль
+email.subject.registration=Ontos LDIW для ACC регистрация
+email.subject.passwordChanged=Ontos LDIW для ACC смена пароля
+email.message.passwordChanged=Пароль был изменен для Вашего аккаунта Linked Data Information Workbench
+email.subject.passwordRestored=Ontos LDIW для ACC восстановение пароля

src/main/webapp/js/admin/users/users-controller.js

@@ -1,6 +1,6 @@
 'use strict';
 
-function UsersCtrl($scope, $http, flash, Helpers, AccountService) {
+function UsersCtrl($scope, $http, flash, Helpers, AccountService, localize) {
 	var emptyUser = { profile: { accountURI:"", username:"", email:""}
 	                    , ownGraphs: []
 	                    , readableGraphs: []
@@ -87,7 +87,8 @@ function UsersCtrl($scope, $http, flash, Helpers, AccountService) {
 	    var parameters = {
 	        mode: newUser ? "create" : "update",
 	        user: JSON.stringify($scope.user),
-	        curuser: AccountService.getUsername()
+	        curuser: AccountService.getUsername(),
+	        lang: localize.language
         };
         $http({
             url: "UserManagerServlet",

src/main/webapp/js/services/login-service.js

@@ -2,7 +2,7 @@
 
 var module = angular.module('app.login-service', []);
 
-module.factory("LoginService", function ($http, $location, $cookieStore, AccountService, ConfigurationService, Base64, flash, ServerErrorResponse) {
+module.factory("LoginService", function ($http, $location, $cookieStore, AccountService, ConfigurationService, Base64, flash, ServerErrorResponse, localize) {
 
     var login = function (username, password) {
 
@@ -81,7 +81,8 @@ module.factory("LoginService", function ($http, $location, $cookieStore, Account
         var postData = {
             username: username,
             email: email,
-            mode: "create"
+            mode: "create",
+            lang: localize.language
         };
         return $http({
             url: "AuthenticationServlet",
@@ -96,7 +97,8 @@ module.factory("LoginService", function ($http, $location, $cookieStore, Account
             username: AccountService.getUsername(),
             oldPassword: oldPassword,
             newPassword: newPassword,
-            mode: "changePassword"
+            mode: "changePassword",
+            lang: localize.language
         };
         return $http({
             url: "AuthenticationServlet",
@@ -109,7 +111,8 @@ module.factory("LoginService", function ($http, $location, $cookieStore, Account
     var restorePassword = function (username) {
         var postData = {
             username: username,
-            mode: "restorePassword"
+            mode: "restorePassword",
+            lang: localize.language
         };
         return $http({
             url: "AuthenticationServlet",

src/main/webapp/js/services/users-service.js

@@ -2,7 +2,7 @@
 
 var module = angular.module('app.users-service', []);
 
-module.factory("UsersService", function($http, Config, AccountService) {
+module.factory("UsersService", function($http, Config, AccountService, localize) {
     var users = [];
     var roles = {};
 
@@ -205,7 +205,8 @@ module.factory("UsersService", function($http, Config, AccountService) {
 	    var parameters = {
 	        mode: "create",
 	        user: JSON.stringify(user),
-	        curuser: AccountService.getUsername()
+	        curuser: AccountService.getUsername(),
+	        lang: localize.language
         };
         return $http({
             url: "UserManagerServlet",