svn commit: r1696898 - in /openmeetings/branches/3.0.x/src: main/java/org/apache/openmeetings/data/user/ web/java/org/apache/openmeetings/web/mail/template/

[vdegtyarev]

Author: vdegtyarev
Date: Fri Aug 21 06:16:04 2015
New Revision: 1696898

URL: http://svn.apache.org/r1696898
Log:
OPENMEETINGS-954 self registration minor changes.

Modified:
    
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/user/EmailManager.java
    
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/user/UserManager.java
    
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/RegisterUserTemplate.java

Modified: 
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/user/EmailManager.java
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/user/EmailManager.java?rev=1696898&r1=1696897&r2=1696898&view=diff
==============================================================================
--- 
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/user/EmailManager.java
 (original)
+++ 
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/user/EmailManager.java
 Fri Aug 21 06:16:04 2015
@@ -50,13 +50,13 @@ public class EmailManager {
         * @return
         * @throws Exception
         */
-       public String sendMail(String username, String userpass, String email, 
String link, Boolean sendEmailWithVerficationCode) {
+       public String sendMail(String username, String userpass, String email, 
String link, Boolean sendEmailWithVerficationCode, Long langId) {
                log.debug("sendMail:: username = {}, email = {}", username, 
email);
                Integer sendEmailAtRegister = 
configurationDao.getConfValue("sendEmailAtRegister", Integer.class, "0");
 
                if (sendEmailAtRegister == 1) {
-                       mailHandler.send(email, Application.getString(512)
-                               , RegisterUserTemplate.getEmail(username, 
userpass, email, sendEmailWithVerficationCode ? link : null));
+                       mailHandler.send(email, langId == null ? 
Application.getString(512) : Application.getString(512, langId)  
+                               , RegisterUserTemplate.getEmail(username, 
userpass, email, sendEmailWithVerficationCode ? link : null, langId));
                }
                return "success";
        }

Modified: 
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/user/UserManager.java
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/user/UserManager.java?rev=1696898&r1=1696897&r2=1696898&view=diff
==============================================================================
--- 
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/user/UserManager.java
 (original)
+++ 
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/user/UserManager.java
 Fri Aug 21 06:16:04 2015
@@ -404,7 +404,7 @@ public class UserManager implements IUse
                                link += "activate?u=" + hash;
 
                                if (sendWelcomeMessage && email.length() != 0) {
-                                       String sendMail = 
emailManagement.sendMail(login, password, email, link, sendConfirmation);
+                                       String sendMail = 
emailManagement.sendMail(login, password, email, link, sendConfirmation, 
language_id);
                                        if (!sendMail.equals("success")) {
                                                return -19L;
                                        }

Modified: 
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/RegisterUserTemplate.java
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/RegisterUserTemplate.java?rev=1696898&r1=1696897&r2=1696898&view=diff
==============================================================================
--- 
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/RegisterUserTemplate.java
 (original)
+++ 
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/RegisterUserTemplate.java
 Fri Aug 21 06:16:04 2015
@@ -37,7 +37,8 @@ public class RegisterUserTemplate extend
                        .setVisible(verification_url != null));
        }
 
-       public static String getEmail(String username, String userpass, String 
email, String verification_url) {
+       public static String getEmail(String username, String userpass, String 
email, String verification_url, Long langId) {
+               ensureApplication(langId);
                return renderPanel(new RegisterUserTemplate(username, userpass, 
email, verification_url)).toString();
        }
 }