Author: solomax
Date: Wed May 21 17:16:38 2014
New Revision: 1596628
URL: http://svn.apache.org/r1596628
Log:
[OPENMEETINGS-996] Invitation recipient format is changed
Modified:
openmeetings/branches/3.0.x/WebContent/src/base/components/text/customEdittext.lzx
openmeetings/branches/3.0.x/WebContent/src/modules/invitation/inviteMainWindow.lzx
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/InvitationService.java
openmeetings/branches/3.0.x/src/main/webapp/languages/arabic.xml
openmeetings/branches/3.0.x/src/main/webapp/languages/bulgarian.xml
openmeetings/branches/3.0.x/src/main/webapp/languages/catalan.xml
openmeetings/branches/3.0.x/src/main/webapp/languages/chinese simplified.xml
openmeetings/branches/3.0.x/src/main/webapp/languages/chinese
traditional.xml
openmeetings/branches/3.0.x/src/main/webapp/languages/czech.xml
openmeetings/branches/3.0.x/src/main/webapp/languages/danish.xml
openmeetings/branches/3.0.x/src/main/webapp/languages/deutsch (studIP).xml
openmeetings/branches/3.0.x/src/main/webapp/languages/deutsch.xml
openmeetings/branches/3.0.x/src/main/webapp/languages/dutch.xml
openmeetings/branches/3.0.x/src/main/webapp/languages/english.xml
openmeetings/branches/3.0.x/src/main/webapp/languages/finnish.xml
openmeetings/branches/3.0.x/src/main/webapp/languages/french.xml
openmeetings/branches/3.0.x/src/main/webapp/languages/galician.xml
openmeetings/branches/3.0.x/src/main/webapp/languages/greek.xml
openmeetings/branches/3.0.x/src/main/webapp/languages/hebrew.xml
openmeetings/branches/3.0.x/src/main/webapp/languages/hungarian.xml
openmeetings/branches/3.0.x/src/main/webapp/languages/indonesian.xml
openmeetings/branches/3.0.x/src/main/webapp/languages/italian.xml
openmeetings/branches/3.0.x/src/main/webapp/languages/japanese.xml
openmeetings/branches/3.0.x/src/main/webapp/languages/korean.xml
openmeetings/branches/3.0.x/src/main/webapp/languages/persian.xml
openmeetings/branches/3.0.x/src/main/webapp/languages/polish.xml
openmeetings/branches/3.0.x/src/main/webapp/languages/portugues brazil.xml
openmeetings/branches/3.0.x/src/main/webapp/languages/portugues.xml
openmeetings/branches/3.0.x/src/main/webapp/languages/russian.xml
openmeetings/branches/3.0.x/src/main/webapp/languages/slovak.xml
openmeetings/branches/3.0.x/src/main/webapp/languages/spanish.xml
openmeetings/branches/3.0.x/src/main/webapp/languages/swedish.xml
openmeetings/branches/3.0.x/src/main/webapp/languages/thai.xml
openmeetings/branches/3.0.x/src/main/webapp/languages/turkish.xml
openmeetings/branches/3.0.x/src/main/webapp/languages/ukrainian.xml
openmeetings/branches/3.0.x/src/test/java/org/apache/openmeetings/test/invitiation/TestInvitation.java
Modified:
openmeetings/branches/3.0.x/WebContent/src/base/components/text/customEdittext.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/src/base/components/text/customEdittext.lzx?rev=1596628&r1=1596627&r2=1596628&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/WebContent/src/base/components/text/customEdittext.lzx
(original)
+++
openmeetings/branches/3.0.x/WebContent/src/base/components/text/customEdittext.lzx
Wed May 21 17:16:38 2014
@@ -31,6 +31,7 @@
<attribute name="regexpType" value="none" type="string" />
<attribute name="regexpLabelid" type="number" />
<attribute name="preText" value="" type="string" />
+ <attribute name="emailRegEx" type="string" value=""/>
<event name="onafterCheck" />
@@ -39,7 +40,10 @@
</handler>
<handler name="oninit">
+ <![CDATA[
+ emailRegEx =
"^[_a-zA-Z0-9-]+(\.[_a-zA-Z0-9-]+)*@([a-zA-Z0-9-]+\.)+([a-zA-Z]{1,3})$";
//this.field.setAttribute("bgcolor",0xFFFFFF);
+ ]]>
</handler>
<handler name="ontext" args="txt">
@@ -157,7 +161,7 @@
var fieldValue = this.getText();
if (this.regexpType=="email") {
//var regExpV =
".+\\@(\\[?)[a-zA-Z0-9\\-\\.]+\\.([a-zA-Z]{2,3}|[0-9]{1,3})(\\]?)";
- var regExpV =
"^[_a-zA-Z0-9-]+(\.[_a-zA-Z0-9-]+)*@([a-zA-Z0-9-]+\.)+([a-zA-Z]{1,3})$";
+ var regExpV = this.emailRegEx;
//var regExpV =
"^([a-zA-Z0-9_\-\.]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([a-zA-Z0-9\-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$";
this.regexpLabelid = 519;
} else if (this.regexpType=="date"){
Modified:
openmeetings/branches/3.0.x/WebContent/src/modules/invitation/inviteMainWindow.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/src/modules/invitation/inviteMainWindow.lzx?rev=1596628&r1=1596627&r2=1596628&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/WebContent/src/modules/invitation/inviteMainWindow.lzx
(original)
+++
openmeetings/branches/3.0.x/WebContent/src/modules/invitation/inviteMainWindow.lzx
Wed May 21 17:16:38 2014
@@ -33,6 +33,9 @@
<attribute name="currentHash" value="" type="string" />
<attribute name="display" value="false" type="boolean" />
<attribute name="addTimezoneItemsDelegate" value="null"/>
+ <attribute name="firstname" value="null"/>
+ <attribute name="lastname" value="null"/>
+ <attribute name="email" value="null"/>
<handler name="oninit">
<![CDATA[
@@ -105,9 +108,61 @@
</method>
<!-- label: recipient -->
- <labelText labelid="216" y="24" width="120" />
- <customEdittext name="_recipient" width="340"
regexpType="email" x="120" y="22" />
+ <labelTextWidthTooltip name="_recepientLbl" y="24" width="120"
labelid="216" labelLabelid="1597" />
+ <customEdittext name="_recipient" width="340" x="120" y="22"
regexpLabelid="1597">
+ <handler name="onblur">
+ <![CDATA[
+ var addr =
parent.replaceAll(parent.replaceAll(getText(), "'", ""), "\"", "");
+ if ($debug) Debug.write("addr: ", addr);
+ var idx1 = addr.indexOf("<"), idx2 =
addr.indexOf(">");
+ if (idx1 > -1 && idx2 > -1 && idx2 > idx1) {
+ parent.email =
parent.trim(addr.substring(idx1 + 1, idx2));
+ var s = parent.trim(addr.substring(0,
idx1));
+ var idx = s.indexOf(" ");
+ if (idx > -1) {
+ parent.firstname =
s.substring(0, idx);
+ parent.lastname =
s.substring(idx + 1);
+ } else {
+ parent.firstname = s;
+ }
+ } else {
+ parent.email = addr;
+ }
+ if ($debug) Debug.write("[first, last, email]:
", getText(), idx1, idx2, parent.firstname, parent.lastname, parent.email);
+ this.regExpCheckId =
canvas.doRegExpCheck(parent.email, this.emailRegEx);
+ if(this.callDelegate == null) {
+ this.callDelegate = new
LzDelegate(this, "checkRegExpResult");
+ }
+ lz.Timer.resetTimer(this.callDelegate, 50);
+ ]]>
+ </handler>
+ <handler name="onafterCheck">
+ if (!isvalidInput) {
+ this.setAttribute('text', "");
+ parent.email = null;
+ parent.firstname = null;
+ parent.lastname = null;
+ }
+ </handler>
+ </customEdittext>
+ <method name="trim" args="s">
+ <![CDATA[
+ var str = "" + s, begin = 0, end = str.length - 1;
+ while (begin <= end && str.charCodeAt(begin) == 32) {
++begin; }
+ while (end > begin && str.charCodeAt(end) == 32) {
--end; }
+ return str.substr(begin, end - begin + 1);
+ ]]>
+ </method>
+
+ <method name="replaceAll" args="s,f,r">
+ <![CDATA[
+ var str = s;
+ while (str.indexOf(f) > -1) { str = str.replace(f, r); }
+ return str;
+ ]]>
+ </method>
+
<!-- label: subject -->
<labelText labelid="215" y="52" width="120" />
<customEdittext name="_subject" labelid="532" width="340"
enabled="false" x="120" y="52" />
@@ -169,6 +224,10 @@
<simpleLabelButton name="generate" labelid="1526" x="$once{
parent.width-440 }" width="170" y="$once{ parent.height-26 }">
<handler name="onclick">
<![CDATA[
+ if (parent.email == null) {
+ new
lz.errorPopup(canvas.main_content._content.inner,{error:canvas.getLabelName(519)});
+ return;
+ }
parent.display = true;
parent.sendInvitationHash.doCall();
]]>
@@ -179,6 +238,10 @@
<simpleLabelButton name="send" labelid="218" x="$once{
parent.width-260 }" width="120" y="$once{ parent.height-26 }">
<handler name="onclick">
<![CDATA[
+ if (parent.email == null) {
+ new
lz.errorPopup(canvas.main_content._content.inner,{error:canvas.getLabelName(519)});
+ return;
+ }
for (var eg in this.parent.subviews){
this.parent.subviews[eg].setAttribute('enabled', false);
}
@@ -217,9 +280,10 @@
<netRemoteCallHib name="sendInvitationHash"
funcname="invitationservice.sendInvitationHash" remotecontext="$once{
canvas.thishib }" >
<netparam name="sid"><method name="getValue">return
canvas.sessionId;</method></netparam>
- <netparam name="username"><method
name="getValue">return hib.userobject.firstname+'
'+hib.userobject.lastname</method></netparam>
+ <netparam name="firstname"><method
name="getValue">return parent.parent.firstname</method></netparam>
+ <netparam name="lastname"><method
name="getValue">return parent.parent.lastname</method></netparam>
<netparam name="message"><method name="getValue">return
this.parent.parent._message.getText();</method></netparam>
- <netparam name="email"><method name="getValue">return
this.parent.parent._recipient.getText();</method></netparam>
+ <netparam name="email"><method name="getValue">return
parent.parent.email;</method></netparam>
<netparam name="subject"><method name="getValue">return
this.parent.parent._subject.getText();</method></netparam>
<netparam name="roomid"><method name="getValue">return
hib.currentroomid;</method></netparam>
<netparam name="conferencedomain"><method
name="getValue">return hib.conferencedomain;</method></netparam>
Modified:
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/InvitationService.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/InvitationService.java?rev=1596628&r1=1596627&r2=1596628&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/InvitationService.java
(original)
+++
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/InvitationService.java
Wed May 21 17:16:38 2014
@@ -84,7 +84,7 @@ public class InvitationService implement
* @param iCalTz
* @return - invitation object in case of success, "Sys - Error" string
or null in case of error
*/
- public Object sendInvitationHash(String SID, String username,
+ public Object sendInvitationHash(String SID, String firstname, String
lastname,
String message, String email, String subject,
Long room_id, String conferencedomain, Boolean
isPasswordProtected,
String invitationpass, Integer valid, Date
validFromDate,
@@ -136,7 +136,7 @@ public class InvitationService implement
Date dFrom = calFrom.getTime();
Date dTo = calTo.getTime();
- User invitee = userDao.getContact(email,
users_id);
+ User invitee = userDao.getContact(email,
firstname, lastname, users_id);
Invitation invitation =
invitationManager.getInvitation(invitee, roomDao.get(room_id),
isPasswordProtected, invitationpass, Valid.fromInt(valid)
,
userDao.get(users_id), language_id,
Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/arabic.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/arabic.xml?rev=1596628&r1=1596627&r2=1596628&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/arabic.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/arabic.xml Wed May 21
17:16:38 2014
@@ -4814,4 +4814,7 @@ see http://openmeetings.apache.org/Langu
<string id="1596" name="whiteboard.add_whiteboard">
<value>Add Whiteboard</value>
</string>
+ <string id="1597" name="multiple_addresses">
+ <value>You can enter address in the format: firstname1 lastname1
<email1> OR "firstname2 lastname2" <email2> OR 'firstname3
lastname3' <email3></value>
+ </string>
</language>
Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/bulgarian.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/bulgarian.xml?rev=1596628&r1=1596627&r2=1596628&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/bulgarian.xml
(original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/bulgarian.xml Wed May
21 17:16:38 2014
@@ -4814,4 +4814,7 @@ see http://openmeetings.apache.org/Langu
<string id="1596" name="whiteboard.add_whiteboard">
<value>Add Whiteboard</value>
</string>
+ <string id="1597" name="multiple_addresses">
+ <value>You can enter address in the format: firstname1 lastname1
<email1> OR "firstname2 lastname2" <email2> OR 'firstname3
lastname3' <email3></value>
+ </string>
</language>
Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/catalan.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/catalan.xml?rev=1596628&r1=1596627&r2=1596628&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/catalan.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/catalan.xml Wed May
21 17:16:38 2014
@@ -4814,4 +4814,7 @@ see http://openmeetings.apache.org/Langu
<string id="1596" name="whiteboard.add_whiteboard">
<value>Add Whiteboard</value>
</string>
+ <string id="1597" name="multiple_addresses">
+ <value>You can enter address in the format: firstname1 lastname1
<email1> OR "firstname2 lastname2" <email2> OR 'firstname3
lastname3' <email3></value>
+ </string>
</language>
Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/chinese
simplified.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/chinese%20simplified.xml?rev=1596628&r1=1596627&r2=1596628&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/chinese
simplified.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/chinese
simplified.xml Wed May 21 17:16:38 2014
@@ -4814,4 +4814,7 @@ see http://openmeetings.apache.org/Langu
<string id="1596" name="whiteboard.add_whiteboard">
<value>Add Whiteboard</value>
</string>
+ <string id="1597" name="multiple_addresses">
+ <value>You can enter address in the format: firstname1 lastname1
<email1> OR "firstname2 lastname2" <email2> OR 'firstname3
lastname3' <email3></value>
+ </string>
</language>
Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/chinese
traditional.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/chinese%20traditional.xml?rev=1596628&r1=1596627&r2=1596628&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/chinese
traditional.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/chinese
traditional.xml Wed May 21 17:16:38 2014
@@ -4814,4 +4814,7 @@ see http://openmeetings.apache.org/Langu
<string id="1596" name="whiteboard.add_whiteboard">
<value>Add Whiteboard</value>
</string>
+ <string id="1597" name="multiple_addresses">
+ <value>You can enter address in the format: firstname1 lastname1
<email1> OR "firstname2 lastname2" <email2> OR 'firstname3
lastname3' <email3></value>
+ </string>
</language>
Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/czech.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/czech.xml?rev=1596628&r1=1596627&r2=1596628&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/czech.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/czech.xml Wed May 21
17:16:38 2014
@@ -4814,4 +4814,7 @@ see http://openmeetings.apache.org/Langu
<string id="1596" name="whiteboard.add_whiteboard">
<value>Add Whiteboard</value>
</string>
+ <string id="1597" name="multiple_addresses">
+ <value>You can enter address in the format: firstname1 lastname1
<email1> OR "firstname2 lastname2" <email2> OR 'firstname3
lastname3' <email3></value>
+ </string>
</language>
Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/danish.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/danish.xml?rev=1596628&r1=1596627&r2=1596628&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/danish.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/danish.xml Wed May 21
17:16:38 2014
@@ -4814,4 +4814,7 @@ see http://openmeetings.apache.org/Langu
<string id="1596" name="whiteboard.add_whiteboard">
<value>Add Whiteboard</value>
</string>
+ <string id="1597" name="multiple_addresses">
+ <value>You can enter address in the format: firstname1 lastname1
<email1> OR "firstname2 lastname2" <email2> OR 'firstname3
lastname3' <email3></value>
+ </string>
</language>
Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/deutsch
(studIP).xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/deutsch%20%28studIP%29.xml?rev=1596628&r1=1596627&r2=1596628&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/deutsch (studIP).xml
(original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/deutsch (studIP).xml
Wed May 21 17:16:38 2014
@@ -4814,4 +4814,7 @@ see http://openmeetings.apache.org/Langu
<string id="1596" name="whiteboard.add_whiteboard">
<value>Add Whiteboard</value>
</string>
+ <string id="1597" name="multiple_addresses">
+ <value>You can enter address in the format: firstname1 lastname1
<email1> OR "firstname2 lastname2" <email2> OR 'firstname3
lastname3' <email3></value>
+ </string>
</language>
Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/deutsch.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/deutsch.xml?rev=1596628&r1=1596627&r2=1596628&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/deutsch.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/deutsch.xml Wed May
21 17:16:38 2014
@@ -4814,4 +4814,7 @@ see http://openmeetings.apache.org/Langu
<string id="1596" name="whiteboard.add_whiteboard">
<value>Add Whiteboard</value>
</string>
+ <string id="1597" name="multiple_addresses">
+ <value>You can enter address in the format: firstname1 lastname1
<email1> OR "firstname2 lastname2" <email2> OR 'firstname3
lastname3' <email3></value>
+ </string>
</language>
Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/dutch.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/dutch.xml?rev=1596628&r1=1596627&r2=1596628&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/dutch.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/dutch.xml Wed May 21
17:16:38 2014
@@ -4814,4 +4814,7 @@ see http://openmeetings.apache.org/Langu
<string id="1596" name="whiteboard.add_whiteboard">
<value>Add Whiteboard</value>
</string>
+ <string id="1597" name="multiple_addresses">
+ <value>You can enter address in the format: firstname1 lastname1
<email1> OR "firstname2 lastname2" <email2> OR 'firstname3
lastname3' <email3></value>
+ </string>
</language>
Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/english.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/english.xml?rev=1596628&r1=1596627&r2=1596628&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/english.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/english.xml Wed May
21 17:16:38 2014
@@ -4814,4 +4814,7 @@ see http://openmeetings.apache.org/Langu
<string id="1596" name="whiteboard.add_whiteboard">
<value>Add Whiteboard</value>
</string>
+ <string id="1597" name="multiple_addresses">
+ <value>You can enter address in the format: firstname1 lastname1
<email1> OR "firstname2 lastname2" <email2> OR 'firstname3
lastname3' <email3></value>
+ </string>
</language>
Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/finnish.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/finnish.xml?rev=1596628&r1=1596627&r2=1596628&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/finnish.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/finnish.xml Wed May
21 17:16:38 2014
@@ -4814,4 +4814,7 @@ see http://openmeetings.apache.org/Langu
<string id="1596" name="whiteboard.add_whiteboard">
<value>Add Whiteboard</value>
</string>
+ <string id="1597" name="multiple_addresses">
+ <value>You can enter address in the format: firstname1 lastname1
<email1> OR "firstname2 lastname2" <email2> OR 'firstname3
lastname3' <email3></value>
+ </string>
</language>
Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/french.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/french.xml?rev=1596628&r1=1596627&r2=1596628&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/french.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/french.xml Wed May 21
17:16:38 2014
@@ -4814,4 +4814,7 @@ see http://openmeetings.apache.org/Langu
<string id="1596" name="whiteboard.add_whiteboard">
<value>Add Whiteboard</value>
</string>
+ <string id="1597" name="multiple_addresses">
+ <value>You can enter address in the format: firstname1 lastname1
<email1> OR "firstname2 lastname2" <email2> OR 'firstname3
lastname3' <email3></value>
+ </string>
</language>
Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/galician.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/galician.xml?rev=1596628&r1=1596627&r2=1596628&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/galician.xml
(original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/galician.xml Wed May
21 17:16:38 2014
@@ -4814,4 +4814,7 @@ see http://openmeetings.apache.org/Langu
<string id="1596" name="whiteboard.add_whiteboard">
<value>Add Whiteboard</value>
</string>
+ <string id="1597" name="multiple_addresses">
+ <value>You can enter address in the format: firstname1 lastname1
<email1> OR "firstname2 lastname2" <email2> OR 'firstname3
lastname3' <email3></value>
+ </string>
</language>
Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/greek.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/greek.xml?rev=1596628&r1=1596627&r2=1596628&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/greek.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/greek.xml Wed May 21
17:16:38 2014
@@ -4814,4 +4814,7 @@ see http://openmeetings.apache.org/Langu
<string id="1596" name="whiteboard.add_whiteboard">
<value>Add Whiteboard</value>
</string>
+ <string id="1597" name="multiple_addresses">
+ <value>You can enter address in the format: firstname1 lastname1
<email1> OR "firstname2 lastname2" <email2> OR 'firstname3
lastname3' <email3></value>
+ </string>
</language>
Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/hebrew.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/hebrew.xml?rev=1596628&r1=1596627&r2=1596628&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/hebrew.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/hebrew.xml Wed May 21
17:16:38 2014
@@ -4814,4 +4814,7 @@ see http://openmeetings.apache.org/Langu
<string id="1596" name="whiteboard.add_whiteboard">
<value>Add Whiteboard</value>
</string>
+ <string id="1597" name="multiple_addresses">
+ <value>You can enter address in the format: firstname1 lastname1
<email1> OR "firstname2 lastname2" <email2> OR 'firstname3
lastname3' <email3></value>
+ </string>
</language>
Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/hungarian.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/hungarian.xml?rev=1596628&r1=1596627&r2=1596628&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/hungarian.xml
(original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/hungarian.xml Wed May
21 17:16:38 2014
@@ -4814,4 +4814,7 @@ see http://openmeetings.apache.org/Langu
<string id="1596" name="whiteboard.add_whiteboard">
<value>Add Whiteboard</value>
</string>
+ <string id="1597" name="multiple_addresses">
+ <value>You can enter address in the format: firstname1 lastname1
<email1> OR "firstname2 lastname2" <email2> OR 'firstname3
lastname3' <email3></value>
+ </string>
</language>
Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/indonesian.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/indonesian.xml?rev=1596628&r1=1596627&r2=1596628&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/indonesian.xml
(original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/indonesian.xml Wed
May 21 17:16:38 2014
@@ -4814,4 +4814,7 @@ see http://openmeetings.apache.org/Langu
<string id="1596" name="whiteboard.add_whiteboard">
<value>Add Whiteboard</value>
</string>
+ <string id="1597" name="multiple_addresses">
+ <value>You can enter address in the format: firstname1 lastname1
<email1> OR "firstname2 lastname2" <email2> OR 'firstname3
lastname3' <email3></value>
+ </string>
</language>
Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/italian.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/italian.xml?rev=1596628&r1=1596627&r2=1596628&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/italian.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/italian.xml Wed May
21 17:16:38 2014
@@ -4814,4 +4814,7 @@ see http://openmeetings.apache.org/Langu
<string id="1596" name="whiteboard.add_whiteboard">
<value>Add Whiteboard</value>
</string>
+ <string id="1597" name="multiple_addresses">
+ <value>You can enter address in the format: firstname1 lastname1
<email1> OR "firstname2 lastname2" <email2> OR 'firstname3
lastname3' <email3></value>
+ </string>
</language>
Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/japanese.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/japanese.xml?rev=1596628&r1=1596627&r2=1596628&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/japanese.xml
(original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/japanese.xml Wed May
21 17:16:38 2014
@@ -4814,4 +4814,7 @@ see http://openmeetings.apache.org/Langu
<string id="1596" name="whiteboard.add_whiteboard">
<value>Add Whiteboard</value>
</string>
+ <string id="1597" name="multiple_addresses">
+ <value>You can enter address in the format: firstname1 lastname1
<email1> OR "firstname2 lastname2" <email2> OR 'firstname3
lastname3' <email3></value>
+ </string>
</language>
Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/korean.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/korean.xml?rev=1596628&r1=1596627&r2=1596628&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/korean.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/korean.xml Wed May 21
17:16:38 2014
@@ -4814,4 +4814,7 @@ see http://openmeetings.apache.org/Langu
<string id="1596" name="whiteboard.add_whiteboard">
<value>Add Whiteboard</value>
</string>
+ <string id="1597" name="multiple_addresses">
+ <value>You can enter address in the format: firstname1 lastname1
<email1> OR "firstname2 lastname2" <email2> OR 'firstname3
lastname3' <email3></value>
+ </string>
</language>
Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/persian.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/persian.xml?rev=1596628&r1=1596627&r2=1596628&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/persian.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/persian.xml Wed May
21 17:16:38 2014
@@ -4814,4 +4814,7 @@ see http://openmeetings.apache.org/Langu
<string id="1596" name="whiteboard.add_whiteboard">
<value>Add Whiteboard</value>
</string>
+ <string id="1597" name="multiple_addresses">
+ <value>You can enter address in the format: firstname1 lastname1
<email1> OR "firstname2 lastname2" <email2> OR 'firstname3
lastname3' <email3></value>
+ </string>
</language>
Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/polish.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/polish.xml?rev=1596628&r1=1596627&r2=1596628&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/polish.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/polish.xml Wed May 21
17:16:38 2014
@@ -4814,4 +4814,7 @@ see http://openmeetings.apache.org/Langu
<string id="1596" name="whiteboard.add_whiteboard">
<value>Add Whiteboard</value>
</string>
+ <string id="1597" name="multiple_addresses">
+ <value>You can enter address in the format: firstname1 lastname1
<email1> OR "firstname2 lastname2" <email2> OR 'firstname3
lastname3' <email3></value>
+ </string>
</language>
Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/portugues
brazil.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/portugues%20brazil.xml?rev=1596628&r1=1596627&r2=1596628&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/portugues brazil.xml
(original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/portugues brazil.xml
Wed May 21 17:16:38 2014
@@ -4814,4 +4814,7 @@ see http://openmeetings.apache.org/Langu
<string id="1596" name="whiteboard.add_whiteboard">
<value>Add Whiteboard</value>
</string>
+ <string id="1597" name="multiple_addresses">
+ <value>You can enter address in the format: firstname1 lastname1
<email1> OR "firstname2 lastname2" <email2> OR 'firstname3
lastname3' <email3></value>
+ </string>
</language>
Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/portugues.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/portugues.xml?rev=1596628&r1=1596627&r2=1596628&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/portugues.xml
(original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/portugues.xml Wed May
21 17:16:38 2014
@@ -4814,4 +4814,7 @@ see http://openmeetings.apache.org/Langu
<string id="1596" name="whiteboard.add_whiteboard">
<value>Add Whiteboard</value>
</string>
+ <string id="1597" name="multiple_addresses">
+ <value>You can enter address in the format: firstname1 lastname1
<email1> OR "firstname2 lastname2" <email2> OR 'firstname3
lastname3' <email3></value>
+ </string>
</language>
Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/russian.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/russian.xml?rev=1596628&r1=1596627&r2=1596628&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/russian.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/russian.xml Wed May
21 17:16:38 2014
@@ -4814,4 +4814,7 @@ see http://openmeetings.apache.org/Langu
<string id="1596" name="whiteboard.add_whiteboard">
<value>ÐобавиÑÑ Ð´Ð¾ÑкÑ</value>
</string>
+ <string id="1597" name="multiple_addresses">
+ <value>ÐÑ Ð¼Ð¾Ð¶ÐµÑе ввеÑÑи адÑÐµÑ Ð² ÑоÑмаÑе:
ÐмÑ1 ФамилиÑ1 <адÑеÑ1> ÐÐÐ "ÐмÑ2 ФамилиÑ2"
<адÑеÑ2> ÐÐÐ 'ÐмÑ3 ФамилиÑ3' <адÑеÑ3></value>
+ </string>
</language>
Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/slovak.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/slovak.xml?rev=1596628&r1=1596627&r2=1596628&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/slovak.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/slovak.xml Wed May 21
17:16:38 2014
@@ -4814,4 +4814,7 @@ see http://openmeetings.apache.org/Langu
<string id="1596" name="whiteboard.add_whiteboard">
<value>Add Whiteboard</value>
</string>
+ <string id="1597" name="multiple_addresses">
+ <value>You can enter address in the format: firstname1 lastname1
<email1> OR "firstname2 lastname2" <email2> OR 'firstname3
lastname3' <email3></value>
+ </string>
</language>
Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/spanish.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/spanish.xml?rev=1596628&r1=1596627&r2=1596628&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/spanish.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/spanish.xml Wed May
21 17:16:38 2014
@@ -4819,4 +4819,7 @@ see http://openmeetings.apache.org/Langu
<string id="1596" name="whiteboard.add_whiteboard">
<value>Add Whiteboard</value>
</string>
+ <string id="1597" name="multiple_addresses">
+ <value>You can enter address in the format: firstname1 lastname1
<email1> OR "firstname2 lastname2" <email2> OR 'firstname3
lastname3' <email3></value>
+ </string>
</language>
Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/swedish.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/swedish.xml?rev=1596628&r1=1596627&r2=1596628&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/swedish.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/swedish.xml Wed May
21 17:16:38 2014
@@ -4814,4 +4814,7 @@ see http://openmeetings.apache.org/Langu
<string id="1596" name="whiteboard.add_whiteboard">
<value>Add Whiteboard</value>
</string>
+ <string id="1597" name="multiple_addresses">
+ <value>You can enter address in the format: firstname1 lastname1
<email1> OR "firstname2 lastname2" <email2> OR 'firstname3
lastname3' <email3></value>
+ </string>
</language>
Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/thai.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/thai.xml?rev=1596628&r1=1596627&r2=1596628&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/thai.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/thai.xml Wed May 21
17:16:38 2014
@@ -4814,4 +4814,7 @@ see http://openmeetings.apache.org/Langu
<string id="1596" name="whiteboard.add_whiteboard">
<value>Add Whiteboard</value>
</string>
+ <string id="1597" name="multiple_addresses">
+ <value>You can enter address in the format: firstname1 lastname1
<email1> OR "firstname2 lastname2" <email2> OR 'firstname3
lastname3' <email3></value>
+ </string>
</language>
Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/turkish.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/turkish.xml?rev=1596628&r1=1596627&r2=1596628&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/turkish.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/turkish.xml Wed May
21 17:16:38 2014
@@ -4814,4 +4814,7 @@ see http://openmeetings.apache.org/Langu
<string id="1596" name="whiteboard.add_whiteboard">
<value>Add Whiteboard</value>
</string>
+ <string id="1597" name="multiple_addresses">
+ <value>You can enter address in the format: firstname1 lastname1
<email1> OR "firstname2 lastname2" <email2> OR 'firstname3
lastname3' <email3></value>
+ </string>
</language>
Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/ukrainian.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/ukrainian.xml?rev=1596628&r1=1596627&r2=1596628&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/ukrainian.xml
(original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/ukrainian.xml Wed May
21 17:16:38 2014
@@ -4814,4 +4814,7 @@ see http://openmeetings.apache.org/Langu
<string id="1596" name="whiteboard.add_whiteboard">
<value>Add Whiteboard</value>
</string>
+ <string id="1597" name="multiple_addresses">
+ <value>You can enter address in the format: firstname1 lastname1
<email1> OR "firstname2 lastname2" <email2> OR 'firstname3
lastname3' <email3></value>
+ </string>
</language>
Modified:
openmeetings/branches/3.0.x/src/test/java/org/apache/openmeetings/test/invitiation/TestInvitation.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/test/java/org/apache/openmeetings/test/invitiation/TestInvitation.java?rev=1596628&r1=1596627&r2=1596628&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/test/java/org/apache/openmeetings/test/invitiation/TestInvitation.java
(original)
+++
openmeetings/branches/3.0.x/src/test/java/org/apache/openmeetings/test/invitiation/TestInvitation.java
Wed May 21 17:16:38 2014
@@ -49,7 +49,7 @@ public class TestInvitation extends Abst
User us = (User)
userManager.loginUser(sessionData.getSession_id(), username, userpass, null,
null, false);
-
invitationService.sendInvitationHash(sessionData.getSession_id(), username,
"message", "[email protected]",
+
invitationService.sendInvitationHash(sessionData.getSession_id(), "Testname",
"Testlastname", "message", "[email protected]",
"subject", 1L, "", false, "", 1, new
Date(), "12:00", new Date(), "14:00", 1L, us.getTimeZoneId(), true);
} catch (Exception err) {
