aboutsummaryrefslogtreecommitdiffhomepage
path: root/inc
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas.loeuillet@gmail.com>2013-08-02 10:39:03 +0200
committerNicolas LÅ“uillet <nicolas.loeuillet@gmail.com>2013-08-02 10:39:03 +0200
commit2ee436eaa19fd5819a0e6c705b5fcc93f11fb338 (patch)
tree0800203c342c47f8bb0bbb626f55e6158cd2674a /inc
parent02ea9f07691adf79f3f9d6cddfb1e045777927b6 (diff)
downloadwallabag-2ee436eaa19fd5819a0e6c705b5fcc93f11fb338.tar.gz
wallabag-2ee436eaa19fd5819a0e6c705b5fcc93f11fb338.tar.zst
wallabag-2ee436eaa19fd5819a0e6c705b5fcc93f11fb338.zip
poche / pocket / bolsillo / Tasche & more
Diffstat (limited to 'inc')
-rw-r--r--inc/MyTool.class.php2
-rw-r--r--inc/config.php7
-rw-r--r--inc/functions.php12
3 files changed, 14 insertions, 7 deletions
diff --git a/inc/MyTool.class.php b/inc/MyTool.class.php
index 1f5051a4..b11f18e9 100644
--- a/inc/MyTool.class.php
+++ b/inc/MyTool.class.php
@@ -15,7 +15,7 @@ class MyTool
15 define('START_TIME', microtime(true)); 15 define('START_TIME', microtime(true));
16 16
17 if (phpversion() < 5) { 17 if (phpversion() < 5) {
18 die("Argh you don't have PHP 5 !"); 18 die(_('Oops, it seems you don\'t have PHP 5.'));
19 } 19 }
20 20
21 error_reporting(E_ALL); 21 error_reporting(E_ALL);
diff --git a/inc/config.php b/inc/config.php
index 4b46366d..6e3f80b8 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -20,6 +20,13 @@ define ('CONVERT_LINKS_FOOTNOTES', TRUE);
20define ('REVERT_FORCED_PARAGRAPH_ELEMENTS',FALSE); 20define ('REVERT_FORCED_PARAGRAPH_ELEMENTS',FALSE);
21define ('DOWNLOAD_PICTURES', TRUE); 21define ('DOWNLOAD_PICTURES', TRUE);
22define ('SALT', '464v54gLLw928uz4zUBqkRJeiPY68zCX'); 22define ('SALT', '464v54gLLw928uz4zUBqkRJeiPY68zCX');
23define ('LANG', 'fr_FR.UTF8');
24
25putenv("LC_ALL=".LANG);
26setlocale(LC_ALL, LANG);
27bindtextdomain(LANG, "./locale");
28textdomain(LANG);
29
23$storage_type = 'sqlite'; # sqlite or file 30$storage_type = 'sqlite'; # sqlite or file
24 31
25include 'functions.php'; 32include 'functions.php';
diff --git a/inc/functions.php b/inc/functions.php
index 73e591c5..34ecf510 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -349,19 +349,19 @@ function action_to_do($action, $url, $id = 0)
349 if (DOWNLOAD_PICTURES) { 349 if (DOWNLOAD_PICTURES) {
350 $content = filtre_picture($parametres_url['content'], $url, $last_id); 350 $content = filtre_picture($parametres_url['content'], $url, $last_id);
351 } 351 }
352 $msg->add('s', 'the link has been added successfully'); 352 $msg->add('s', _('the link has been added successfully'));
353 } 353 }
354 else { 354 else {
355 $msg->add('e', 'error during insertion : the link wasn\'t added'); 355 $msg->add('e', _('error during insertion : the link wasn\'t added'));
356 } 356 }
357 } 357 }
358 else { 358 else {
359 $msg->add('e', 'error during url preparation : the link wasn\'t added'); 359 $msg->add('e', _('error during url preparation : the link wasn\'t added'));
360 logm('error during url preparation'); 360 logm('error during url preparation');
361 } 361 }
362 } 362 }
363 else { 363 else {
364 $msg->add('e', 'error during url preparation : the link is not valid'); 364 $msg->add('e', _('error during url preparation : the link is not valid'));
365 logm($url . ' is not a valid url'); 365 logm($url . ' is not a valid url');
366 } 366 }
367 367
@@ -370,11 +370,11 @@ function action_to_do($action, $url, $id = 0)
370 case 'delete': 370 case 'delete':
371 if ($store->deleteById($id)) { 371 if ($store->deleteById($id)) {
372 remove_directory(ABS_PATH . $id); 372 remove_directory(ABS_PATH . $id);
373 $msg->add('s', 'the link has been deleted successfully'); 373 $msg->add('s', _('the link has been deleted successfully'));
374 logm('delete link #' . $id); 374 logm('delete link #' . $id);
375 } 375 }
376 else { 376 else {
377 $msg->add('e', 'the link wasn\'t deleted'); 377 $msg->add('e', _('the link wasn\'t deleted'));
378 logm('error : can\'t delete link #' . $id); 378 logm('error : can\'t delete link #' . $id);
379 } 379 }
380 break; 380 break;