moparisthebest/wallabag
1
0
Fork 0
mirror of https://github.com/moparisthebest/wallabag synced 2024-11-30 04:42:19 -05:00
Code Issues Releases Wiki Activity

Merge branch 'dev' into update-icomoon

Browse Source
This commit is contained in:
Thomas Citharel 2015-01-03 12:07:14 +01:00
commit 8f53ef9548
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CREDITS.md
View File

@ -8,6 +8,7 @@ wallabag is based on :
* Twig http://twig.sensiolabs.org * Twig http://twig.sensiolabs.org
* Flash messages https://github.com/plasticbrain/PHP-Flash-Messages * Flash messages https://github.com/plasticbrain/PHP-Flash-Messages
* Pagination https://github.com/daveismyname/pagination * Pagination https://github.com/daveismyname/pagination
* PHPePub https://github.com/Grandt/PHPePub/
wallabag is mainly developed by Nicolas Lœuillet under the MIT License wallabag is mainly developed by Nicolas Lœuillet under the MIT License

5
inc/poche/Tools.class.php
View File

@ -342,7 +342,10 @@ final class Tools
return $json; return $json;
}; };
$json = $scope("inc/3rdparty/makefulltextfeed.php", array("url" => $url)); // Silence $scope function to avoid
// issues with FTRSS when error_reporting is to high
// FTRSS generates PHP warnings which break output
$json = @$scope("inc/3rdparty/makefulltextfeed.php", array("url" => $url));
// Clearing and restoring context // Clearing and restoring context
foreach ($GLOBALS as $key => $value) { foreach ($GLOBALS as $key => $value) {

BIN
locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo
View File

Binary file not shown.

2
locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po
View File

@ -250,7 +250,7 @@ msgid ""
"your config file: IMPORT_LIMIT (how many articles are fetched at once) and " "your config file: IMPORT_LIMIT (how many articles are fetched at once) and "
"IMPORT_DELAY (delay between fetch of next batch of articles)." "IMPORT_DELAY (delay between fetch of next batch of articles)."
msgstr "" msgstr ""
"Sélectionner le fichier à importer sur votre disque dur, et pressez la " "Sélectionnez le fichier à importer sur votre disque dur, et pressez la "
"bouton « Importer » ci-dessous.<br />wallabag analysera votre fichier, " "bouton « Importer » ci-dessous.<br />wallabag analysera votre fichier, "
"ajoutera toutes les URL trouvées et commencera à télécharger les contenus si " "ajoutera toutes les URL trouvées et commencera à télécharger les contenus si "
"nécessaire.<br />Le processus de téléchargement est contrôlé par deux " "nécessaire.<br />Le processus de téléchargement est contrôlé par deux "