I18n.php

[Pman.Core] / I18n.php

diff --git a/I18n.php b/I18n.php
index 6f51c4d..bcf9c79 100644 (file)
--- a/I18n.php
+++ b/I18n.php
@@ -47,7 +47,7 @@
  */
 require_once 'Pman.php';
 
-class Pman_Core_i18N extends Pman
+class Pman_Core_I18N extends Pman
 {
  
     
@@ -93,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->availableCodes($k);
                 continue;
             }
             $this->cfg[$k] = is_array($v) ? $v  : explode(',', $v);
@@ -114,63 +114,17 @@ class Pman_Core_i18N extends Pman
         
         return true;
     }
-    // returns a list of all countries..
-    function getDefaultCfg($t) {
-        $ret = array();
-        switch ($t) {
-            case 'c':
-                require_once 'I18Nv2/Country.php';
-                
-                $c = new I18Nv2_Country('en');
-                $ret =  array_keys($c->codes);
-                $ret[] = '**';
-                break;
-            case 'l':
-                require_once 'I18Nv2/Language.php';
-                $c = new I18Nv2_Language('en');
-                $ret =  array_keys($c->codes);
-                $ret[] = '**';
-                break;
-            case 'm':
-                require_once 'I18Nv2/Currency.php';
-                $c = new I18Nv2_Currency('en');
-                $ret =  array_keys($c->codes);
-                $ret[] = '**';
-                break;
-        }
-        
-        foreach ($ret as $k=>$v) {
-            $ret[$k] = strtoupper($v);
-        }
-        
-        
-        return $ret;
-    }
+     
     
      
     function get($s ='')
     {
         
+        $i = DB_DataObject::Factory('I18n');
+        $i->buildDb();
+        $this->outputJavascript();
+    
         
-        switch ($s)
-        {
-            
-            case 'BuildDB':
-            // by admin only?!?
-                //DB_DataObject::debugLevel(1);
-                $this->buildDb('l');
-                $this->buildDb('c');
-                $this->buildDb('m');
-                die("DONE!");
-                break;
-                  
-            default: 
-                $this->outputJavascript();
-                // output javascript..
-                $this->jerr("ERROR");
-        }
-         
-        $this->jdata($ret);
         exit;
         
     }
@@ -195,7 +149,7 @@ class Pman_Core_i18N extends Pman
                 'm' => $this->objToList('m', new I18Nv2_Currency($rlang, 'UTF-8'))
             );
         }
-        echo '<PRE>';print_r($ar);
+        //echo '<PRE>';print_r($ar);
         header('Content-type: text/javascript');
         echo 'Pman.I18n.Data = ' .  json_encode($ar);
         exit;
@@ -205,11 +159,11 @@ class Pman_Core_i18N extends Pman
     }
     function objToList($type, $obj) {
         $ret = array();
-        
-        $country = new I18Nv2_Country($obj->language, 'UTF-8')
-        
+         
+         
         foreach($this->cfg[$type] as $k) {
             $sub = false;
+            
             if (strpos($k, '_') !== false) {
                 $bits = explode('_', $k);
                 $k = array_shift($bits);
@@ -218,11 +172,11 @@ class Pman_Core_i18N extends Pman
             $v = $k == '**' ? 'Other' : $obj->getName($k);
             
             if ($sub) {
-                $v .= ' ('. $country->getName($sub).')';
+                $v .= ' ('.$sub.')';
             }
             
             $ret[] = array(
-                'code'=>   $type=='l' ? strtolower($k) : strtoupper($k), 
+                'code'=>   ($type=='l' ? strtolower($k) : strtoupper($k)) . ($sub ? '_'.strtoupper($sub) : ''), 
                 'title' => $v
             );
         }
@@ -283,48 +237,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