Uncommited changes synced

[Pman.Admin] / Translations.php

diff --git a/Translations.php b/Translations.php
index cf9525a..a9ce759 100644 (file)
--- a/Translations.php
+++ b/Translations.php
@@ -41,8 +41,35 @@ class Pman_Admin_Translations extends Pman
     }
     
     
-    function get()
+    function get($module, $opts = Array())
     {
+        
+        if (!empty($module)) {
+            $this->init();
+            //DB_DataObject::debugLevel(1);
+            require_once 'Services/JSON.php';
+            $d = DB_DataObject::factory('translations');
+            $d->module = $module;
+            $d->selectAdd();
+            $d->selectAdd('distinct(tlang) as tlang');
+            header('Content-type: text/javascript');
+            $langs= $d->fetchAll('tlang');
+            foreach($langs as $lang) {
+                // output the translations strings file..
+                
+                    
+                $this->loadOriginalStrings($module);
+                
+                $data = $this->loadTranslateDB($lang,$module);
+                
+                $j = new Services_JSON();
+                echo "_T.{$lang}= Roo.apply( _T.{$lang} || { }, " .  $j->stringify($data, null, 4) . ");\n";
+                
+            }
+            exit;
+            
+        }
+        
         // load and parse json file containing all translations...
         if (isset($_REQUEST['id'])) {
             return $this->post();
@@ -62,10 +89,12 @@ class Pman_Admin_Translations extends Pman
         $module = $_REQUEST['module'];
         
         
-         $this->loadOriginalStrings($lang,$module); // what needs translating..
-        
-        
+         $this->loadOriginalStrings($module); // what needs translating..
         
+        $ff = $this->bootLoader;
+        if (empty($ff->Pman['public_cache_dir'])) {
+            $this->jerr("public_cache_dir has not been set up");
+        }
         
         
         
@@ -100,12 +129,12 @@ class Pman_Admin_Translations extends Pman
         
     }
     
-    function post() 
+    function post($v) 
     {
          
-        $fm = HTML_FlexyFramework::get();
-        $enable = explode(',',   $fm->enable);
-        if (empty($_REQUEST['module']) || !in_array($_REQUEST['module'], $enable)) {
+         
+        
+        if (empty($_REQUEST['module']) || !in_array($_REQUEST['module'], $this->modulesList())) {
             $this->jerr("NO MODULE / INVALID MODULE");
         }
         
@@ -113,13 +142,15 @@ class Pman_Admin_Translations extends Pman
         //txt  é \85ç\9b®
         list($lang,$id) = explode('/', $_REQUEST['id']);
         
-        $this->loadOriginalStrings();
+        $this->loadOriginalStrings($_REQUEST['module']);
         
         $data = $this->loadTranslateDB($lang,$_REQUEST['module']);
         
         $data[$id] = $_REQUEST['txt'];
         
         if (!isset($this->originalKeys[$id])) {
+            
+            
             $this->jerr("invalid key ?");
         }
         
@@ -138,7 +169,7 @@ class Pman_Admin_Translations extends Pman
      * load strings that need translating..
      */
     
-    function loadOriginalStrings($lang, $module)
+    function loadOriginalStrings($module)
     {
         // since this can handle errors better.!!?
         $info = $this->moduleJavascriptFilesInfo($module);
@@ -152,7 +183,9 @@ class Pman_Admin_Translations extends Pman
         
         require_once 'Services/JSON.php';
         $j = new Services_JSON();
-        $this->original = $j->decode('{'. file_get_contents($tfile).'}');
+        $this->original = (array) $j->decode('{'. file_get_contents($tfile).'}');
+        ksort($this->original);
+
         $this->originalKeys = array();
         
         // 
@@ -185,8 +218,9 @@ class Pman_Admin_Translations extends Pman
         //DB_DataObject::debugLevel(1);
         $d = DB_DataObject::factory('translations');
         $d->module = $module;
-        $d->lang = $lang;
-        
+        $d->tlang = $lang;
+        $d->whereAdd('LENGTH(tval) > 0');
+        $ret = array();
         
         if ($d->count()) {
             // since key includes file 
@@ -216,13 +250,13 @@ class Pman_Admin_Translations extends Pman
             if (!isset($this->originalKeys[$k])) {
                 continue;
             }
+            
             // it's current..
             $this->saveTranslateDB($lang, $module, $this->originalKeys[$k], $k, $v);
             $ret[$k] = $v;
             
             
         }
-        
         return $ret;
         
          
@@ -232,7 +266,7 @@ class Pman_Admin_Translations extends Pman
     {
         $d = DB_DataObject::factory('translations');
         $d->module = $module;
-        $d->lang = $lang;
+        $d->tlang = $lang;
         $d->tfile = $tfile;
         $d->tkey = $tkey;
         if ($d->find(true)) {
@@ -306,6 +340,6 @@ class Pman_Admin_Translations extends Pman
         //$this->writeTrans($lang);
     }
      
-    
+     
     
 }
\ No newline at end of file