Changeset 10070

Timestamp:

07/02/08 16:53:50 (2 months ago)

Author:

francois

Message:

sfPropelFinderPlugin I18n tweaking

Files:

• plugins/sfPropelFinderPlugin/lib/sfPropelFinder.php (modified) (1 diff)
• plugins/sfPropelFinderPlugin/test/unit/sfPropelFinderTest.php (modified) (3 diffs)

plugins/sfPropelFinderPlugin/lib/sfPropelFinder.php

@@ -573 +573 @@
-  }
-  
-
+$culture = null
-  {
-    $i18nClass = $this->class.'I18n';
-    $tmp = new $i18nClass();
-    $i18nPeerClass = get_class($tmp->getPeer());
-
+if(is_null($culture)) 
-    $this->addWithClass($this->class.'I18n');
-    $this->criteria->add(constant($i18nPeerClass.'::CULTURE'), $culture);

plugins/sfPropelFinderPlugin/test/unit/sfPropelFinderTest.php

@@ -65 +65 @@
-ArticlePeer::doDeleteAll();
-
-39
+40
-
-$t->diag('find()');
@@ -745 +745 @@
-$t->is($article->getContent(), 'contenu français', 'withI18n() considers the current user culture for hydration');
-
+sfContext::getInstance()->getUser()->setCulture('fr');
+$article = sfPropelFinder::from('Article')->
+  withI18n('en')->
+  findOne();
+$t->is($article->getContent(), 'english content', 'withI18n() accepts a culture parameter to override the user culture');
+
-sfContext::getInstance()->getUser()->setCulture('en');
-$finder = sfPropelFinder::from('Article')->with('I18n');
@@ -872 +878 @@
-$t->is(sfPropelFinder::from('Article')->where('Title', 'updated title')->count(), 1, 'set() updates only the records found based on the array of values');
-
-
-try
-{