Fix i18n for nav menu

app/i18n/en/gen.php

@@ -53,7 +53,6 @@ return array(
 	'access_protected_feeds' => 'Connection allows to access HTTP protected RSS feeds',
 	'activate_sharing' => 'Activate sharing',
 	'add_category' => 'Add a category',
-	'add_query' => 'Add a query',
 	'add_rss_feed' => 'Add a RSS feed',
 	'administration' => 'Manage',
 	'advanced' => 'Advanced',
@@ -105,8 +104,6 @@ return array(
 	'bdd_conf_is_ok' => 'Database configuration has been saved.',
 	'bdd_configuration' => 'Database configuration',
 	'bdd_type' => 'Type of database',
-	'before_one_day' => 'Before one day',
-	'before_one_week' => 'Before one week',
 	'before_yesterday' => 'Before yesterday',
 	'blank_to_disable' => 'Leave blank to disable',
 	'blogotext' => 'Blogotext',
@@ -221,7 +218,6 @@ return array(
 	'general_conf_is_ok' => 'General configuration has been saved.',
 	'general_configuration' => 'General configuration',
 	'github_or_email' => '<a href="https://github.com/marienfressinaud/FreshRSS/issues">on Github</a> or <a href="mailto:dev@marienfressinaud.fr">by mail</a>',
-	'global_view' => 'Global view',
 	'help' => 'Display documentation',
 	'hide_read_feeds' => 'Hide categories & feeds with no unread article (does not work with “Show all articles” configuration)',
 	'host' => 'Host',
@@ -274,7 +270,6 @@ return array(
 	'logs_empty' => 'Log file is empty',
 	'mar' => 'mar',
 	'march' => 'Mar',
-	'mark_all_read' => 'Mark all as read',
 	'mark_cat_read' => 'Mark category as read',
 	'mark_favorite' => 'Mark as favourite',
 	'mark_feed_read' => 'Mark feed as read',
@@ -288,7 +283,6 @@ return array(
 	'n_feeds_actualized' => '%d feeds have been updated',
 	'new_article' => 'There are new available articles, click to refresh the page.',
 	'new_category' => 'New category',
-	'newer_first' => 'Newer first',
 	'next' => 'Next',
 	'next_article' => 'Skip to the next article',
 	'next_page' => 'Skip to the next page',
@@ -303,7 +297,6 @@ return array(
 	'no_selected_feed' => 'No feed selected.',
 	'no_update' => 'No update to apply',
 	'no_zip_extension' => 'Zip extension is not present on your server.',
-	'normal_view' => 'Normal view',
 	'not_read' => '%d unread',
 	'not_reads' => '%d unread',
 	'not_yet_implemented' => 'Not yet implemented',
@@ -318,7 +311,6 @@ return array(
 	'oct' => 'oct',
 	'october' => 'Oct',
 	'ok' => 'Ok!',
-	'older_first' => 'Oldest first',
 	'oops' => 'Oops!',
 	'optimization_complete' => 'Optimization complete',
 	'optimize_bdd' => 'Optimize database',
@@ -374,14 +366,12 @@ return array(
 	'query_state_14' => 'Display unread articles',
 	'query_state_15' => 'Display all articles',
 	'random_string' => 'Random string',
-	'reader_view' => 'Reading view',
 	'reading_confirm' => 'Display a confirmation dialog on “mark all as read” actions',
 	'refresh' => 'Refresh',
 	'related_tags' => 'Related tags',
 	'retrieve_truncated_feeds' => 'Retrieves truncated RSS feeds (attention, requires more time!)',
 	'rss_feed_management' => 'RSS feeds management',
 	'rss_feeds_of' => 'RSS feed of %s',
-	'rss_view' => 'RSS feed',
 	'sat' => 'Sat',
 	'save' => 'Save',
 	'scroll' => 'while scrolling',
@@ -404,11 +394,7 @@ return array(
 	'shortcuts_updated' => 'Shortcuts have been updated',
 	'show_adaptive' => 'Adjust showing',
 	'show_all_articles' => 'Show all articles',
-	'show_favorite' => 'Show only favorites',
 	'show_in_all_flux' => 'Show in main stream',
-	'show_not_favorite' => 'Show all but favorites',
-	'show_not_reads' => 'Show only unread',
-	'show_read' => 'Show only read',
 	'sort_order' => 'Sort order',
 	'starred_list' => 'List of favourite articles',
 	'stats_entry_count' => 'Entry count',

app/i18n/en/index.php

@@ -4,13 +4,28 @@ return array(
 	'menu' => array(
 		'about' => 'About FreshRSS',
 		'actualize' => 'Actualize',
+		'add_query' => 'Add a query',
+		'before_one_day' => 'Before one day',
+		'before_one_week' => 'Before one week',
 		'favorites' => 'Favourites (%s)',
 		'filter' => 'Filter',
+		'global_view' => 'Global view',
 		'main_stream' => 'Main stream',
 		'manage' => 'Manage',
+		'mark_all_read' => 'Mark all as read',
 		'mark_read' => 'Mark as read',
+		'newer_first' => 'Newer first',
+		'non-starred' => 'Show all but favorites',
+		'normal_view' => 'Normal view',
+		'older_first' => 'Oldest first',
+		'queries' => 'User queries',
+		'read' => 'Show only unread',
+		'reader_view' => 'Reading view',
+		'rss_view' => 'RSS feed',
 		'see_website' => 'See website',
+		'starred' => 'Show only favorites',
 		'stats' => 'Statistics',
 		'subscription' => 'Subscriptions management',
+		'unread' => 'Show only read',
 	),
 );

app/i18n/fr/gen.php

@@ -53,7 +53,6 @@ return array(
 	'access_protected_feeds' => 'La connexion permet d’accéder aux flux protégés par une authentification HTTP.',
 	'activate_sharing' => 'Activer le partage',
 	'add_category' => 'Ajouter une catégorie',
-	'add_query' => 'Créer un filtre',
 	'add_rss_feed' => 'Ajouter un flux RSS',
 	'administration' => 'Gérer',
 	'advanced' => 'Avancé',
@@ -105,8 +104,6 @@ return array(
 	'bdd_conf_is_ok' => 'La configuration de la base de données a été enregistrée.',
 	'bdd_configuration' => 'Base de données',
 	'bdd_type' => 'Type de base de données',
-	'before_one_day' => 'Antérieurs à 1 jour',
-	'before_one_week' => 'Antérieurs à 1 semaine',
 	'before_yesterday' => 'À partir d’avant-hier',
 	'blank_to_disable' => 'Laissez vide pour désactiver',
 	'blogotext' => 'Blogotext',
@@ -221,7 +218,6 @@ return array(
 	'general_conf_is_ok' => 'La configuration générale a été enregistrée.',
 	'general_configuration' => 'Configuration générale',
 	'github_or_email' => '<a href="https://github.com/marienfressinaud/FreshRSS/issues">sur Github</a> ou <a href="mailto:dev@marienfressinaud.fr">par courriel</a>',
-	'global_view' => 'Vue globale',
 	'help' => 'Afficher la documentation',
 	'hide_read_feeds' => 'Cacher les catégories & flux sans article non-lu (ne fonctionne pas avec la configuration “Afficher tous les articles”)',
 	'host' => 'Hôte',
@@ -274,7 +270,6 @@ return array(
 	'logs_empty' => 'Les logs sont vides.',
 	'mar' => 'mar.',
 	'march' => 'mars',
-	'mark_all_read' => 'Tout marquer comme lu',
 	'mark_cat_read' => 'Marquer la catégorie comme lue',
 	'mark_favorite' => 'Mettre en favori',
 	'mark_feed_read' => 'Marquer le flux comme lu',
@@ -288,7 +283,6 @@ return array(
 	'n_feeds_actualized' => '%d flux ont été mis à jour.',
 	'new_article' => 'Il y a de nouveaux articles disponibles, cliquez pour rafraîchir la page.',
 	'new_category' => 'Nouvelle catégorie',
-	'newer_first' => 'Plus récents en premier',
 	'next' => 'Suivant',
 	'next_article' => 'Passer à l’article suivant',
 	'next_page' => 'Passer à la page suivante',
@@ -303,7 +297,6 @@ return array(
 	'no_selected_feed' => 'Aucun flux sélectionné.',
 	'no_update' => 'Aucune mise à jour à appliquer',
 	'no_zip_extension' => 'L’extension Zip n’est pas présente sur votre serveur.',
-	'normal_view' => 'Vue normale',
 	'not_read' => '%d non lu',
 	'not_reads' => '%d non lus',
 	'not_yet_implemented' => 'Pas encore implémenté',
@@ -318,7 +311,6 @@ return array(
 	'oct' => 'oct.',
 	'october' => 'octobre',
 	'ok' => 'Ok !',
-	'older_first' => 'Plus anciens en premier',
 	'oops' => 'Oups !',
 	'optimization_complete' => 'Optimisation terminée.',
 	'optimize_bdd' => 'Optimiser la base de données',
@@ -374,14 +366,12 @@ return array(
 	'query_state_14' => 'Afficher les articles non lus',
 	'query_state_15' => 'Afficher tous les articles',
 	'random_string' => 'Chaîne aléatoire',
-	'reader_view' => 'Vue lecture',
 	'reading_confirm' => 'Afficher une confirmation lors des actions “marquer tout comme lu”',
 	'refresh' => 'Actualisation',
 	'related_tags' => 'Tags associés',
 	'retrieve_truncated_feeds' => 'Permet de récupérer les flux tronqués (attention, demande plus de temps !)',
 	'rss_feed_management' => 'Gestion des flux RSS',
 	'rss_feeds_of' => 'Flux RSS de %s',
-	'rss_view' => 'Flux RSS',
 	'sat' => 'sam.',
 	'save' => 'Enregistrer',
 	'scroll' => 'au défilement de la page',
@@ -404,11 +394,7 @@ return array(
 	'shortcuts_updated' => 'Les raccourcis ont été mis à jour.',
 	'show_adaptive' => 'Adapter l’affichage',
 	'show_all_articles' => 'Afficher tous les articles',
-	'show_favorite' => 'Afficher les favoris',
 	'show_in_all_flux' => 'Afficher dans le flux principal',
-	'show_not_favorite' => 'Afficher tout sauf les favoris',
-	'show_not_reads' => 'Afficher les non lus',
-	'show_read' => 'Afficher les lus',
 	'sort_order' => 'Ordre de tri',
 	'starred_list' => 'Liste des articles favoris',
 	'stats_entry_count' => 'Nombre d’articles',

app/i18n/fr/index.php

@@ -4,13 +4,28 @@ return array(
 	'menu' => array(
 		'about' => 'À propos de FreshRSS',
 		'actualize' => 'Actualiser',
+		'add_query' => 'Créer un filtre',
+		'before_one_day' => 'Antérieurs à 1 jour',
+		'before_one_week' => 'Antérieurs à 1 semaine',
 		'favorites' => 'Favoris (%s)',
 		'filter' => 'Filtrer',
+		'global_view' => 'Vue globale',
 		'main_stream' => 'Flux principal',
 		'manage' => 'Gérer',
+		'mark_all_read' => 'Tout marquer comme lu',
 		'mark_read' => 'Marquer comme lu',
+		'newer_first' => 'Plus récents en premier',
+		'non-starred' => 'Afficher tout sauf les favoris',
+		'normal_view' => 'Vue normale',
+		'older_first' => 'Plus anciens en premier',
+		'queries' => 'Filtres utilisateurs',
+		'read' => 'Afficher les non lus',
+		'reader_view' => 'Vue lecture',
+		'rss_view' => 'Flux RSS',
 		'see_website' => 'Voir le site',
+		'starred' => 'Afficher les favoris',
 		'stats' => 'Statistiques',
 		'subscription' => 'Gestion des abonnements',
+		'unread' => 'Afficher les lus',
 	),
 );

app/layout/nav_menu.phtml

@@ -23,7 +23,7 @@
 		<a id="toggle-<?php echo $state_str; ?>"
 		   class="btn <?php echo $state_enabled ? 'active' : ''; ?>"
 		   aria-checked="<?php echo $state_enabled ? 'true' : 'false'; ?>"
-		   title="<?php echo _t($state_str); ?>"
+		   title="<?php echo _t('index.menu.' . $state_str); ?>"
 		   href="<?php echo Minz_Url::display($url_state); ?>"><?php echo _i($state_str); ?></a>
 		<?php } ?>
 
@@ -35,7 +35,7 @@
 				<li class="dropdown-close"><a href="#close">❌</a></li>
 
 				<li class="dropdown-header">
-					<?php echo _t('queries'); ?>
+					<?php echo _t('index.menu.queries'); ?>
 					<a class="no-mobile" href="<?php echo _url('configure', 'queries'); ?>"><?php echo _i('configure'); ?></a>
 				</li>
 
@@ -54,18 +54,18 @@
 					$url_query['c'] = 'configure';
 					$url_query['a'] = 'addQuery';
 				?>
-				<li class="item no-mobile"><a href="<?php echo Minz_Url::display($url_query); ?>"><?php echo _i('bookmark-add'); ?> <?php echo _t('add_query'); ?></a></li>
+				<li class="item no-mobile"><a href="<?php echo Minz_Url::display($url_query); ?>"><?php echo _i('bookmark-add'); ?> <?php echo _t('index.menu.add_query'); ?></a></li>
 			</ul>
 		</div>
 	</div>
 
 	<?php
 		$get = FreshRSS_Context::currentGet();
-		$string_mark = _t('mark_all_read');
+		$string_mark = _t('index.menu.mark_all_read');
 		if ($get[0] == 'f') {
-			$string_mark = _t('mark_feed_read');
+			$string_mark = _t('index.menu.mark_feed_read');
 		} elseif ($get[0] == 'c') {
-			$string_mark = _t('mark_cat_read');
+			$string_mark = _t('index.menu.mark_cat_read');
 		}
 
 		$mark_read_url = array(
@@ -86,7 +86,7 @@
 		<button class="read_all btn <?php echo $confirm; ?>"
 		        form="mark-read-menu"
 		        formaction="<?php echo Minz_Url::display($mark_read_url); ?>"
-		        type="submit"><?php echo _t('mark_read'); ?></button>
+		        type="submit"><?php echo _t('index.menu.mark_read'); ?></button>
 
 		<div class="dropdown">
 			<div id="dropdown-read" class="dropdown-target"></div>
@@ -113,13 +113,13 @@
 					<button class="as-link <?php echo $confirm; ?>"
 					        form="mark-read-menu"
 					        formaction="<?php echo Minz_Url::display($mark_before_today); ?>"
-					        type="submit"><?php echo _t('before_one_day'); ?></button>
+					        type="submit"><?php echo _t('index.menu.before_one_day'); ?></button>
 				</li>
 				<li class="item">
 					<button class="as-link <?php echo $confirm; ?>"
 					        form="mark-read-menu"
 					        formaction="<?php echo Minz_Url::display($mark_before_one_week); ?>"
-					        type="submit"><?php echo _t('before_one_week'); ?></button>
+					        type="submit"><?php echo _t('index.menu.before_one_week'); ?></button>
 				</li>
 			</ul>
 		</div>
@@ -129,17 +129,17 @@
 	<?php $url_output = Minz_Request::currentRequest(); ?>
 	<div class="stick" id="nav_menu_views">
 		<?php $url_output['a'] = 'normal'; ?>
-		<a class="view_normal btn <?php echo $actual_view == 'normal'? 'active' : ''; ?>" title="<?php echo _t('normal_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
+		<a class="view_normal btn <?php echo $actual_view == 'normal'? 'active' : ''; ?>" title="<?php echo _t('index.menu.normal_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
 			<?php echo _i("view-normal"); ?>
 		</a>
 
 		<?php $url_output['a'] = 'global'; ?>
-		<a class="view_global btn <?php echo $actual_view == 'global'? 'active' : ''; ?>" title="<?php echo _t('global_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
+		<a class="view_global btn <?php echo $actual_view == 'global'? 'active' : ''; ?>" title="<?php echo _t('index.menu.global_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
 			<?php echo _i("view-global"); ?>
 		</a>
 
 		<?php $url_output['a'] = 'reader'; ?>
-		<a class="view_reader btn <?php echo $actual_view == 'reader'? 'active' : ''; ?>" title="<?php echo _t('reader_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
+		<a class="view_reader btn <?php echo $actual_view == 'reader'? 'active' : ''; ?>" title="<?php echo _t('index.menu.reader_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
 			<?php echo _i("view-reader"); ?>
 		</a>
 
@@ -149,7 +149,7 @@
 				$url_output['params']['token'] = FreshRSS_Context::$conf->token;
 			}
 		?>
-		<a class="view_rss btn" target="_blank" title="<?php echo _t('rss_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
+		<a class="view_rss btn" target="_blank" title="<?php echo _t('index.menu.rss_view'); ?>" href="<?php echo Minz_Url::display($url_output); ?>">
 			<?php echo _i('rss'); ?>
 		</a>
 	</div>
@@ -157,7 +157,7 @@
 	<div class="item search">
 		<form action="<?php echo _url('index', 'index'); ?>" method="get">
 			<?php $search = Minz_Request::param('search', ''); ?>
-			<input type="search" name="search" class="extend" value="<?php echo $search; ?>" placeholder="<?php echo _t('search_short'); ?>" />
+			<input type="search" name="search" class="extend" value="<?php echo $search; ?>" placeholder="<?php echo _t('index.menu.search_short'); ?>" />
 
 			<?php $get = Minz_Request::param('get', ''); ?>
 			<?php if($get != '') { ?>
@@ -180,11 +180,11 @@
 		if (FreshRSS_Context::$order === 'DESC') {
 			$order = 'ASC';
 			$icon = 'up';
-			$title = 'older_first';
+			$title = 'index.menu.older_first';
 		} else {
 			$order = 'DESC';
 			$icon = 'down';
-			$title = 'newer_first';
+			$title = 'index.menu.newer_first';
 		}
 		$url_order = Minz_Request::currentRequest();
 		$url_order['params']['order'] = $order;
@@ -194,6 +194,6 @@
 	</a>
 	
 	<?php if (FreshRSS_Auth::hasAccess() || Minz_Configuration::allowAnonymousRefresh()) { ?>
-	<a id="actualize" class="btn" href="<?php echo _url('feed', 'actualize'); ?>"><?php echo _i('refresh'); ?></a>
+	<a id="actualize" class="btn" href="<?php echo _url('feed', 'actualize'); ?>" title="<?php echo _t('index.menu.actualize'); ?>"><?php echo _i('refresh'); ?></a>
 	<?php } ?>
 </div>