svn commit: r1464270 - in /openmeetings/trunk/singlewebapp: WebContent/languages/ WebContent/src/modules/admin/roomadmin/ WebContent/src/modules/lzcalendar/compontents/ WebContent/src/modules/settings/privatemessages/ src/org/apache/openmeetings/data/c...

Wed, 03 Apr 2013 20:33:45 -0700 

Author: vdegtyarev
Date: Thu Apr  4 03:33:09 2013
New Revision: 1464270

URL: http://svn.apache.org/r1464270
Log:
OPENMEETINGS-564 is implemented. Room types are localized.

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/admin/roomadmin/roomValueForm.lzx
    
openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/lzEditCalendarEvent.lzx
    
openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/privatemessages/newPrivateMessage.lzx
    
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/RoomManager.java
    
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java
    
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/RoomType.java
    
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java
    
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomForm.java
    
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/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=1464270&r1=1464269&r2=1464270&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml Thu Apr  4 
03:33:09 2013
@@ -4646,4 +4646,13 @@ see http://openmeetings.apache.org/Langu
   <string id="1540" name="no_timezone">
     <value>Please specify your timezone</value>
   </string>
+  <string id="1541" name="conference_room_type">
+    <value>conference (1-25 users)</value>
+  </string>
+  <string id="1542" name="conference_room_type">
+    <value>restricted (1-150 users)</value>
+  </string>
+  <string id="1543" name="conference_room_type">
+    <value>interview (1:1 meeting with recording)</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=1464270&r1=1464269&r2=1464270&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml 
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml Thu Apr  
4 03:33:09 2013
@@ -4646,4 +4646,13 @@ see http://openmeetings.apache.org/Langu
   <string id="1540" name="no_timezone">
     <value>Please specify your timezone</value>
   </string>
+  <string id="1541" name="conference_room_type">
+    <value>conference (1-25 users)</value>
+  </string>
+  <string id="1542" name="conference_room_type">
+    <value>restricted (1-150 users)</value>
+  </string>
+  <string id="1543" name="conference_room_type">
+    <value>interview (1:1 meeting with recording)</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=1464270&r1=1464269&r2=1464270&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml Thu Apr  4 
03:33:09 2013
@@ -4646,4 +4646,13 @@ see http://openmeetings.apache.org/Langu
   <string id="1540" name="no_timezone">
     <value>Please specify your timezone</value>
   </string>
+  <string id="1541" name="conference_room_type">
+    <value>conference (1-25 users)</value>
+  </string>
+  <string id="1542" name="conference_room_type">
+    <value>restricted (1-150 users)</value>
+  </string>
+  <string id="1543" name="conference_room_type">
+    <value>interview (1:1 meeting with recording)</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=1464270&r1=1464269&r2=1464270&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/chinese simplified.xml 
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/chinese simplified.xml 
Thu Apr  4 03:33:09 2013
@@ -4646,4 +4646,13 @@ see http://openmeetings.apache.org/Langu
   <string id="1540" name="no_timezone">
     <value>Please specify your timezone</value>
   </string>
+  <string id="1541" name="conference_room_type">
+    <value>conference (1-25 users)</value>
+  </string>
+  <string id="1542" name="conference_room_type">
+    <value>restricted (1-150 users)</value>
+  </string>
+  <string id="1543" name="conference_room_type">
+    <value>interview (1:1 meeting with recording)</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=1464270&r1=1464269&r2=1464270&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/chinese 
traditional.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/chinese 
traditional.xml Thu Apr  4 03:33:09 2013
@@ -4646,4 +4646,13 @@ see http://openmeetings.apache.org/Langu
   <string id="1540" name="no_timezone">
     <value>Please specify your timezone</value>
   </string>
+  <string id="1541" name="conference_room_type">
+    <value>conference (1-25 users)</value>
+  </string>
+  <string id="1542" name="conference_room_type">
+    <value>restricted (1-150 users)</value>
+  </string>
+  <string id="1543" name="conference_room_type">
+    <value>interview (1:1 meeting with recording)</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=1464270&r1=1464269&r2=1464270&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml Thu Apr  4 
03:33:09 2013
@@ -4646,4 +4646,13 @@ see http://openmeetings.apache.org/Langu
   <string id="1540" name="no_timezone">
     <value>Please specify your timezone</value>
   </string>
