roo...

solomax Sun, 05 Aug 2012 21:54:07 -0700

Author: solomax
Date: Mon Aug  6 04:53:08 2012
New Revision: 1369721

URL: http://svn.apache.org/viewvc?rev=1369721&view=rev
Log:
OPENMEETINGS-390 russian translations are added, version bumped; options dialog 
is fixed


Modified:
    incubator/openmeetings/trunk/plugins/bitrix/build.xml
    
incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/component.php
    
incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/lang/en/component.php
    
incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/lang/ru/.description.php
    
incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/lang/ru/component.php
    
incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/templates/.default/lang/ru/template.php
    
incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/templates/show_room/lang/ru/template.php
    incubator/openmeetings/trunk/plugins/bitrix/install/index.php
    incubator/openmeetings/trunk/plugins/bitrix/lang/ru/install/install.php
    incubator/openmeetings/trunk/plugins/bitrix/lang/ru/options.php
    incubator/openmeetings/trunk/plugins/bitrix/options.php

Modified: incubator/openmeetings/trunk/plugins/bitrix/build.xml
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/bitrix/build.xml?rev=1369721&r1=1369720&r2=1369721&view=diff
==============================================================================
--- incubator/openmeetings/trunk/plugins/bitrix/build.xml (original)
+++ incubator/openmeetings/trunk/plugins/bitrix/build.xml Mon Aug  6 04:53:08 
2012
@@ -16,7 +16,7 @@
 <project name="openmeetings bitrix plugin" basedir="./" default="dist-bin" 
xmlns="antlib:org.apache.tools.ant" xmlns:rat="antlib:org.apache.rat.anttasks" 
xmlns:ivy="antlib:org.apache.ivy.ant">
 
        <property name="dist.dir" value="dist" />
-       <property name="project.version" value="0.1" />
+       <property name="project.version" value="0.2" />
        <property name="project.distname" value="openmeetings-bitrix-plugin" />
        <property name="plugin.name" value="openmeetings" />
 

Modified: 
incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/component.php
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/component.php?rev=1369721&r1=1369720&r2=1369721&view=diff
==============================================================================
--- 
incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/component.php
 (original)
+++ 
incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/component.php
 Mon Aug  6 04:53:08 2012
