From dbfa9228358feb3fa6d5f4ea2a35a3dacd0b5852 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Mon, 27 Jan 2014 21:03:58 +0100 Subject: Changement du nom poche en wallabag MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Le nom de poche a été changé en wallabag suite à "l'affaire Pocket". Le changement a été impacté partout même au niveau du fichier de conf. À priori ce n'est pas très impactant puisque poche n'est introduit que dans cette version et qu'il ne devrait pas y avoir "trop" de testeurs. Au pire si l'adresse poche/wallabag disparaît lors d'une migration, il suffit de la ressaisir, ce n'est pas critique :) Voir #397 --- app/Controllers/configureController.php | 2 +- app/Models/Configuration.php | 4 ++-- app/i18n/en.php | 4 ++-- app/i18n/fr.php | 4 ++-- app/views/configure/sharing.phtml | 8 ++++---- app/views/helpers/view/normal_view.phtml | 12 ++++++------ 6 files changed, 17 insertions(+), 17 deletions(-) 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 @@
-
diff --git a/app/views/helpers/view/normal_view.phtml b/app/views/helpers/view/normal_view.phtml index 1c2ed49e2..7b7faccee 100644 --- a/app/views/helpers/view/normal_view.phtml +++ b/app/views/helpers/view/normal_view.phtml @@ -9,11 +9,11 @@ if (!empty($this->entries)) { $display_others = true; if ($this->loginOk) { $shaarli = $this->conf->sharing ('shaarli'); - $poche = $this->conf->sharing ('poche'); + $wallabag = $this->conf->sharing ('wallabag'); $diaspora = $this->conf->sharing ('diaspora'); } else { $shaarli = ''; - $poche = ''; + $wallabag = ''; $diaspora = ''; } $twitter = $this->conf->sharing ('twitter'); @@ -30,7 +30,7 @@ if (!empty($this->entries)) { $bottomline_read = $this->conf->bottomline_read; $bottomline_favorite = $this->conf->bottomline_favorite; $bottomline_sharing = $this->conf->bottomline_sharing && ( - $shaarli || $poche || $diaspora || $twitter || + $shaarli || $wallabag || $diaspora || $twitter || $google_plus || $facebook || $email || $print); $bottomline_tags = $this->conf->bottomline_tags; $bottomline_date = $this->conf->bottomline_date; @@ -152,10 +152,10 @@ if (!empty($this->entries)) { - +
  • - - + +
    • -- cgit v1.2.3