+  <string id="1541" name="conference_room_type">
+    <value>conference (1-25 users)</value>
+  </string>
+  <string id="1542" name="conference_room_type">
+    <value>restricted (1-150 users)</value>
+  </string>
+  <string id="1543" name="conference_room_type">
+    <value>interview (1:1 meeting with recording)</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=1464270&r1=1464269&r2=1464270&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml Thu Apr  4 
03:33:09 2013
@@ -4646,4 +4646,13 @@ see http://openmeetings.apache.org/Langu
   <string id="1540" name="no_timezone">
     <value>Please specify your timezone</value>
   </string>
+  <string id="1541" name="conference_room_type">
+    <value>conference (1-25 users)</value>
+  </string>
+  <string id="1542" name="conference_room_type">
+    <value>restricted (1-150 users)</value>
+  </string>
+  <string id="1543" name="conference_room_type">
+    <value>interview (1:1 meeting with recording)</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=1464270&r1=1464269&r2=1464270&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml 
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml 
Thu Apr  4 03:33:09 2013
@@ -4646,4 +4646,13 @@ see http://openmeetings.apache.org/Langu
   <string id="1540" name="no_timezone">
     <value>Please specify your timezone</value>
   </string>
+  <string id="1541" name="conference_room_type">
+    <value>conference (1-25 users)</value>
+  </string>
+  <string id="1542" name="conference_room_type">
+    <value>restricted (1-150 users)</value>
+  </string>
+  <string id="1543" name="conference_room_type">
+    <value>interview (1:1 meeting with recording)</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=1464270&r1=1464269&r2=1464270&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml Thu Apr  4 
03:33:09 2013
@@ -4646,4 +4646,13 @@ see http://openmeetings.apache.org/Langu
   <string id="1540" name="no_timezone">
     <value>Please specify your timezone</value>
   </string>
+  <string id="1541" name="conference_room_type">
+    <value>conference (1-25 users)</value>
+  </string>
+  <string id="1542" name="conference_room_type">
+    <value>restricted (1-150 users)</value>
+  </string>
+  <string id="1543" name="conference_room_type">
+    <value>interview (1:1 meeting with recording)</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=1464270&r1=1464269&r2=1464270&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml Thu Apr  4 
03:33:09 2013
@@ -4646,4 +4646,13 @@ see http://openmeetings.apache.org/Langu
   <string id="1540" name="no_timezone">
     <value>Please specify your timezone</value>
   </string>
+  <string id="1541" name="conference_room_type">
+    <value>conference (1-25 users)</value>
+  </string>
+  <string id="1542" name="conference_room_type">
+    <value>restricted (1-150 users)</value>
+  </string>
+  <string id="1543" name="conference_room_type">
+    <value>interview (1:1 meeting with recording)</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=1464270&r1=1464269&r2=1464270&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/english.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/english.xml Thu Apr  4 
03:33:09 2013
@@ -4646,4 +4646,13 @@ see http://openmeetings.apache.org/Langu
   <string id="1540" name="no_timezone">
     <value>Please specify your timezone</value>
   </string>
+  <string id="1541" name="conference_room_type">
+    <value>conference (1-25 users)</value>
+  </string>
+  <string id="1542" name="conference_room_type">
+    <value>restricted (1-150 users)</value>
+  </string>
+  <string id="1543" name="conference_room_type">
+    <value>interview (1:1 meeting with recording)</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=1464270&r1=1464269&r2=1464270&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml Thu Apr  4 
03:33:09 2013
@@ -4646,4 +4646,13 @@ see http://openmeetings.apache.org/Langu
   <string id="1540" name="no_timezone">
     <value>Please specify your timezone</value>
   </string>
+  <string id="1541" name="conference_room_type">
+    <value>conference (1-25 users)</value>
+  </string>
+  <string id="1542" name="conference_room_type">
+    <value>restricted (1-150 users)</value>
+  </string>
+  <string id="1543" name="conference_room_type">
+    <value>interview (1:1 meeting with recording)</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=1464270&r1=1464269&r2=1464270&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/french.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/french.xml Thu Apr  4 
03:33:09 2013
@@ -4646,4 +4646,13 @@ see http://openmeetings.apache.org/Langu
   <string id="1540" name="no_timezone">
     <value>Please specify your timezone</value>
   </string>
