midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-1829 Impossible to send reset password email in the user language / based on patch from Nicolas Micoud (nmicoud)

This commit is contained in:
Carlos Ruiz 2014-03-19 20:42:06 -05:00
parent 6e8fbabdfa
commit 0543cd8685
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
org.adempiere.base/src/org/compiere/model/MMailText.java
View File

@ -27,6 +27,7 @@ import org.compiere.util.DB;
import org.compiere.util.DisplayType; import org.compiere.util.DisplayType;
import org.compiere.util.Env; import org.compiere.util.Env;
import org.compiere.util.Msg; import org.compiere.util.Msg;
import org.compiere.util.Util;
/** /**
* Request Mail Template Model. * Request Mail Template Model.
@ -39,7 +40,7 @@ public class MMailText extends X_R_MailText
/** /**
* *
*/ */
private static final long serialVersionUID = -9121875595478208460L; private static final long serialVersionUID = -3278575461023934790L;
/** /**
* Standard Constructor * Standard Constructor
@ -79,6 +80,7 @@ public class MMailText extends X_R_MailText
private String m_MailText3 = null; private String m_MailText3 = null;
/** Translation Cache */ /** Translation Cache */
private static CCache<String,MMailTextTrl> s_cacheTrl = new CCache<String,MMailTextTrl> (Table_Name, 20); private static CCache<String,MMailTextTrl> s_cacheTrl = new CCache<String,MMailTextTrl> (Table_Name, 20);
private String m_language = null;
/** /**
* Get parsed/translated Mail Text * Get parsed/translated Mail Text
@ -323,13 +325,19 @@ public class MMailText extends X_R_MailText
*/ */
private void translate() private void translate()
{ {
if (m_bpartner != null && m_bpartner.getAD_Language() != null) // Default if no Translation
m_MailHeader = super.getMailHeader();
m_MailText = super.getMailText();
m_MailText2 = super.getMailText2();
m_MailText3 = super.getMailText3();
if ((m_bpartner != null && m_bpartner.getAD_Language() != null) || !Util.isEmpty(m_language))
{ {
StringBuilder key = new StringBuilder().append(m_bpartner.getAD_Language()).append(get_ID()); String adLanguage = m_bpartner != null ? m_bpartner.getAD_Language() : m_language;
StringBuilder key = new StringBuilder().append(adLanguage).append(get_ID());
MMailTextTrl trl = s_cacheTrl.get(key.toString()); MMailTextTrl trl = s_cacheTrl.get(key.toString());
if (trl == null) if (trl == null)
{ {
trl = getTranslation(m_bpartner.getAD_Language()); trl = getTranslation(adLanguage);
if (trl != null) if (trl != null)
s_cacheTrl.put(key.toString(), trl); s_cacheTrl.put(key.toString(), trl);
} }
@ -341,11 +349,6 @@ public class MMailText extends X_R_MailText
m_MailText3 = trl.MailText3; m_MailText3 = trl.MailText3;
} }
} }
// No Translation
m_MailHeader = super.getMailHeader();
m_MailText = super.getMailText();
m_MailText2 = super.getMailText2();
m_MailText3 = super.getMailText3();
} // translate } // translate
/** /**
@ -406,4 +409,9 @@ public class MMailText extends X_R_MailText
String MailText3 = null; String MailText3 = null;
} // MMailTextTrl } // MMailTextTrl
public void setLanguage(String language)
{
m_language = language;
}
} // MMailText } // MMailText

1
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ResetPasswordPanel.java
View File

@ -506,6 +506,7 @@ public class ResetPasswordPanel extends Window implements EventListener<Event>
return false; return false;
MMailText mailText = new MMailText(m_ctx, R_MailText_ID, null); MMailText mailText = new MMailText(m_ctx, R_MailText_ID, null);
mailText.setLanguage(Env.getContext(m_ctx, "#AD_Language"));
to.set_ValueOfColumn("Password", newPassword); // will be hashed and validate on saveEx to.set_ValueOfColumn("Password", newPassword); // will be hashed and validate on saveEx
mailText.setUser(to); mailText.setUser(to);
String message = mailText.getMailText(true); String message = mailText.getMailText(true);