diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php index 70144a8db..645f9eabf 100755 --- a/app/Controllers/configureController.php +++ b/app/Controllers/configureController.php @@ -196,7 +196,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController { if (Minz_Request::isPost ()) { $this->view->conf->_sharing (array( 'shaarli' => Minz_Request::param ('shaarli', false), - 'poche' => Minz_Request::param ('poche', false), + 'wallabag' => Minz_Request::param ('wallabag', false), 'diaspora' => Minz_Request::param ('diaspora', false), 'twitter' => Minz_Request::param ('twitter', false), 'g+' => Minz_Request::param ('g+', false), diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php index f3fb76e72..2a7fe95aa 100644 --- a/app/Models/Configuration.php +++ b/app/Models/Configuration.php @@ -48,7 +48,7 @@ class FreshRSS_Configuration { 'bottomline_link' => true, 'sharing' => array( 'shaarli' => '', - 'poche' => '', + 'wallabag' => '', 'diaspora' => '', 'twitter' => true, 'g+' => true, @@ -185,7 +185,7 @@ class FreshRSS_Configuration { } } public function _sharing ($values) { - $are_url = array ('shaarli', 'poche', 'diaspora'); + $are_url = array ('shaarli', 'wallabag', 'diaspora'); foreach ($values as $key => $value) { if (in_array($key, $are_url)) { $is_url = ( diff --git a/app/i18n/en.php b/app/i18n/en.php index 8073ecf51..a2cc461c5 100644 --- a/app/i18n/en.php +++ b/app/i18n/en.php @@ -210,7 +210,7 @@ return array ( 'scroll' => 'during page scrolls', 'upon_reception' => 'upon reception of the article', 'your_shaarli' => 'Your Shaarli', - 'your_poche' => 'Your Poche', + 'your_wallabag' => 'Your wallabag', 'your_diaspora_pod' => 'Your Diaspora* pod', 'sharing' => 'Sharing', 'share' => 'Share', @@ -221,7 +221,7 @@ return array ( 'more_information' => 'More information', 'activate_sharing' => 'Activate sharing', 'shaarli' => 'Shaarli', - 'poche' => 'Poche', + 'wallabag' => 'wallabag', 'diaspora' => 'Diaspora*', 'twitter' => 'Twitter', 'g+' => 'Google+', diff --git a/app/i18n/fr.php b/app/i18n/fr.php index 3dad497ae..9ab06ba26 100644 --- a/app/i18n/fr.php +++ b/app/i18n/fr.php @@ -210,7 +210,7 @@ return array ( 'scroll' => 'au défilement de la page', 'upon_reception' => 'dès la réception du nouvel article', 'your_shaarli' => 'Votre Shaarli', - 'your_poche' => 'Votre Poche', + 'your_wallabag' => 'Votre wallabag', 'your_diaspora_pod' => 'Votre pod Diaspora*', 'sharing' => 'Partage', 'share' => 'Partager', @@ -221,7 +221,7 @@ return array ( 'more_information' => 'Plus d’informations', 'activate_sharing' => 'Activer le partage', 'shaarli' => 'Shaarli', - 'poche' => 'Poche', + 'wallabag' => 'wallabag', 'diaspora' => 'Diaspora*', 'twitter' => 'Twitter', 'g+' => 'Google+', diff --git a/app/views/configure/sharing.phtml b/app/views/configure/sharing.phtml index 9dc733392..e3ea11665 100644 --- a/app/views/configure/sharing.phtml +++ b/app/views/configure/sharing.phtml @@ -17,13 +17,13 @@