Merge pull request #766 from btactic/language_autodetect

Improve autodetection of language.

1 files changed, 8 insertions, 2 deletions

diff --git a/lib/l10n.php b/lib/l10n.php
index f172710e5d7..b83d8ff86db 100644
--- a/lib/l10n.php
+++ b/lib/l10n.php
@@ -294,8 +294,14 @@ class OC_L10N{
 			}
 			foreach($accepted_languages as $i) {
 				$temp = explode(';', $i);
-				if(array_search($temp[0], $available) !== false) {
-					return $temp[0];
+				$temp[0] = str_replace('-','_',$temp[0]);
+				if( ($key = array_search($temp[0], $available)) !== false) {
+					return $available[$key];
+				}
+				foreach($available as $l) {
+					if ( $temp[0] == substr($l,0,2) ) {
+						return $l;
+					}
 				}
 			}
 		}