X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=application%2Fconfig%2FConfigJson.php;h=8c8d5610efb145c49c3b319514f7e3ba0dab68ca;hb=bede8e1b633d720d6a7d1b05ba367811f3ac2b87;hp=9ef2ef562634bb346cf398b290093cbd02e66926;hpb=c4c655d9bfe68a914898d76bb9c479eea1b04f72;p=github%2Fshaarli%2FShaarli.git
diff --git a/application/config/ConfigJson.php b/application/config/ConfigJson.php
index 9ef2ef56..8c8d5610 100644
--- a/application/config/ConfigJson.php
+++ b/application/config/ConfigJson.php
@@ -22,10 +22,15 @@ class ConfigJson implements ConfigIO
$data = json_decode($data, true);
if ($data === null) {
$errorCode = json_last_error();
- $error = 'An error occurred while parsing JSON configuration file ('. $filepath .'): error code #';
- $error .= $errorCode. '
â ' . json_last_error_msg() .'
';
+ $error = sprintf(
+ 'An error occurred while parsing JSON configuration file (%s): error code #%d',
+ $filepath,
+ $errorCode
+ );
+ $error .= '
â ' . json_last_error_msg() .'
';
if ($errorCode === JSON_ERROR_SYNTAX) {
- $error .= '
Please check your JSON syntax (without PHP comment tags) using a JSON lint tool such as ';
+ $error .= '
';
+ $error .= 'Please check your JSON syntax (without PHP comment tags) using a JSON lint tool such as ';
$error .= 'jsonlint.com.';
}
throw new \Exception($error);
@@ -44,8 +49,8 @@ class ConfigJson implements ConfigIO
if (!file_put_contents($filepath, $data)) {
throw new \IOException(
$filepath,
- 'Shaarli could not create the config file.
- Please make sure Shaarli has the right to write in the folder is it installed in.'
+ t('Shaarli could not create the config file. '.
+ 'Please make sure Shaarli has the right to write in the folder is it installed in.')
);
}
}