mirror/FreshRSS
0
0 Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-10-19 01:42:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

Coding style + i18n

Browse Source 
Change "Show only unread or read if no unread" into "Adjust showing". It
is less explicit but shorter.
This commit is contained in:
Marien Fressinaud committed 2014-09-17 11:22:45 +02:00
1 parent f5c863705b
commit 9fec7f328b
4 files changed
+18 -18
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/Models/Configuration.php
+12 -12
View File
@@ -141,18 +141,18 @@ class FreshRSS_Configuration {
}
}
public function _default_view ($value) {
switch ($value):
case FreshRSS_Entry::STATE_ALL:
// left blank on purpose
case FreshRSS_Entry::STATE_NOT_READ:
// left blank on purpose
case FreshRSS_Entry::STATE_NOT_READ_STRICT:
$this->data['default_view'] = $value;
break;
default:
$this->data['default_view'] = FreshRSS_Entry::STATE_ALL;
break;
endswitch;
switch ($value) {
case FreshRSS_Entry::STATE_ALL:
// left blank on purpose
case FreshRSS_Entry::STATE_NOT_READ:
// left blank on purpose
case FreshRSS_Entry::STATE_NOT_READ_STRICT:
$this->data['default_view'] = $value;
break;
default:
$this->data['default_view'] = FreshRSS_Entry::STATE_ALL;
break;
}
}
public function _display_posts ($value) {
$this->data['display_posts'] = ((bool)$value) && $value !== 'no';
app/i18n/en.php
+1 -1
View File
@@ -92,7 +92,7 @@ return array (
'rss_view' => 'RSS feed',
'show_all_articles' => 'Show all articles',
'show_not_reads' => 'Show only unread',
'show_not_reads_with_fallback' => 'Show only unread or read if no unread',
'show_adaptive' => 'Adjust showing',
'show_read' => 'Show only read',
'show_favorite' => 'Show only favorites',
'show_not_favorite' => 'Show all but favorites',
app/i18n/fr.php
+1 -1
View File
@@ -92,7 +92,7 @@ return array (
'rss_view' => 'Flux RSS',
'show_all_articles' => 'Afficher tous les articles',
'show_not_reads' => 'Afficher les non lus',
'show_not_reads_with_fallback' => 'Afficher les non lus ou les lus si aucun non lus',
'show_adaptive' => 'Adapter l’affichage',
'show_read' => 'Afficher les lus',
'show_favorite' => 'Afficher les favoris',
'show_not_favorite' => 'Afficher tout sauf les favoris',
app/views/configure/reading.phtml
+4 -4
View File
@@ -38,12 +38,12 @@
</div>
<div class="form-group">
<label class="group-name" for="view_mode"><?php echo Minz_Translate::t ('articles_to_display'); ?></label>
<label class="group-name" for="view_mode"><?php echo _t('articles_to_display'); ?></label>
<div class="group-controls">
<select name="default_view" id="default_view">
<option value="<?php echo FreshRSS_Entry::STATE_ALL; ?>"<?php echo $this->conf->default_view === FreshRSS_Entry::STATE_ALL ? ' selected="selected"' : ''; ?>><?php echo Minz_Translate::t ('show_all_articles'); ?></option>
<option value="<?php echo FreshRSS_Entry::STATE_NOT_READ; ?>"<?php echo $this->conf->default_view === FreshRSS_Entry::STATE_NOT_READ ? ' selected="selected"' : ''; ?>><?php echo Minz_Translate::t ('show_not_reads_with_fallback'); ?></option>
<option value="<?php echo FreshRSS_Entry::STATE_NOT_READ_STRICT; ?>"<?php echo $this->conf->default_view === FreshRSS_Entry::STATE_NOT_READ_STRICT ? ' selected="selected"' : ''; ?>><?php echo Minz_Translate::t ('show_not_reads'); ?></option>
<option value="<?php echo FreshRSS_Entry::STATE_NOT_READ; ?>"<?php echo $this->conf->default_view === FreshRSS_Entry::STATE_NOT_READ ? ' selected="selected"' : ''; ?>><?php echo _t('show_adaptive'); ?></option>
<option value="<?php echo FreshRSS_Entry::STATE_ALL; ?>"<?php echo $this->conf->default_view === FreshRSS_Entry::STATE_ALL ? ' selected="selected"' : ''; ?>><?php echo _t('show_all_articles'); ?></option>
<option value="<?php echo FreshRSS_Entry::STATE_NOT_READ_STRICT; ?>"<?php echo $this->conf->default_view === FreshRSS_Entry::STATE_NOT_READ_STRICT ? ' selected="selected"' : ''; ?>><?php echo _t('show_not_reads'); ?></option>
</select>
</div>
</div>