Commit 8d1db84e authored by Bart Visscher's avatar Bart Visscher
Browse files

Merge pull request #2887 from owncloud/l10n-caching

L10N: cache the result of findLanguage
parents 01d203c7 2180a4c4
......@@ -298,10 +298,16 @@ class OC_L10N{
$temp = explode(';', $i);
$temp[0] = str_replace('-', '_', $temp[0]);
if( ($key = array_search($temp[0], $available)) !== false) {
if (is_null($app)) {
self::$language = $available[$key];
}
return $available[$key];
}
foreach($available as $l) {
if ( $temp[0] == substr($l, 0, 2) ) {
if (is_null($app)) {
self::$language = $l;
}
return $l;
}
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment