I18n.php

[Pman.Core] / I18n.php

diff --git a/I18n.php b/I18n.php
index 3d616c8..846094d 100644 (file)
--- a/I18n.php
+++ b/I18n.php
@@ -47,19 +47,22 @@
  */
 require_once 'Pman.php';
 
-class Pman_Core_i18N extends Pman
+class Pman_Core_I18N extends Pman
 {
  
     
     // these are the default languages we support.
     // they will allways be overlaid with the current configuration (via getAuth)
+    // THESE WILL ALLWAYS BE UPPERCASE!!!
     var $cfg = array(
         // translated versions availalable
+        
         't' => array(
             'en', 'zh_CN',   'zh_HK', 
         ),
         // languages available
         'l' => array(
+            
             'en', 'zh_CN',   'zh_HK',  'zh_TW', 'th', 'ko', 'ja', 'ms', 
             'id', // indonesian
             'tl', // tagalog
@@ -90,17 +93,17 @@ class Pman_Core_i18N extends Pman
         //}
         $this->authUser = $au;
         
-        $opts = PEAR::getStaticProperty('Pman_Core_I18N', 'options');
-        if (empty($opts)) {
-            $opts = PEAR::getStaticProperty('Pman_I18N', 'options');
-        }
-        $opts = empty($opts)  ?  array() : $opts;
+        $ff= HTML_FlexyFramework::get();
+         
+        
+        $opts = empty($ff->Pman_Core_I18N) ? (empty($ff->Pman_I18N) ? array() : $ff->Pman_I18N)  : $ff->Pman_Core_I18N;
         
+        $i = DB_DataObject::Factory('I18n');
         // load the cofiguration
         foreach($opts as $k=>$v) {
             
-            if ($v == '*') {
-                $this->cfg[$k] = $this->getDefaultCfg($k);
+            if ($v == '*') { // everything..
+                $this->cfg[$k] = $i->available($k);
                 continue;
             }
             $this->cfg[$k] = is_array($v) ? $v  : explode(',', $v);
@@ -135,6 +138,7 @@ class Pman_Core_i18N extends Pman
                 $ret[] = '**';
                 break;
         }
+        
         foreach ($ret as $k=>$v) {
             $ret[$k] = strtoupper($v);
         }
@@ -154,9 +158,8 @@ class Pman_Core_i18N extends Pman
             case 'BuildDB':
             // by admin only?!?
                 //DB_DataObject::debugLevel(1);
-                $this->buildDb('l');
-                $this->buildDb('c');
-                $this->buildDb('m');
+                $i = DB_DataObject::Factory('I18n');
+                $i->buildDb();
                 die("DONE!");
                 break;
                   
@@ -178,19 +181,20 @@ class Pman_Core_i18N extends Pman
         require_once 'I18Nv2/Language.php';
         require_once 'I18Nv2/Currency.php';
         
-        $langs = $this->cfg['l'];
-        var_dump($langs);exit;
+        $langs = $this->cfg['t'];
+       // var_dump($langs);exit;
         $ar = array();
         foreach($langs as $lang)
         {
-            $lang = array_shift(explode('_', strtoupper($lang)));
+            $rlang = array_shift(explode('_', strtoupper($lang)));
             
             $ar[$lang] = array(
-                'l' => $this->objToList(new I18Nv2_Language($lang, 'UTF-8')),
-                'c' => $this->objToList(new I18Nv2_Country($lang, 'UTF-8')),
-                'm' => $this->objToList(new I18Nv2_Currency($lang, 'UTF-8'))
+                'l' => $this->objToList('l', new I18Nv2_Language($rlang, 'UTF-8')),
+                'c' => $this->objToList('c', new I18Nv2_Country($rlang, 'UTF-8')),
+                'm' => $this->objToList('m', new I18Nv2_Currency($rlang, 'UTF-8'))
             );
         }
+        //echo '<PRE>';print_r($ar);
         header('Content-type: text/javascript');
         echo 'Pman.I18n.Data = ' .  json_encode($ar);
         exit;
@@ -198,12 +202,26 @@ class Pman_Core_i18N extends Pman
         
         
     }
-    function objToList($obj) {
+    function objToList($type, $obj) {
         $ret = array();
-        foreach($obj->codes as $k=>$v) {
+         
+         
+        foreach($this->cfg[$type] as $k) {
+            $sub = false;
+            
+            if (strpos($k, '_') !== false) {
+                $bits = explode('_', $k);
+                $k = array_shift($bits);
+                $sub = array_shift($bits);
+            }
+            $v = $k == '**' ? 'Other' : $obj->getName($k);
+            
+            if ($sub) {
+                $v .= ' ('.$sub.')';
+            }
             
             $ret[] = array(
-                'code'=> $k , 
+                'code'=>   ($type=='l' ? strtolower($k) : strtoupper($k)) . ($sub ? '_'.strtoupper($sub) : ''), 
                 'title' => $v
             );
         }
@@ -264,48 +282,6 @@ class Pman_Core_i18N extends Pman
         
         
     }
-    
-    
-    
-    function buildDB($ltype= false, $inlang= false )
-    {
-        if ($ltype === false) {
-            
-            die("OOPS NO LTYPE");
-        }
-        if ($inlang == '**') {
-            return; // dont bother building generic..
-        }
-        if ($inlang === false) {
-            foreach( $this->cfg['t'] as $l) {
-                $this->buildDB($ltype, $l);
-            }
-            return;
-        }
-        
-        $list =  $this->getDefaultCfg($ltype);
-        
-        DB_DataObject::debugLevel(1);
-        
-        foreach($list as $lkey) {
-            $x = DB_DataObject::factory('i18n');
-            $x->ltype = $ltype;
-            $x->lkey = $lkey;
-            $x->inlang= $inlang;
-            if ($x->find(true)) {
-                $xx= clone($x);
-                $x->lval = $this->translate($inlang, $ltype, $lkey);
-                $x->update($xx);
-                continue;
-            }
-            $x->lval = $this->translate($inlang, $ltype, $lkey);
-            $x->insert();
-            
-        }
-        
-        
-        
-        
-    }
+     
     
 }
\ No newline at end of file