From 6bc8b9574dd3a69621c5d84a346f8b20618f8f8a Mon Sep 17 00:00:00 2001
From: Erik Amaru Ortiz <erik@colosa.com>
Date: Fri, 21 Jan 2011 16:26:36 +0000
Subject: [PATCH] fixed a language import a export bug

---
 workflow/engine/classes/class.languages.php        | 5 +++--
 workflow/engine/methods/setup/languages_Export.php | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/workflow/engine/classes/class.languages.php b/workflow/engine/classes/class.languages.php
index 4d2f7e8b0..5d2953793 100644
--- a/workflow/engine/classes/class.languages.php
+++ b/workflow/engine/classes/class.languages.php
@@ -330,8 +330,9 @@ class languages {
       $oLanguage = new Language();
       $oLanguage->update(array('LAN_ID' => $languageID, 'LAN_ENABLED' => '1'));
 
-      Translation::generateFileTranslation($LOCALE);
-      Translation::addTranslationEnvironment($LOCALE, $POHeaders, $countItemsSuccess);
+      $trn = new Translation();
+      $trn->generateFileTranslation($LOCALE);
+      $trn->addTranslationEnvironment($LOCALE, $POHeaders, $countItemsSuccess);
       
       $this->log( "checking and updating CONTENT");
       $content = new Content();
diff --git a/workflow/engine/methods/setup/languages_Export.php b/workflow/engine/methods/setup/languages_Export.php
index 23544dee6..d8ab800ce 100644
--- a/workflow/engine/methods/setup/languages_Export.php
+++ b/workflow/engine/methods/setup/languages_Export.php
@@ -223,7 +223,7 @@ foreach ($aXMLForms as $xmlFormPath) {
     
     $aMsgids[$msgid] = true;
     
-    //if it is a dropdown field
+    //if this node has options child nodes
     if( isset($arrayNode[$_BASE_LANG]) && isset($arrayNode[$_BASE_LANG][0]) && isset($arrayNode[$_BASE_LANG][0]['option']) ){
       
       $originOptionNode = $arrayNode[$_BASE_LANG][0]['option']; //get the options
@@ -256,8 +256,8 @@ foreach ($aXMLForms as $xmlFormPath) {
             $targetOptionValue = $originOptionValue;
           }
             
-          $targetOptionValue = ($targetOptionValue != '') ? $targetOptionValue : "''"; 
-          $optionName = ($optionName != '') ? $optionName : "''";
+          //$targetOptionValue = ($targetOptionValue != '') ? $targetOptionValue : "''"; 
+          //$optionName = ($optionName != '') ? $optionName : "''";
           
           $msgid = '[' . $xmlFormFile . '?' . $nodeName  . '-' . $optionName . ']';
           /*g::dump($xmlFormFile . '?' . $nodeName . '-'. $originOptionValue);