Changeset 8610

Timestamp:

04/23/08 17:57:16 (1 year ago)

Author:

nicolas

Message:

fixed #3355 - added a translationCatalogue property in sfWidgetFormSchemaFormatter class to handle specific catalogue name to pass back to the translation catalogue. Example of use in a sfForm instance:

<?php
class I18nCustomCatalogueForm extends sfForm
{
  public function configure()
  {
    // [...] configure your form here
    $this->widgetSchema->getFormFormatter()->setTranslationCatalogue('custom');
  }
}

Files:

• branches/1.1/lib/plugins/sfPropelPlugin/test/functional/fixtures/config (modified) (1 prop)
• branches/1.1/lib/widget/sfWidgetFormSchemaFormatter.class.php (modified) (6 diffs)
• branches/1.1/test/functional/fixtures/project/apps/i18n/modules/i18n/actions/actions.class.php (modified) (1 diff)
• branches/1.1/test/functional/fixtures/project/apps/i18n/modules/i18n/i18n/custom.fr.xml (added)
• branches/1.1/test/functional/fixtures/project/apps/i18n/modules/i18n/lib/I18nCustomCatalogueForm.class.php (added)
• branches/1.1/test/functional/i18nFormTest.php (modified) (1 diff)
• branches/1.1/test/unit/widget/sfWidgetFormSchemaFormatterTest.php (modified) (3 diffs)

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

@@ -30 +30 @@
-    $namedErrorRowFormatInARow = "    <li>%name%: %error%</li>\n",
-    $decoratorFormat           = '',
-
+
+
-
-  /**
@@ -58 +59 @@
-   * @param  mixed  $subject     The subject to translate
-   * @param  array  $parameters  Additional parameters to pass back to the callable
-   * 
-   * @return string
-   */
-static 
+
-  {
-    if (false === $subject)
@@ -81 +81 @@
-      return strtr($subject, $parameters);
-    }
+    
+    $catalogue = $this->getTranslationCatalogue();
-
-    if (self::$translationCallable instanceof sfCallable)
-    {
-
-
-
-
+, $catalogue
+
+
+, $catalogue
-  }
-
@@ -124 +126 @@
-    }
-
-self::
+$this->
-  }
-
@@ -188 +190 @@
-    }
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  protected function unnestErrors($errors, $prefix = '')
-  {
@@ -205 +233 @@
-        if ($error instanceof sfValidatorError)
-        {
-self::
+$this->
-        }
-        else
-        {
-self::
+$this->
-        }
-

branches/1.1/test/functional/fixtures/project/apps/i18n/modules/i18n/actions/actions.class.php

@@ -39 +39 @@
-    }
-  }
+  
+  public function executeI18nCustomCatalogueForm(sfWebRequest $request)
+  {
+    $this->form = new I18nCustomCatalogueForm();
+    $this->setTemplate('I18nForm');
+  }
-}

branches/1.1/test/functional/i18nFormTest.php

@@ -51 +51 @@
-;
-
+// forms label custoim catalogue test
+$b->
+  get('/fr/i18n/i18nCustomCatalogueForm')->
+  isStatusCode(200)->
+  isRequestParameter('module', 'i18n')->
+  isRequestParameter('action', 'i18nCustomCatalogueForm')->
+  isUserCulture('fr')->
+  checkResponseElement('label', 'Prénom!!!', array('position' => 0))->
+  checkResponseElement('label', 'Nom!!!', array('position' => 1))->
+  checkResponseElement('label', 'Adresse email!!!', array('position' => 2))
+;

branches/1.1/test/unit/widget/sfWidgetFormSchemaFormatterTest.php

@@ -11 +11 @@
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-
-2
+5
-
-class MyFormatter extends sfWidgetFormSchemaFormatter
@@ -114 +114 @@
-
-$t->diag('->translate()');
-
+
+
-
-MyFormatter::setTranslationCallable(array('myI18n', '__'));
-MyFormatter::
+$f->
-
-$t->diag('->generateLabel() ->generateLabelName() ->setLabel() ->setLabels()');
@@ -144 +145 @@
-MyFormatter::setTranslationCallable('my__');
-$t->is($f->generateLabel('last_name'), '<label for="last_name">[Your Last Name]</label>', '->generateLabelName() returns a i18ned label tag');
+
+// ->setTranslationCatalogue() ->getTranslationCatalogue()
+class MyFormatter2 extends sfWidgetFormSchemaFormatter
+{
+  
+}
+
+$f = new MyFormatter2(new sfWidgetFormSchema(array()));
+$f->setTranslationCatalogue('foo');
+$t->is($f->getTranslationCatalogue(), 'foo', 'setTranslationCatalogue() has set the i18n catalogue correctly');
+$t->diag('->setTranslationCatalogue() ->getTranslationCatalogue()');
+try
+{
+  $f->setTranslationCatalogue(array('foo'));
+  $t->fail('setTranslationCatalogue() does not throw an exception when catalogue name is incorrectly typed');
+}
+catch (InvalidArgumentException $e)
+{
+  $t->pass('setTranslationCatalogue() throws an exception when catalogue name is incorrectly typed');
+}
+
+function ___my($s, $p, $c)
+{
+  return $c;
+}
+
+$f = new MyFormatter2(new sfWidgetFormSchema());
+$f->setTranslationCallable('___my');
+$f->setTranslationCatalogue('bar');
+$t->is($f->translate('foo', array()), 'bar', 'translate() passes back the catalogue to the translation callable');