You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2015/04/09 13:05:10 UTC
svn commit: r1672291 - in /openmeetings:
branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/
branches/3.0.x/src/web/java/org/apache/openmeetings/web/util/
trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/...
Author: solomax
Date: Thu Apr 9 11:05:10 2015
New Revision: 1672291
URL: http://svn.apache.org/r1672291
Log:
[OPENMEETINGS-1168] language for contact request/confirmation is selected correctly
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/RequestContactConfirmTemplate.html
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/RequestContactConfirmTemplate.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/RequestContactTemplate.html
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/RequestContactTemplate.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/util/ContactsHelper.java
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactConfirmTemplate.html
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactConfirmTemplate.java
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactTemplate.html
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactTemplate.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/RequestContactConfirmTemplate.html
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/RequestContactConfirmTemplate.html?rev=1672291&r1=1672290&r2=1672291&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/RequestContactConfirmTemplate.html (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/RequestContactConfirmTemplate.html Thu Apr 9 11:05:10 2015
@@ -20,9 +20,8 @@
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:extend>
- <wicket:ommessage key="1192"/> <span wicket:id="addedFirstName"></span> <span wicket:id="addedLastName"></span><br/>
+ <span wicket:id="hi"></span> <span wicket:id="firstName"></span> <span wicket:id="lastName"></span><br/>
<br/>
- <span wicket:id="firstName"></span> <span wicket:id="lastName"></span> <wicket:ommessage key="1193"/><br/>
- <wicket:ommessage key="1194"/><br/>
+ <span wicket:id="addedFirstName"></span> <span wicket:id="addedLastName"></span> <span wicket:id="confirmed"></span><br/>
</wicket:extend>
</html>
\ No newline at end of file
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/RequestContactConfirmTemplate.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/RequestContactConfirmTemplate.java?rev=1672291&r1=1672290&r2=1672291&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/RequestContactConfirmTemplate.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/RequestContactConfirmTemplate.java Thu Apr 9 11:05:10 2015
@@ -18,7 +18,6 @@
*/
package org.apache.openmeetings.web.mail.template;
-import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.entity.user.UserContact;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.wicket.markup.html.basic.Label;
@@ -26,15 +25,17 @@ import org.apache.wicket.markup.html.bas
public class RequestContactConfirmTemplate extends AbstractTemplatePanel {
private static final long serialVersionUID = 1L;
- public RequestContactConfirmTemplate(User user, UserContact contact) {
- super(WebSession.getLanguage());
- add(new Label("firstName", user.getFirstname()));
- add(new Label("lastName", user.getLastname()));
+ public RequestContactConfirmTemplate(UserContact contact) {
+ super(contact.getOwner().getLanguage_id());
+ add(new Label("hi", WebSession.getString(1192, langId)));
+ add(new Label("firstName", contact.getOwner().getFirstname()));
+ add(new Label("lastName", contact.getOwner().getLastname()));
add(new Label("addedFirstName", contact.getContact().getFirstname()));
add(new Label("addedLastName", contact.getContact().getLastname()));
+ add(new Label("confirmed", WebSession.getString(1198, langId)));
}
- public static String getEmail(User user, UserContact contact) {
- return renderPanel(new RequestContactConfirmTemplate(user, contact)).toString();
+ public static String getEmail(UserContact contact) {
+ return renderPanel(new RequestContactConfirmTemplate(contact)).toString();
}
}
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/RequestContactTemplate.html
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/RequestContactTemplate.html?rev=1672291&r1=1672290&r2=1672291&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/RequestContactTemplate.html (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/RequestContactTemplate.html Thu Apr 9 11:05:10 2015
@@ -20,12 +20,12 @@
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:extend>
- <wicket:ommessage key="1192"/> <span wicket:id="addedFirstName"></span> <span wicket:id="addedLastName"></span><br/>
+ <span wicket:id="hi"></span> <span wicket:id="addedFirstName"></span> <span wicket:id="addedLastName"></span><br/>
<br/>
- <span wicket:id="firstName"></span> <span wicket:id="lastName"></span> <wicket:ommessage key="1198"/><br/>
- <wicket:ommessage key="1194"/><br/>
+ <span wicket:id="firstName"></span> <span wicket:id="lastName"></span> <span wicket:id="likeToAdd"></span><br/>
+ <span wicket:id="check"></span><br/>
<br/>
<br/>
- <a wicket:id="link"><wicket:ommessage key="1196"/></a><br/>
+ <a wicket:id="link"><span wicket:id="contactList"></span></a><br/>
</wicket:extend>
</html>
\ No newline at end of file
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/RequestContactTemplate.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/RequestContactTemplate.java?rev=1672291&r1=1672290&r2=1672291&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/RequestContactTemplate.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/RequestContactTemplate.java Thu Apr 9 11:05:10 2015
@@ -28,12 +28,15 @@ public class RequestContactTemplate exte
private static final long serialVersionUID = 1L;
public RequestContactTemplate(User userToAdd, User user) {
- super(WebSession.getLanguage());
+ super(userToAdd.getLanguage_id());
+ add(new Label("hi", WebSession.getString(1192, langId)));
add(new Label("addedFirstName", userToAdd.getFirstname()));
add(new Label("addedLastName", userToAdd.getLastname()));
add(new Label("firstName", user.getFirstname()));
add(new Label("lastName", user.getLastname()));
- add(new ExternalLink("link", ContactsHelper.getLink()));
+ add(new Label("likeToAdd", WebSession.getString(1193, langId)));
+ add(new Label("check", WebSession.getString(1194, langId)));
+ add(new ExternalLink("link", ContactsHelper.getLink()).add(new Label("contactList", WebSession.getString(1196, langId))));
}
public static String getEmail(User userToAdd, User user) {
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/util/ContactsHelper.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/util/ContactsHelper.java?rev=1672291&r1=1672290&r2=1672291&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/util/ContactsHelper.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/util/ContactsHelper.java Thu Apr 9 11:05:10 2015
@@ -79,13 +79,12 @@ public class ContactsHelper {
dao.updateContactStatus(userContactId, false);
contact = dao.get(userContactId);
-
- dao.addUserContact(contact.getOwner().getUser_id(), getUserId(), false, "");
-
User user = contact.getOwner();
+ dao.addUserContact(user.getUser_id(), getUserId(), false, "");
+
if (user.getAdresses() != null) {
- String message = RequestContactConfirmTemplate.getEmail(user, contact);
+ String message = RequestContactConfirmTemplate.getEmail(contact);
String subj = contact.getContact().getFirstname() + " " + contact.getContact().getLastname() + " " + WebSession.getString(1198);
Modified: openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactConfirmTemplate.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactConfirmTemplate.html?rev=1672291&r1=1672290&r2=1672291&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactConfirmTemplate.html (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactConfirmTemplate.html Thu Apr 9 11:05:10 2015
@@ -20,9 +20,8 @@
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:extend>
- <wicket:ommessage key="1192"/> <span wicket:id="addedFirstName"></span> <span wicket:id="addedLastName"></span><br/>
+ <span wicket:id="hi"></span> <span wicket:id="firstName"></span> <span wicket:id="lastName"></span><br/>
<br/>
- <span wicket:id="firstName"></span> <span wicket:id="lastName"></span> <wicket:ommessage key="1193"/><br/>
- <wicket:ommessage key="1194"/><br/>
+ <span wicket:id="addedFirstName"></span> <span wicket:id="addedLastName"></span> <span wicket:id="confirmed"></span><br/>
</wicket:extend>
</html>
\ No newline at end of file
Modified: openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactConfirmTemplate.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactConfirmTemplate.java?rev=1672291&r1=1672290&r2=1672291&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactConfirmTemplate.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactConfirmTemplate.java Thu Apr 9 11:05:10 2015
@@ -18,22 +18,23 @@
*/
package org.apache.openmeetings.service.mail.template;
-import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.entity.user.UserContact;
import org.apache.wicket.markup.html.basic.Label;
public class RequestContactConfirmTemplate extends AbstractTemplatePanel {
private static final long serialVersionUID = 1L;
- public RequestContactConfirmTemplate(User user, UserContact contact) {
- super(getOmSession().getOmLanguage());
- add(new Label("firstName", user.getFirstname()));
- add(new Label("lastName", user.getLastname()));
+ public RequestContactConfirmTemplate(UserContact contact) {
+ super(contact.getOwner().getLanguageId());
+ add(new Label("hi", getString(1192, langId)));
+ add(new Label("firstName", contact.getOwner().getFirstname()));
+ add(new Label("lastName", contact.getOwner().getLastname()));
add(new Label("addedFirstName", contact.getContact().getFirstname()));
add(new Label("addedLastName", contact.getContact().getLastname()));
+ add(new Label("confirmed", getString(1198, langId)));
}
- public static String getEmail(User user, UserContact contact) {
- return renderPanel(new RequestContactConfirmTemplate(user, contact)).toString();
+ public static String getEmail(UserContact contact) {
+ return renderPanel(new RequestContactConfirmTemplate(contact)).toString();
}
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactTemplate.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactTemplate.html?rev=1672291&r1=1672290&r2=1672291&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactTemplate.html (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactTemplate.html Thu Apr 9 11:05:10 2015
@@ -20,12 +20,12 @@
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:extend>
- <wicket:ommessage key="1192"/> <span wicket:id="addedFirstName"></span> <span wicket:id="addedLastName"></span><br/>
+ <span wicket:id="hi"></span> <span wicket:id="addedFirstName"></span> <span wicket:id="addedLastName"></span><br/>
<br/>
- <span wicket:id="firstName"></span> <span wicket:id="lastName"></span> <wicket:ommessage key="1198"/><br/>
- <wicket:ommessage key="1194"/><br/>
+ <span wicket:id="firstName"></span> <span wicket:id="lastName"></span> <span wicket:id="likeToAdd"></span><br/>
+ <span wicket:id="check"></span><br/>
<br/>
<br/>
- <a wicket:id="link"><wicket:ommessage key="1196"/></a><br/>
+ <a wicket:id="link"><span wicket:id="contactList"></span></a><br/>
</wicket:extend>
</html>
\ No newline at end of file
Modified: openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactTemplate.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactTemplate.java?rev=1672291&r1=1672290&r2=1672291&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactTemplate.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactTemplate.java Thu Apr 9 11:05:10 2015
@@ -26,12 +26,15 @@ public class RequestContactTemplate exte
private static final long serialVersionUID = 1L;
public RequestContactTemplate(User userToAdd, User user) {
- super(getOmSession().getOmLanguage());
+ super(userToAdd.getLanguageId());
+ add(new Label("hi", getString(1192, langId)));
add(new Label("addedFirstName", userToAdd.getFirstname()));
add(new Label("addedLastName", userToAdd.getLastname()));
add(new Label("firstName", user.getFirstname()));
add(new Label("lastName", user.getLastname()));
- add(new ExternalLink("link", getApp().getOmContactsLink()));
+ add(new Label("likeToAdd", getString(1193, langId)));
+ add(new Label("check", getString(1194, langId)));
+ add(new ExternalLink("link", getApp().getOmContactsLink()).add(new Label("contactList", getString(1196, langId))));
}
public static String getEmail(User userToAdd, User user) {
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java?rev=1672291&r1=1672290&r2=1672291&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ContactsHelper.java Thu Apr 9 11:05:10 2015
@@ -78,13 +78,12 @@ public class ContactsHelper {
dao.updateContactStatus(userContactId, false);
contact = dao.get(userContactId);
-
- dao.addUserContact(contact.getOwner().getId(), getUserId(), false, "");
-
User user = contact.getOwner();
+ dao.addUserContact(user.getId(), getUserId(), false, "");
+
if (user.getAdresses() != null) {
- String message = RequestContactConfirmTemplate.getEmail(user, contact);
+ String message = RequestContactConfirmTemplate.getEmail(contact);
String subj = contact.getContact().getFirstname() + " " + contact.getContact().getLastname() + " " + WebSession.getString(1198);