X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FI18n.php;h=aca38a4e79dec5c85b4edddccb67393d7d25d9d6;hb=1da188f769fd540f5863ffe801c3fc0e65c23cd5;hp=46ba68b36d8397a7ef2c89be98db783dabb74f55;hpb=ca11862adbd675fb41c88bc2527e011a65fa1c74;p=Pman.Core

diff --git a/DataObjects/I18n.php b/DataObjects/I18n.php
index 46ba68b3..aca38a4e 100644
--- a/DataObjects/I18n.php
+++ b/DataObjects/I18n.php
@@ -52,10 +52,11 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
         'm' => array(
             'USD', 'HKD', 'GBP', 'CNY', 'SGD', 'JPY'
         ),
+        'p' => '*',
         'add_l'=> array(), // key -> value additional languages... 
         'add_c'=> array(), // additional countries...(eg. '-R' => 'Regional' )
         'add_m'=> array(), // additional currencies...
-        'add_t'=> array(), // additional currencies...
+        'add_p'=> array(), // additional currencies...
 
         
     );
@@ -250,12 +251,12 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
                 }
                 $ret[] = '**';
                 break;
-            case 't':
+            case 'p':
                 require_once 'I18Nv2/PhonePrefix.php';
                 $c = new I18Nv2_PhonePrefix('en');
                 $ret =  array_keys($c->codes);
-                if (!empty($cfg['add_t'])) {
-                    $ret = array_merge($ret, array_keys($cfg['add_m']));
+                if (!empty($cfg['add_p'])) {
+                    $ret = array_merge($ret, array_keys($cfg['add_p']));
                 }
                 $ret[] = '**';
                 break;
@@ -289,7 +290,7 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
 //            $this->buildDB('c');
 //            $this->buildDB('l');
 //            $this->buildDB('m');
-            $this->buildDB('t');
+            $this->buildDB('p');
             return;
         }
         
@@ -318,7 +319,6 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
         $complete = $x->fetchAll('lkey');
         
         $list =  $this->availableCodes($ltype);
-        //echo '<PRE>'; print_r($list); 
         
         foreach($list as $lkey) {
             // skip ones we know we have done...
@@ -354,7 +354,7 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
      
     function defaultTranslate($lang, $type, $k) 
     {
-      
+        print_R($lang);exit;
         static $cache;
         
         
@@ -377,7 +377,7 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
                 'l' =>  new I18Nv2_Language($lang, 'UTF-8'),
                 'c' => new I18Nv2_Country($lang, 'UTF-8'),
                 'm' => new I18Nv2_Currency($lang, 'UTF-8'),
-                't' => new I18Nv2_PhonePrefix($lang, 'UTF-8')
+                'p' => new I18Nv2_PhonePrefix($lang, 'UTF-8')
             );
             //echo '<PRE>';print_r(array($lang, $cache[$lang]['c']));
         }