From daf93c45165ac2c73fc1f0d6af513b8c3e497691 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Wed, 23 Oct 2013 15:38:54 +0200 Subject: [PATCH] Sort, so 'de' is preferred over 'de_DE' when performing non-exact matching. --- lib/private/l10n.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/private/l10n.php b/lib/private/l10n.php index 62827312d32..9392cfac05b 100644 --- a/lib/private/l10n.php +++ b/lib/private/l10n.php @@ -458,6 +458,10 @@ class OC_L10N implements \OCP\IL10N { } else { $available = self::findAvailableLanguages($app); } + + // E.g. make sure that 'de' is before 'de_DE'. + sort($available); + $preferences = preg_split('/,\s*/', strtolower($_SERVER['HTTP_ACCEPT_LANGUAGE'])); foreach($preferences as $preference) { list($prefered_language) = explode(';', $preference); -- 2.39.5