From: nodiscc <nodiscc@gmail.com>
Date: Fri, 10 Apr 2015 18:30:15 +0000 (+0200)
Subject: Merge remote-tracking branch 'ArthurHoaro/localecharset' into next
X-Git-Tag: v0.5.0~48
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=507849290c802b2a2a45541d6888108a9aef238b;hp=c5db827aee741315cf4789ed63074d6229fe7fba;p=github%2Fshaarli%2FShaarli.git

Merge remote-tracking branch 'ArthurHoaro/localecharset' into next
---

diff --git a/index.php b/index.php
index b622f963..69a53c56 100644
--- a/index.php
+++ b/index.php
@@ -307,9 +307,10 @@ function autoLocale()
     {   // (It's a bit crude, but it works very well. Preferred language is always presented first.)
         if (preg_match('/([a-z]{2})-?([a-z]{2})?/i',$_SERVER['HTTP_ACCEPT_LANGUAGE'],$matches)) {
             $loc = $matches[1] . (!empty($matches[2]) ? '_' . strtoupper($matches[2]) : '');
-            $attempts = array($loc, str_replace('_', '-', $loc),
-                $loc . '_' . strtoupper($loc), $loc . '_' . $loc,
-                $loc . '-' . strtoupper($loc), $loc . '-' . $loc);
+            $attempts = array($loc.'.UTF-8', $loc, str_replace('_', '-', $loc).'.UTF-8', str_replace('_', '-', $loc),
+                $loc . '_' . strtoupper($loc).'.UTF-8', $loc . '_' . strtoupper($loc), 
+                $loc . '_' . $loc.'.UTF-8', $loc . '_' . $loc, $loc . '-' . strtoupper($loc).'.UTF-8', 
+                $loc . '-' . strtoupper($loc), $loc . '-' . $loc.'.UTF-8', $loc . '-' . $loc);
         }
     }
     setlocale(LC_TIME, $attempts);  // LC_TIME = Set local for date/time format only.