@@ -32,7 +32,7 @@ if (isset($_REQUEST["ID"]) && is_numeric
        $arResult["ROOM"] = $_REQUEST["ID"];
        $arResult["URL"] = COpenmeetings::GetOMUrl();
        $arResult["HASH"] = COpenmeetings::GetRoomHash($_REQUEST["ID"]);
-       $arResult["LANGUAGE"] = 9;
+       $arResult["LANGUAGE"] = GetMessage("OPENMEETINGS_LANGUAGE");
        $this->__templateName = "show_room";
 } else {
        $arResult["ROOMS"] = COpenmeetings::GetRoomList();

Modified: 
incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/lang/en/component.php
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/lang/en/component.php?rev=1369721&r1=1369720&r2=1369721&view=diff
==============================================================================
--- 
incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/lang/en/component.php
 (original)
+++ 
incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/lang/en/component.php
 Mon Aug  6 04:53:08 2012
@@ -18,3 +18,4 @@
  * under the License.
  */
 $MESS ['OPENMEETINGS_MODULE_IS_NOT_INSTALLED'] = "Openmeetings module is not 
installed.";
+$MESS ['OPENMEETINGS_LANGUAGE'] = "1";

Modified: 
incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/lang/ru/.description.php
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/lang/ru/.description.php?rev=1369721&r1=1369720&r2=1369721&view=diff
==============================================================================
--- 
incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/lang/ru/.description.php
 (original)
+++ 
incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/lang/ru/.description.php
 Mon Aug  6 04:53:08 2012
@@ -17,8 +17,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-$MESS ['OPENMEETINGS_ROOMS_NAME'] = "Available Rooms";
-$MESS ['OPENMEETINGS_ROOMS_DESCRIPTION'] = "Openmeetings rooms available to 
attend";
+$MESS ['OPENMEETINGS_ROOMS_NAME'] = "ÐÐ¾ÑÑÑÐ¿Ð½ÑÐµ ÐºÐ¾Ð¼Ð½Ð°ÑÑ";
+$MESS ['OPENMEETINGS_ROOMS_DESCRIPTION'] = "ÐÐ¾Ð¼Ð½Ð°ÑÑ Openmeetings 
ÐºÐ¾ÑÐ¾ÑÑÐµ Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿Ð¾ÑÐµÑÐ¸ÑÑ";
 $MESS ['OPENMEETINGS_NAME'] = "Openmeetings";
 ?>
 

Modified: 
incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/lang/ru/component.php
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/lang/ru/component.php?rev=1369721&r1=1369720&r2=1369721&view=diff
==============================================================================
--- 
incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/lang/ru/component.php
 (original)
+++ 
incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/lang/ru/component.php
 Mon Aug  6 04:53:08 2012
@@ -17,4 +17,5 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-$MESS ['OPENMEETINGS_MODULE_IS_NOT_INSTALLED'] = "Openmeetings module is not 
installed.";
+$MESS ['OPENMEETINGS_MODULE_IS_NOT_INSTALLED'] = "ÐÐ¾Ð´ÑÐ»Ñ Openmeetings 
Ð½Ðµ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½.";
+$MESS ['OPENMEETINGS_LANGUAGE'] = "9";

Modified: 
incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/templates/.default/lang/ru/template.php
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/templates/.default/lang/ru/template.php?rev=1369721&r1=1369720&r2=1369721&view=diff
==============================================================================
--- 
incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/templates/.default/lang/ru/template.php
 (original)
+++ 
incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/templates/.default/lang/ru/template.php
 Mon Aug  6 04:53:08 2012
@@ -17,6 +17,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-$MESS["ROOMS_DESCRIPTION"] = "Please select Room below to attend webinar";
-$MESS["ENTER_ROOM"] = "Enter room";
+$MESS["ROOMS_DESCRIPTION"] = "ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ° Ð²ÑÐ±ÐµÑÐ¸ÑÐµ 
ÐºÐ¾Ð¼Ð½Ð°ÑÑ Ð¸Ð· Ð¿ÑÐµÐ´ÑÑÐ°Ð²Ð»ÐµÐ½Ð½ÑÑ Ð½Ð¸Ð¶Ðµ, ÑÑÐ¾Ð±Ñ 
Ð¿Ð¾ÑÐµÑÐ¸ÑÑ ÐºÐ¾Ð½ÑÐµÑÐµÐ½ÑÐ¸Ñ";
+$MESS["ENTER_ROOM"] = "ÐÐ¾Ð¹ÑÐ¸ Ð² ÐºÐ¾Ð¼Ð½Ð°ÑÑ";
 

Modified: 
incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/templates/show_room/lang/ru/template.php
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/templates/show_room/lang/ru/template.php?rev=1369721&r1=1369720&r2=1369721&view=diff
==============================================================================
--- 
incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/templates/show_room/lang/ru/template.php
 (original)
+++ 
incubator/openmeetings/trunk/plugins/bitrix/install/components/openmeetings/rooms/templates/show_room/lang/ru/template.php
 Mon Aug  6 04:53:08 2012
@@ -17,5 +17,5 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-$MESS["NEED_FLASH"] = "This content requires the Adobe Flash Player: ";
-$MESS["GET_FLASH"] = "Get Flash";
+$MESS["NEED_FLASH"] = "ÐÐ»Ñ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ñ ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ð¼Ð¾Ð³Ð¾ 
Ð½ÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼ Ð¿ÑÐ¾Ð¸Ð³ÑÑÐ²Ð°ÑÐµÐ»Ñ Flash: ";
+$MESS["GET_FLASH"] = "Ð¡ÐºÐ°ÑÐ°ÑÑ Ð¿ÑÐ¾Ð¸Ð³ÑÑÐ²Ð°ÑÐµÐ»Ñ Flash";

Modified: incubator/openmeetings/trunk/plugins/bitrix/install/index.php
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/bitrix/install/index.php?rev=1369721&r1=1369720&r2=1369721&view=diff
==============================================================================
--- incubator/openmeetings/trunk/plugins/bitrix/install/index.php (original)
+++ incubator/openmeetings/trunk/plugins/bitrix/install/index.php Mon Aug  6 
04:53:08 2012
@@ -136,6 +136,7 @@ Class openmeetings extends CModule {
                
//DeleteDirFiles($_SERVER["DOCUMENT_ROOT"]."/bitrix/modules/openmeetings/install/themes/.default/",
 $_SERVER["DOCUMENT_ROOT"]."/bitrix/themes/.default");//css
                
//DeleteDirFilesEx("/bitrix/themes/.default/icons/openmeetings/");//icons
                DeleteDirFilesEx("/bitrix/images/openmeetings/");//images
+               DeleteDirFilesEx("/bitrix/components/openmeetings");//component
                DeleteDirFilesEx("/bitrix/js/openmeetings/");//images
                return true;
        }

