diff --git a/workflow/engine/classes/class.wsTools.php b/workflow/engine/classes/class.wsTools.php index f33a8ec89..aa7e49cb8 100644 --- a/workflow/engine/classes/class.wsTools.php +++ b/workflow/engine/classes/class.wsTools.php @@ -271,9 +271,8 @@ class workspaceTools { */ public function upgradeTranslation($first = true) { $this->initPropel(true); - G::LoadClass('languages'); + require('classes/model/Language.php'); G::LoadThirdParty('pear/json', 'class.json'); - $languages = new languages(); foreach (System::listPoFiles() as $poFile) { $poName = basename($poFile); $names = explode(".", basename($poFile)); @@ -281,10 +280,10 @@ class workspaceTools { $langid = array_pop($names); if (strcasecmp($langid, "en") == 0) { CLI::logging("Updating database translations with $poName\n"); - $languages->importLanguage($poFile, false, true); + Language::import($poFile, false, true); } else if ($first) { CLI::logging("Updating XML form translations with $poName\n"); - $languages->importLanguage($poFile, true, false); + Language::import($poFile, true, false); } } } diff --git a/workflow/engine/classes/model/Language.php b/workflow/engine/classes/model/Language.php index 44feabe22..75844812f 100644 --- a/workflow/engine/classes/model/Language.php +++ b/workflow/engine/classes/model/Language.php @@ -126,26 +126,6 @@ class Language extends BaseLanguage { $oDataset->next(); return $oDataset->getRow(); } - - - /* - * Log - * @param text $text - * @return void - */ - function log ( $text ) - { - $logDir = PATH_DATA . 'log'; - if (!file_exists($logDir)) - if (!mkdir($logDir)) - return; - $logFile = "$logDir/query.log"; - $fp = fopen ( $logFile, 'a+' ); - if ($fp !== false) { - fwrite ( $fp, date("Y-m-d H:i:s") . " " . $text . "\n" ); - fclose ( $fp ); - } - } /* * Import a language file @@ -285,7 +265,6 @@ class Language extends BaseLanguage { $trn->generateFileTranslation($LOCALE); $trn->addTranslationEnvironment($LOCALE, $POHeaders, $countItemsSuccess); - $this->log( "checking and updating CONTENT"); $content = new Content(); $content->regenerateContent($languageID); @@ -583,4 +562,4 @@ class Language extends BaseLanguage { } } return false; - } \ No newline at end of file + }