Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1070 from ArthurHoaro/hotfix/lc-messages-warning

Browse source 
Use LC_COLLATE instead of LC_MESSAGES if php-intl is not installed
This commit is contained in:
ArthurHoaro 2018-02-02 18:51:53 +01:00 committed by GitHub
commit 40e816e379
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
application/Languages.php
View file

@ -69,6 +69,8 @@ public function __construct($language, $conf)
{ {
$this->conf = $conf; $this->conf = $conf;
$confLanguage = $this->conf->get('translation.language', 'auto'); $confLanguage = $this->conf->get('translation.language', 'auto');
// Auto mode or invalid parameter, use the detected language.
// If the detected language is invalid, it doesn't matter, it will use English.
if ($confLanguage === 'auto' || ! $this->isValidLanguage($confLanguage)) { if ($confLanguage === 'auto' || ! $this->isValidLanguage($confLanguage)) {
$this->language = substr($language, 0, 5); $this->language = substr($language, 0, 5);
} else { } else {

5
index.php
View file

@ -124,6 +124,11 @@
$conf = new ConfigManager(); $conf = new ConfigManager();
$sessionManager = new SessionManager($_SESSION, $conf); $sessionManager = new SessionManager($_SESSION, $conf);
// LC_MESSAGES isn't defined without php-intl, in this case use LC_COLLATE locale instead.
if (! defined('LC_MESSAGES')) {
define('LC_MESSAGES', LC_COLLATE);
}
// Sniff browser language and set date format accordingly. // Sniff browser language and set date format accordingly.
if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) { if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
autoLocale($_SERVER['HTTP_ACCEPT_LANGUAGE']); autoLocale($_SERVER['HTTP_ACCEPT_LANGUAGE']);