Changeset 8463

Timestamp:

04/15/08 01:40:45 (5 months ago)

Author:

fabien

Message:

fixed form translation when not using i18n with an object as a parameter

Files:

• branches/1.1/lib/widget/sfWidgetFormSchemaFormatter.class.php (modified) (2 diffs)

branches/1.1/lib/widget/sfWidgetFormSchemaFormatter.class.php

@@ -67 +67 @@
-      return false;  
-    }
-
+
-    if (is_null(self::$translationCallable))
-    {
+      // replace object with strings
+      foreach ($parameters as $key => $value)
+      {
+        if (is_object($value) && method_exists($value, '__toString'))
+        {
+          $parameters[$key] = $value->__toString();
+        }
+      }
+
-      return strtr($subject, $parameters);
-    }
-
+
-    if (self::$translationCallable instanceof sfCallable)
-    {
@@ -80 +89 @@
-    return call_user_func(self::$translationCallable, $subject, $parameters);
-  }
-
+
-  /**
-   * Returns the current i18n callable