Mirrors/yii
2
0
Fork 0
mirror of https://github.com/yiisoft/yii.git synced 2026-03-03 23:04:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'patch-2' of https://github.com/zvirusz/yii

Browse Source 
* 'patch-2' of https://github.com/zvirusz/yii:
  Backport Request::getPreferredLanguage() from yii2
This commit is contained in:
Carsten Brandt
2014-04-22 23:44:08 +02:00
parent 72afaeed30 7e1938fbd7
commit fafe5926cb
1 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
framework/web/CHttpRequest.php
View File

@@ -1031,14 +1031,31 @@ class CHttpRequest extends CApplicationComponent
}
/**
* Returns the user preferred language.
* The returned language ID will be canonicalized using {@link CLocale::getCanonicalID}.
* @return string the user preferred language or false if the user does not have any.
* Returns the user-preferred language that should be used by this application.
* The language resolution is based on the user preferred languages and the languages
* supported by the application. The method will try to find the best match.
* @param array $languages a list of the languages supported by the application.
* If empty, this method will return the first language returned by [[getPreferredLanguages()]].
* @return string the language that the application should use. false is returned if both [[getPreferredLanguages()]]
* and `$languages` are empty.
*/
public function getPreferredLanguage()
public function getPreferredLanguage($languages=array())
{
$preferredLanguages=$this->getPreferredLanguages();
return !empty($preferredLanguages) ? CLocale::getCanonicalID($preferredLanguages[0]) : false;
if(empty($languages)) {
return !empty($preferredLanguages) ? CLocale::getCanonicalID($preferredLanguages[0]) : false;
}
foreach ($preferredLanguages as $preferredLanguage) {
$preferredLanguage=CLocale::getCanonicalID($preferredLanguage);
foreach ($languages as $language) {
$language=CLocale::getCanonicalID($language);
// en_us==en_us, en==en_us, en_us==en
if($language===$acceptedLanguage || strpos($acceptedLanguage,$language.'_')===0 || strpos($language,$acceptedLanguage.'_')===0) {
return $language;
}
}
}
return reset($languages);
}
/**