DataObjects/pman.links.ini

[Pman.Core] / I18n.php

diff --git a/I18n.php b/I18n.php
index 9f345f4..afd8950 100644 (file)
--- a/I18n.php
+++ b/I18n.php
@@ -93,11 +93,11 @@ 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;
+        
         
         // load the cofiguration
         foreach($opts as $k=>$v) {
@@ -205,11 +205,11 @@ class Pman_Core_i18N extends Pman
     }
     function objToList($type, $obj) {
         $ret = array();
-        echo '<PRE>';print_r($this->cfg);
-        
+         
          
         foreach($this->cfg[$type] as $k) {
             $sub = false;
+            
             if (strpos($k, '_') !== false) {
                 $bits = explode('_', $k);
                 $k = array_shift($bits);
@@ -222,7 +222,7 @@ class Pman_Core_i18N extends Pman
             }
             
             $ret[] = array(
-                'code'=>   $type=='l' ? strtolower($k) : strtoupper($k), 
+                'code'=>   ($type=='l' ? strtolower($k) : strtoupper($k)) . ($sub ? '_'.strtoupper($sub) : ''), 
                 'title' => $v
             );
         }