Modified: 
incubator/openmeetings/trunk/plugins/bitrix/lang/ru/install/install.php
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/bitrix/lang/ru/install/install.php?rev=1369721&r1=1369720&r2=1369721&view=diff
==============================================================================
--- incubator/openmeetings/trunk/plugins/bitrix/lang/ru/install/install.php 
(original)
+++ incubator/openmeetings/trunk/plugins/bitrix/lang/ru/install/install.php Mon 
Aug  6 04:53:08 2012
@@ -18,4 +18,4 @@
  * under the License.
  */
 $MESS ['OPENMEETINGS_MODULE_NAME'] = "Apache Openmeetings Incubating";
-$MESS ['OPENMEETINGS_MODULE_DESCRIPTION'] = "This module allows to use Apache 
Openmeetings Incubating with Bitrix.";
\ No newline at end of file
+$MESS ['OPENMEETINGS_MODULE_DESCRIPTION'] = "ÐÑÐ¾Ñ Ð¼Ð¾Ð´ÑÐ»Ñ 
Ð¿Ð¾Ð·Ð²Ð¾Ð»ÑÐµÑ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ Apache Openmeetings Incubating 
Ð´Ð»Ñ ÑÐ°Ð±Ð¾ÑÑ Ñ ÐÐ¸ÑÑÐ¸ÐºÑ.";
\ No newline at end of file

