Author: solomax
Date: Wed Nov 23 04:13:47 2016
New Revision: 1770908
URL: http://svn.apache.org/viewvc?rev=1770908&view=rev
Log:
[OPENMEETINGS-1488] reminders should work as expected
Modified:
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java
openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java
openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/RecordingExpiringTemplate.java
openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/ReminderJob.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java
openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java
openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/RecordingExpiringTemplate.java
openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/ReminderJob.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/RecordingExpiringTemplate.java
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/ReminderJob.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
Modified:
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java?rev=1770908&r1=1770907&r2=1770908&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java
Wed Nov 23 04:13:47 2016
@@ -36,7 +36,7 @@ public interface IApplication {
String getOmString(long id);
String getOmString(long id, long languageId);
String getOmString(String key, long languageId);
- String getOmString(String key, final Locale loc);
+ String getOmString(String key, final Locale loc, String... params);
String getOmContactsLink();
String getOmInvitationLink(Invitation i);
String urlForActivatePage(PageParameters pp);
Modified:
openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java?rev=1770908&r1=1770907&r2=1770908&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java
Wed Nov 23 04:13:47 2016
@@ -53,11 +53,10 @@ public abstract class AbstractTemplatePa
public AbstractTemplatePanel(Locale locale) {
super(COMP_ID);
this.locale = locale == null ? getDefault() : locale;
- WebSession.get().setLocale(this.locale);
add(new
TransparentWebMarkupContainer("container").add(AttributeAppender.append("dir",
FormatHelper.isRtlLanguage(this.locale.toLanguageTag()) ? "rtl" : "ltr")));
}
- public static String getString(String id, Locale locale) {
- return ensureApplication().getOmString(id, locale);
+ public static String getString(String id, Locale locale, String...
params) {
+ return ensureApplication().getOmString(id, locale, params);
}
}
Modified:
openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/RecordingExpiringTemplate.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/RecordingExpiringTemplate.java?rev=1770908&r1=1770907&r2=1770908&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/RecordingExpiringTemplate.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/RecordingExpiringTemplate.java
Wed Nov 23 04:13:47 2016
@@ -28,7 +28,6 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.service.mail.template.OmTextLabel;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Fragment;
-import org.apache.wicket.model.StringResourceModel;
public class RecordingExpiringTemplate extends AbstractSubjectEmailTemplate {
private static final long serialVersionUID = 1L;
@@ -52,17 +51,17 @@ public class RecordingExpiringTemplate e
protected void onInitialize() {
super.onInitialize();
final String app = getBean(ConfigurationDao.class).getAppName();
- add(new Label("greetings", new
StringResourceModel("template.recording.expiring.greetings").setParameters(u.getFirstname())));
- add(new Label("body", new
StringResourceModel("template.recording.expiring.body").setParameters(app,
remainingDays)));
- add(new Label("footer", new
StringResourceModel("template.recording.expiring.footer").setParameters(app)));
+ add(new Label("greetings",
getString("template.recording.expiring.greetings", locale, u.getFirstname())));
+ add(new Label("body",
getString("template.recording.expiring.body", locale, app, "" +
remainingDays)));
+ add(new Label("footer",
getString("template.recording.expiring.footer", locale, app)));
}
@Override
Fragment getSubjectFragment() {
Fragment f = new Fragment(COMP_ID, "subject", this);
Room room = getBean(RoomDao.class).get(rec.getRoomId());
- f.add(new OmTextLabel("prefix",
getString("template.recording.expiring.subj.prefix"))
- , new OmTextLabel("room", room == null ? null :
new
StringResourceModel("template.recording.expiring.subj.room").setParameters(room.getName())).setVisible(room
!= null)
+ f.add(new OmTextLabel("prefix",
getString("template.recording.expiring.subj.prefix", locale))
+ , new OmTextLabel("room", room == null ? null :
getString("template.recording.expiring.subj.room", locale,
room.getName())).setVisible(room != null)
);
return f;
}
Modified:
openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/ReminderJob.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/ReminderJob.java?rev=1770908&r1=1770907&r2=1770908&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/ReminderJob.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/ReminderJob.java
Wed Nov 23 04:13:47 2016
@@ -56,7 +56,7 @@ public class ReminderJob extends Abstrac
log.debug("ReminderJob.remindExpiringRecordings");
processExpiringRecordings(false, (rec, days) -> {
if (days > 0) {
- User u = userDao.get(rec.getOwnerId());
+ User u = userDao.get(rec.getInsertedBy());
if (u == null) {
log.debug("Unable to send expiration
email due to recording owner is NULL, {}", rec);
} else {
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java?rev=1770908&r1=1770907&r2=1770908&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
Wed Nov 23 04:13:47 2016
@@ -371,7 +371,7 @@ public class Application extends Authent
}
public static String getString(String key, final long languageId) {
- return getString(key, getLocale(languageId), false);
+ return getString(key, getLocale(languageId));
}
public static String getString(long id, final long languageId) {
@@ -379,20 +379,23 @@ public class Application extends Authent
}
public static String getString(long id, final Locale loc) {
- return getString("" + id, loc, false);
+ return getString("" + id, loc);
}
-
- public static String getString(String key, final Locale loc, boolean
noReplace) {
+
+ public static String getString(String key, final Locale loc, String...
params) {
if (!exists()) {
ThreadContext.setApplication(Application.get(appName));
}
+ if ((params == null || params.length == 0) &&
STRINGS_WITH_APP.contains(key)) {
+ params = new
String[]{getBean(ConfigurationDao.class).getAppName()};
+ }
Localizer l = get().getResourceSettings().getLocalizer();
String value = l.getStringIgnoreSettings(key, null, null, loc,
null, "[Missing]");
- if (!noReplace && STRINGS_WITH_APP.contains(key)) {
+ if (params != null && params.length > 0) {
final MessageFormat format = new MessageFormat(value,
loc);
- value = format.format(new
Object[]{getBean(ConfigurationDao.class).getAppName()});
+ value = format.format(params);
}
- if (!noReplace && RuntimeConfigurationType.DEVELOPMENT ==
get().getConfigurationType()) {
+ if (RuntimeConfigurationType.DEVELOPMENT ==
get().getConfigurationType()) {
value += String.format(" [%s]", key);
}
return value;
@@ -492,7 +495,7 @@ public class Application extends Authent
}
@Override
- public String getOmString(String key, final Locale loc) {
- return getString(key, loc, false);
+ public String getOmString(String key, final Locale loc, String...
params) {
+ return getString(key, loc, params);
}
}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java?rev=1770908&r1=1770907&r2=1770908&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java
Wed Nov 23 04:13:47 2016
@@ -37,7 +37,7 @@ public interface IApplication {
String getOmString(long id);
String getOmString(long id, long languageId);
String getOmString(String key, long languageId);
- String getOmString(String key, final Locale loc);
+ String getOmString(String key, final Locale loc, String... params);
Client updateClient(Client rcl);
String getOmContactsLink();
String getOmInvitationLink(Invitation i);
Modified:
openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java?rev=1770908&r1=1770907&r2=1770908&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java
Wed Nov 23 04:13:47 2016
@@ -53,11 +53,10 @@ public abstract class AbstractTemplatePa
public AbstractTemplatePanel(Locale locale) {
super(COMP_ID);
this.locale = locale == null ? getDefault() : locale;
- WebSession.get().setLocale(this.locale);
add(new
TransparentWebMarkupContainer("container").add(AttributeAppender.append("dir",
FormatHelper.isRtlLanguage(this.locale.toLanguageTag()) ? "rtl" : "ltr")));
}
- public static String getString(String id, Locale locale) {
- return ensureApplication().getOmString(id, locale);
+ public static String getString(String id, Locale locale, String...
params) {
+ return ensureApplication().getOmString(id, locale, params);
}
}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/RecordingExpiringTemplate.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/RecordingExpiringTemplate.java?rev=1770908&r1=1770907&r2=1770908&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/RecordingExpiringTemplate.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/RecordingExpiringTemplate.java
Wed Nov 23 04:13:47 2016
@@ -28,7 +28,6 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.service.mail.template.OmTextLabel;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Fragment;
-import org.apache.wicket.model.StringResourceModel;
public class RecordingExpiringTemplate extends AbstractSubjectEmailTemplate {
private static final long serialVersionUID = 1L;
@@ -52,17 +51,17 @@ public class RecordingExpiringTemplate e
protected void onInitialize() {
super.onInitialize();
final String app = getBean(ConfigurationDao.class).getAppName();
- add(new Label("greetings", new
StringResourceModel("template.recording.expiring.greetings").setParameters(u.getFirstname())));
- add(new Label("body", new
StringResourceModel("template.recording.expiring.body").setParameters(app,
remainingDays)));
- add(new Label("footer", new
StringResourceModel("template.recording.expiring.footer").setParameters(app)));
+ add(new Label("greetings",
getString("template.recording.expiring.greetings", locale, u.getFirstname())));
+ add(new Label("body",
getString("template.recording.expiring.body", locale, app, "" +
remainingDays)));
+ add(new Label("footer",
getString("template.recording.expiring.footer", locale, app)));
}
@Override
Fragment getSubjectFragment() {
Fragment f = new Fragment(COMP_ID, "subject", this);
Room room = getBean(RoomDao.class).get(rec.getRoomId());
- f.add(new OmTextLabel("prefix",
getString("template.recording.expiring.subj.prefix"))
- , new OmTextLabel("room", room == null ? null :
new
StringResourceModel("template.recording.expiring.subj.room").setParameters(room.getName())).setVisible(room
!= null)
+ f.add(new OmTextLabel("prefix",
getString("template.recording.expiring.subj.prefix", locale))
+ , new OmTextLabel("room", room == null ? null :
getString("template.recording.expiring.subj.room", locale,
room.getName())).setVisible(room != null)
);
return f;
}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/ReminderJob.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/ReminderJob.java?rev=1770908&r1=1770907&r2=1770908&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/ReminderJob.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/ReminderJob.java
Wed Nov 23 04:13:47 2016
@@ -56,7 +56,7 @@ public class ReminderJob extends Abstrac
log.debug("ReminderJob.remindExpiringRecordings");
processExpiringRecordings(false, (rec, days) -> {
if (days > 0) {
- User u = userDao.get(rec.getOwnerId());
+ User u = userDao.get(rec.getInsertedBy());
if (u == null) {
log.debug("Unable to send expiration
email due to recording owner is NULL, {}", rec);
} else {
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java?rev=1770908&r1=1770907&r2=1770908&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
Wed Nov 23 04:13:47 2016
@@ -408,7 +408,7 @@ public class Application extends Authent
}
public static String getString(String key, final long languageId) {
- return getString(key, getLocale(languageId), false);
+ return getString(key, getLocale(languageId));
}
public static String getString(long id, final long languageId) {
@@ -416,20 +416,23 @@ public class Application extends Authent
}
public static String getString(long id, final Locale loc) {
- return getString("" + id, loc, false);
+ return getString("" + id, loc);
}
-
- public static String getString(String key, final Locale loc, boolean
noReplace) {
+
+ public static String getString(String key, final Locale loc, String...
params) {
if (!exists()) {
ThreadContext.setApplication(Application.get(appName));
}
+ if ((params == null || params.length == 0) &&
STRINGS_WITH_APP.contains(key)) {
+ params = new
String[]{getBean(ConfigurationDao.class).getAppName()};
+ }
Localizer l = get().getResourceSettings().getLocalizer();
String value = l.getStringIgnoreSettings(key, null, null, loc,
null, "[Missing]");
- if (!noReplace && STRINGS_WITH_APP.contains(key)) {
+ if (params != null && params.length > 0) {
final MessageFormat format = new MessageFormat(value,
loc);
- value = format.format(new
Object[]{getBean(ConfigurationDao.class).getAppName()});
+ value = format.format(params);
}
- if (!noReplace && RuntimeConfigurationType.DEVELOPMENT ==
get().getConfigurationType()) {
+ if (RuntimeConfigurationType.DEVELOPMENT ==
get().getConfigurationType()) {
value += String.format(" [%s]", key);
}
return value;
@@ -529,7 +532,7 @@ public class Application extends Authent
}
@Override
- public String getOmString(String key, final Locale loc) {
- return getString(key, loc, false);
+ public String getOmString(String key, final Locale loc, String...
params) {
+ return getString(key, loc, params);
}
}
Modified:
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java?rev=1770908&r1=1770907&r2=1770908&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java
(original)
+++
openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/IApplication.java
Wed Nov 23 04:13:47 2016
@@ -37,7 +37,7 @@ public interface IApplication {
String getOmString(long id);
String getOmString(long id, long languageId);
String getOmString(String key, long languageId);
- String getOmString(String key, final Locale loc);
+ String getOmString(String key, final Locale loc, String... params);
Client updateClient(Client rcl);
String getOmContactsLink();
String getOmInvitationLink(Invitation i);
Modified:
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java?rev=1770908&r1=1770907&r2=1770908&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java
(original)
+++
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java
Wed Nov 23 04:13:47 2016
@@ -53,11 +53,10 @@ public abstract class AbstractTemplatePa
public AbstractTemplatePanel(Locale locale) {
super(COMP_ID);
this.locale = locale == null ? getDefault() : locale;
- WebSession.get().setLocale(this.locale);
add(new
TransparentWebMarkupContainer("container").add(AttributeAppender.append("dir",
FormatHelper.isRtlLanguage(this.locale.toLanguageTag()) ? "rtl" : "ltr")));
}
- public static String getString(String id, Locale locale) {
- return ensureApplication().getOmString(id, locale);
+ public static String getString(String id, Locale locale, String...
params) {
+ return ensureApplication().getOmString(id, locale, params);
}
}
Modified:
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/RecordingExpiringTemplate.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/RecordingExpiringTemplate.java?rev=1770908&r1=1770907&r2=1770908&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/RecordingExpiringTemplate.java
(original)
+++
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/RecordingExpiringTemplate.java
Wed Nov 23 04:13:47 2016
@@ -28,7 +28,6 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.service.mail.template.OmTextLabel;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Fragment;
-import org.apache.wicket.model.StringResourceModel;
public class RecordingExpiringTemplate extends AbstractSubjectEmailTemplate {
private static final long serialVersionUID = 1L;
@@ -52,17 +51,17 @@ public class RecordingExpiringTemplate e
protected void onInitialize() {
super.onInitialize();
final String app = getBean(ConfigurationDao.class).getAppName();
- add(new Label("greetings", new
StringResourceModel("template.recording.expiring.greetings").setParameters(u.getFirstname())));
- add(new Label("body", new
StringResourceModel("template.recording.expiring.body").setParameters(app,
remainingDays)));
- add(new Label("footer", new
StringResourceModel("template.recording.expiring.footer").setParameters(app)));
+ add(new Label("greetings",
getString("template.recording.expiring.greetings", locale, u.getFirstname())));
+ add(new Label("body",
getString("template.recording.expiring.body", locale, app, "" +
remainingDays)));
+ add(new Label("footer",
getString("template.recording.expiring.footer", locale, app)));
}
@Override
Fragment getSubjectFragment() {
Fragment f = new Fragment(COMP_ID, "subject", this);
Room room = getBean(RoomDao.class).get(rec.getRoomId());
- f.add(new OmTextLabel("prefix",
getString("template.recording.expiring.subj.prefix"))
- , new OmTextLabel("room", room == null ? null :
new
StringResourceModel("template.recording.expiring.subj.room").setParameters(room.getName())).setVisible(room
!= null)
+ f.add(new OmTextLabel("prefix",
getString("template.recording.expiring.subj.prefix", locale))
+ , new OmTextLabel("room", room == null ? null :
getString("template.recording.expiring.subj.room", locale,
room.getName())).setVisible(room != null)
);
return f;
}
Modified:
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/ReminderJob.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/ReminderJob.java?rev=1770908&r1=1770907&r2=1770908&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/ReminderJob.java
(original)
+++
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/ReminderJob.java
Wed Nov 23 04:13:47 2016
@@ -56,7 +56,7 @@ public class ReminderJob extends Abstrac
log.debug("ReminderJob.remindExpiringRecordings");
processExpiringRecordings(false, (rec, days) -> {
if (days > 0) {
- User u = userDao.get(rec.getOwnerId());
+ User u = userDao.get(rec.getInsertedBy());
if (u == null) {
log.debug("Unable to send expiration
email due to recording owner is NULL, {}", rec);
} else {
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java?rev=1770908&r1=1770907&r2=1770908&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
Wed Nov 23 04:13:47 2016
@@ -408,7 +408,7 @@ public class Application extends Authent
}
public static String getString(String key, final long languageId) {
- return getString(key, getLocale(languageId), false);
+ return getString(key, getLocale(languageId));
}
public static String getString(long id, final long languageId) {
@@ -416,20 +416,23 @@ public class Application extends Authent
}
public static String getString(long id, final Locale loc) {
- return getString("" + id, loc, false);
+ return getString("" + id, loc);
}
-
- public static String getString(String key, final Locale loc, boolean
noReplace) {
+
+ public static String getString(String key, final Locale loc, String...
params) {
if (!exists()) {
ThreadContext.setApplication(Application.get(appName));
}
+ if ((params == null || params.length == 0) &&
STRINGS_WITH_APP.contains(key)) {
+ params = new
String[]{getBean(ConfigurationDao.class).getAppName()};
+ }
Localizer l = get().getResourceSettings().getLocalizer();
String value = l.getStringIgnoreSettings(key, null, null, loc,
null, "[Missing]");
- if (!noReplace && STRINGS_WITH_APP.contains(key)) {
+ if (params != null && params.length > 0) {
final MessageFormat format = new MessageFormat(value,
loc);
- value = format.format(new
Object[]{getBean(ConfigurationDao.class).getAppName()});
+ value = format.format(params);
}
- if (!noReplace && RuntimeConfigurationType.DEVELOPMENT ==
get().getConfigurationType()) {
+ if (RuntimeConfigurationType.DEVELOPMENT ==
get().getConfigurationType()) {
value += String.format(" [%s]", key);
}
return value;
@@ -529,7 +532,7 @@ public class Application extends Authent
}
@Override
- public String getOmString(String key, final Locale loc) {
- return getString(key, loc, false);
+ public String getOmString(String key, final Locale loc, String...
params) {
+ return getString(key, loc, params);
}
}
