BUG 9216 Al cambiar el idioma por system settings... SOLVED

- By selecting the language in settings the Dropdown shows no language predefined. - was add posts to language in the login and system for more information, and was modified the Dropdown for show the language predefined.
2012-07-10 19:01:57 -04:00
parent 8c44e21c1c
commit 9f3ba08665
4 changed files with 850 additions and 846 deletions
--- a/workflow/engine/controllers/main.php
+++ b/workflow/engine/controllers/main.php
--- a/workflow/engine/methods/login/sysLogin.php
+++ b/workflow/engine/methods/login/sysLogin.php
@@ -22,58 +22,62 @@
 * Coral Gables, FL, 33134, USA, or email info@colosa.com.
 *
 */
-if (isset ( $_POST ['form'] ['USER_ENV'] )) {
-  session_start ();
-  $_SESSION ['sysLogin'] = $_POST ['form'];
-  G::header ( 'location: /sys' . $_POST ['form'] ['USER_ENV'] . '/' . SYS_LANG . '/' . SYS_SKIN . '/login/sysLoginVerify' );
-  die ();
+if (isset ($_POST['form']['USER_ENV'])) {
+    session_start ();
+    $_SESSION ['sysLogin'] = $_POST ['form'];
+    G::header ('location: /sys' . $_POST ['form'] ['USER_ENV'] . '/' . SYS_LANG . '/' . SYS_SKIN .
+        '/login/sysLoginVerify');
+    die ();
 }

 //Required classes for dbArray work
 require_once ("propel/Propel.php");
 require_once ("creole/Creole.php");
-G::LoadThirdParty ( "pake", "pakeColor.class" );
-Propel::init ( PATH_CORE . "config/databases.php" );
-Creole::registerDriver ( 'dbarray', 'creole.contrib.DBArrayConnection' );
+G::LoadThirdParty ("pake", "pakeColor.class");
+Propel::init (PATH_CORE . "config/databases.php");
+Creole::registerDriver ('dbarray', 'creole.contrib.DBArrayConnection');

-function getLangFiles() {
-  $dir = PATH_LANGUAGECONT;
-  $filesArray = array ();
-  if (file_exists ( $dir )) {
-    if ($handle = opendir ( $dir )) {
-      while ( false !== ($file = readdir ( $handle )) ) {
+function getLangFiles()
+{
+    $dir = PATH_LANGUAGECONT;
+    $filesArray = array ();
+    if (file_exists ($dir)) {
+        if ($handle = opendir ($dir)) {
+            while (false !== ($file = readdir ($handle))) {

-        $fileParts = explode ( ".", $file );
-        if ($fileParts [0] == "translation") {
-          $filesArray [$fileParts [1]] = $file;
+                $fileParts = explode (".", $file);
+                if ($fileParts [0] == "translation") {
+                    $filesArray [$fileParts [1]] = $file;
+                }
+            }
+            closedir ($handle);
        }
-      }
-      closedir ( $handle );
    }
-  }
-  return $filesArray;
+    return $filesArray;
 }

-function getWorkspacesAvailable() {
-  G::LoadClass ( 'serverConfiguration' );
-  $oServerConf = & serverConf::getSingleton ();
-  $dir = PATH_DB;
-  $filesArray = array ();
-  if (file_exists ( $dir )) {
-    if ($handle = opendir ( $dir )) {
-      while ( false !== ($file = readdir ( $handle )) ) {
-        if (($file != ".") && ($file != "..")) {
-          if (file_exists ( PATH_DB . $file . '/db.php' )) {
-            if (! $oServerConf->isWSDisabled ( $file ))
-              $filesArray [] = $file;
-          }
+function getWorkspacesAvailable()
+{
+    G::LoadClass ('serverConfiguration');
+    $oServerConf = & serverConf::getSingleton ();
+    $dir = PATH_DB;
+    $filesArray = array ();
+    if (file_exists ($dir)) {
+        if ($handle = opendir ($dir)) {
+            while (false !== ($file = readdir ($handle))) {
+                if (($file != ".") && ($file != "..")) {
+                    if (file_exists (PATH_DB . $file . '/db.php')) {
+                        if (! $oServerConf->isWSDisabled ($file)) {
+                            $filesArray [] = $file;
+                        }
+                    }
+                }
+            }
+            closedir ($handle);
        }
-      }
-      closedir ( $handle );
    }
-  }
-  sort ( $filesArray, SORT_STRING );
-  return $filesArray;
+    sort ($filesArray, SORT_STRING);
+    return $filesArray;
 }
 $availableWorkspace = getWorkspacesAvailable ();

@@ -82,24 +86,25 @@ $Translations = G::getModel("Translation");
 $translationsTable = $Translations->getTranslationEnvironments();

 $availableLangArray = array ();
-$availableLangArray [] = array ('LANG_ID' => 'char', 'LANG_NAME' => 'char' );
+$availableLangArray [] = array ('LANG_ID' => 'char', 'LANG_NAME' => 'char');

-foreach ( $translationsTable as $locale ) {
-  $aFields['LANG_ID'] = $locale['LOCALE'];
-  if( $locale['COUNTRY'] != '.' )
-    $aFields['LANG_NAME'] = $locale['LANGUAGE'] . ' (' . (ucwords(strtolower($locale['COUNTRY']))) . ')';
-  else
-    $aFields['LANG_NAME'] = $locale['LANGUAGE'];
+foreach ($translationsTable as $locale) {
+    $aFields['LANG_ID'] = $locale['LOCALE'];
+    if ($locale['COUNTRY'] != '.') {
+        $aFields['LANG_NAME'] = $locale['LANGUAGE'] . ' (' . (ucwords(strtolower($locale['COUNTRY']))) . ')';
+    } else {
+        $aFields['LANG_NAME'] = $locale['LANGUAGE'];
+    }

-  $availableLangArray [] = $aFields;
+    $availableLangArray [] = $aFields;
 }


 $availableWorkspaceArray = array ();
-$availableWorkspaceArray [] = array ('ENV_ID' => 'char', 'ENV_NAME' => 'char' );
-foreach ( $availableWorkspace as $envKey => $envName ) {
-  $aFields = array ('ENV_ID' => $envName, 'ENV_NAME' => $envName );
-  $availableWorkspaceArray [] = $aFields;
+$availableWorkspaceArray [] = array ('ENV_ID' => 'char', 'ENV_NAME' => 'char');
+foreach ($availableWorkspace as $envKey => $envName) {
+    $aFields = array ('ENV_ID' => $envName, 'ENV_NAME' => $envName);
+    $availableWorkspaceArray [] = $aFields;
 }

 global $_DBArray;
@@ -109,24 +114,22 @@ $_DBArray ['availableWorkspace'] = $availableWorkspaceArray;

 $_SESSION ['_DBArray'] = $_DBArray;

-$aField ['LOGIN_VERIFY_MSG'] = G::loadTranslation ( 'LOGIN_VERIFY_MSG' );
+$aField ['LOGIN_VERIFY_MSG'] = G::loadTranslation ('LOGIN_VERIFY_MSG');
 $aField['USER_LANG'] = SYS_LANG;
 //Get Server Configuration
-G::LoadClass ( 'serverConfiguration' );
+G::LoadClass ('serverConfiguration');
 $oServerConf = & serverConf::getSingleton ();

-$G_PUBLISH = new Publisher ( );
-if ($oServerConf->getProperty ( 'LOGIN_NO_WS' )) {
-  $G_PUBLISH->AddContent ( 'xmlform', 'xmlform', 'login/sysLoginNoWS', '', $aField, 'sysLogin' );
-}
-else {
-  $G_PUBLISH->AddContent ( 'xmlform', 'xmlform', 'login/sysLogin', '', $aField, 'sysLogin' );
+$G_PUBLISH = new Publisher ();
+if ($oServerConf->getProperty ('LOGIN_NO_WS')) {
+    $G_PUBLISH->AddContent ('xmlform', 'xmlform', 'login/sysLoginNoWS', '', $aField, 'sysLogin');
+} else {
+    $G_PUBLISH->AddContent ('xmlform', 'xmlform', 'login/sysLogin', '', $aField, 'sysLogin');
 }

 //g::dump($G_PUBLISH);

-G::RenderPage ( "publish" );
-
+G::RenderPage ("publish");


 ?>
@@ -134,48 +137,48 @@ G::RenderPage ( "publish" );
    var oInfoPanel;
    var openInfoPanel = function()
    {
-    
-    // note added by carlos pacha carlos[at]colosa[dot]com pckrlos[at]gmail[dot]com
-    // the following lines of code are getting the hight of panel. Related 8021 bug
-    var hightpnl= 424;
-    var varjs = "<?php echo isset($_POST['form']['USER_ENV'])?$_POST['form']['USER_ENV']:''; ?>";
-    if(varjs !=' ')
-      hightpnl= 330;
-    
-      var oInfoPanel = new leimnud.module.panel();
-      oInfoPanel.options = {
-        size    :{w:500,h:hightpnl},
-        position:{x:0,y:0,center:true},
-        title   :'System Information',
-        theme   :'processmaker',
-        control :{
-          close :true,
-          drag  :false
-        },
-        fx:{
-          modal:true
+        // note added by carlos pacha carlos[at]colosa[dot]com pckrlos[at]gmail[dot]com
+        // the following lines of code are getting the hight of panel. Related 8021 bug
+        var hightpnl= 424;
+        var varjs = "<?php echo isset($_POST['form']['USER_ENV'])?$_POST['form']['USER_ENV']:''; ?>";
+        if (varjs !=' ') {
+            hightpnl= 330;
        }
-      };
-      oInfoPanel.setStyle = {modal: {
-        backgroundColor: 'white'
-      }};
-      oInfoPanel.make();

-      var oRPC = new leimnud.module.rpc.xmlhttp({
-        url   : '../login/dbInfo',
-        //async : false,
-        method: 'POST',
-        args  : ''
-      });
+        var oInfoPanel = new leimnud.module.panel();
+        oInfoPanel.options = {
+            size    :{w:500,h:hightpnl},
+            position:{x:0,y:0,center:true},
+            title   :'System Information',
+            theme   :'processmaker',
+            control :{
+                close :true,
+                drag  :false
+            },
+            fx:{
+                modal:true
+            }
+        };
+        oInfoPanel.setStyle = {modal: {
+            backgroundColor: 'white'
+        }};
+        oInfoPanel.make();

-      oRPC.callback = function(oRPC) {
-      oInfoPanel.loader.hide();
-      var scs = oRPC.xmlhttp.responseText.extractScript();
-      oInfoPanel.addContent(oRPC.xmlhttp.responseText);
-      scs.evalScript();
-      }.extend(this);
+        var oRPC = new leimnud.module.rpc.xmlhttp({
+            url   : '../login/dbInfo',
+            //async : false,
+            method: 'POST',
+            args  : ''
+        });

-      oRPC.make();
-      oInfoPanel.addContent(oRPC.xmlhttp.responseText);
+        oRPC.callback = function(oRPC) {
+            oInfoPanel.loader.hide();
+            var scs = oRPC.xmlhttp.responseText.extractScript();
+            oInfoPanel.addContent(oRPC.xmlhttp.responseText);
+            scs.evalScript();
+        }.extend(this);
+
+        oRPC.make();
+        oInfoPanel.addContent(oRPC.xmlhttp.responseText);
    };
 </script>
--- a/workflow/engine/templates/admin/system.js
+++ b/workflow/engine/templates/admin/system.js
@@ -122,10 +122,7 @@ Ext.onReady(function(){
        bodyStyle:'padding:5px',
        frame: true,
        height: 'auto',
-        html:'The language that is set by default applies directly when the domain is entered '+
-            ' (eg.- http://127.0.0.1:8081), the system reads the configuration and redirects '+
-            '  the link to the selected language (eg.- http://127.0.0.1:8081/sys/en/classic/login/login),'+
-            ' it should be emphasized that this configuration is for all environments.'
+        html: _('ID_MESSAGE_SYSTEM')+" "+_('ID_MESSAGE_SYSTEM2')
      }
    ]
  });
--- a/workflow/engine/templates/setup/loginSettings.js
+++ b/workflow/engine/templates/setup/loginSettings.js
@@ -67,8 +67,7 @@ Ext.onReady(function(){
        bodyStyle:'padding:5px',
        frame: true,
        height: 'auto',
-        html:'The default language that is configured in this place is for the "dropdown" of the '+
-            'languages that are displaying on the login screen, this configuration is set for each workspace.'
+        html: _('ID_MESSAGE_LOGIN')
      }
    ],
    buttons : [saveButton]