mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-06-07 23:24:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Changement du nom poche en wallabag

Browse Source 
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
This commit is contained in:
Marien Fressinaud
2014-01-27 21:03:58 +01:00
parent 3f15f847c0
commit dbfa922835
6 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controllers/configureController.php
View File

@@ -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),

4
app/Models/Configuration.php
View File

@@ -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 = (

4
app/i18n/en.php
View File

@@ -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+',

4
app/i18n/fr.php
View File

@@ -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+',

8
app/views/configure/sharing.phtml
View File

@@ -17,13 +17,13 @@
</div>
<div class="form-group">
<label class="group-name" for="poche">
<?php echo Minz_Translate::t ('your_poche'); ?>
<label class="group-name" for="wallabag">
<?php echo Minz_Translate::t ('your_wallabag'); ?>
</label>
<div class="group-controls">
<input type="url" id="poche" name="poche" class="extend" value="<?php echo $this->conf->sharing ('poche'); ?>" placeholder="<?php echo Minz_Translate::t ('blank_to_disable'); ?>" size="64" />
<input type="url" id="wallabag" name="wallabag" class="extend" value="<?php echo $this->conf->sharing ('wallabag'); ?>" placeholder="<?php echo Minz_Translate::t ('blank_to_disable'); ?>" size="64" />
<?php echo FreshRSS_Themes::icon('help'); ?> <a target="_blank" href="http://www.inthepoche.com/"><?php echo Minz_Translate::t ('more_information'); ?></a>
<?php echo FreshRSS_Themes::icon('help'); ?> <a target="_blank" href="http://www.wallabag.org"><?php echo Minz_Translate::t ('more_information'); ?></a>
</div>
</div>

12
app/views/helpers/view/normal_view.phtml
View File

@@ -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)) {
<?php echo Minz_Translate::t ('shaarli'); ?>
</a>
</li>
<?php } if ($poche) { ?>
<?php } if ($wallabag) { ?>
<li class="item">
<a target="_blank" href="<?php echo $poche . '?action=add&amp;url=' . base64_encode (urldecode($link)); ?>">
<?php echo Minz_Translate::t ('poche'); ?>
<a target="_blank" href="<?php echo $wallabag . '?action=add&amp;url=' . base64_encode (urldecode($link)); ?>">
<?php echo Minz_Translate::t ('wallabag'); ?>
</a>
</li>
<?php } if ($diaspora) { ?>