fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correccion de conflictos

Browse Source
This commit is contained in:
Brayan Osmar Pereyra Suxo
2014-05-29 15:38:10 -04:00
parent db6c8fb6f8
commit 8800f47343
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
workflow/engine/classes/model/Translation.php
View File

@@ -92,12 +92,12 @@ class Translation extends BaseTranslation
"$dateFrom", "$dateFrom",
Criteria::GREATER_EQUAL Criteria::GREATER_EQUAL
)->addAnd( )->addAnd(
$oCriteria->getNewCriterion( $oCriteria->getNewCriterion(
TranslationPeer::TRN_UPDATE_DATE, TranslationPeer::TRN_UPDATE_DATE,
"$dateTo", "$dateTo",
Criteria::LESS_EQUAL Criteria::LESS_EQUAL
)
) )
)
); );
} }
// end filter // end filter
@@ -124,7 +124,8 @@ class Translation extends BaseTranslation
while ($rs->next()) { while ($rs->next()) {
$rows[] = $rs->getRow(); $rows[] = $rs->getRow();
} }
$result = new StdClass;
$result = new StdClass();
$result->data = $rows; $result->data = $rows;
$result->totalCount = $totalCount; $result->totalCount = $totalCount;
@@ -179,10 +180,10 @@ class Translation extends BaseTranslation
//$json = new Services_JSON(); DEPRECATED //$json = new Services_JSON(); DEPRECATED
$f = fopen( $cacheFileJS, 'w' ); $f = fopen( $cacheFileJS, 'w' );
if ($f == false) { if ($f == false) {
error_log("Error: Cannot write into cachefilejs: $cacheFileJS\n"); error_log("Error: Cannot write into cachefilejs: $cacheFileJS\n");
} else { } else {
fwrite( $f, "var G_STRINGS =" . Bootstrap::json_encode( $translationJS ) . ";\n"); fwrite( $f, "var G_STRINGS =" . Bootstrap::json_encode( $translationJS ) . ";\n");
fclose( $f ); fclose( $f );
} }
$res['cacheFile'] = $cacheFile; $res['cacheFile'] = $cacheFile;
@@ -214,7 +215,7 @@ class Translation extends BaseTranslation
foreach ($tranlations as $key => $row) { foreach ($tranlations as $key => $row) {
if ($row->getTrnCategory() === 'LABEL') { if ($row->getTrnCategory() === 'LABEL') {
$translation[$row->getTrnLang()][$row->getTrnId()] = $row->getTrnValue(); $translation[$row->getTrnLang()][$row->getTrnId()] = $row->getTrnValue();
} }
} }
@@ -227,10 +228,10 @@ class Translation extends BaseTranslation
$f = fopen( $cacheFileMafe, 'w' ); $f = fopen( $cacheFileMafe, 'w' );
if ($f == false) { if ($f == false) {
error_log("Error: Cannot write into cacheFileMafe: $cacheFileMafe\n"); error_log("Error: Cannot write into cacheFileMafe: $cacheFileMafe\n");
} else { } else {
fwrite( $f, "var __TRANSLATIONMAFE = " . Bootstrap::json_encode( $translation ) . ";\n"); fwrite( $f, "var __TRANSLATIONMAFE = " . Bootstrap::json_encode( $translation ) . ";\n");
fclose( $f ); fclose( $f );
} }
$res['cacheFileMafe'] = $cacheFileMafe; $res['cacheFileMafe'] = $cacheFileMafe;
@@ -621,7 +622,7 @@ class Translation extends BaseTranslation
} }
return false; return false;
} }
public function generateTransaltionMafe ($lang='en') public function generateTransaltionMafe ($lang='en')
{ {
if (!file_exists(PATH_TRUNK .'vendor/colosa/MichelangeloFE/' . 'labels.php')) { if (!file_exists(PATH_TRUNK .'vendor/colosa/MichelangeloFE/' . 'labels.php')) {
@@ -635,4 +636,3 @@ class Translation extends BaseTranslation
} }
} }
} }