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 2016/11/18 18:31:02 UTC
svn commit: r1770421 [3/4] - in /openmeetings/application:
branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/
branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/installation/
branches/3.1.x/openmeet...
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml?rev=1770421&r1=1770420&r2=1770421&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml Fri Nov 18 18:31:00 2016
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -1971,4 +1971,12 @@
<entry key="files.download.original">Original</entry>
<entry key="files.download.pdf">PDF</entry>
<entry key="files.download.jpg">JPG</entry>
+ <entry key="template.recording.expiring.greetings">Dear {0}</entry>
+ <entry key="template.recording.expiring.body">Your recent {0} recording will be automatically deleted
+ in {1} days. If you would like to save this recording, please download it before then.</entry>
+ <entry key="template.recording.expiring.footer"><![CDATA[
+ Regards,<br/>
+ {0} Support Team.]]></entry>
+ <entry key="template.recording.expiring.subj.prefix">Recording will be deleted</entry>
+ <entry key="template.recording.expiring.subj.room"> -- Room[{0}]</entry>
</properties>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml?rev=1770421&r1=1770420&r2=1770421&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml Fri Nov 18 18:31:00 2016
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -1971,4 +1971,12 @@
<entry key="files.download.original">Original</entry>
<entry key="files.download.pdf">PDF</entry>
<entry key="files.download.jpg">JPG</entry>
+ <entry key="template.recording.expiring.greetings">Dear {0}</entry>
+ <entry key="template.recording.expiring.body">Your recent {0} recording will be automatically deleted
+ in {1} days. If you would like to save this recording, please download it before then.</entry>
+ <entry key="template.recording.expiring.footer"><![CDATA[
+ Regards,<br/>
+ {0} Support Team.]]></entry>
+ <entry key="template.recording.expiring.subj.prefix">Recording will be deleted</entry>
+ <entry key="template.recording.expiring.subj.room"> -- Room[{0}]</entry>
</properties>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml?rev=1770421&r1=1770420&r2=1770421&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml Fri Nov 18 18:31:00 2016
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -1971,4 +1971,12 @@
<entry key="files.download.original">Original</entry>
<entry key="files.download.pdf">PDF</entry>
<entry key="files.download.jpg">JPG</entry>
+ <entry key="template.recording.expiring.greetings">Dear {0}</entry>
+ <entry key="template.recording.expiring.body">Your recent {0} recording will be automatically deleted
+ in {1} days. If you would like to save this recording, please download it before then.</entry>
+ <entry key="template.recording.expiring.footer"><![CDATA[
+ Regards,<br/>
+ {0} Support Team.]]></entry>
+ <entry key="template.recording.expiring.subj.prefix">Recording will be deleted</entry>
+ <entry key="template.recording.expiring.subj.room"> -- Room[{0}]</entry>
</properties>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml?rev=1770421&r1=1770420&r2=1770421&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml Fri Nov 18 18:31:00 2016
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -1971,4 +1971,12 @@
<entry key="files.download.original">Original</entry>
<entry key="files.download.pdf">PDF</entry>
<entry key="files.download.jpg">JPG</entry>
+ <entry key="template.recording.expiring.greetings">Dear {0}</entry>
+ <entry key="template.recording.expiring.body">Your recent {0} recording will be automatically deleted
+ in {1} days. If you would like to save this recording, please download it before then.</entry>
+ <entry key="template.recording.expiring.footer"><![CDATA[
+ Regards,<br/>
+ {0} Support Team.]]></entry>
+ <entry key="template.recording.expiring.subj.prefix">Recording will be deleted</entry>
+ <entry key="template.recording.expiring.subj.room"> -- Room[{0}]</entry>
</properties>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml?rev=1770421&r1=1770420&r2=1770421&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml Fri Nov 18 18:31:00 2016
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -1977,4 +1977,12 @@
<entry key="files.download.original">Original</entry>
<entry key="files.download.pdf">PDF</entry>
<entry key="files.download.jpg">JPG</entry>
+ <entry key="template.recording.expiring.greetings">Dear {0}</entry>
+ <entry key="template.recording.expiring.body">Your recent {0} recording will be automatically deleted
+ in {1} days. If you would like to save this recording, please download it before then.</entry>
+ <entry key="template.recording.expiring.footer"><![CDATA[
+ Regards,<br/>
+ {0} Support Team.]]></entry>
+ <entry key="template.recording.expiring.subj.prefix">Recording will be deleted</entry>
+ <entry key="template.recording.expiring.subj.room"> -- Room[{0}]</entry>
</properties>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml?rev=1770421&r1=1770420&r2=1770421&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml Fri Nov 18 18:31:00 2016
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -1941,4 +1941,12 @@
<entry key="files.download.original">Original</entry>
<entry key="files.download.pdf">PDF</entry>
<entry key="files.download.jpg">JPG</entry>
+ <entry key="template.recording.expiring.greetings">Dear {0}</entry>
+ <entry key="template.recording.expiring.body">Your recent {0} recording will be automatically deleted
+ in {1} days. If you would like to save this recording, please download it before then.</entry>
+ <entry key="template.recording.expiring.footer"><![CDATA[
+ Regards,<br/>
+ {0} Support Team.]]></entry>
+ <entry key="template.recording.expiring.subj.prefix">Recording will be deleted</entry>
+ <entry key="template.recording.expiring.subj.room"> -- Room[{0}]</entry>
</properties>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml?rev=1770421&r1=1770420&r2=1770421&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml Fri Nov 18 18:31:00 2016
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -1971,4 +1971,12 @@
<entry key="files.download.original">Original</entry>
<entry key="files.download.pdf">PDF</entry>
<entry key="files.download.jpg">JPG</entry>
+ <entry key="template.recording.expiring.greetings">Dear {0}</entry>
+ <entry key="template.recording.expiring.body">Your recent {0} recording will be automatically deleted
+ in {1} days. If you would like to save this recording, please download it before then.</entry>
+ <entry key="template.recording.expiring.footer"><![CDATA[
+ Regards,<br/>
+ {0} Support Team.]]></entry>
+ <entry key="template.recording.expiring.subj.prefix">Recording will be deleted</entry>
+ <entry key="template.recording.expiring.subj.room"> -- Room[{0}]</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java?rev=1770421&r1=1770420&r2=1770421&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java (original)
+++ openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java Fri Nov 18 18:31:00 2016
@@ -20,6 +20,7 @@ package org.apache.openmeetings.core.mai
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SYSTEM_EMAIL;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -89,7 +90,7 @@ public class MailHandler {
private void init() {
smtpServer = cfgDao.getConfValue("smtp_server", String.class, null);
smtpPort = cfgDao.getConfValue("smtp_port", String.class, "25");
- from = cfgDao.getConfValue("system_email_addr", String.class, null);
+ from = cfgDao.getConfValue(CONFIG_SYSTEM_EMAIL, String.class, null);
mailAuthUser = cfgDao.getConfValue("email_username", String.class, null);
mailAuthPass = cfgDao.getConfValue("email_userpass", String.class, null);
mailTls = "1".equals(cfgDao.getConfValue("mail.smtp.starttls.enable", String.class, "0"));
@@ -97,7 +98,7 @@ public class MailHandler {
smtpConnectionTimeOut = cfgDao.getConfValue("mail.smtp.connection.timeout", Integer.class, "30000");
smtpTimeOut = cfgDao.getConfValue("mail.smtp.timeout", Integer.class, "30000");
}
-
+
public void init(String smtpServer, String smtpPort, String from, String mailAuthUser, String mailAuthPass, boolean mailTls, boolean mailAddReplyTo) {
this.smtpServer = smtpServer;
this.smtpPort = smtpPort;
@@ -107,7 +108,7 @@ public class MailHandler {
this.mailTls = mailTls;
this.mailAddReplyTo = mailAddReplyTo;
}
-
+
protected MimeMessage appendIcsBody(MimeMessage msg, MailMessage m) throws Exception {
log.debug("setMessageBody for iCal message");
// -- Create a new message --
@@ -140,11 +141,11 @@ public class MailHandler {
msg.setContent(multipart);
return msg;
}
-
+
private MimeMessage appendBody(MimeMessage msg, MailMessage m) throws MessagingException, IOException {
return appendBody(msg, m.getBody());
}
-
+
public MimeMessage appendBody(MimeMessage msg, String body) throws MessagingException, IOException {
// -- Set the subject and body text --
msg.setDataHandler(new DataHandler(new ByteArrayDataSource(body, "text/html; charset=\"utf-8\"")));
@@ -155,7 +156,7 @@ public class MailHandler {
return msg;
}
-
+
public MimeMessage getBasicMimeMessage() throws Exception {
log.debug("getBasicMimeMessage");
if (smtpServer == null) {
@@ -192,7 +193,7 @@ public class MailHandler {
msg.setFrom(new InternetAddress(from));
return msg;
}
-
+
private MimeMessage getMimeMessage(MailMessage m) throws Exception {
log.debug("getMimeMessage");
// Building MimeMessage
@@ -209,19 +210,19 @@ public class MailHandler {
return m.getIcs() == null ? appendBody(msg, m) : appendIcsBody(msg, m);
}
-
+
public void send(String toEmail, String subj, String message) {
send(toEmail, null, subj, message);
}
-
+
public void send(String toEmail, String replyTo, String subj, String message) {
send(new MailMessage(toEmail, replyTo, subj, message));
}
-
+
public void send(MailMessage m) {
send(m, false);
}
-
+
public void send(final MailMessage m, boolean send) {
if (send) {
if (m.getId() != null) {
@@ -260,7 +261,7 @@ public class MailHandler {
mailMessageDao.update(m, null);
}
}
-
+
public void resetSendingStatus() {
log.debug("resetSendingStatus enter ...");
Calendar c = Calendar.getInstance();
@@ -268,7 +269,7 @@ public class MailHandler {
mailMessageDao.resetSendingStatus(c);
log.debug("... resetSendingStatus done.");
}
-
+
public void sendMails() throws Exception {
init();
log.debug("sendMails enter ...");
Modified: openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java?rev=1770421&r1=1770420&r2=1770421&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java (original)
+++ openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java Fri Nov 18 18:31:00 2016
@@ -48,6 +48,7 @@ import static org.apache.openmeetings.ut
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SCREENSHARING_QUALITY;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SIP_ENABLED;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SOAP_REGISTER_KEY;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SYSTEM_EMAIL;
import static org.apache.openmeetings.util.OpenmeetingsVariables.LEVEL_ADMIN;
import static org.apache.openmeetings.util.OpenmeetingsVariables.LEVEL_GROUP_ADMIN;
import static org.apache.openmeetings.util.OpenmeetingsVariables.LEVEL_USER;
@@ -214,7 +215,7 @@ public class ImportInitvalues {
cfgDao.add("smtp_port", "" + cfg.smtpPort, null,
"this is the smtp server port normally 25");
- cfgDao.add("system_email_addr", cfg.mailReferer, null, "all send e-mails by the system will have this address");
+ cfgDao.add(CONFIG_SYSTEM_EMAIL, cfg.mailReferer, null, "all send e-mails by the system will have this address");
cfgDao.add("email_username", cfg.mailAuthName, null, "System auth email username");
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=1770421&r1=1770420&r2=1770421&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 Fri Nov 18 18:31:00 2016
@@ -53,6 +53,7 @@ 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")));
}
Modified: openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/OmTextLabel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/OmTextLabel.java?rev=1770421&r1=1770420&r2=1770421&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/OmTextLabel.java (original)
+++ openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/OmTextLabel.java Fri Nov 18 18:31:00 2016
@@ -21,16 +21,22 @@ package org.apache.openmeetings.service.
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.MarkupStream;
import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
public class OmTextLabel extends Label {
private static final long serialVersionUID = 1L;
private static final String WICKET_VISIBLE = ":visible";
- public OmTextLabel(String id, String label) {
- super(id, label);
+ public OmTextLabel(String id, IModel<?> model) {
+ super(id, model);
setRenderBodyOnly(true);
}
+ public OmTextLabel(String id, String label) {
+ this(id, Model.of(label));
+ }
+
@Override
public void onComponentTagBody(MarkupStream markupStream, ComponentTag openTag) {
final String vis = openTag.getAttribute(markupStream.getWicketNamespace() + WICKET_VISIBLE);
Added: openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/AbstractAppointmentTemplate.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/AbstractAppointmentTemplate.java?rev=1770421&view=auto
==============================================================================
--- openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/AbstractAppointmentTemplate.java (added)
+++ openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/AbstractAppointmentTemplate.java Fri Nov 18 18:31:00 2016
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.service.mail.template.subject;
+
+import static org.apache.commons.lang3.time.FastDateFormat.MEDIUM;
+import static org.apache.commons.lang3.time.FastDateFormat.SHORT;
+
+import java.util.Date;
+import java.util.Locale;
+import java.util.TimeZone;
+
+import org.apache.commons.lang3.time.FastDateFormat;
+import org.apache.openmeetings.db.entity.calendar.Appointment;
+import org.apache.openmeetings.service.mail.template.DashOmTextLabel;
+import org.apache.openmeetings.service.mail.template.OmTextLabel;
+import org.apache.wicket.markup.html.panel.Fragment;
+
+public abstract class AbstractAppointmentTemplate extends AbstractSubjectEmailTemplate {
+ private static final long serialVersionUID = 1L;
+ protected Appointment a;
+ protected TimeZone tz;
+
+ public AbstractAppointmentTemplate(Locale locale, Appointment a, TimeZone tz) {
+ super(locale);
+ this.a = a;
+ this.tz = tz;
+ }
+
+ abstract String getPrefix();
+
+ Fragment getSubjectFragment() {
+ Fragment f = new Fragment(COMP_ID, "subject", this);
+ f.add(new OmTextLabel("prefix", getPrefix())
+ , new OmTextLabel("title", a.getTitle())
+ , new OmTextLabel("start", format(a.getStart(), SHORT))
+ , new DashOmTextLabel("dash")
+ , new OmTextLabel("end", format(a.getEnd(), SHORT))
+ );
+ return f;
+ }
+
+ protected String format(Date d) {
+ return format(d, MEDIUM);
+ }
+
+ protected String format(Date d, int fmt) {
+ return FastDateFormat.getDateTimeInstance(fmt, fmt, tz, locale).format(d);
+ }
+}
Modified: openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/AbstractSubjectEmailTemplate.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/AbstractSubjectEmailTemplate.java?rev=1770421&r1=1770420&r2=1770421&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/AbstractSubjectEmailTemplate.java (original)
+++ openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/AbstractSubjectEmailTemplate.java Fri Nov 18 18:31:00 2016
@@ -18,33 +18,20 @@
*/
package org.apache.openmeetings.service.mail.template.subject;
-import static org.apache.commons.lang3.time.FastDateFormat.MEDIUM;
-import static org.apache.commons.lang3.time.FastDateFormat.SHORT;
-
-import java.util.Date;
import java.util.Locale;
-import java.util.TimeZone;
-import org.apache.commons.lang3.time.FastDateFormat;
-import org.apache.openmeetings.db.entity.calendar.Appointment;
import org.apache.openmeetings.service.mail.template.AbstractTemplatePanel;
-import org.apache.openmeetings.service.mail.template.DashOmTextLabel;
-import org.apache.openmeetings.service.mail.template.OmTextLabel;
import org.apache.wicket.core.util.string.ComponentRenderer;
import org.apache.wicket.markup.html.panel.Fragment;
public abstract class AbstractSubjectEmailTemplate extends AbstractTemplatePanel {
private static final long serialVersionUID = 1L;
- protected Appointment a;
- protected TimeZone tz;
private String email = null;
private String subject = null;
private boolean created = false;
- public AbstractSubjectEmailTemplate(Locale locale, Appointment a, TimeZone tz) {
+ public AbstractSubjectEmailTemplate(Locale locale) {
super(locale);
- this.a = a;
- this.tz = tz;
}
AbstractSubjectEmailTemplate create() {
@@ -54,26 +41,7 @@ public abstract class AbstractSubjectEma
return this;
}
- abstract String getPrefix();
-
- protected String format(Date d) {
- return format(d, MEDIUM);
- }
-
- protected String format(Date d, int fmt) {
- return FastDateFormat.getDateTimeInstance(fmt, fmt, tz, locale).format(d);
- }
-
- Fragment getSubjectFragment() {
- Fragment f = new Fragment(COMP_ID, "subject", this);
- f.add(new OmTextLabel("prefix", getPrefix())
- , new OmTextLabel("title", a.getTitle())
- , new OmTextLabel("start", format(a.getStart(), SHORT))
- , new DashOmTextLabel("dash")
- , new OmTextLabel("end", format(a.getEnd(), SHORT))
- );
- return f;
- }
+ abstract Fragment getSubjectFragment();
public final String getEmail() {
if (!created) {
Modified: openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/AppointmentReminderTemplate.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/AppointmentReminderTemplate.java?rev=1770421&r1=1770420&r2=1770421&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/AppointmentReminderTemplate.java (original)
+++ openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/AppointmentReminderTemplate.java Fri Nov 18 18:31:00 2016
@@ -29,7 +29,7 @@ import org.apache.wicket.markup.html.Web
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.util.string.Strings;
-public class AppointmentReminderTemplate extends AbstractSubjectEmailTemplate {
+public class AppointmentReminderTemplate extends AbstractAppointmentTemplate {
private static final long serialVersionUID = 1L;
private AppointmentReminderTemplate(Locale locale, Appointment a, TimeZone tz) {
Modified: openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/CanceledAppointmentTemplate.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/CanceledAppointmentTemplate.java?rev=1770421&r1=1770420&r2=1770421&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/CanceledAppointmentTemplate.java (original)
+++ openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/CanceledAppointmentTemplate.java Fri Nov 18 18:31:00 2016
@@ -29,7 +29,7 @@ import org.apache.wicket.markup.html.Web
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.util.string.Strings;
-public class CanceledAppointmentTemplate extends AbstractSubjectEmailTemplate {
+public class CanceledAppointmentTemplate extends AbstractAppointmentTemplate {
private static final long serialVersionUID = 1L;
private final String invitorName;
Modified: openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/CreatedAppointmentTemplate.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/CreatedAppointmentTemplate.java?rev=1770421&r1=1770420&r2=1770421&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/CreatedAppointmentTemplate.java (original)
+++ openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/CreatedAppointmentTemplate.java Fri Nov 18 18:31:00 2016
@@ -29,7 +29,7 @@ import org.apache.wicket.markup.html.Web
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.util.string.Strings;
-public class CreatedAppointmentTemplate extends AbstractSubjectEmailTemplate {
+public class CreatedAppointmentTemplate extends AbstractAppointmentTemplate {
private static final long serialVersionUID = 1L;
private final String invitorName;
Added: openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/RecordingExpiringTemplate.html
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/RecordingExpiringTemplate.html?rev=1770421&view=auto
==============================================================================
--- openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/RecordingExpiringTemplate.html (added)
+++ openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/RecordingExpiringTemplate.html Fri Nov 18 18:31:00 2016
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<html xmlns:wicket="http://wicket.apache.org">
+<wicket:extend>
+ <span wicket:id="greetings"></span><br />
+ <br />
+ <br />
+ <p wicket:id="body"></p>
+ <br />
+ <br />
+ <span wicket:id="footer"></span><br/>
+
+ <wicket:fragment wicket:id="subject"><span wicket:id="prefix"></span><span wicket:id="room"></span></wicket:fragment>
+</wicket:extend>
+</html>
Added: 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=1770421&view=auto
==============================================================================
--- openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/RecordingExpiringTemplate.java (added)
+++ openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/RecordingExpiringTemplate.java Fri Nov 18 18:31:00 2016
@@ -0,0 +1,69 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.service.mail.template.subject;
+
+import static org.apache.openmeetings.db.util.ApplicationHelper.ensureApplication;
+
+import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
+import org.apache.openmeetings.db.dao.room.RoomDao;
+import org.apache.openmeetings.db.entity.record.Recording;
+import org.apache.openmeetings.db.entity.room.Room;
+import org.apache.openmeetings.db.entity.user.User;
+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;
+ private final Recording rec;
+ private long remainingDays;
+ private final User u;
+
+ private RecordingExpiringTemplate(User u, final Recording rec, long remainingDays) {
+ super(getOmSession().getLocale(u));
+ this.u = u;
+ this.rec = rec;
+ this.remainingDays = remainingDays;
+ }
+
+ public static AbstractSubjectEmailTemplate get(User u, Recording rec, long remainingDays) {
+ ensureApplication(u.getLanguageId());
+ return new RecordingExpiringTemplate(u, rec, remainingDays).create();
+ }
+
+ @Override
+ 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)));
+ }
+
+ @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)
+ );
+ return f;
+ }
+}
Modified: openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/UpdatedAppointmentTemplate.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/UpdatedAppointmentTemplate.java?rev=1770421&r1=1770420&r2=1770421&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/UpdatedAppointmentTemplate.java (original)
+++ openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/UpdatedAppointmentTemplate.java Fri Nov 18 18:31:00 2016
@@ -29,7 +29,7 @@ import org.apache.wicket.markup.html.Web
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.util.string.Strings;
-public class UpdatedAppointmentTemplate extends AbstractSubjectEmailTemplate {
+public class UpdatedAppointmentTemplate extends AbstractAppointmentTemplate {
private static final long serialVersionUID = 1L;
private final String invitorName;
Modified: openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java?rev=1770421&r1=1770420&r2=1770421&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java (original)
+++ openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java Fri Nov 18 18:31:00 2016
@@ -47,6 +47,7 @@ public class OpenmeetingsVariables {
public static final String CONFIG_CALENDAR_FIRST_DAY = "calendar.firstday";
public static final String CONFIG_DEFAULT_GROUP_ID = "default_group_id";
public static final String CONFIG_GOOGLE_ANALYTICS_CODE = "google.analytics.code";
+ public static final String CONFIG_SYSTEM_EMAIL = "system_email_addr";
public static final int LEVEL_USER = 1;
public static final int LEVEL_GROUP_ADMIN = 2;
public static final int LEVEL_ADMIN = 3;
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml?rev=1770421&r1=1770420&r2=1770421&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml Fri Nov 18 18:31:00 2016
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -1970,4 +1970,12 @@
<entry key="files.download.original">Original</entry>
<entry key="files.download.pdf">PDF</entry>
<entry key="files.download.jpg">JPG</entry>
+ <entry key="template.recording.expiring.greetings">Dear {0}</entry>
+ <entry key="template.recording.expiring.body">Your recent {0} recording will be automatically deleted
+ in {1} days. If you would like to save this recording, please download it before then.</entry>
+ <entry key="template.recording.expiring.footer"><![CDATA[
+ Regards,<br/>
+ {0} Support Team.]]></entry>
+ <entry key="template.recording.expiring.subj.prefix">Recording will be deleted</entry>
+ <entry key="template.recording.expiring.subj.room"> -- Room[{0}]</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml?rev=1770421&r1=1770420&r2=1770421&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml Fri Nov 18 18:31:00 2016
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -1971,4 +1971,12 @@
<entry key="files.download.original">Original</entry>
<entry key="files.download.pdf">PDF</entry>
<entry key="files.download.jpg">JPG</entry>
+ <entry key="template.recording.expiring.greetings">Dear {0}</entry>
+ <entry key="template.recording.expiring.body">Your recent {0} recording will be automatically deleted
+ in {1} days. If you would like to save this recording, please download it before then.</entry>
+ <entry key="template.recording.expiring.footer"><![CDATA[
+ Regards,<br/>
+ {0} Support Team.]]></entry>
+ <entry key="template.recording.expiring.subj.prefix">Recording will be deleted</entry>
+ <entry key="template.recording.expiring.subj.room"> -- Room[{0}]</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml?rev=1770421&r1=1770420&r2=1770421&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml Fri Nov 18 18:31:00 2016
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -1971,4 +1971,12 @@
<entry key="files.download.original">Original</entry>
<entry key="files.download.pdf">PDF</entry>
<entry key="files.download.jpg">JPG</entry>
+ <entry key="template.recording.expiring.greetings">Dear {0}</entry>
+ <entry key="template.recording.expiring.body">Your recent {0} recording will be automatically deleted
+ in {1} days. If you would like to save this recording, please download it before then.</entry>
+ <entry key="template.recording.expiring.footer"><![CDATA[
+ Regards,<br/>
+ {0} Support Team.]]></entry>
+ <entry key="template.recording.expiring.subj.prefix">Recording will be deleted</entry>
+ <entry key="template.recording.expiring.subj.room"> -- Room[{0}]</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml?rev=1770421&r1=1770420&r2=1770421&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml Fri Nov 18 18:31:00 2016
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -1971,4 +1971,12 @@
<entry key="files.download.original">Original</entry>
<entry key="files.download.pdf">PDF</entry>
<entry key="files.download.jpg">JPG</entry>
+ <entry key="template.recording.expiring.greetings">Dear {0}</entry>
+ <entry key="template.recording.expiring.body">Your recent {0} recording will be automatically deleted
+ in {1} days. If you would like to save this recording, please download it before then.</entry>
+ <entry key="template.recording.expiring.footer"><![CDATA[
+ Regards,<br/>
+ {0} Support Team.]]></entry>
+ <entry key="template.recording.expiring.subj.prefix">Recording will be deleted</entry>
+ <entry key="template.recording.expiring.subj.room"> -- Room[{0}]</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml?rev=1770421&r1=1770420&r2=1770421&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml Fri Nov 18 18:31:00 2016
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -1971,4 +1971,12 @@
<entry key="files.download.original">Original</entry>
<entry key="files.download.pdf">PDF</entry>
<entry key="files.download.jpg">JPG</entry>
+ <entry key="template.recording.expiring.greetings">Dear {0}</entry>
+ <entry key="template.recording.expiring.body">Your recent {0} recording will be automatically deleted
+ in {1} days. If you would like to save this recording, please download it before then.</entry>
+ <entry key="template.recording.expiring.footer"><![CDATA[
+ Regards,<br/>
+ {0} Support Team.]]></entry>
+ <entry key="template.recording.expiring.subj.prefix">Recording will be deleted</entry>
+ <entry key="template.recording.expiring.subj.room"> -- Room[{0}]</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml?rev=1770421&r1=1770420&r2=1770421&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml Fri Nov 18 18:31:00 2016
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -1971,4 +1971,12 @@
<entry key="files.download.original">Original</entry>
<entry key="files.download.pdf">PDF</entry>
<entry key="files.download.jpg">JPG</entry>
+ <entry key="template.recording.expiring.greetings">Dear {0}</entry>
+ <entry key="template.recording.expiring.body">Your recent {0} recording will be automatically deleted
+ in {1} days. If you would like to save this recording, please download it before then.</entry>
+ <entry key="template.recording.expiring.footer"><![CDATA[
+ Regards,<br/>
+ {0} Support Team.]]></entry>
+ <entry key="template.recording.expiring.subj.prefix">Recording will be deleted</entry>
+ <entry key="template.recording.expiring.subj.room"> -- Room[{0}]</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml?rev=1770421&r1=1770420&r2=1770421&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml Fri Nov 18 18:31:00 2016
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -1981,4 +1981,12 @@
<entry key="files.download.original">Original</entry>
<entry key="files.download.pdf">PDF</entry>
<entry key="files.download.jpg">JPG</entry>
+ <entry key="template.recording.expiring.greetings">Dear {0}</entry>
+ <entry key="template.recording.expiring.body">Your recent {0} recording will be automatically deleted
+ in {1} days. If you would like to save this recording, please download it before then.</entry>
+ <entry key="template.recording.expiring.footer"><![CDATA[
+ Regards,<br/>
+ {0} Support Team.]]></entry>
+ <entry key="template.recording.expiring.subj.prefix">Recording will be deleted</entry>
+ <entry key="template.recording.expiring.subj.room"> -- Room[{0}]</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml?rev=1770421&r1=1770420&r2=1770421&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml Fri Nov 18 18:31:00 2016
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -1971,4 +1971,12 @@
<entry key="files.download.original">Original</entry>
<entry key="files.download.pdf">PDF</entry>
<entry key="files.download.jpg">JPG</entry>
+ <entry key="template.recording.expiring.greetings">Dear {0}</entry>
+ <entry key="template.recording.expiring.body">Your recent {0} recording will be automatically deleted
+ in {1} days. If you would like to save this recording, please download it before then.</entry>
+ <entry key="template.recording.expiring.footer"><![CDATA[
+ Regards,<br/>
+ {0} Support Team.]]></entry>
+ <entry key="template.recording.expiring.subj.prefix">Recording will be deleted</entry>
+ <entry key="template.recording.expiring.subj.room"> -- Room[{0}]</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml?rev=1770421&r1=1770420&r2=1770421&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml Fri Nov 18 18:31:00 2016
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -1965,4 +1965,12 @@
<entry key="files.download.original">Original</entry>
<entry key="files.download.pdf">PDF</entry>
<entry key="files.download.jpg">JPG</entry>
+ <entry key="template.recording.expiring.greetings">Dear {0}</entry>
+ <entry key="template.recording.expiring.body">Your recent {0} recording will be automatically deleted
+ in {1} days. If you would like to save this recording, please download it before then.</entry>
+ <entry key="template.recording.expiring.footer"><![CDATA[
+ Regards,<br/>
+ {0} Support Team.]]></entry>
+ <entry key="template.recording.expiring.subj.prefix">Recording will be deleted</entry>
+ <entry key="template.recording.expiring.subj.room"> -- Room[{0}]</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml?rev=1770421&r1=1770420&r2=1770421&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml Fri Nov 18 18:31:00 2016
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -1971,4 +1971,12 @@
<entry key="files.download.original">Original</entry>
<entry key="files.download.pdf">PDF</entry>
<entry key="files.download.jpg">JPG</entry>
+ <entry key="template.recording.expiring.greetings">Dear {0}</entry>
+ <entry key="template.recording.expiring.body">Your recent {0} recording will be automatically deleted
+ in {1} days. If you would like to save this recording, please download it before then.</entry>
+ <entry key="template.recording.expiring.footer"><![CDATA[
+ Regards,<br/>
+ {0} Support Team.]]></entry>
+ <entry key="template.recording.expiring.subj.prefix">Recording will be deleted</entry>
+ <entry key="template.recording.expiring.subj.room"> -- Room[{0}]</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml?rev=1770421&r1=1770420&r2=1770421&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml Fri Nov 18 18:31:00 2016
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -1971,4 +1971,12 @@
<entry key="files.download.original">Original</entry>
<entry key="files.download.pdf">PDF</entry>
<entry key="files.download.jpg">JPG</entry>
+ <entry key="template.recording.expiring.greetings">Dear {0}</entry>
+ <entry key="template.recording.expiring.body">Your recent {0} recording will be automatically deleted
+ in {1} days. If you would like to save this recording, please download it before then.</entry>
+ <entry key="template.recording.expiring.footer"><![CDATA[
+ Regards,<br/>
+ {0} Support Team.]]></entry>
+ <entry key="template.recording.expiring.subj.prefix">Recording will be deleted</entry>
+ <entry key="template.recording.expiring.subj.room"> -- Room[{0}]</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml?rev=1770421&r1=1770420&r2=1770421&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml Fri Nov 18 18:31:00 2016
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -1937,4 +1937,12 @@
<entry key="files.download.original">Original</entry>
<entry key="files.download.pdf">PDF</entry>
<entry key="files.download.jpg">JPG</entry>
+ <entry key="template.recording.expiring.greetings">Dear {0}</entry>
+ <entry key="template.recording.expiring.body">Your recent {0} recording will be automatically deleted
+ in {1} days. If you would like to save this recording, please download it before then.</entry>
+ <entry key="template.recording.expiring.footer"><![CDATA[
+ Regards,<br/>
+ {0} Support Team.]]></entry>
+ <entry key="template.recording.expiring.subj.prefix">Recording will be deleted</entry>
+ <entry key="template.recording.expiring.subj.room"> -- Room[{0}]</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml?rev=1770421&r1=1770420&r2=1770421&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml Fri Nov 18 18:31:00 2016
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -1971,4 +1971,12 @@
<entry key="files.download.original">Original</entry>
<entry key="files.download.pdf">PDF</entry>
<entry key="files.download.jpg">JPG</entry>
+ <entry key="template.recording.expiring.greetings">Dear {0}</entry>
+ <entry key="template.recording.expiring.body">Your recent {0} recording will be automatically deleted
+ in {1} days. If you would like to save this recording, please download it before then.</entry>
+ <entry key="template.recording.expiring.footer"><![CDATA[
+ Regards,<br/>
+ {0} Support Team.]]></entry>
+ <entry key="template.recording.expiring.subj.prefix">Recording will be deleted</entry>
+ <entry key="template.recording.expiring.subj.room"> -- Room[{0}]</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml?rev=1770421&r1=1770420&r2=1770421&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml Fri Nov 18 18:31:00 2016
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -1959,4 +1959,12 @@
<entry key="files.download.original">Original</entry>
<entry key="files.download.pdf">PDF</entry>
<entry key="files.download.jpg">JPG</entry>
+ <entry key="template.recording.expiring.greetings">Dear {0}</entry>
+ <entry key="template.recording.expiring.body">Your recent {0} recording will be automatically deleted
+ in {1} days. If you would like to save this recording, please download it before then.</entry>
+ <entry key="template.recording.expiring.footer"><![CDATA[
+ Regards,<br/>
+ {0} Support Team.]]></entry>
+ <entry key="template.recording.expiring.subj.prefix">Recording will be deleted</entry>
+ <entry key="template.recording.expiring.subj.room"> -- Room[{0}]</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml?rev=1770421&r1=1770420&r2=1770421&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml Fri Nov 18 18:31:00 2016
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -1971,4 +1971,12 @@
<entry key="files.download.original">Original</entry>
<entry key="files.download.pdf">PDF</entry>
<entry key="files.download.jpg">JPG</entry>
+ <entry key="template.recording.expiring.greetings">Dear {0}</entry>
+ <entry key="template.recording.expiring.body">Your recent {0} recording will be automatically deleted
+ in {1} days. If you would like to save this recording, please download it before then.</entry>
+ <entry key="template.recording.expiring.footer"><![CDATA[
+ Regards,<br/>
+ {0} Support Team.]]></entry>
+ <entry key="template.recording.expiring.subj.prefix">Recording will be deleted</entry>
+ <entry key="template.recording.expiring.subj.room"> -- Room[{0}]</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml?rev=1770421&r1=1770420&r2=1770421&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml Fri Nov 18 18:31:00 2016
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -1971,4 +1971,12 @@
<entry key="files.download.original">Original</entry>
<entry key="files.download.pdf">PDF</entry>
<entry key="files.download.jpg">JPG</entry>
+ <entry key="template.recording.expiring.greetings">Dear {0}</entry>
+ <entry key="template.recording.expiring.body">Your recent {0} recording will be automatically deleted
+ in {1} days. If you would like to save this recording, please download it before then.</entry>
+ <entry key="template.recording.expiring.footer"><![CDATA[
+ Regards,<br/>
+ {0} Support Team.]]></entry>
+ <entry key="template.recording.expiring.subj.prefix">Recording will be deleted</entry>
+ <entry key="template.recording.expiring.subj.room"> -- Room[{0}]</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml?rev=1770421&r1=1770420&r2=1770421&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml Fri Nov 18 18:31:00 2016
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -1971,4 +1971,12 @@
<entry key="files.download.original">Original</entry>
<entry key="files.download.pdf">PDF</entry>
<entry key="files.download.jpg">JPG</entry>
+ <entry key="template.recording.expiring.greetings">Dear {0}</entry>
+ <entry key="template.recording.expiring.body">Your recent {0} recording will be automatically deleted
+ in {1} days. If you would like to save this recording, please download it before then.</entry>
+ <entry key="template.recording.expiring.footer"><![CDATA[
+ Regards,<br/>
+ {0} Support Team.]]></entry>
+ <entry key="template.recording.expiring.subj.prefix">Recording will be deleted</entry>
+ <entry key="template.recording.expiring.subj.room"> -- Room[{0}]</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml?rev=1770421&r1=1770420&r2=1770421&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml Fri Nov 18 18:31:00 2016
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -1973,4 +1973,12 @@
<entry key="files.download.original">Original</entry>
<entry key="files.download.pdf">PDF</entry>
<entry key="files.download.jpg">JPG</entry>
+ <entry key="template.recording.expiring.greetings">Dear {0}</entry>
+ <entry key="template.recording.expiring.body">Your recent {0} recording will be automatically deleted
+ in {1} days. If you would like to save this recording, please download it before then.</entry>
+ <entry key="template.recording.expiring.footer"><![CDATA[
+ Regards,<br/>
+ {0} Support Team.]]></entry>
+ <entry key="template.recording.expiring.subj.prefix">Recording will be deleted</entry>
+ <entry key="template.recording.expiring.subj.room"> -- Room[{0}]</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml?rev=1770421&r1=1770420&r2=1770421&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml Fri Nov 18 18:31:00 2016
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -1971,4 +1971,12 @@
<entry key="files.download.original">Original</entry>
<entry key="files.download.pdf">PDF</entry>
<entry key="files.download.jpg">JPG</entry>
+ <entry key="template.recording.expiring.greetings">Dear {0}</entry>
+ <entry key="template.recording.expiring.body">Your recent {0} recording will be automatically deleted
+ in {1} days. If you would like to save this recording, please download it before then.</entry>
+ <entry key="template.recording.expiring.footer"><![CDATA[
+ Regards,<br/>
+ {0} Support Team.]]></entry>
+ <entry key="template.recording.expiring.subj.prefix">Recording will be deleted</entry>
+ <entry key="template.recording.expiring.subj.room"> -- Room[{0}]</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml?rev=1770421&r1=1770420&r2=1770421&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml Fri Nov 18 18:31:00 2016
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -1971,4 +1971,12 @@
<entry key="files.download.original">Original</entry>
<entry key="files.download.pdf">PDF</entry>
<entry key="files.download.jpg">JPG</entry>
+ <entry key="template.recording.expiring.greetings">Dear {0}</entry>
+ <entry key="template.recording.expiring.body">Your recent {0} recording will be automatically deleted
+ in {1} days. If you would like to save this recording, please download it before then.</entry>
+ <entry key="template.recording.expiring.footer"><![CDATA[
+ Regards,<br/>
+ {0} Support Team.]]></entry>
+ <entry key="template.recording.expiring.subj.prefix">Recording will be deleted</entry>
+ <entry key="template.recording.expiring.subj.room"> -- Room[{0}]</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml?rev=1770421&r1=1770420&r2=1770421&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml Fri Nov 18 18:31:00 2016
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -1971,4 +1971,12 @@
<entry key="files.download.original">Original</entry>
<entry key="files.download.pdf">PDF</entry>
<entry key="files.download.jpg">JPG</entry>
+ <entry key="template.recording.expiring.greetings">Dear {0}</entry>
+ <entry key="template.recording.expiring.body">Your recent {0} recording will be automatically deleted
+ in {1} days. If you would like to save this recording, please download it before then.</entry>
+ <entry key="template.recording.expiring.footer"><![CDATA[
+ Regards,<br/>
+ {0} Support Team.]]></entry>
+ <entry key="template.recording.expiring.subj.prefix">Recording will be deleted</entry>
+ <entry key="template.recording.expiring.subj.room"> -- Room[{0}]</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml?rev=1770421&r1=1770420&r2=1770421&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml Fri Nov 18 18:31:00 2016
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -1971,4 +1971,12 @@
<entry key="files.download.original">Original</entry>
<entry key="files.download.pdf">PDF</entry>
<entry key="files.download.jpg">JPG</entry>
+ <entry key="template.recording.expiring.greetings">Dear {0}</entry>
+ <entry key="template.recording.expiring.body">Your recent {0} recording will be automatically deleted
+ in {1} days. If you would like to save this recording, please download it before then.</entry>
+ <entry key="template.recording.expiring.footer"><![CDATA[
+ Regards,<br/>
+ {0} Support Team.]]></entry>
+ <entry key="template.recording.expiring.subj.prefix">Recording will be deleted</entry>
+ <entry key="template.recording.expiring.subj.room"> -- Room[{0}]</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml?rev=1770421&r1=1770420&r2=1770421&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml Fri Nov 18 18:31:00 2016
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -1977,4 +1977,12 @@
<entry key="files.download.original">Оригинальный</entry>
<entry key="files.download.pdf">PDF</entry>
<entry key="files.download.jpg">JPG</entry>
+ <entry key="template.recording.expiring.greetings">Дорогой(ая) {0}</entry>
+ <entry key="template.recording.expiring.body">Ваша {0} запись(и) будут автоматически удалены
+ в течении {1} дней. Пожалуйста скачайте запись если она Вам нужна.</entry>
+ <entry key="template.recording.expiring.footer"><![CDATA[
+ С уважением,<br/>
+ {0} Комманда поддержки.]]></entry>
+ <entry key="template.recording.expiring.subj.prefix">Запись будет удалена</entry>
+ <entry key="template.recording.expiring.subj.room"> -- Комната[{0}]</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml?rev=1770421&r1=1770420&r2=1770421&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml Fri Nov 18 18:31:00 2016
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -1971,4 +1971,12 @@
<entry key="files.download.original">Original</entry>
<entry key="files.download.pdf">PDF</entry>
<entry key="files.download.jpg">JPG</entry>
+ <entry key="template.recording.expiring.greetings">Dear {0}</entry>
+ <entry key="template.recording.expiring.body">Your recent {0} recording will be automatically deleted
+ in {1} days. If you would like to save this recording, please download it before then.</entry>
+ <entry key="template.recording.expiring.footer"><![CDATA[
+ Regards,<br/>
+ {0} Support Team.]]></entry>
+ <entry key="template.recording.expiring.subj.prefix">Recording will be deleted</entry>
+ <entry key="template.recording.expiring.subj.room"> -- Room[{0}]</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml?rev=1770421&r1=1770420&r2=1770421&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml Fri Nov 18 18:31:00 2016
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -1971,4 +1971,12 @@
<entry key="files.download.original">Original</entry>
<entry key="files.download.pdf">PDF</entry>
<entry key="files.download.jpg">JPG</entry>
+ <entry key="template.recording.expiring.greetings">Dear {0}</entry>
+ <entry key="template.recording.expiring.body">Your recent {0} recording will be automatically deleted
+ in {1} days. If you would like to save this recording, please download it before then.</entry>
+ <entry key="template.recording.expiring.footer"><![CDATA[
+ Regards,<br/>
+ {0} Support Team.]]></entry>
+ <entry key="template.recording.expiring.subj.prefix">Recording will be deleted</entry>
+ <entry key="template.recording.expiring.subj.room"> -- Room[{0}]</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml?rev=1770421&r1=1770420&r2=1770421&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml Fri Nov 18 18:31:00 2016
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -1971,4 +1971,12 @@
<entry key="files.download.original">Original</entry>
<entry key="files.download.pdf">PDF</entry>
<entry key="files.download.jpg">JPG</entry>
+ <entry key="template.recording.expiring.greetings">Dear {0}</entry>
+ <entry key="template.recording.expiring.body">Your recent {0} recording will be automatically deleted
+ in {1} days. If you would like to save this recording, please download it before then.</entry>
+ <entry key="template.recording.expiring.footer"><![CDATA[
+ Regards,<br/>
+ {0} Support Team.]]></entry>
+ <entry key="template.recording.expiring.subj.prefix">Recording will be deleted</entry>
+ <entry key="template.recording.expiring.subj.room"> -- Room[{0}]</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml?rev=1770421&r1=1770420&r2=1770421&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml Fri Nov 18 18:31:00 2016
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -1971,4 +1971,12 @@
<entry key="files.download.original">Original</entry>
<entry key="files.download.pdf">PDF</entry>
<entry key="files.download.jpg">JPG</entry>
+ <entry key="template.recording.expiring.greetings">Dear {0}</entry>
+ <entry key="template.recording.expiring.body">Your recent {0} recording will be automatically deleted
+ in {1} days. If you would like to save this recording, please download it before then.</entry>
+ <entry key="template.recording.expiring.footer"><![CDATA[
+ Regards,<br/>
+ {0} Support Team.]]></entry>
+ <entry key="template.recording.expiring.subj.prefix">Recording will be deleted</entry>
+ <entry key="template.recording.expiring.subj.room"> -- Room[{0}]</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml?rev=1770421&r1=1770420&r2=1770421&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml Fri Nov 18 18:31:00 2016
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -1977,4 +1977,12 @@
<entry key="files.download.original">Original</entry>
<entry key="files.download.pdf">PDF</entry>
<entry key="files.download.jpg">JPG</entry>
+ <entry key="template.recording.expiring.greetings">Dear {0}</entry>
+ <entry key="template.recording.expiring.body">Your recent {0} recording will be automatically deleted
+ in {1} days. If you would like to save this recording, please download it before then.</entry>
+ <entry key="template.recording.expiring.footer"><![CDATA[
+ Regards,<br/>
+ {0} Support Team.]]></entry>
+ <entry key="template.recording.expiring.subj.prefix">Recording will be deleted</entry>
+ <entry key="template.recording.expiring.subj.room"> -- Room[{0}]</entry>
</properties>