diff options
author | ArthurHoaro <arthur@hoa.ro> | 2015-04-08 06:53:34 +0200 |
---|---|---|
committer | ArthurHoaro <arthur@hoa.ro> | 2015-04-08 06:53:34 +0200 |
commit | da49603b86966ea9b915174c629b6329a2502473 (patch) | |
tree | 7cc9b0c21b8a6f820a241c02f4e6f5970ce198f2 | |
parent | 8438a2e5d0cb90a869d67516c6e6cf756f77a588 (diff) | |
download | Shaarli-da49603b86966ea9b915174c629b6329a2502473.tar.gz Shaarli-da49603b86966ea9b915174c629b6329a2502473.tar.zst Shaarli-da49603b86966ea9b915174c629b6329a2502473.zip |
#193 add UTF8 by default to autoLocale
-rw-r--r-- | index.php | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -307,9 +307,10 @@ function autoLocale() | |||
307 | { // (It's a bit crude, but it works very well. Preferred language is always presented first.) | 307 | { // (It's a bit crude, but it works very well. Preferred language is always presented first.) |
308 | if (preg_match('/([a-z]{2})-?([a-z]{2})?/i',$_SERVER['HTTP_ACCEPT_LANGUAGE'],$matches)) { | 308 | if (preg_match('/([a-z]{2})-?([a-z]{2})?/i',$_SERVER['HTTP_ACCEPT_LANGUAGE'],$matches)) { |
309 | $loc = $matches[1] . (!empty($matches[2]) ? '_' . strtoupper($matches[2]) : ''); | 309 | $loc = $matches[1] . (!empty($matches[2]) ? '_' . strtoupper($matches[2]) : ''); |
310 | $attempts = array($loc, str_replace('_', '-', $loc), | 310 | $attempts = array($loc.'.UTF-8', $loc, str_replace('_', '-', $loc).'.UTF-8', str_replace('_', '-', $loc), |
311 | $loc . '_' . strtoupper($loc), $loc . '_' . $loc, | 311 | $loc . '_' . strtoupper($loc).'.UTF-8', $loc . '_' . strtoupper($loc), |
312 | $loc . '-' . strtoupper($loc), $loc . '-' . $loc); | 312 | $loc . '_' . $loc.'.UTF-8', $loc . '_' . $loc, $loc . '-' . strtoupper($loc).'.UTF-8', |
313 | $loc . '-' . strtoupper($loc), $loc . '-' . $loc.'.UTF-8', $loc . '-' . $loc); | ||
313 | } | 314 | } |
314 | } | 315 | } |
315 | setlocale(LC_TIME, $attempts); // LC_TIME = Set local for date/time format only. | 316 | setlocale(LC_TIME, $attempts); // LC_TIME = Set local for date/time format only. |