aboutsummaryrefslogtreecommitdiffhomepage
path: root/application
diff options
context:
space:
mode:
authorArthurHoaro <arthur@hoa.ro>2018-02-02 18:51:53 +0100
committerGitHub <noreply@github.com>2018-02-02 18:51:53 +0100
commit40e816e3796d7d4fdf4b442c25f4c2b76f5eebc0 (patch)
tree92b1cae91b21e8d3edf41df8dd561cdfd39be42c /application
parent499bd43c37a6ee3d13dabe8bdd0bb449ae57122a (diff)
parentb7c412d4d0fec7f3f54ecaa09178afa16c779d7e (diff)
downloadShaarli-40e816e3796d7d4fdf4b442c25f4c2b76f5eebc0.tar.gz
Shaarli-40e816e3796d7d4fdf4b442c25f4c2b76f5eebc0.tar.zst
Shaarli-40e816e3796d7d4fdf4b442c25f4c2b76f5eebc0.zip
Merge pull request #1070 from ArthurHoaro/hotfix/lc-messages-warning
Use LC_COLLATE instead of LC_MESSAGES if php-intl is not installed
Diffstat (limited to 'application')
-rw-r--r--application/Languages.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/application/Languages.php b/application/Languages.php
index 357c7524..3eb3388f 100644
--- a/application/Languages.php
+++ b/application/Languages.php
@@ -69,6 +69,8 @@ class Languages
69 { 69 {
70 $this->conf = $conf; 70 $this->conf = $conf;
71 $confLanguage = $this->conf->get('translation.language', 'auto'); 71 $confLanguage = $this->conf->get('translation.language', 'auto');
72 // Auto mode or invalid parameter, use the detected language.
73 // If the detected language is invalid, it doesn't matter, it will use English.
72 if ($confLanguage === 'auto' || ! $this->isValidLanguage($confLanguage)) { 74 if ($confLanguage === 'auto' || ! $this->isValidLanguage($confLanguage)) {
73 $this->language = substr($language, 0, 5); 75 $this->language = substr($language, 0, 5);
74 } else { 76 } else {