X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FI18n.php;h=cae6e3bc24127a598049c408d7426eab2d3b7730;hp=b13c2469966d4a33c8600c26ab3c251378557521;hb=5d4ac076dc4f620fbb91944eead3e0af66216a03;hpb=27588487655b1f7cac27dc845c018afc77ef6489

diff --git a/DataObjects/I18n.php b/DataObjects/I18n.php
index b13c2469..cae6e3bc 100644
--- a/DataObjects/I18n.php
+++ b/DataObjects/I18n.php
@@ -7,7 +7,7 @@
  * It should eventually replace most of that..
  * 
  */
-require_once 'DB/DataObject.php';
+class_exists('DB_DataObject') ? '' : require_once 'DB/DataObject.php';
 
 class Pman_Core_DataObjects_I18n extends DB_DataObject 
 {
@@ -52,6 +52,7 @@ 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...
@@ -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', 'en');
             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...
@@ -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']));
         }