+  <string id="1541" name="conference_room_type">
+    <value>conference (1-25 users)</value>
+  </string>
+  <string id="1542" name="conference_room_type">
+    <value>restricted (1-150 users)</value>
+  </string>
+  <string id="1543" name="conference_room_type">
+    <value>interview (1:1 meeting with recording)</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=1464270&r1=1464269&r2=1464270&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml Thu Apr  
4 03:33:09 2013
@@ -4646,4 +4646,13 @@ see http://openmeetings.apache.org/Langu
   <string id="1540" name="no_timezone">
     <value>Please specify your timezone</value>
   </string>
+  <string id="1541" name="conference_room_type">
+    <value>conference (1-25 users)</value>
+  </string>
+  <string id="1542" name="conference_room_type">
+    <value>restricted (1-150 users)</value>
+  </string>
+  <string id="1543" name="conference_room_type">
+    <value>interview (1:1 meeting with recording)</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=1464270&r1=1464269&r2=1464270&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml Thu Apr  4 
03:33:09 2013
@@ -4646,4 +4646,13 @@ see http://openmeetings.apache.org/Langu
   <string id="1540" name="no_timezone">
     <value>Please specify your timezone</value>
   </string>
+  <string id="1541" name="conference_room_type">
+    <value>conference (1-25 users)</value>
+  </string>
+  <string id="1542" name="conference_room_type">
+    <value>restricted (1-150 users)</value>
+  </string>
+  <string id="1543" name="conference_room_type">
+    <value>interview (1:1 meeting with recording)</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=1464270&r1=1464269&r2=1464270&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml Thu Apr  4 
03:33:09 2013
@@ -4646,4 +4646,13 @@ see http://openmeetings.apache.org/Langu
   <string id="1540" name="no_timezone">
     <value>Please specify your timezone</value>
   </string>
+  <string id="1541" name="conference_room_type">
+    <value>conference (1-25 users)</value>
+  </string>
+  <string id="1542" name="conference_room_type">
+    <value>restricted (1-150 users)</value>
+  </string>
+  <string id="1543" name="conference_room_type">
+    <value>interview (1:1 meeting with recording)</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=1464270&r1=1464269&r2=1464270&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml 
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml Thu Apr  
4 03:33:09 2013
@@ -4646,4 +4646,13 @@ see http://openmeetings.apache.org/Langu
   <string id="1540" name="no_timezone">
     <value>Please specify your timezone</value>
   </string>
+  <string id="1541" name="conference_room_type">
+    <value>conference (1-25 users)</value>
+  </string>
+  <string id="1542" name="conference_room_type">
+    <value>restricted (1-150 users)</value>
+  </string>
+  <string id="1543" name="conference_room_type">
+    <value>interview (1:1 meeting with recording)</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=1464270&r1=1464269&r2=1464270&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml 
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml Thu Apr 
 4 03:33:09 2013
@@ -4646,4 +4646,13 @@ see http://openmeetings.apache.org/Langu
   <string id="1540" name="no_timezone">
     <value>Please specify your timezone</value>
   </string>
+  <string id="1541" name="conference_room_type">
+    <value>conference (1-25 users)</value>
+  </string>
+  <string id="1542" name="conference_room_type">
+    <value>restricted (1-150 users)</value>
+  </string>
+  <string id="1543" name="conference_room_type">
+    <value>interview (1:1 meeting with recording)</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=1464270&r1=1464269&r2=1464270&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml Thu Apr  4 
03:33:09 2013
@@ -4646,4 +4646,13 @@ see http://openmeetings.apache.org/Langu
   <string id="1540" name="no_timezone">
     <value>Please specify your timezone</value>
   </string>
+  <string id="1541" name="conference_room_type">
+    <value>conference (1-25 users)</value>
+  </string>
+  <string id="1542" name="conference_room_type">
+    <value>restricted (1-150 users)</value>
+  </string>
+  <string id="1543" name="conference_room_type">
+    <value>interview (1:1 meeting with recording)</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=1464270&r1=1464269&r2=1464270&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml Thu Apr  
4 03:33:09 2013
@@ -4646,4 +4646,13 @@ see http://openmeetings.apache.org/Langu
   <string id="1540" name="no_timezone">
     <value>Please specify your timezone</value>
   </string>
