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 2014/12/02 17:17:36 UTC
svn commit: r1642930 - in /openmeetings:
branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/
branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/
trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core...
Author: solomax
Date: Tue Dec 2 16:17:36 2014
New Revision: 1642930
URL: http://svn.apache.org/r1642930
Log:
[OPENMEETINGS-1130] APP_NAME is being replaced in email templates
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/WebSession.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/CanceledAppointmentTemplate.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/CreatedAppointmentTemplate.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/UpdatedAppointmentTemplate.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/IWebSession.java
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractAppointmentTemplate.java
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CanceledAppointmentTemplate.java
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CreatedAppointmentTemplate.java
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/UpdatedAppointmentTemplate.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/WebSession.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/WebSession.java?rev=1642930&r1=1642929&r2=1642930&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/WebSession.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/WebSession.java Tue Dec 2 16:17:36 2014
@@ -287,7 +287,11 @@ public class WebSession extends Abstract
}
public static String getString(long id) {
- String s = getBean(FieldLanguagesValuesDao.class).getString(id, getLanguage());
+ return getString(id, getLanguage());
+ }
+
+ public static String getString(long id, long languageId) {
+ String s = getBean(FieldLanguagesValuesDao.class).getString(id, languageId);
return s == null ? "[Missing]" :
(STRINGS_WITH_APP.contains(id) ? s.replaceAll("\\$APP_NAME", getBean(ConfigurationDao.class).getAppName()) : s);
}
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/CanceledAppointmentTemplate.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/CanceledAppointmentTemplate.java?rev=1642930&r1=1642929&r2=1642930&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/CanceledAppointmentTemplate.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/CanceledAppointmentTemplate.java Tue Dec 2 16:17:36 2014
@@ -18,13 +18,11 @@
*/
package org.apache.openmeetings.web.mail.template;
-import static org.apache.openmeetings.web.app.Application.getBean;
-
import java.util.TimeZone;
-import org.apache.openmeetings.db.dao.label.FieldLanguagesValuesDao;
import org.apache.openmeetings.db.entity.calendar.Appointment;
import org.apache.openmeetings.util.CalendarPatterns;
+import org.apache.openmeetings.web.app.WebSession;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.util.string.Strings;
@@ -35,27 +33,25 @@ public class CanceledAppointmentTemplate
public CanceledAppointmentTemplate(Long langId, Appointment a, TimeZone tz, String invitorName) {
super(langId, a, tz, invitorName);
- FieldLanguagesValuesDao dao = getBean(FieldLanguagesValuesDao.class);
- add(new Label("titleLbl", dao.getString(1157L, langId)));
+ add(new Label("titleLbl", WebSession.getString(1157L, langId)));
add(new Label("title", a.getTitle()));
add(new WebMarkupContainer("descContainer")
- .add(new Label("descLbl", dao.getString(1152L, langId)))
+ .add(new Label("descLbl", WebSession.getString(1152L, langId)))
.add(new Label("desc", a.getDescription()))
.setVisible(!Strings.isEmpty(a.getDescription()))
);
- add(new Label("startLbl", dao.getString(1153L, langId)));
+ add(new Label("startLbl", WebSession.getString(1153L, langId)));
add(new Label("start", CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getStart(), tz)));
- add(new Label("endLbl", dao.getString(1154L, langId)));
+ add(new Label("endLbl", WebSession.getString(1154L, langId)));
add(new Label("end", CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getEnd(), tz)));
- add(new Label("invitorLbl", dao.getString(1156L, langId)));
+ add(new Label("invitorLbl", WebSession.getString(1156L, langId)));
add(new Label("invitor", invitorName));
}
@Override
public String getSubject() {
- FieldLanguagesValuesDao dao = getBean(FieldLanguagesValuesDao.class);
StringBuilder sb = new StringBuilder();
- sb.append(dao.getString(1157L, langId)).append(" ").append(a.getTitle())
+ sb.append(WebSession.getString(1157L, langId)).append(" ").append(a.getTitle())
.append(" ").append(CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getStart(), tz))
.append(" - ").append(CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getEnd(), tz));
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/CreatedAppointmentTemplate.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/CreatedAppointmentTemplate.java?rev=1642930&r1=1642929&r2=1642930&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/CreatedAppointmentTemplate.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/CreatedAppointmentTemplate.java Tue Dec 2 16:17:36 2014
@@ -18,14 +18,11 @@
*/
package org.apache.openmeetings.web.mail.template;
-import static org.apache.openmeetings.web.app.Application.getBean;
-
import java.util.TimeZone;
-import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
-import org.apache.openmeetings.db.dao.label.FieldLanguagesValuesDao;
import org.apache.openmeetings.db.entity.calendar.Appointment;
import org.apache.openmeetings.util.CalendarPatterns;
+import org.apache.openmeetings.web.app.WebSession;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.util.string.Strings;
@@ -33,34 +30,28 @@ import org.apache.wicket.util.string.Str
public class CreatedAppointmentTemplate extends AbstractAppointmentTemplate {
private static final long serialVersionUID = 1L;
- private String getTitleLbl(FieldLanguagesValuesDao dao) {
- return dao.getString(1151L, langId).replaceAll("\\$APP_NAME", getBean(ConfigurationDao.class).getAppName());
- }
-
public CreatedAppointmentTemplate(Long langId, Appointment a, TimeZone tz, String invitorName) {
super(langId, a, tz, invitorName);
- FieldLanguagesValuesDao dao = getBean(FieldLanguagesValuesDao.class);
- add(new Label("titleLbl", getTitleLbl(dao)));
+ add(new Label("titleLbl", WebSession.getString(1151L, langId)));
add(new Label("title", a.getTitle()));
add(new WebMarkupContainer("descContainer")
- .add(new Label("descLbl", dao.getString(1152L, langId)))
+ .add(new Label("descLbl", WebSession.getString(1152L, langId)))
.add(new Label("desc", a.getDescription()))
.setVisible(!Strings.isEmpty(a.getDescription()))
);
- add(new Label("startLbl", dao.getString(1153L, langId)));
+ add(new Label("startLbl", WebSession.getString(1153L, langId)));
add(new Label("start", CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getStart(), tz)));
- add(new Label("endLbl", dao.getString(1154L, langId)));
+ add(new Label("endLbl", WebSession.getString(1154L, langId)));
add(new Label("end", CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getEnd(), tz)));
- add(new Label("invitorLbl", dao.getString(1156L, langId)));
+ add(new Label("invitorLbl", WebSession.getString(1156L, langId)));
add(new Label("invitor", invitorName));
}
@Override
public String getSubject() {
- FieldLanguagesValuesDao dao = getBean(FieldLanguagesValuesDao.class);
StringBuilder sb = new StringBuilder();
- sb.append(getTitleLbl(dao)).append(" ").append(a.getTitle())
+ sb.append(WebSession.getString(1151L, langId)).append(" ").append(a.getTitle())
.append(" ").append(CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getStart(), tz))
.append(" - ").append(CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getEnd(), tz));
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/UpdatedAppointmentTemplate.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/UpdatedAppointmentTemplate.java?rev=1642930&r1=1642929&r2=1642930&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/UpdatedAppointmentTemplate.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/UpdatedAppointmentTemplate.java Tue Dec 2 16:17:36 2014
@@ -18,13 +18,11 @@
*/
package org.apache.openmeetings.web.mail.template;
-import static org.apache.openmeetings.web.app.Application.getBean;
-
import java.util.TimeZone;
-import org.apache.openmeetings.db.dao.label.FieldLanguagesValuesDao;
import org.apache.openmeetings.db.entity.calendar.Appointment;
import org.apache.openmeetings.util.CalendarPatterns;
+import org.apache.openmeetings.web.app.WebSession;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.util.string.Strings;
@@ -35,27 +33,25 @@ public class UpdatedAppointmentTemplate
public UpdatedAppointmentTemplate(Long langId, Appointment a, TimeZone tz, String invitorName) {
super(langId, a, tz, invitorName);
- FieldLanguagesValuesDao dao = getBean(FieldLanguagesValuesDao.class);
- add(new Label("titleLbl", dao.getString(1155L, langId)));
+ add(new Label("titleLbl", WebSession.getString(1155L, langId)));
add(new Label("title", a.getTitle()));
add(new WebMarkupContainer("descContainer")
- .add(new Label("descLbl", dao.getString(1152L, langId)))
+ .add(new Label("descLbl", WebSession.getString(1152L, langId)))
.add(new Label("desc", a.getDescription()))
.setVisible(!Strings.isEmpty(a.getDescription()))
);
- add(new Label("startLbl", dao.getString(1153L, langId)));
+ add(new Label("startLbl", WebSession.getString(1153L, langId)));
add(new Label("start", CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getStart(), tz)));
- add(new Label("endLbl", dao.getString(1154L, langId)));
+ add(new Label("endLbl", WebSession.getString(1154L, langId)));
add(new Label("end", CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getEnd(), tz)));
- add(new Label("invitorLbl", dao.getString(1156L, langId)));
+ add(new Label("invitorLbl", WebSession.getString(1156L, langId)));
add(new Label("invitor", invitorName));
}
@Override
public String getSubject() {
- FieldLanguagesValuesDao dao = getBean(FieldLanguagesValuesDao.class);
StringBuilder sb = new StringBuilder();
- sb.append(dao.getString(1155L, langId)).append(" ").append(a.getTitle())
+ sb.append(WebSession.getString(1155L, langId)).append(" ").append(a.getTitle())
.append(" ").append(CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getStart(), tz))
.append(" - ").append(CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getEnd(), tz));
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/IWebSession.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/IWebSession.java?rev=1642930&r1=1642929&r2=1642930&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/IWebSession.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/IWebSession.java Tue Dec 2 16:17:36 2014
@@ -20,5 +20,6 @@ package org.apache.openmeetings.core;
public interface IWebSession {
String getOmString(long id);
+ String getOmString(long id, long languageId);
void setLanguage(long languageId);
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractAppointmentTemplate.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractAppointmentTemplate.java?rev=1642930&r1=1642929&r2=1642930&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractAppointmentTemplate.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractAppointmentTemplate.java Tue Dec 2 16:17:36 2014
@@ -2,7 +2,9 @@ package org.apache.openmeetings.service.
import java.util.TimeZone;
+import org.apache.openmeetings.core.IWebSession;
import org.apache.openmeetings.db.entity.calendar.Appointment;
+import org.apache.wicket.protocol.http.WebSession;
public abstract class AbstractAppointmentTemplate extends AbstractTemplatePanel {
private static final long serialVersionUID = 1L;
@@ -18,6 +20,10 @@ public abstract class AbstractAppointmen
ensureApplication(langId);
}
+ public static String getString(long id, long languageId) {
+ return ((IWebSession)WebSession.get()).getOmString(id, languageId);
+ }
+
public String getEmail() {
return renderPanel(this).toString();
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CanceledAppointmentTemplate.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CanceledAppointmentTemplate.java?rev=1642930&r1=1642929&r2=1642930&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CanceledAppointmentTemplate.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CanceledAppointmentTemplate.java Tue Dec 2 16:17:36 2014
@@ -18,15 +18,10 @@
*/
package org.apache.openmeetings.service.mail.template;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.wicketApplicationName;
-
import java.util.TimeZone;
-import org.apache.openmeetings.core.IApplication;
-import org.apache.openmeetings.db.dao.label.FieldLanguagesValuesDao;
import org.apache.openmeetings.db.entity.calendar.Appointment;
import org.apache.openmeetings.util.CalendarPatterns;
-import org.apache.wicket.Application;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.util.string.Strings;
@@ -37,27 +32,25 @@ public class CanceledAppointmentTemplate
public CanceledAppointmentTemplate(Long langId, Appointment a, TimeZone tz, String invitorName) {
super(langId, a, tz, invitorName);
- FieldLanguagesValuesDao dao = ((IApplication)Application.get(wicketApplicationName)).getOmBean(FieldLanguagesValuesDao.class);
- add(new Label("titleLbl", dao.getString(1157L, langId)));
+ add(new Label("titleLbl", getString(1157L, langId)));
add(new Label("title", a.getTitle()));
add(new WebMarkupContainer("descContainer")
- .add(new Label("descLbl", dao.getString(1152L, langId)))
+ .add(new Label("descLbl", getString(1152L, langId)))
.add(new Label("desc", a.getDescription()))
.setVisible(!Strings.isEmpty(a.getDescription()))
);
- add(new Label("startLbl", dao.getString(1153L, langId)));
+ add(new Label("startLbl", getString(1153L, langId)));
add(new Label("start", CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getStart(), tz)));
- add(new Label("endLbl", dao.getString(1154L, langId)));
+ add(new Label("endLbl", getString(1154L, langId)));
add(new Label("end", CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getEnd(), tz)));
- add(new Label("invitorLbl", dao.getString(1156L, langId)));
+ add(new Label("invitorLbl", getString(1156L, langId)));
add(new Label("invitor", invitorName));
}
@Override
public String getSubject() {
- FieldLanguagesValuesDao dao = ((IApplication)Application.get(wicketApplicationName)).getOmBean(FieldLanguagesValuesDao.class);
StringBuilder sb = new StringBuilder();
- sb.append(dao.getString(1157L, langId)).append(" ").append(a.getTitle())
+ sb.append(getString(1157L, langId)).append(" ").append(a.getTitle())
.append(" ").append(CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getStart(), tz))
.append(" - ").append(CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getEnd(), tz));
Modified: openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CreatedAppointmentTemplate.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CreatedAppointmentTemplate.java?rev=1642930&r1=1642929&r2=1642930&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CreatedAppointmentTemplate.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/CreatedAppointmentTemplate.java Tue Dec 2 16:17:36 2014
@@ -18,16 +18,10 @@
*/
package org.apache.openmeetings.service.mail.template;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.wicketApplicationName;
-
import java.util.TimeZone;
-import org.apache.openmeetings.core.IApplication;
-import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
-import org.apache.openmeetings.db.dao.label.FieldLanguagesValuesDao;
import org.apache.openmeetings.db.entity.calendar.Appointment;
import org.apache.openmeetings.util.CalendarPatterns;
-import org.apache.wicket.Application;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.util.string.Strings;
@@ -35,37 +29,28 @@ import org.apache.wicket.util.string.Str
public class CreatedAppointmentTemplate extends AbstractAppointmentTemplate {
private static final long serialVersionUID = 1L;
- private String getTitleLbl(IApplication app, FieldLanguagesValuesDao dao) {
- return dao.getString(1151L, langId).replaceAll("\\$APP_NAME", app.getOmBean(ConfigurationDao.class).getAppName());
- }
-
public CreatedAppointmentTemplate(Long langId, Appointment a, TimeZone tz, String invitorName) {
super(langId, a, tz, invitorName);
- IApplication app = ((IApplication)Application.get(wicketApplicationName));
- FieldLanguagesValuesDao dao = app.getOmBean(FieldLanguagesValuesDao.class);
- add(new Label("titleLbl", getTitleLbl(app, dao)));
+ add(new Label("titleLbl", getString(1151L, langId)));
add(new Label("title", a.getTitle()));
add(new WebMarkupContainer("descContainer")
- .add(new Label("descLbl", dao.getString(1152L, langId)))
+ .add(new Label("descLbl", getString(1152L, langId)))
.add(new Label("desc", a.getDescription()))
.setVisible(!Strings.isEmpty(a.getDescription()))
);
- add(new Label("startLbl", dao.getString(1153L, langId)));
+ add(new Label("startLbl", getString(1153L, langId)));
add(new Label("start", CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getStart(), tz)));
- add(new Label("endLbl", dao.getString(1154L, langId)));
+ add(new Label("endLbl", getString(1154L, langId)));
add(new Label("end", CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getEnd(), tz)));
- add(new Label("invitorLbl", dao.getString(1156L, langId)));
+ add(new Label("invitorLbl", getString(1156L, langId)));
add(new Label("invitor", invitorName));
}
@Override
public String getSubject() {
- IApplication app = ((IApplication)Application.get(wicketApplicationName));
-
- FieldLanguagesValuesDao dao = app.getOmBean(FieldLanguagesValuesDao.class);
StringBuilder sb = new StringBuilder();
- sb.append(getTitleLbl(app, dao)).append(" ").append(a.getTitle())
+ sb.append(getString(1151L, langId)).append(" ").append(a.getTitle())
.append(" ").append(CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getStart(), tz))
.append(" - ").append(CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getEnd(), tz));
Modified: openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/UpdatedAppointmentTemplate.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/UpdatedAppointmentTemplate.java?rev=1642930&r1=1642929&r2=1642930&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/UpdatedAppointmentTemplate.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/UpdatedAppointmentTemplate.java Tue Dec 2 16:17:36 2014
@@ -18,15 +18,10 @@
*/
package org.apache.openmeetings.service.mail.template;
-import static org.apache.openmeetings.util.OpenmeetingsVariables.wicketApplicationName;
-
import java.util.TimeZone;
-import org.apache.openmeetings.core.IApplication;
-import org.apache.openmeetings.db.dao.label.FieldLanguagesValuesDao;
import org.apache.openmeetings.db.entity.calendar.Appointment;
import org.apache.openmeetings.util.CalendarPatterns;
-import org.apache.wicket.Application;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.util.string.Strings;
@@ -37,27 +32,25 @@ public class UpdatedAppointmentTemplate
public UpdatedAppointmentTemplate(Long langId, Appointment a, TimeZone tz, String invitorName) {
super(langId, a, tz, invitorName);
- FieldLanguagesValuesDao dao = ((IApplication)Application.get(wicketApplicationName)).getOmBean(FieldLanguagesValuesDao.class);
- add(new Label("titleLbl", dao.getString(1155L, langId)));
+ add(new Label("titleLbl", getString(1155L, langId)));
add(new Label("title", a.getTitle()));
add(new WebMarkupContainer("descContainer")
- .add(new Label("descLbl", dao.getString(1152L, langId)))
+ .add(new Label("descLbl", getString(1152L, langId)))
.add(new Label("desc", a.getDescription()))
.setVisible(!Strings.isEmpty(a.getDescription()))
);
- add(new Label("startLbl", dao.getString(1153L, langId)));
+ add(new Label("startLbl", getString(1153L, langId)));
add(new Label("start", CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getStart(), tz)));
- add(new Label("endLbl", dao.getString(1154L, langId)));
+ add(new Label("endLbl", getString(1154L, langId)));
add(new Label("end", CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getEnd(), tz)));
- add(new Label("invitorLbl", dao.getString(1156L, langId)));
+ add(new Label("invitorLbl", getString(1156L, langId)));
add(new Label("invitor", invitorName));
}
@Override
public String getSubject() {
- FieldLanguagesValuesDao dao = ((IApplication)Application.get(wicketApplicationName)).getOmBean(FieldLanguagesValuesDao.class);
StringBuilder sb = new StringBuilder();
- sb.append(dao.getString(1155L, langId)).append(" ").append(a.getTitle())
+ sb.append(getString(1155L, langId)).append(" ").append(a.getTitle())
.append(" ").append(CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getStart(), tz))
.append(" - ").append(CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(a.getEnd(), tz));
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java?rev=1642930&r1=1642929&r2=1642930&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java Tue Dec 2 16:17:36 2014
@@ -287,12 +287,16 @@ public class WebSession extends Abstract
}
public static String getString(long id) {
- String s = getBean(FieldLanguagesValuesDao.class).getString(id, getLanguage());
+ return getString(id, getLanguage());
+ }
+
+ public static String getString(long id, long languageId) {
+ String s = getBean(FieldLanguagesValuesDao.class).getString(id, languageId);
s = s == null ? "[Missing]" :
(STRINGS_WITH_APP.contains(id) ? s.replaceAll("\\$APP_NAME", getBean(ConfigurationDao.class).getAppName()) : s);
return s + (Application.get().getDebugSettings().isDevelopmentUtilitiesEnabled() ? " [" + id + "]" : "");
}
-
+
public void setLanguage(long languageId) {
this.languageId = languageId;
}
@@ -502,4 +506,8 @@ public class WebSession extends Abstract
public String getOmString(long id) {
return getString(id);
}
+
+ public String getOmString(long id, long languageId) {
+ return getString(id, languageId);
+ }
}