diff options
author | ArthurHoaro <arthur@hoa.ro> | 2017-10-22 13:19:51 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-22 13:19:51 +0200 |
commit | d8acf8550480694d050091e270a06c01e7b313f0 (patch) | |
tree | f62befb2351c4b6550f71e11f6845bc3acb78a5d /application/config/ConfigManager.php | |
parent | efd3a6405a381501b070b8805ae37d1313969784 (diff) | |
parent | 1a47014f99d2f7aae00d37e62e0364d4eaa1ce29 (diff) | |
download | Shaarli-d8acf8550480694d050091e270a06c01e7b313f0.tar.gz Shaarli-d8acf8550480694d050091e270a06c01e7b313f0.tar.zst Shaarli-d8acf8550480694d050091e270a06c01e7b313f0.zip |
Merge pull request #871 from ArthurHoaro/feature/translation
Shaarli's translation
Diffstat (limited to 'application/config/ConfigManager.php')
-rw-r--r-- | application/config/ConfigManager.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/application/config/ConfigManager.php b/application/config/ConfigManager.php index 7ff2fe67..9e4c9f63 100644 --- a/application/config/ConfigManager.php +++ b/application/config/ConfigManager.php | |||
@@ -132,7 +132,7 @@ class ConfigManager | |||
132 | public function set($setting, $value, $write = false, $isLoggedIn = false) | 132 | public function set($setting, $value, $write = false, $isLoggedIn = false) |
133 | { | 133 | { |
134 | if (empty($setting) || ! is_string($setting)) { | 134 | if (empty($setting) || ! is_string($setting)) { |
135 | throw new \Exception('Invalid setting key parameter. String expected, got: '. gettype($setting)); | 135 | throw new \Exception(t('Invalid setting key parameter. String expected, got: '). gettype($setting)); |
136 | } | 136 | } |
137 | 137 | ||
138 | // During the ConfigIO transition, map legacy settings to the new ones. | 138 | // During the ConfigIO transition, map legacy settings to the new ones. |
@@ -339,6 +339,10 @@ class ConfigManager | |||
339 | $this->setEmpty('redirector.url', ''); | 339 | $this->setEmpty('redirector.url', ''); |
340 | $this->setEmpty('redirector.encode_url', true); | 340 | $this->setEmpty('redirector.encode_url', true); |
341 | 341 | ||
342 | $this->setEmpty('translation.language', 'auto'); | ||
343 | $this->setEmpty('translation.mode', 'php'); | ||
344 | $this->setEmpty('translation.extensions', []); | ||
345 | |||
342 | $this->setEmpty('plugins', array()); | 346 | $this->setEmpty('plugins', array()); |
343 | } | 347 | } |
344 | 348 | ||