+  <string id="1541" name="conference_room_type">
+    <value>conference (1-25 users)</value>
+  </string>
+  <string id="1542" name="conference_room_type">
+    <value>restricted (1-150 users)</value>
+  </string>
+  <string id="1543" name="conference_room_type">
+    <value>interview (1:1 meeting with recording)</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=1464270&r1=1464269&r2=1464270&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml Thu Apr  4 
03:33:09 2013
@@ -4646,4 +4646,13 @@ see http://openmeetings.apache.org/Langu
   <string id="1540" name="no_timezone">
     <value>Please specify your timezone</value>
   </string>
+  <string id="1541" name="conference_room_type">
+    <value>conference (1-25 users)</value>
+  </string>
+  <string id="1542" name="conference_room_type">
+    <value>restricted (1-150 users)</value>
+  </string>
+  <string id="1543" name="conference_room_type">
+    <value>interview (1:1 meeting with recording)</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=1464270&r1=1464269&r2=1464270&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml Thu Apr  4 
03:33:09 2013
@@ -4646,4 +4646,13 @@ see http://openmeetings.apache.org/Langu
   <string id="1540" name="no_timezone">
     <value>Please specify your timezone</value>
   </string>
+  <string id="1541" name="conference_room_type">
+    <value>conference (1-25 users)</value>
+  </string>
+  <string id="1542" name="conference_room_type">
+    <value>restricted (1-150 users)</value>
+  </string>
+  <string id="1543" name="conference_room_type">
+    <value>interview (1:1 meeting with recording)</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=1464270&r1=1464269&r2=1464270&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml Thu Apr  4 
03:33:09 2013
@@ -4646,4 +4646,13 @@ see http://openmeetings.apache.org/Langu
   <string id="1540" name="no_timezone">
     <value>Please specify your timezone</value>
   </string>
+  <string id="1541" name="conference_room_type">
+    <value>conference (1-25 users)</value>
+  </string>
+  <string id="1542" name="conference_room_type">
+    <value>restricted (1-150 users)</value>
+  </string>
+  <string id="1543" name="conference_room_type">
+    <value>interview (1:1 meeting with recording)</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=1464270&r1=1464269&r2=1464270&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/portugues brazil.xml 
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/portugues brazil.xml 
Thu Apr  4 03:33:09 2013
@@ -4646,4 +4646,13 @@ see http://openmeetings.apache.org/Langu
   <string id="1540" name="no_timezone">
     <value>Please specify your timezone</value>
   </string>
+  <string id="1541" name="conference_room_type">
+    <value>conference (1-25 users)</value>
+  </string>
+  <string id="1542" name="conference_room_type">
+    <value>restricted (1-150 users)</value>
+  </string>
+  <string id="1543" name="conference_room_type">
+    <value>interview (1:1 meeting with recording)</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=1464270&r1=1464269&r2=1464270&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml 
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml Thu Apr  
4 03:33:09 2013
@@ -4646,4 +4646,13 @@ see http://openmeetings.apache.org/Langu
   <string id="1540" name="no_timezone">
     <value>Please specify your timezone</value>
   </string>
+  <string id="1541" name="conference_room_type">
+    <value>conference (1-25 users)</value>
+  </string>
+  <string id="1542" name="conference_room_type">
+    <value>restricted (1-150 users)</value>
+  </string>
+  <string id="1543" name="conference_room_type">
+    <value>interview (1:1 meeting with recording)</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=1464270&r1=1464269&r2=1464270&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml Thu Apr  4 
03:33:09 2013
@@ -4644,6 +4644,15 @@ see http://openmeetings.apache.org/Langu
     <value>Вы действительно хотите дать слово 
этому участнику?</value>
   </string>
   <string id="1540" name="no_timezone">
-    <value>Please specify your timezone</value>
+    <value>Укажите Ваш часовой пояс</value>
+  </string>
+  <string id="1541" name="conference_room_type">
+    <value>конференц зал (1-25 участников)</value>
+  </string>
+  <string id="1542" name="conference_room_type">
+    <value>ограниченная (1-150 участников)</value>
+  </string>
+  <string id="1543" name="conference_room_type">
+    <value>интервью (1:1 встреча с записью)</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=1464270&r1=1464269&r2=1464270&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml Thu Apr  4 
03:33:09 2013
@@ -4646,4 +4646,13 @@ see http://openmeetings.apache.org/Langu
   <string id="1540" name="no_timezone">
     <value>Please specify your timezone</value>
   </string>
