lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Do not output a translation if api return error.

Browse Source
This commit is contained in:
Laurent Destailleur 2010-07-09 23:13:27 +00:00
parent 3e20c737d1
commit a70595d969
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dev/translation/langAutoParser.class.php
View File

@ -14,10 +14,12 @@
class langAutoParser { class langAutoParser {
private $translatedFiles = array(); private $translatedFiles = array();
private $destLang = string; private $destLang = '';
private $refLang = string; private $refLang = '';
private $langDir = string; private $langDir = '';
private $limittofile = string; private $limittofile = '';
private $time;
private $time_end;
private $outputpagecode = 'UTF-8'; private $outputpagecode = 'UTF-8';
//private $outputpagecode = 'ISO-8859-1'; //private $outputpagecode = 'ISO-8859-1';
const DIR_SEPARATOR = '/'; const DIR_SEPARATOR = '/';
@ -74,6 +76,7 @@ FILE_SKIP_EMPTY_LINES);
$this->updateTranslationFile($destPath,$file); $this->updateTranslationFile($destPath,$file);
echo "New translated lines: " . $newlines . "<br>\n"; echo "New translated lines: " . $newlines . "<br>\n";
$this->time_end = date('Y-m-d H:i:s');
#if ($counter ==3) die('fim'); #if ($counter ==3) die('fim');
} }
} }
@ -90,7 +93,7 @@ FILE_SKIP_EMPTY_LINES);
foreach( $this->translatedFiles[$file] as $line) { foreach( $this->translatedFiles[$file] as $line) {
fwrite($fp, $line . "\r\n"); fwrite($fp, $line . "\r\n");
} }
fwrite($fp, "// STOP - Lines generated via autotranslator.php tool (".$this->time.").\r\n"); fwrite($fp, "// STOP - Lines generated via autotranslator.php tool (".$this->time_end.").\r\n");
fclose($fp); fclose($fp);
} }
return; return;
@ -113,10 +116,11 @@ FILE_SKIP_EMPTY_LINES);
* @param unknown_type $content Existing content of dest file * @param unknown_type $content Existing content of dest file
* @param unknown_type $file File name translated (xxxx.lang) * @param unknown_type $file File name translated (xxxx.lang)
* @param unknown_type $key Key to translate * @param unknown_type $key Key to translate
* @param unknown_type $value Existing key in source file * @param unknown_type $value Existing value in source file
* @return int 0=Nothing translated, 1=Record translated * @return int 0=Nothing translated, 1=Record translated
*/ */
private function translateFileLine($content,$file,$key,$value){ private function translateFileLine($content,$file,$key,$value)
{
//print "key =".$key."\n"; //print "key =".$key."\n";
foreach( $content as $line ) { foreach( $content as $line ) {
@ -130,11 +134,15 @@ FILE_SKIP_EMPTY_LINES);
} }
} }
if ($key == 'CHARSET') $val=$this->outputpagecode;
else if (preg_match('/^Format/',$key)) $val=$value;
else
{
// If not translated then translate // If not translated then translate
if ($this->outputpagecode == 'UTF-8') $val=$this->translateTexts(array($value),substr($this->refLang,0,2),substr($this->destLang,0,2)); if ($this->outputpagecode == 'UTF-8') $val=$this->translateTexts(array($value),substr($this->refLang,0,2),substr($this->destLang,0,2));
else $val=utf8_decode($this->translateTexts(array($value),substr($this->refLang,0,2),substr($this->destLang,0,2))); else $val=utf8_decode($this->translateTexts(array($value),substr($this->refLang,0,2),substr($this->destLang,0,2)));
}
if ($key == 'CHARSET') $val=$this->outputpagecode;
$val=trim($val); $val=trim($val);
if (empty($val)) return 0; if (empty($val)) return 0;