Revert "localize e-mail messages"

This reverts commit d37115d.

Author: alegrm

src/main/java/authentication/FrameworkConfiguration.java

@@ -1,18 +1,13 @@
 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;
@@ -55,8 +50,6 @@ public class FrameworkConfiguration {
 
   private static FrameworkConfiguration instance;
 
-    private HashMap<Locale, Localizer> localizers = new HashMap<Locale, Localizer>();
-
   /**
    * 
    * @param context
@@ -367,30 +360,4 @@ 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,7 +5,6 @@
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Locale;
 import java.util.UUID;
 
 import javax.mail.MessagingException;
@@ -20,7 +19,6 @@
 
 import util.EmailSender;
 import util.HttpUtils;
-import util.Localizer;
 import util.RandomStringGenerator;
 import accounts.FrameworkUserManager;
 import accounts.UserProfile;
@@ -69,11 +67,6 @@ 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)) {
@@ -156,11 +149,11 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
       try {
         frameworkUserManager.createUser(username, password, email);
 
-        FrameworkConfiguration frameworkConfiguration = FrameworkConfiguration.getInstance(getServletContext());
-        Localizer localizer = frameworkConfiguration.getLocalizer(locale);
-        EmailSender emailSender = frameworkConfiguration.getDefaultEmailSender();
+        EmailSender emailSender = FrameworkConfiguration.getInstance(getServletContext())
+            .getDefaultEmailSender();
 
-        emailSender.send(email, localizer.localize("email.subject.registration"), localizer.localize("login") + ": " + username + "\n" + localizer.localize("password") + ": " + password);
+        emailSender.send(email, "Ontos LDIW for ACC registration", "Your login: " + username + ", password: "
+            + password);
         String responseStr = "{\"message\" : \"Your password will be sent to your e-mail address "
             + email + " \"}";
         response.getWriter().print(responseStr);
@@ -204,10 +197,8 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
                 response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "User profile " + username + " not found");
                 return;
             }
-            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);
+            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.");
 
           String responseStr = "{\"message\" : \"Your password was changed\"}";
           response.getWriter().print(responseStr);
@@ -234,11 +225,10 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
         frameworkUserManager.setPassword(username, password);
 
         // send new password to user
-        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);
+        EmailSender emailSender = FrameworkConfiguration.getInstance(getServletContext())
+            .getDefaultEmailSender();
+        emailSender.send(userProfile.getEmail(), "Ontos LDIW for ACC restore password", "Your login: "
+            + username + ", 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,7 +5,6 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
-import java.util.Locale;
 
 import javax.mail.MessagingException;
 import javax.servlet.ServletConfig;
@@ -19,7 +18,6 @@
 
 import util.EmailSender;
 import util.HttpUtils;
-import util.Localizer;
 import util.RandomStringGenerator;
 import accounts.FrameworkUserManager;
 import accounts.UserProfileExtended;
@@ -139,14 +137,10 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws S
 
       EmailSender emailSender = null;
       try {
-        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);
+        emailSender = FrameworkConfiguration.getInstance(getServletContext())
+            .getDefaultEmailSender();
+        emailSender.send(email, "Ontos LDIW for ACC registration", "Your login: " + username + ", password: "
+            + password);
       } catch (MessagingException e) {
         throw new ServletException("Failed to send email to " + email + " using " + emailSender, e);
       } catch (Exception e) {