Download as
Browse Code »

Commit 073cbe16c8c14c2011ba256cbcadc084951a2b02

Authored by Adriano Vieira
1 parent 21f0dec0
Exists in master and in 1 other branch 3.1

Gerente "trunk" atualizado 

- dados básicos para instalador do idioma selecionado ou, caso não tenha, usa do idioma padrão
- melhor definição do idioma padrão

git-svn-id: http://svn.softwarepublico.gov.br/svn/cacic/cacic/trunk/gerente@401 fecfc0c7-e812-0410-ae72-849f08638ee7
Showing 2 changed files with 10 additions and 4 deletions   Show diff stats
include/define.php
  Diff comments   View file @073cbe1
@@ -108,7 +108,7 @@ defined( 'CACIC' ) or die( 'Acesso restrito (Restricted access)!' ); @@ -108,7 +108,7 @@ defined( 'CACIC' ) or die( 'Acesso restrito (Restricted access)!' );
108 /* 108 /*
109 * CACIC application language 109 * CACIC application language
110 */ 110 */
111 - if(isset($cacic_language)) 111 + if(isset($cacic_language) and !empty($cacic_language))
112 define( 'CACIC_LANGUAGE', $cacic_language ); 112 define( 'CACIC_LANGUAGE', $cacic_language );
113 else 113 else
114 define( 'CACIC_LANGUAGE', 'pt_BR'); 114 define( 'CACIC_LANGUAGE', 'pt_BR');
instalador/classes/install.ajax.php
  Diff comments   View file @073cbe1
@@ -185,8 +185,11 @@ class InstallAjax { @@ -185,8 +185,11 @@ class InstallAjax {
185 } 185 }
186 $fileName = $cacic_config['path'].'language'.CACIC_DS.$cacic_config['cacic_language'].CACIC_DS.'sql'.CACIC_DS.CACIC_SQLFILE_STDDATA; 186 $fileName = $cacic_config['path'].'language'.CACIC_DS.$cacic_config['cacic_language'].CACIC_DS.'sql'.CACIC_DS.CACIC_SQLFILE_STDDATA;
187 if(!is_readable($fileName)) { 187 if(!is_readable($fileName)) {
188 - $dadosOK = false;  
189 - $msg .= '<span class="Erro">['.InstallAjax::_('kciq_msg error', '',2)."! ] - ".InstallAjax::_('kciq_msg inst database sqldata not defined',array(CACIC_SQLFILE_STDDATA)).'</span><br>'; 188 + $fileName = $cacic_config['path'].'language'.CACIC_DS.CACIC_LANGUAGE.CACIC_DS.'sql'.CACIC_DS.CACIC_SQLFILE_STDDATA;
  189 + if(!is_readable($fileName)) {
  190 + $dadosOK = false;
  191 + $msg .= '<span class="Erro">['.InstallAjax::_('kciq_msg error', '',2)."! ] - ".InstallAjax::_('kciq_msg inst database sqldata not defined',array(CACIC_SQLFILE_STDDATA)).'</span><br>';
  192 + }
190 } 193 }
191 if($cacic_config['dbdet']['demo'] == 'demo') { 194 if($cacic_config['dbdet']['demo'] == 'demo') {
192 $fileName = $cacic_config['path'].'instalador'.CACIC_DS.'sql'.CACIC_DS.CACIC_SQLFILE_DEMODATA; 195 $fileName = $cacic_config['path'].'instalador'.CACIC_DS.'sql'.CACIC_DS.CACIC_SQLFILE_DEMODATA;
@@ -547,9 +550,12 @@ class InstallAjax { @@ -547,9 +550,12 @@ class InstallAjax {
547 550
548 if($installType == 'createDB') { 551 if($installType == 'createDB') {
549 /* 552 /*
550 - * Inclui dados básicos para CACIC 553 + * Inclui dados básicos para CACIC, do idioma selecionado ou, caso não exista, do idioma padrão
551 */ 554 */
552 $fileName = $cacic_config['path'].'language'.CACIC_DS.$cacic_config['cacic_language'].CACIC_DS.'sql'.CACIC_DS.CACIC_SQLFILE_STDDATA; 555 $fileName = $cacic_config['path'].'language'.CACIC_DS.$cacic_config['cacic_language'].CACIC_DS.'sql'.CACIC_DS.CACIC_SQLFILE_STDDATA;
  556 + if(!is_readable($fileName))
  557 + $fileName = $cacic_config['path'].'language'.CACIC_DS.CACIC_LANGUAGE.CACIC_DS.'sql'.CACIC_DS.CACIC_SQLFILE_STDDATA;
  558 +
553 if(is_readable($fileName)) { 559 if(is_readable($fileName)) {
554 $cacic_sql_dadosbase = $fileName; 560 $cacic_sql_dadosbase = $fileName;
555 echo "<br>".InstallAjax::_('kciq_msg inst insert basic data',array($cacic_config['db_name'])); 561 echo "<br>".InstallAjax::_('kciq_msg inst insert basic data',array($cacic_config['db_name']));