+  <string id="1541" name="conference_room_type">
+    <value>conference (1-25 users)</value>
+  </string>
+  <string id="1542" name="conference_room_type">
+    <value>restricted (1-150 users)</value>
+  </string>
+  <string id="1543" name="conference_room_type">
+    <value>interview (1:1 meeting with recording)</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=1464270&r1=1464269&r2=1464270&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml Thu Apr  4 
03:33:09 2013
@@ -4646,4 +4646,13 @@ see http://openmeetings.apache.org/Langu
   <string id="1540" name="no_timezone">
     <value>Please specify your timezone</value>
   </string>
+  <string id="1541" name="conference_room_type">
+    <value>conference (1-25 users)</value>
+  </string>
+  <string id="1542" name="conference_room_type">
+    <value>restricted (1-150 users)</value>
+  </string>
+  <string id="1543" name="conference_room_type">
+    <value>interview (1:1 meeting with recording)</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=1464270&r1=1464269&r2=1464270&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml Thu Apr  4 
03:33:09 2013
@@ -4646,4 +4646,13 @@ see http://openmeetings.apache.org/Langu
   <string id="1540" name="no_timezone">
     <value>Please specify your timezone</value>
   </string>
+  <string id="1541" name="conference_room_type">
+    <value>conference (1-25 users)</value>
+  </string>
+  <string id="1542" name="conference_room_type">
+    <value>restricted (1-150 users)</value>
+  </string>
+  <string id="1543" name="conference_room_type">
+    <value>interview (1:1 meeting with recording)</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=1464270&r1=1464269&r2=1464270&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml Thu Apr  4 
03:33:09 2013
@@ -4646,4 +4646,13 @@ see http://openmeetings.apache.org/Langu
   <string id="1540" name="no_timezone">
     <value>Please specify your timezone</value>
   </string>
+  <string id="1541" name="conference_room_type">
+    <value>conference (1-25 users)</value>
+  </string>
+  <string id="1542" name="conference_room_type">
+    <value>restricted (1-150 users)</value>
+  </string>
+  <string id="1543" name="conference_room_type">
+    <value>interview (1:1 meeting with recording)</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=1464270&r1=1464269&r2=1464270&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml Thu Apr  4 
03:33:09 2013
@@ -4646,4 +4646,13 @@ see http://openmeetings.apache.org/Langu
   <string id="1540" name="no_timezone">
     <value>Please specify your timezone</value>
   </string>
+  <string id="1541" name="conference_room_type">
+    <value>conference (1-25 users)</value>
+  </string>
+  <string id="1542" name="conference_room_type">
+    <value>restricted (1-150 users)</value>
+  </string>
+  <string id="1543" name="conference_room_type">
+    <value>interview (1:1 meeting with recording)</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=1464270&r1=1464269&r2=1464270&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml 
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml Thu Apr  
4 03:33:09 2013
@@ -4646,4 +4646,13 @@ see http://openmeetings.apache.org/Langu
   <string id="1540" name="no_timezone">
     <value>Please specify your timezone</value>
   </string>
+  <string id="1541" name="conference_room_type">
+    <value>conference (1-25 users)</value>
+  </string>
+  <string id="1542" name="conference_room_type">
+    <value>restricted (1-150 users)</value>
+  </string>
+  <string id="1543" name="conference_room_type">
+    <value>interview (1:1 meeting with recording)</value>
+  </string>
 </language>

Modified: 
openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomValueForm.lzx
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomValueForm.lzx?rev=1464270&r1=1464269&r2=1464270&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomValueForm.lzx
 (original)
+++ 
openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomValueForm.lzx
 Thu Apr  4 03:33:09 2013
@@ -410,7 +410,7 @@
                <handler name="oninit" >
                    <![CDATA[
                    for (var i=0;i<canvas.roomTypesInitValues.length;i++){
-                       
this.addItem(canvas.roomTypesInitValues[i].name,canvas.roomTypesInitValues[i].roomtypes_id);
+                       
this.addItem(canvas.roomTypesInitValues[i].label.value,canvas.roomTypesInitValues[i].roomtypes_id);
                    }
                    
this.selectItem(String(canvas.roomTypesInitValues[0].roomtypes_id));
                    ]]>

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=1464270&r1=1464269&r2=1464270&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/lzEditCalendarEvent.lzx
 (original)
