Changeset 2427

Timestamp:

09/01/08 18:08:38 (3 months ago)

Author:

ringmaster

Message:

Update Locale functions to accept parameters for replacement, circumvent sprintf().

For example: _e('My name: $s', array('Name'), 'domain') outputs-> My name: Name

Files:

• trunk/htdocs/system/classes/locale.php (modified) (3 diffs)

trunk/htdocs/system/classes/locale.php

@@ -260 +260 @@
      * @param string $domain (optional) The domain to search for the message     
      **/
-    public static function _e( $text, $domain= 'habari' )
-    {
-        echo self::_t( $text, $domain );
+    public static function _e( )
+    {
+        $args = func_get_args();
+        echo call_user_func_array(array('Locale', '_t'), $args);
     }
 
     /**
      * Return a version of the string translated into the current locale
-     * 
+     *
      * @param string $text The text to echo translated
-     * @param string $domain (optional) The domain to search for the message     
+     * @param string $domain (optional) The domain to search for the message
      * @return string The translated string
      **/
-    public static function _t( $text, $domain= 'habari' )
-    {
+    public static function _t($text, $args = array(), $domain = 'habari')
+    {
+        if( is_string($args) ) {
+            $domain = $args;
+        }
+
         if ( isset( self::$messages[$domain][$text] ) ) {
-            return self::$messages[$domain][$text][1][0];
+            $t = self::$messages[$domain][$text][1][0];
         }
         else {
-            return $text;
-        }
+            $t = $text;
+        }
+
+        if(!empty($args) && is_array($args)) {
+            array_unshift($args, $t);
+            $t = call_user_func_array('sprintf', $args);
+        }
+
+        return $t;
     }
 
@@ -324 +336 @@
  * @param string $text The text to translate
  **/
-function _e( $text, $domain= 'habari' )
-{
-    return Locale::_e( $text, $domain );
+function _e( $text, $args = array(), $domain= 'habari' )
+{
+    return Locale::_e( $text, $args, $domain );
 }
 
@@ -348 +360 @@
  * @return string The translated string
  **/
-function _t( $text, $domain= 'habari' )
-{
-    return Locale::_t( $text, $domain );
+function _t( $text, $args = array(), $domain= 'habari' )
+{
+    return Locale::_t( $text, $args, $domain );
 }