Changeset 2465

Timestamp:

06/03/2008 09:33:23 AM (6 months ago)

Author:

tof

Message:

Fixed #860

Location:

trunk

Files:

• HISTORY (modified) (1 diff)
• framework/PradoBase.php (modified) (2 diffs)

trunk/HISTORY

@@ -6 +6 @@
 BUG: Ticket#843 - TDataList alternatinItem issue after changes in rev 2227 (Christophe)
 BUG: Ticket#849 - TDatePicker selecting current date problem (Christophe)
+BUG: Ticket#860 - Prado::localize() bug (japplegame)
 ENH: Added Prado.Validation.validateControl(id) on client side to validate a specific control (Michael)
 

trunk/framework/PradoBase.php

@@ -573 +573 @@
                         return strtr($text, $params);
 
-                Translation::init();
-
-                if(empty($catalogue) && isset($config['catalogue']))
-                        $catalogue = $config['catalogue'];
+                if ($catalogue===null)
+                        $catalogue=isset($config['catalogue'])?$config['catalogue']:'messages';
+                        
+                Translation::init($catalogue);
 
                 //globalization charset
@@ -588 +588 @@
                 if(empty($charset)) $charset = $defaultCharset;
 
-                return Translation::formatter()->format($text,$params,$catalogue,$charset);
+                return Translation::formatter($catalogue)->format($text,$params,$catalogue,$charset);
         }
 }