Modified: incubator/openmeetings/trunk/plugins/bitrix/lang/ru/options.php
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/bitrix/lang/ru/options.php?rev=1369721&r1=1369720&r2=1369721&view=diff
==============================================================================
--- incubator/openmeetings/trunk/plugins/bitrix/lang/ru/options.php (original)
+++ incubator/openmeetings/trunk/plugins/bitrix/lang/ru/options.php Mon Aug  6 
04:53:08 2012
@@ -17,13 +17,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-$MESS ['OPENMEETINGS_SAVE'] = "Save";
-$MESS ['OPENMEETINGS_RESET'] = "Reset";
-$MESS ['MAIN_RESTORE_DEFAULTS'] = "Restore defaults";
-$MESS ['OPENMEETINGS_URL'] = "Openmeetings URL:";
-$MESS ['OPENMEETINGS_CONTEXT'] = "Context of Openmeetings:";
-$MESS ['OPENMEETINGS_MODULE_KEY'] = "Openmeetings module key:";
-$MESS ['OPENMEETINGS_USER'] = "Admin user name:";
-$MESS ['OPENMEETINGS_PASSWORD'] = "Admin user password:";
+$MESS ['OPENMEETINGS_SAVE'] = "Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ";
+$MESS ['OPENMEETINGS_RESET'] = "Ð¡Ð±ÑÐ¾ÑÐ¸ÑÑ";
+$MESS ['MAIN_RESTORE_DEFAULTS'] = "ÐÐ¾ÑÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ 
Ð¿Ð¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ";
+$MESS ['OPENMEETINGS_URL'] = "ÐÐ´ÑÐµÑ ÑÐµÑÐ²ÐµÑÐ° Openmeetings:";
+$MESS ['OPENMEETINGS_CONTEXT'] = "ÐÐ¾Ð½ÑÐµÐºÑÑ ÑÐµÑÐ²ÐµÑÐ° 
Openmeetings:";
+$MESS ['OPENMEETINGS_MODULE_KEY'] = "ÐÐ»ÑÑ Ð¼Ð¾Ð´ÑÐ»Ñ Openmeetings:";
+$MESS ['OPENMEETINGS_USER'] = "ÐÐ¼Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ ÑÑÐ¾Ð²Ð½Ñ 
Admin Ð¸Ð»Ð¸ SOAP:";
+$MESS ['OPENMEETINGS_PASSWORD'] = "ÐÐ°ÑÐ¾Ð»Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ:";
 
 ?>
\ No newline at end of file

Modified: incubator/openmeetings/trunk/plugins/bitrix/options.php
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/bitrix/options.php?rev=1369721&r1=1369720&r2=1369721&view=diff
==============================================================================
--- incubator/openmeetings/trunk/plugins/bitrix/options.php (original)
+++ incubator/openmeetings/trunk/plugins/bitrix/options.php Mon Aug  6 04:53:08 
2012
@@ -45,7 +45,7 @@ if ($OPENMEETINGS_RIGHT>="R") {
                        array("CONTEXT", GetMessage("OPENMEETINGS_CONTEXT"), 
array("text", 64)),
                        array("MODULE_KEY", 
GetMessage("OPENMEETINGS_MODULE_KEY"), array("text", 64)),
                        array("OM_USER", GetMessage("OPENMEETINGS_USER"), 
array("text", 64)),
-                       array("OM_PASSWORD", 
GetMessage("OPENMEETINGS_PASSWORD"), array("text", 64))
+                       array("OM_PASSWORD", 
GetMessage("OPENMEETINGS_PASSWORD"), array("password", 64))
        );
        
        if($REQUEST_METHOD=="POST" && strlen($Update)>0 && 
COpenmeetings::IsAdmin() && check_bitrix_sessid()) {
@@ -85,6 +85,8 @@ if ($OPENMEETINGS_RIGHT>="R") {
                                        ?><input type="checkbox" name="<?echo 
htmlspecialchars($Option[0])?>" id="<?echo htmlspecialchars($Option[0])?>" 
value="Y"<?if($val=="Y")echo" checked";?>><?
                                elseif($type[0]=="text"):
                                        ?><input type="text" size="<?echo 
$type[1]?>" maxlength="255" value="<?echo htmlspecialchars($val)?>" 
name="<?echo htmlspecialchars($Option[0])?>"><?
+                               elseif($type[0]=="password"):
+                                       ?><input type="password" size="<?echo 
$type[1]?>" maxlength="255" value="<?echo htmlspecialchars($val)?>" 
name="<?echo htmlspecialchars($Option[0])?>"><?
                                elseif($type[0]=="textarea"):
                                        ?><textarea rows="<?echo $type[1]?>" 
cols="<?echo $type[2]?>" name="<?echo htmlspecialchars($Option[0])?>"><?echo 
htmlspecialchars($val)?></textarea><?
                                endif;

svn commit: r1369721 - in /incubator/openmeetings/trunk/plugins/bitrix: ./ install/ install/components/openmeetings/rooms/ install/components/openmeetings/rooms/lang/en/ install/components/openmeetings/rooms/lang/ru/ install/components/openmeetings/roo...

Reply via email to