From f2855c2d3070914d9fd798b46ce599bc5be90d2e Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Tue, 1 Apr 2008 11:15:31 +0000
Subject: [PATCH] Template: Iterate over languages in the order they are in the
Accept-Language header.
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@479 44740490-163a-0410-bde0-09ae8108e29a
---
lib/SimpleSAML/XHTML/Template.php | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/lib/SimpleSAML/XHTML/Template.php b/lib/SimpleSAML/XHTML/Template.php
index d685de812..da8d87c93 100644
--- a/lib/SimpleSAML/XHTML/Template.php
+++ b/lib/SimpleSAML/XHTML/Template.php
@@ -78,14 +78,19 @@ class SimpleSAML_XHTML_Template {
/* Find the available language with the best score. */
$bestLanguage = NULL;
$bestScore = -1.0;
- foreach($availableLanguages as $language) {
- if(!array_key_exists($language, $languageScore)) {
- /* Skip this language - it wasn't mentioned in the http header. */
+ foreach($languageScore as $language => $score) {
+
+ if(!in_array($language, $availableLanguages, TRUE)) {
+ /* Skip this language - we don't have it. */
continue;
}
- $score = $languageScore[$language];
+ /* Some user agents use very limited precicion of the quality value, but order the
+ * elements in descending order. Therefore we rely on the order of the output from
+ * getAcceptLanguage() matching the order of the languages in the header when two
+ * languages have the same quality.
+ */
if($score > $bestScore) {
$bestLanguage = $language;
$bestScore = $score;
--
GitLab