Author: vdegtyarev
Date: Thu Jun 6 04:29:15 2013
New Revision: 1490128
URL: http://svn.apache.org/r1490128
Log:
OPENMEETINGS-660 is fixed
Modified:
openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
openmeetings/trunk/singlewebapp/WebContent/languages/chinese simplified.xml
openmeetings/trunk/singlewebapp/WebContent/languages/chinese traditional.xml
openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
openmeetings/trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml
openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
openmeetings/trunk/singlewebapp/WebContent/languages/portugues brazil.xml
openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml
openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/lzEditCalendarEvent.lzx
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/CalendarWebService.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/AppointmentReminderTypDao.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/AppointmentReminderTyps.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/CalendarService.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/calendar/TestDatabaseStructureAppointmentReminderTyp.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml?rev=1490128&r1=1490127&r2=1490128&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml Thu Jun 6
04:29:15 2013
@@ -4727,4 +4727,13 @@ see http://openmeetings.apache.org/Langu
<string id="1567" name="calendar_shortmonthnames">
<value>Dec</value>
</string>
+ <string id="1568" name="remindertype_no_email">
+ <value>do not send notification</value>
+ </string>
+ <string id="1569" name="remindertype_simple_email">
+ <value>simple email</value>
+ </string>
+ <string id="1570" name="remindertype_iCal_email">
+ <value>iCal email</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml?rev=1490128&r1=1490127&r2=1490128&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml Thu Jun
6 04:29:15 2013
@@ -4727,4 +4727,13 @@ see http://openmeetings.apache.org/Langu
<string id="1567" name="calendar_shortmonthnames">
<value>Dec</value>
</string>
+ <string id="1568" name="remindertype_no_email">
+ <value>do not send notification</value>
+ </string>
+ <string id="1569" name="remindertype_simple_email">
+ <value>simple email</value>
+ </string>
+ <string id="1570" name="remindertype_iCal_email">
+ <value>iCal email</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml?rev=1490128&r1=1490127&r2=1490128&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml Thu Jun 6
04:29:15 2013
@@ -4727,4 +4727,13 @@ see http://openmeetings.apache.org/Langu
<string id="1567" name="calendar_shortmonthnames">
<value>Dec</value>
</string>
+ <string id="1568" name="remindertype_no_email">
+ <value>do not send notification</value>
+ </string>
+ <string id="1569" name="remindertype_simple_email">
+ <value>simple email</value>
+ </string>
+ <string id="1570" name="remindertype_iCal_email">
+ <value>iCal email</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/chinese
simplified.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/chinese%20simplified.xml?rev=1490128&r1=1490127&r2=1490128&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/chinese simplified.xml
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/chinese simplified.xml
Thu Jun 6 04:29:15 2013
@@ -4727,4 +4727,13 @@ see http://openmeetings.apache.org/Langu
<string id="1567" name="calendar_shortmonthnames">
<value>Dec</value>
</string>
+ <string id="1568" name="remindertype_no_email">
+ <value>do not send notification</value>
+ </string>
+ <string id="1569" name="remindertype_simple_email">
+ <value>simple email</value>
+ </string>
+ <string id="1570" name="remindertype_iCal_email">
+ <value>iCal email</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/chinese
traditional.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/chinese%20traditional.xml?rev=1490128&r1=1490127&r2=1490128&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/chinese
traditional.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/chinese
traditional.xml Thu Jun 6 04:29:15 2013
@@ -4727,4 +4727,13 @@ see http://openmeetings.apache.org/Langu
<string id="1567" name="calendar_shortmonthnames">
<value>Dec</value>
</string>
+ <string id="1568" name="remindertype_no_email">
+ <value>do not send notification</value>
+ </string>
+ <string id="1569" name="remindertype_simple_email">
+ <value>simple email</value>
+ </string>
+ <string id="1570" name="remindertype_iCal_email">
+ <value>iCal email</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml?rev=1490128&r1=1490127&r2=1490128&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml Thu Jun 6
04:29:15 2013
@@ -4727,4 +4727,13 @@ see http://openmeetings.apache.org/Langu
<string id="1567" name="calendar_shortmonthnames">
<value>Dec</value>
</string>
+ <string id="1568" name="remindertype_no_email">
+ <value>do not send notification</value>
+ </string>
+ <string id="1569" name="remindertype_simple_email">
+ <value>simple email</value>
+ </string>
+ <string id="1570" name="remindertype_iCal_email">
+ <value>iCal email</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml?rev=1490128&r1=1490127&r2=1490128&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml Thu Jun 6
04:29:15 2013
@@ -4727,4 +4727,13 @@ see http://openmeetings.apache.org/Langu
<string id="1567" name="calendar_shortmonthnames">
<value>Dec</value>
</string>
+ <string id="1568" name="remindertype_no_email">
+ <value>do not send notification</value>
+ </string>
+ <string id="1569" name="remindertype_simple_email">
+ <value>simple email</value>
+ </string>
+ <string id="1570" name="remindertype_iCal_email">
+ <value>iCal email</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/deutsch
(studIP).xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch%20%28studIP%29.xml?rev=1490128&r1=1490127&r2=1490128&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml
Thu Jun 6 04:29:15 2013
@@ -4727,4 +4727,13 @@ see http://openmeetings.apache.org/Langu
<string id="1567" name="calendar_shortmonthnames">
<value>Dec</value>
</string>
+ <string id="1568" name="remindertype_no_email">
+ <value>do not send notification</value>
+ </string>
+ <string id="1569" name="remindertype_simple_email">
+ <value>simple email</value>
+ </string>
+ <string id="1570" name="remindertype_iCal_email">
+ <value>iCal email</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml?rev=1490128&r1=1490127&r2=1490128&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml Thu Jun 6
04:29:15 2013
@@ -4727,4 +4727,13 @@ see http://openmeetings.apache.org/Langu
<string id="1567" name="calendar_shortmonthnames">
<value>Dec</value>
</string>
+ <string id="1568" name="remindertype_no_email">
+ <value>do not send notification</value>
+ </string>
+ <string id="1569" name="remindertype_simple_email">
+ <value>simple email</value>
+ </string>
+ <string id="1570" name="remindertype_iCal_email">
+ <value>iCal email</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml?rev=1490128&r1=1490127&r2=1490128&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml Thu Jun 6
04:29:15 2013
@@ -4727,4 +4727,13 @@ see http://openmeetings.apache.org/Langu
<string id="1567" name="calendar_shortmonthnames">
<value>Dec</value>
</string>
+ <string id="1568" name="remindertype_no_email">
+ <value>do not send notification</value>
+ </string>
+ <string id="1569" name="remindertype_simple_email">
+ <value>simple email</value>
+ </string>
+ <string id="1570" name="remindertype_iCal_email">
+ <value>iCal email</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml?rev=1490128&r1=1490127&r2=1490128&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/english.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/english.xml Thu Jun 6
04:29:15 2013
@@ -4727,4 +4727,13 @@ see http://openmeetings.apache.org/Langu
<string id="1567" name="calendar_shortmonthnames">
<value>Dec</value>
</string>
+ <string id="1568" name="remindertype_no_email">
+ <value>do not send notification</value>
+ </string>
+ <string id="1569" name="remindertype_simple_email">
+ <value>simple email</value>
+ </string>
+ <string id="1570" name="remindertype_iCal_email">
+ <value>iCal email</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml?rev=1490128&r1=1490127&r2=1490128&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml Thu Jun 6
04:29:15 2013
@@ -4727,4 +4727,13 @@ see http://openmeetings.apache.org/Langu
<string id="1567" name="calendar_shortmonthnames">
<value>Dec</value>
</string>
+ <string id="1568" name="remindertype_no_email">
+ <value>do not send notification</value>
+ </string>
+ <string id="1569" name="remindertype_simple_email">
+ <value>simple email</value>
+ </string>
+ <string id="1570" name="remindertype_iCal_email">
+ <value>iCal email</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml?rev=1490128&r1=1490127&r2=1490128&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/french.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/french.xml Thu Jun 6
04:29:15 2013
@@ -4727,4 +4727,13 @@ see http://openmeetings.apache.org/Langu
<string id="1567" name="calendar_shortmonthnames">
<value>Dec</value>
</string>
+ <string id="1568" name="remindertype_no_email">
+ <value>do not send notification</value>
+ </string>
+ <string id="1569" name="remindertype_simple_email">
+ <value>simple email</value>
+ </string>
+ <string id="1570" name="remindertype_iCal_email">
+ <value>iCal email</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml?rev=1490128&r1=1490127&r2=1490128&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml Thu Jun
6 04:29:15 2013
@@ -4727,4 +4727,13 @@ see http://openmeetings.apache.org/Langu
<string id="1567" name="calendar_shortmonthnames">
<value>Dec</value>
</string>
+ <string id="1568" name="remindertype_no_email">
+ <value>do not send notification</value>
+ </string>
+ <string id="1569" name="remindertype_simple_email">
+ <value>simple email</value>
+ </string>
+ <string id="1570" name="remindertype_iCal_email">
+ <value>iCal email</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml?rev=1490128&r1=1490127&r2=1490128&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml Thu Jun 6
04:29:15 2013
@@ -4727,4 +4727,13 @@ see http://openmeetings.apache.org/Langu
<string id="1567" name="calendar_shortmonthnames">
<value>Dec</value>
</string>
+ <string id="1568" name="remindertype_no_email">
+ <value>do not send notification</value>
+ </string>
+ <string id="1569" name="remindertype_simple_email">
+ <value>simple email</value>
+ </string>
+ <string id="1570" name="remindertype_iCal_email">
+ <value>iCal email</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml?rev=1490128&r1=1490127&r2=1490128&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml Thu Jun 6
04:29:15 2013
@@ -4727,4 +4727,13 @@ see http://openmeetings.apache.org/Langu
<string id="1567" name="calendar_shortmonthnames">
<value>Dec</value>
</string>
+ <string id="1568" name="remindertype_no_email">
+ <value>do not send notification</value>
+ </string>
+ <string id="1569" name="remindertype_simple_email">
+ <value>simple email</value>
+ </string>
+ <string id="1570" name="remindertype_iCal_email">
+ <value>iCal email</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml?rev=1490128&r1=1490127&r2=1490128&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml Thu Jun
6 04:29:15 2013
@@ -4727,4 +4727,13 @@ see http://openmeetings.apache.org/Langu
<string id="1567" name="calendar_shortmonthnames">
<value>Dec</value>
</string>
+ <string id="1568" name="remindertype_no_email">
+ <value>do not send notification</value>
+ </string>
+ <string id="1569" name="remindertype_simple_email">
+ <value>simple email</value>
+ </string>
+ <string id="1570" name="remindertype_iCal_email">
+ <value>iCal email</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml?rev=1490128&r1=1490127&r2=1490128&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml Thu Jun
6 04:29:15 2013
@@ -4727,4 +4727,13 @@ see http://openmeetings.apache.org/Langu
<string id="1567" name="calendar_shortmonthnames">
<value>Dec</value>
</string>
+ <string id="1568" name="remindertype_no_email">
+ <value>do not send notification</value>
+ </string>
+ <string id="1569" name="remindertype_simple_email">
+ <value>simple email</value>
+ </string>
+ <string id="1570" name="remindertype_iCal_email">
+ <value>iCal email</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml?rev=1490128&r1=1490127&r2=1490128&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml Thu Jun 6
04:29:15 2013
@@ -4727,4 +4727,13 @@ see http://openmeetings.apache.org/Langu
<string id="1567" name="calendar_shortmonthnames">
<value>Dec</value>
</string>
+ <string id="1568" name="remindertype_no_email">
+ <value>do not send notification</value>
+ </string>
+ <string id="1569" name="remindertype_simple_email">
+ <value>simple email</value>
+ </string>
+ <string id="1570" name="remindertype_iCal_email">
+ <value>iCal email</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml?rev=1490128&r1=1490127&r2=1490128&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml Thu Jun
6 04:29:15 2013
@@ -4727,4 +4727,13 @@ see http://openmeetings.apache.org/Langu
<string id="1567" name="calendar_shortmonthnames">
<value>Dec</value>
</string>
+ <string id="1568" name="remindertype_no_email">
+ <value>do not send notification</value>
+ </string>
+ <string id="1569" name="remindertype_simple_email">
+ <value>simple email</value>
+ </string>
+ <string id="1570" name="remindertype_iCal_email">
+ <value>iCal email</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml?rev=1490128&r1=1490127&r2=1490128&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml Thu Jun 6
04:29:15 2013
@@ -4727,4 +4727,13 @@ see http://openmeetings.apache.org/Langu
<string id="1567" name="calendar_shortmonthnames">
<value>Dec</value>
</string>
+ <string id="1568" name="remindertype_no_email">
+ <value>do not send notification</value>
+ </string>
+ <string id="1569" name="remindertype_simple_email">
+ <value>simple email</value>
+ </string>
+ <string id="1570" name="remindertype_iCal_email">
+ <value>iCal email</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml?rev=1490128&r1=1490127&r2=1490128&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml Thu Jun 6
04:29:15 2013
@@ -4727,4 +4727,13 @@ see http://openmeetings.apache.org/Langu
<string id="1567" name="calendar_shortmonthnames">
<value>Dec</value>
</string>
+ <string id="1568" name="remindertype_no_email">
+ <value>do not send notification</value>
+ </string>
+ <string id="1569" name="remindertype_simple_email">
+ <value>simple email</value>
+ </string>
+ <string id="1570" name="remindertype_iCal_email">
+ <value>iCal email</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml?rev=1490128&r1=1490127&r2=1490128&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml Thu Jun 6
04:29:15 2013
@@ -4727,4 +4727,13 @@ see http://openmeetings.apache.org/Langu
<string id="1567" name="calendar_shortmonthnames">
<value>Dec</value>
</string>
+ <string id="1568" name="remindertype_no_email">
+ <value>do not send notification</value>
+ </string>
+ <string id="1569" name="remindertype_simple_email">
+ <value>simple email</value>
+ </string>
+ <string id="1570" name="remindertype_iCal_email">
+ <value>iCal email</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/portugues
brazil.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/portugues%20brazil.xml?rev=1490128&r1=1490127&r2=1490128&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/portugues brazil.xml
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/portugues brazil.xml
Thu Jun 6 04:29:15 2013
@@ -4727,4 +4727,13 @@ see http://openmeetings.apache.org/Langu
<string id="1567" name="calendar_shortmonthnames">
<value>Dec</value>
</string>
+ <string id="1568" name="remindertype_no_email">
+ <value>do not send notification</value>
+ </string>
+ <string id="1569" name="remindertype_simple_email">
+ <value>simple email</value>
+ </string>
+ <string id="1570" name="remindertype_iCal_email">
+ <value>iCal email</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml?rev=1490128&r1=1490127&r2=1490128&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml Thu Jun
6 04:29:15 2013
@@ -4727,4 +4727,13 @@ see http://openmeetings.apache.org/Langu
<string id="1567" name="calendar_shortmonthnames">
<value>Dec</value>
</string>
+ <string id="1568" name="remindertype_no_email">
+ <value>do not send notification</value>
+ </string>
+ <string id="1569" name="remindertype_simple_email">
+ <value>simple email</value>
+ </string>
+ <string id="1570" name="remindertype_iCal_email">
+ <value>iCal email</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml?rev=1490128&r1=1490127&r2=1490128&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml Thu Jun 6
04:29:15 2013
@@ -4727,4 +4727,13 @@ see http://openmeetings.apache.org/Langu
<string id="1567" name="calendar_shortmonthnames">
<value>Ðек</value>
</string>
+ <string id="1568" name="remindertype_no_email">
+ <value>не поÑÑлаÑÑ Ñведомление</value>
+ </string>
+ <string id="1569" name="remindertype_simple_email">
+ <value>обÑÑнÑй e-майл</value>
+ </string>
+ <string id="1570" name="remindertype_iCal_email">
+ <value>iCal e-майл</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml?rev=1490128&r1=1490127&r2=1490128&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml Thu Jun 6
04:29:15 2013
@@ -4727,4 +4727,13 @@ see http://openmeetings.apache.org/Langu
<string id="1567" name="calendar_shortmonthnames">
<value>Dec</value>
</string>
+ <string id="1568" name="remindertype_no_email">
+ <value>do not send notification</value>
+ </string>
+ <string id="1569" name="remindertype_simple_email">
+ <value>simple email</value>
+ </string>
+ <string id="1570" name="remindertype_iCal_email">
+ <value>iCal email</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml?rev=1490128&r1=1490127&r2=1490128&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml Thu Jun 6
04:29:15 2013
@@ -4727,4 +4727,13 @@ see http://openmeetings.apache.org/Langu
<string id="1567" name="calendar_shortmonthnames">
<value>Dec</value>
</string>
+ <string id="1568" name="remindertype_no_email">
+ <value>do not send notification</value>
+ </string>
+ <string id="1569" name="remindertype_simple_email">
+ <value>simple email</value>
+ </string>
+ <string id="1570" name="remindertype_iCal_email">
+ <value>iCal email</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml?rev=1490128&r1=1490127&r2=1490128&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml Thu Jun 6
04:29:15 2013
@@ -4727,4 +4727,13 @@ see http://openmeetings.apache.org/Langu
<string id="1567" name="calendar_shortmonthnames">
<value>Dec</value>
</string>
+ <string id="1568" name="remindertype_no_email">
+ <value>do not send notification</value>
+ </string>
+ <string id="1569" name="remindertype_simple_email">
+ <value>simple email</value>
+ </string>
+ <string id="1570" name="remindertype_iCal_email">
+ <value>iCal email</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml?rev=1490128&r1=1490127&r2=1490128&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml Thu Jun 6
04:29:15 2013
@@ -4727,4 +4727,13 @@ see http://openmeetings.apache.org/Langu
<string id="1567" name="calendar_shortmonthnames">
<value>Dec</value>
</string>
+ <string id="1568" name="remindertype_no_email">
+ <value>do not send notification</value>
+ </string>
+ <string id="1569" name="remindertype_simple_email">
+ <value>simple email</value>
+ </string>
+ <string id="1570" name="remindertype_iCal_email">
+ <value>iCal email</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml?rev=1490128&r1=1490127&r2=1490128&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml Thu Jun 6
04:29:15 2013
@@ -4727,4 +4727,13 @@ see http://openmeetings.apache.org/Langu
<string id="1567" name="calendar_shortmonthnames">
<value>Dec</value>
</string>
+ <string id="1568" name="remindertype_no_email">
+ <value>do not send notification</value>
+ </string>
+ <string id="1569" name="remindertype_simple_email">
+ <value>simple email</value>
+ </string>
+ <string id="1570" name="remindertype_iCal_email">
+ <value>iCal email</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml?rev=1490128&r1=1490127&r2=1490128&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml Thu Jun
6 04:29:15 2013
@@ -4727,4 +4727,13 @@ see http://openmeetings.apache.org/Langu
<string id="1567" name="calendar_shortmonthnames">
<value>Dec</value>
</string>
+ <string id="1568" name="remindertype_no_email">
+ <value>do not send notification</value>
+ </string>
+ <string id="1569" name="remindertype_simple_email">
+ <value>simple email</value>
+ </string>
+ <string id="1570" name="remindertype_iCal_email">
+ <value>iCal email</value>
+ </string>
</language>
Modified:
openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/lzEditCalendarEvent.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/lzEditCalendarEvent.lzx?rev=1490128&r1=1490127&r2=1490128&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/lzEditCalendarEvent.lzx
(original)
+++
openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/lzEditCalendarEvent.lzx
Thu Jun 6 04:29:15 2013
@@ -285,7 +285,7 @@
}
</handler>
<textlistitem
datapath="local:classroot.getAppointmentReminderTypList:/getAppointmentReminderTypListResponse/return"
- text="$path{'name/text()'}"
value="$path{'typId/text()'}" />
+ text="$path{'label/value/text()'}"
value="$path{'typId/text()'}" />
</resetCombobox>
<!-- New/Existent room selector -->
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/CalendarWebService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/CalendarWebService.java?rev=1490128&r1=1490127&r2=1490128&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/CalendarWebService.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/CalendarWebService.java
Thu Jun 6 04:29:15 2013
@@ -44,10 +44,10 @@ import org.apache.openmeetings.data.user
import org.apache.openmeetings.persistence.beans.calendar.Appointment;
import org.apache.openmeetings.persistence.beans.calendar.AppointmentCategory;
import
org.apache.openmeetings.persistence.beans.calendar.AppointmentReminderTyps;
-import org.apache.openmeetings.persistence.beans.room.RoomType;
import org.apache.openmeetings.persistence.beans.room.Room;
-import org.apache.openmeetings.persistence.beans.user.UserContact;
+import org.apache.openmeetings.persistence.beans.room.RoomType;
import org.apache.openmeetings.persistence.beans.user.User;
+import org.apache.openmeetings.persistence.beans.user.UserContact;
import org.apache.openmeetings.utils.math.TimezoneUtil;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -646,8 +646,10 @@ public class CalendarWebService {
Long user_level =
userManager.getUserLevelByID(users_id);
if (authLevelUtil.checkUserLevel(user_level)) {
+ User user = userManager.getUserById(users_id);
+ long language_id = (user == null) ? 1 :
user.getLanguage_id();
List<AppointmentReminderTyps> res =
appointmentReminderTypDaoImpl
-
.getAppointmentReminderTypList();
+
.getAppointmentReminderTypList(language_id);
if (res == null || res.size() < 1) {
log.debug("no remindertyps found!");
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/AppointmentReminderTypDao.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/AppointmentReminderTypDao.java?rev=1490128&r1=1490127&r2=1490128&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/AppointmentReminderTypDao.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/AppointmentReminderTypDao.java
Thu Jun 6 04:29:15 2013
@@ -27,6 +27,7 @@ import javax.persistence.PersistenceCont
import javax.persistence.TypedQuery;
import org.apache.openmeetings.OpenmeetingsVariables;
+import org.apache.openmeetings.data.basic.FieldLanguagesValuesDao;
import org.apache.openmeetings.data.user.dao.UsersDao;
import
org.apache.openmeetings.persistence.beans.calendar.AppointmentReminderTyps;
import org.red5.logging.Red5LoggerFactory;
@@ -45,6 +46,8 @@ public class AppointmentReminderTypDao {
private EntityManager em;
@Autowired
private UsersDao usersDao;
+ @Autowired
+ private FieldLanguagesValuesDao fieldLanguagesValuesDao;
public AppointmentReminderTyps getAppointmentReminderTypById(Long
typId) {
try {
@@ -95,7 +98,7 @@ public class AppointmentReminderTypDao {
return null;
}
- public Long addAppointmentReminderTyps(Long user_id, String name) {
+ public Long addAppointmentReminderTyps(Long user_id, String name, long
fieldvalues_id) {
try {
AppointmentReminderTyps ac = new
AppointmentReminderTyps();
@@ -104,6 +107,7 @@ public class AppointmentReminderTypDao {
ac.setStarttime(new Date());
ac.setDeleted(false);
ac.setUser(usersDao.get(user_id));
+ ac.setFieldvalues_id(fieldvalues_id);
ac = em.merge(ac);
Long category_id = ac.getTypId();
@@ -145,7 +149,7 @@ public class AppointmentReminderTypDao {
return null;
}
- public List<AppointmentReminderTyps> getAppointmentReminderTypList() {
+ public List<AppointmentReminderTyps> getAppointmentReminderTypList(long
language_id) {
log.debug("getAppointmenetReminderTypList");
try {
@@ -158,6 +162,10 @@ public class AppointmentReminderTypDao {
List<AppointmentReminderTyps>
listAppointmentReminderTyp = query
.getResultList();
+ for (AppointmentReminderTyps ti :
listAppointmentReminderTyp) {
+ ti.setLabel(fieldLanguagesValuesDao.get(
+ ti.getFieldvalues_id(),
language_id));
+ }
return listAppointmentReminderTyp;
} catch (Exception ex2) {
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java?rev=1490128&r1=1490127&r2=1490128&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java
Thu Jun 6 04:29:15 2013
@@ -854,11 +854,11 @@ public class ImportInitvalues {
log.debug("ImportInitValues.loadInitAppointmentReminderTypes");
appointmentReminderTypDaoImpl.addAppointmentReminderTyps(-1L,
- "do not send notification");
+ "do not send notification", 1568);
appointmentReminderTypDaoImpl.addAppointmentReminderTyps(-1L,
- "simple email");
+ "simple email", 1569);
appointmentReminderTypDaoImpl.addAppointmentReminderTyps(-1L,
- "iCal email");
+ "iCal email", 1570);
}
public void loadLanguagesFile(int langId) throws Exception {
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/AppointmentReminderTyps.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/AppointmentReminderTyps.java?rev=1490128&r1=1490127&r2=1490128&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/AppointmentReminderTyps.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/AppointmentReminderTyps.java
Thu Jun 6 04:29:15 2013
@@ -30,9 +30,12 @@ import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
+import javax.persistence.Transient;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
+import org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues;
import org.apache.openmeetings.persistence.beans.user.User;
+import org.simpleframework.xml.Element;
@Entity
@@ -61,6 +64,13 @@ public class AppointmentReminderTyps imp
@Column(name="deleted")
private boolean deleted;
+ @Column(name="fieldvalues_id")
+ @Element(data=true, required=false)
+ private Long fieldvalues_id;
+
+ @Transient
+ private Fieldlanguagesvalues label;
+
public Long getTypId() {
return typId;
}
@@ -102,5 +112,19 @@ public class AppointmentReminderTyps imp
public void setDeleted(boolean deleted) {
this.deleted = deleted;
}
+
+ public Long getFieldvalues_id() {
+ return fieldvalues_id;
+ }
+ public void setFieldvalues_id(Long fieldvalues_id) {
+ this.fieldvalues_id = fieldvalues_id;
+ }
+ public Fieldlanguagesvalues getLabel() {
+ return label;
+ }
+
+ public void setLabel(Fieldlanguagesvalues label) {
+ this.label = label;
+ }
}
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/CalendarService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/CalendarService.java?rev=1490128&r1=1490127&r2=1490128&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/CalendarService.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/CalendarService.java
Thu Jun 6 04:29:15 2013
@@ -388,8 +388,10 @@ public class CalendarService {
Long user_level =
userManager.getUserLevelByID(users_id);
if (authLevelUtil.checkUserLevel(user_level)) {
+ User user = userManager.getUserById(users_id);
+ long language_id = (user == null) ? 1 :
user.getLanguage_id();
List<AppointmentReminderTyps> res =
appointmentReminderTypDaoImpl
-
.getAppointmentReminderTypList();
+
.getAppointmentReminderTypList(language_id);
if (res == null || res.size() < 1) {
log.debug("no remindertyps found!");
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/calendar/TestDatabaseStructureAppointmentReminderTyp.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/calendar/TestDatabaseStructureAppointmentReminderTyp.java?rev=1490128&r1=1490127&r2=1490128&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/calendar/TestDatabaseStructureAppointmentReminderTyp.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/calendar/TestDatabaseStructureAppointmentReminderTyp.java
Thu Jun 6 04:29:15 2013
@@ -49,9 +49,9 @@ public class TestDatabaseStructureAppoin
cal.getTime();
appointmentReminderTypDaoImpl.addAppointmentReminderTyps(1L,
- "test 5 min");
+ "test 5 min", -1);
List<AppointmentReminderTyps> listAppoints =
appointmentReminderTypDaoImpl
- .getAppointmentReminderTypList();
+ .getAppointmentReminderTypList(1);
log.debug("Anzahl: " + listAppoints.size());
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java?rev=1490128&r1=1490127&r2=1490128&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
Thu Jun 6 04:29:15 2013
@@ -54,9 +54,9 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
-//import com.googlecode.wicket.jquery.ui.plugins.wysiwyg.WysiwygEditor;
import com.googlecode.wicket.jquery.ui.widget.dialog.AbstractFormDialog;
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
+//import com.googlecode.wicket.jquery.ui.plugins.wysiwyg.WysiwygEditor;
public class AppointmentDialog extends AbstractFormDialog<Appointment> {
private static final long serialVersionUID = 7553035786264113827L;
@@ -184,7 +184,7 @@ public class AppointmentDialog extends A
add(new DropDownChoice<AppointmentReminderTyps>(
"remind"
, remindTypes
- , new
ChoiceRenderer<AppointmentReminderTyps>("name", "typId")));
+ , new
ChoiceRenderer<AppointmentReminderTyps>("label.value", "typId")));
final DropDownChoice<RoomType> roomType = new
RoomTypeDropDown("room.roomtype");
roomType.setEnabled(createRoom);
@@ -229,7 +229,7 @@ public class AppointmentDialog extends A
}
private List<AppointmentReminderTyps> getRemindTypes() {
- return
getBean(AppointmentReminderTypDao.class).getAppointmentReminderTypList();
+ return
getBean(AppointmentReminderTypDao.class).getAppointmentReminderTypList(getLanguage());
}
private List<Room> getRoomList() {
