Changeset 6690

Timestamp:

12/24/07 13:56:19 (1 year ago)

Author:

fabien

Message:

added sfWebRequest::getPreferredCulture()

Files:

• branches/1.1/lib/request/sfWebRequest.class.php (modified) (1 diff)
• branches/1.1/test/unit/request/sfWebRequestTest.php (modified) (2 diffs)

branches/1.1/lib/request/sfWebRequest.class.php

@@ -553 +553 @@
-
-    return isset($pathArray['REQUEST_METHOD']) ? $pathArray['REQUEST_METHOD'] : 'GET';
+  }
+
+  /**
+   * Returns the preferred culture for the current request.
+   *
+   * @param  array  An array of ordered cultures available
+   *
+   * @return string The preferred culture
+   */
+  public function getPreferredCulture(array $cultures = null)
+  {
+    $preferredCultures = $this->getLanguages();
+
+    if (is_null($cultures))
+    {
+      return isset($preferredCultures[0]) ? $preferredCultures[0] : null;
+    }
+
+    if (!$preferredCultures)
+    {
+      return $cultures[0];
+    }
+
+    $preferredCultures = array_values(array_intersect($preferredCultures, $cultures));
+
+    return isset($preferredCultures[0]) ? $preferredCultures[0] : null;
-  }
-

branches/1.1/test/unit/request/sfWebRequestTest.php

@@ -11 +11 @@
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-
-3
+6
-
-class myRequest extends sfWebRequest
@@ -35 +35 @@
-$_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'en-us,en;q=0.5,fr;q=0.3';
-$t->is($request->getLanguages(), array('en_US', 'en', 'fr'), '->getLanguages() returns an array with all accepted languages');
+
+// ->getPreferredCulture()
+$t->diag('->getPreferredCulture()');
+$request->languages = null;
+$_SERVER['HTTP_ACCEPT_LANGUAGE'] = '';
+$t->is($request->getPreferredCulture(array('fr', 'en')), 'fr', '->getPreferredCulture() returns the first given culture if the client do not send an ACCEPT_LANGUAGE header');
+
+$request->languages = null;
+$_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'en-us,en;q=0.5,fr;q=0.3';
+$t->is($request->getPreferredCulture(array('fr', 'en')), 'en', '->getPreferredCulture() returns the preferred culture');
+
+$request->languages = null;
+$_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'en-us,en;q=0.5,fr';
+$t->is($request->getPreferredCulture(array('fr', 'en')), 'fr', '->getPreferredCulture() returns the preferred culture');
-
-// ->getCharsets()