+++ 
openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/lzEditCalendarEvent.lzx
 Thu Apr  4 03:33:09 2013
@@ -316,7 +316,7 @@
                <handler name="oninit" >
                    <![CDATA[
                    for (var i=0;i<canvas.roomTypesInitValues.length;i++){
-                       
this.addItem(canvas.roomTypesInitValues[i].name,canvas.roomTypesInitValues[i].roomtypes_id);
+                       
this.addItem(canvas.roomTypesInitValues[i].label.value,canvas.roomTypesInitValues[i].roomtypes_id);
                    }
                    
//this.selectItem(String(canvas.roomTypesInitValues[0].roomtypes_id));
                    ]]>

Modified: 
openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/privatemessages/newPrivateMessage.lzx
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/privatemessages/newPrivateMessage.lzx?rev=1464270&r1=1464269&r2=1464270&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/privatemessages/newPrivateMessage.lzx
 (original)
+++ 
openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/privatemessages/newPrivateMessage.lzx
 Thu Apr  4 03:33:09 2013
@@ -377,7 +377,7 @@
                <handler name="oninit" >
                    <![CDATA[
                            for (var 
i=0;i<canvas.roomTypesInitValues.length;i++){
-                               
this.addItem(canvas.roomTypesInitValues[i].name,canvas.roomTypesInitValues[i].roomtypes_id);
+                               
this.addItem(canvas.roomTypesInitValues[i].label.value,canvas.roomTypesInitValues[i].roomtypes_id);
                            }
                            this.selectItemAt(0);
                    ]]>

Modified: 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/RoomManager.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/RoomManager.java?rev=1464270&r1=1464269&r2=1464270&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/RoomManager.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/RoomManager.java
 Thu Apr  4 03:33:09 2013
@@ -33,6 +33,7 @@ import javax.persistence.criteria.Predic
 import javax.persistence.criteria.Root;
 
 import org.apache.openmeetings.data.basic.AuthLevelUtil;
+import org.apache.openmeetings.data.basic.FieldManager;
 import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
 import org.apache.openmeetings.data.beans.basic.SearchResult;
 import org.apache.openmeetings.data.conference.dao.RoomDao;
