X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FI18n.php;h=7d04c9dce9a04b79650bdf1848b0d51079909a1b;hb=23c8b866767181f107e2e8bcd40c6725d96ed850;hp=0002cf588c084de05eaed862f3e4b82fa33247dc;hpb=a71a5a4bbd668a87c1de82cb5bc9c18f141cb821;p=Pman.Core

diff --git a/DataObjects/I18n.php b/DataObjects/I18n.php
index 0002cf58..7d04c9dc 100644
--- a/DataObjects/I18n.php
+++ b/DataObjects/I18n.php
@@ -46,9 +46,9 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
           //  'ta', // tamil
           //  '**', // other
         ),
-        'c' => array(
-             'AU', 'CN', 'HK', 'IN', 'ID', 'JP', 'MY', 'NZ', 'TW', 'SG', 'TH', 'KR', 'US', 'PH', 'VN','**'
-        ),
+        'c' => '*', // array(
+             //'AU', 'CN', 'HK', 'IN', 'ID', 'JP', 'MY', 'NZ', 'TW', 'SG', 'TH', 'KR', 'US', 'PH', 'VN','**'
+        //),
         'm' => array(
             'USD', 'HKD', 'GBP', 'CNY', 'SGD', 'JPY'
         ),
@@ -70,9 +70,17 @@ class Pman_Core_DataObjects_I18n extends DB_DataObject
         }
         $loaded =true;
         $ff= HTML_FlexyFramework::get();
-         
-        // since our opts array changed alot..
-        $opts = empty($ff->Pman_Core_I18N) ? (empty($ff->Pman_I18N) ? array() : $ff->Pman_I18N)  : $ff->Pman_Core_I18N;
+        
+        // BC compatible.. if any of these are set, then we use them as the settings..
+        $opts = array();
+        foreach(array('Pman_Core_I18N', 'Pman_I18N','Pman_I18n') as $pk) {
+            if (isset($ff->$pk)) {
+                var_dump($pk);
+                $opts=  $ff->$pk;
+                break;
+            }
+        }
+        //print_R($opts);
         
          
        //  var_dump($opts);exit;