stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2024-10-29 21:07:18 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve language preference (Acccept-Language header matching): Boost same-language match over exact locale match for lower qvalue.

Browse Source
This commit is contained in:
Andy Staudacher 2009-09-15 11:19:32 -07:00
parent 5f343ab8a0
commit 59eadacc67
2 changed files with 41 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
modules/gallery/helpers/locales.php
View File

@ -165,50 +165,58 @@ class locales_Core {
list ($ignored, $qvalue) = explode("=", $qvalue . "==");
$qvalue = floatval($qvalue);
}
$locale_preferences[] = array($requested_locale, $qvalue);
// Group by language to boost inexact same-language matches
list ($language) = explode("_", $requested_locale . "_");
if (!isset($locale_preferences[$language])) {
$locale_preferences[$language] = array();
}
$locale_preferences[$language][$requested_locale] = $qvalue;
}
}
// Compare and score requested locales with installed ones
$scored_locales = array();
foreach ($locale_preferences as $requested_value) {
$scored_locale_match = self::_locale_match_score($requested_value);
if ($scored_locale_match) {
$scored_locales[] = $scored_locale_match;
foreach ($locale_preferences as $language => $requested_locales) {
// Inexact match adjustment (same language, different region)
$fallback_adjustment_factor = 0.95;
if (count($requested_locales) > 1) {
// Sort by qvalue, descending
$qvalues = array_values($requested_locales);
rsort($qvalues);
// Ensure inexact match scores worse than 2nd preference in same language.
$fallback_adjustment_factor *= $qvalues[1];
}
foreach ($requested_locales as $requested_locale => $qvalue) {
list ($matched_locale, $match_score) =
self::_locale_match_score($requested_locale, $qvalue, $fallback_adjustment_factor);
if ($matched_locale &&
(!isset($scored_locales[$matched_locale]) ||
$match_score > $scored_locales[$matched_locale])) {
$scored_locales[$matched_locale] = $match_score;
}
}
}
usort($scored_locales, array("locales", "_compare_locale_by_qvalue"));
arsort($scored_locales);
$best_match = array_shift($scored_locales);
if ($best_match) {
return $best_match[0];
}
list ($locale) = each($scored_locales);
return $locale;
}
return null;
}
static function _compare_locale_by_qvalue($a, $b) {
$a = $a[1];
$b = $b[1];
if ($a == $b) {
return 0;
}
return $a < $b ? 1 : -1;
}
private static function _locale_match_score($requested_locale_and_qvalue) {
list ($requested_locale, $qvalue) = $requested_locale_and_qvalue;
private static function _locale_match_score($requested_locale, $qvalue, $adjustment_factor) {
$installed = self::installed();
if (isset($installed[$requested_locale])) {
return $requested_locale_and_qvalue;
return array($requested_locale, $qvalue);
}
list ($language) = explode("_", $requested_locale . "_");
if (isset(self::$language_subtag_to_locale[$language]) &&
isset($installed[self::$language_subtag_to_locale[$language]])) {
return array(self::$language_subtag_to_locale[$language], $qvalue * 0.66);
$score = $adjustment_factor * $qvalue;
return array(self::$language_subtag_to_locale[$language], $score);
}
return null;
return array(null, 0);
}
}

10
modules/gallery/tests/Locales_Helper_Test.php
View File

@ -67,7 +67,7 @@ class Locales_Helper_Test extends Unit_Test_Case {
locales::update_installed(array("no_NO", "pt_PT", "ja_JP"));
$_SERVER["HTTP_ACCEPT_LANGUAGE"] = "en,en-us,ja_JP;q=0.7,no-fr;q=0.9";
$locale = locales::locale_from_http_request();
$this->assert_equal("ja_JP", $locale);
$this->assert_equal("no_NO", $locale);
}
public function locale_from_http_request_best_match_vs_installed_2_test() {
@ -83,4 +83,12 @@ class Locales_Helper_Test extends Unit_Test_Case {
$locale = locales::locale_from_http_request();
$this->assert_equal(null, $locale);
}
public function locale_from_http_request_prefer_inexact_same_language_match_over_exact_other_language_match_test() {
locales::update_installed(array("de_DE", "ar_AR", "fa_IR", "he_IL", "en_US"));
// Accept-Language header from Firefox 3.5/Ubuntu
$_SERVER["HTTP_ACCEPT_LANGUAGE"] = "he,en-us;q=0.9,de-ch;q=0.5,en;q=0.3";
$locale = locales::locale_from_http_request();
$this->assert_equal("he_IL", $locale);
}
}