@@ -77,6 +78,8 @@ public class RoomManager {
        private ISessionManager sessionManager;
     @Autowired
        private ConfigurationDao configurationDao;
+       @Autowired
+       private FieldManager fieldManager;
     @Autowired
        private RoomDao roomDao;
     @Autowired
@@ -88,12 +91,13 @@ public class RoomManager {
         * @param name
         * @return ID of new created roomtype or null
         */
-       public Long addRoomType(String name, boolean deleted) {
+       public Long addRoomType(String name, long fieldvalues_id, boolean 
deleted) {
                try {
                        RoomType rtype = new RoomType();
                        rtype.setName(name);
                        rtype.setStarttime(new Date());
                        rtype.setDeleted(deleted);
+                       rtype.setFieldvalues_id(fieldvalues_id);
                        rtype = em.merge(rtype);
                        long returnId = rtype.getRoomtypes_id();
                        return returnId;
@@ -108,12 +112,17 @@ public class RoomManager {
         * 
         * @return List of RoomTypes
         */
-       public List<RoomType> getAllRoomTypes() {
+       public List<RoomType> getAllRoomTypes(long language_id) {
                try {
                        TypedQuery<RoomType> query = em
                                        .createNamedQuery("getAllRoomTypes", 
RoomType.class);
                        query.setParameter("deleted", true);
-                       return query.getResultList();
+                       List<RoomType> ll = query.getResultList();
+                       for (RoomType ti : ll) {
+                               
ti.setLabel(fieldManager.getFieldByIdAndLanguage(
+                                               ti.getFieldvalues_id(), 
language_id));
+                       }
+                       return ll;
                } catch (Exception ex2) {
                        log.error("[getAllRoomTypes] ", 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=1464270&r1=1464269&r2=1464270&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java
 Thu Apr  4 03:33:09 2013
@@ -496,23 +496,22 @@ public class ImportInitvalues {
 
        public void loadRoomTypes() {
                long conference_Id = roomManager.addRoomType(
-                               "conference (1-25 users)", false);
+                               "conference", 1541, false);
                log.debug("conference_Id: " + conference_Id);
 
                // Audience room type is not in use anymore
-               roomManager.addRoomType("audience (1-50 users)", true);
+               roomManager.addRoomType("audience", -1, true);
 
                long restricted_Id = roomManager.addRoomType(
-                               "restricted  (1-150 users)", false);
+                               "restricted", 1542, false);
                log.debug("restricted_Id: " + restricted_Id);
 
                long interview_Id = roomManager.addRoomType(
-                               "interview  (1:1 meeting with recording)", 
false);
+                               "interview", 1543, false);
                log.debug("interview_Id: " + interview_Id);
 
                // Custom room type is not in use anymore
-               roomManager.addRoomType("custom (extension point for your 
plugin)",
-                               true);
+               roomManager.addRoomType("custom", -2, true);
                log.debug("RoomTypes ADDED");
        }
 

Modified: 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/RoomType.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/RoomType.java?rev=1464270&r1=1464269&r2=1464270&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/RoomType.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/RoomType.java
 Thu Apr  4 03:33:09 2013
@@ -29,6 +29,10 @@ import javax.persistence.Id;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
 import javax.persistence.Table;
+import javax.persistence.Transient;
+
+import org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues;
+import org.simpleframework.xml.Element;
 
 @Entity
 @NamedQueries({
@@ -55,6 +59,13 @@ public class RoomType implements Seriali
        
        @Column(name = "deleted")
        private boolean deleted;
+       
+       @Column(name="fieldvalues_id")
+       @Element(data=true, required=false)
+       private Long fieldvalues_id;
+       
+       @Transient
+       private Fieldlanguagesvalues label;     
 
     
        public String getName() {
@@ -92,4 +103,19 @@ public class RoomType implements Seriali
                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/ConferenceService.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java?rev=1464270&r1=1464269&r2=1464270&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java
 Thu Apr  4 03:33:09 2013
@@ -412,7 +412,8 @@ public class ConferenceService {
                Long users_id = sessiondataDao.checkSession(SID);
                Long user_level = userManager.getUserLevelByID(users_id);
                if (authLevelUtil.checkUserLevel(user_level)) {
-                       return roomManager.getAllRoomTypes();
+                       User user = userManager.getUserById(users_id);
+                       return 
roomManager.getAllRoomTypes(user.getLanguage_id());
                }
                return null;
        }

Modified: 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomForm.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomForm.java?rev=1464270&r1=1464269&r2=1464270&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomForm.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomForm.java
 Thu Apr  4 03:33:09 2013
@@ -24,9 +24,9 @@ import java.util.List;
 import org.apache.openmeetings.data.conference.RoomManager;
 import org.apache.openmeetings.data.user.OrganisationManager;
 import org.apache.openmeetings.persistence.beans.domain.Organisation;
-import org.apache.openmeetings.persistence.beans.room.RoomType;
 import org.apache.openmeetings.persistence.beans.room.Room;
 import org.apache.openmeetings.persistence.beans.room.RoomOrganisation;
+import org.apache.openmeetings.persistence.beans.room.RoomType;
 import org.apache.openmeetings.web.app.Application;
 import org.apache.openmeetings.web.app.WebSession;
 import org.apache.openmeetings.web.components.admin.AdminBaseForm;
@@ -74,8 +74,8 @@ public class RoomForm extends AdminBaseF
                                }));
 
                add(new DropDownChoice<RoomType>("roomtype", 
Application.getBean(
-                               RoomManager.class).getAllRoomTypes(),
-                               new ChoiceRenderer<RoomType>("name", 
"roomtypes_id")));
+                               
RoomManager.class).getAllRoomTypes(WebSession.getLanguage()),
+                               new ChoiceRenderer<RoomType>("label", 
"roomtypes_id")));
 
                add(new TextArea<String>("comment"));
 

Modified: 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/AppointmentDialog.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/AppointmentDialog.java?rev=1464270&r1=1464269&r2=1464270&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/AppointmentDialog.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/AppointmentDialog.java
 Thu Apr  4 03:33:09 2013
@@ -184,7 +184,7 @@ public class AppointmentDialog extends A
                }
                
                private List<RoomType> getRoomTypes() {
-                       return 
Application.getBean(RoomManager.class).getAllRoomTypes();
+                       return 
Application.getBean(RoomManager.class).getAllRoomTypes(WebSession.getLanguage());
                }
                
                private List<AppointmentReminderTyps> getRemindTypes() {

Reply via email to