From c8fad68a4fd15857a2e3e21e7d5311dc7f87226c Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 5 Oct 2014 16:10:25 +0200
Subject: Use _i() whenever it is possible

Transform FreshRSS_Themes::icon\s? in _i

See https://github.com/marienfressinaud/FreshRSS/issues/655
---
 app/views/helpers/feed/update.phtml      |  8 ++++----
 app/views/helpers/javascript_vars.phtml  |  2 +-
 app/views/helpers/view/global_view.phtml |  2 +-
 app/views/helpers/view/normal_view.phtml | 14 +++++++-------
 4 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'app/views/helpers')

diff --git a/app/views/helpers/feed/update.phtml b/app/views/helpers/feed/update.phtml
index 8bd645d11..9235752c3 100644
--- a/app/views/helpers/feed/update.phtml
+++ b/app/views/helpers/feed/update.phtml
@@ -36,7 +36,7 @@
 			<div class="group-controls">
 				<div class="stick">
 					<input type="text" name="website" id="website" class="extend" value="<?php echo $this->feed->website (); ?>" />
-					<a class="btn" target="_blank" href="<?php echo $this->feed->website (); ?>"><?php echo FreshRSS_Themes::icon('link'); ?></a>
+					<a class="btn" target="_blank" href="<?php echo $this->feed->website (); ?>"><?php echo _i('link'); ?></a>
 				</div>
 			</div>
 		</div>
@@ -45,7 +45,7 @@
 			<div class="group-controls">
 				<div class="stick">
 					<input type="text" name="url" id="url" class="extend" value="<?php echo $this->feed->url (); ?>" />
-					<a class="btn" target="_blank" href="<?php echo $this->feed->url (); ?>"><?php echo FreshRSS_Themes::icon('link'); ?></a>
+					<a class="btn" target="_blank" href="<?php echo $this->feed->url (); ?>"><?php echo _i('link'); ?></a>
 				</div>
 
 				<a class="btn" target="_blank" href="http://validator.w3.org/feed/check.cgi?url=<?php echo $this->feed->url (); ?>"><?php echo _t('feed_validator'); ?></a>
@@ -139,7 +139,7 @@
 			<label class="group-name" for="http_user"><?php echo _t('http_username'); ?></label>
 			<div class="group-controls">
 				<input type="text" name="http_user" id="http_user" class="extend" value="<?php echo $auth['username']; ?>" autocomplete="off" />
-				<?php echo FreshRSS_Themes::icon('help'); ?> <?php echo _t('access_protected_feeds'); ?>
+				<?php echo _i('help'); ?> <?php echo _t('access_protected_feeds'); ?>
 			</div>
 
 			<label class="group-name" for="http_pass"><?php echo _t('http_password'); ?></label>
@@ -160,7 +160,7 @@
 			<label class="group-name" for="path_entries"><?php echo _t('css_path_on_website'); ?></label>
 			<div class="group-controls">
 				<input type="text" name="path_entries" id="path_entries" class="extend" value="<?php echo $this->feed->pathEntries (); ?>" placeholder="<?php echo _t('blank_to_disable'); ?>" />
-				<?php echo FreshRSS_Themes::icon('help'); ?> <?php echo _t('retrieve_truncated_feeds'); ?>
+				<?php echo _i('help'); ?> <?php echo _t('retrieve_truncated_feeds'); ?>
 			</div>
 		</div>
 
diff --git a/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtml
index ba02b9fad..011b17b7a 100644
--- a/app/views/helpers/javascript_vars.phtml
+++ b/app/views/helpers/javascript_vars.phtml
@@ -33,7 +33,7 @@ echo ',shortcuts={',
 "},\n";
 
 if (Minz_Request::param ('output') === 'global') {
-	echo "iconClose='", FreshRSS_Themes::icon('close'), "',\n";
+	echo "iconClose='", _i('close'), "',\n";
 }
 
 $authType = Minz_Configuration::authType();
diff --git a/app/views/helpers/view/global_view.phtml b/app/views/helpers/view/global_view.phtml
index 5e4cad01a..0e553c957 100644
--- a/app/views/helpers/view/global_view.phtml
+++ b/app/views/helpers/view/global_view.phtml
@@ -42,7 +42,7 @@
 
 <div id="overlay"></div>
 <div id="panel"<?php echo $this->conf->display_posts ? '' : ' class="hide_posts"'; ?>>
-	<a class="close" href="#"><?php echo FreshRSS_Themes::icon('close'); ?></a>
+	<a class="close" href="#"><?php echo _i('close'); ?></a>
 </div>
 
 <?php } else { ?>
diff --git a/app/views/helpers/view/normal_view.phtml b/app/views/helpers/view/normal_view.phtml
index ee745144f..66b79cd7f 100644
--- a/app/views/helpers/view/normal_view.phtml
+++ b/app/views/helpers/view/normal_view.phtml
@@ -66,7 +66,7 @@ if (!empty($this->entries)) {
 							$arUrl['params']['is_read'] = 0;
 						}
 						?><a class="read" href="<?php echo Minz_Url::display($arUrl); ?>"><?php
-							echo FreshRSS_Themes::icon($item->isRead () ? 'read' : 'unread'); ?></a><?php
+							echo _i($item->isRead () ? 'read' : 'unread'); ?></a><?php
 					?></li><?php
 				}
 				if ($topline_favorite) {
@@ -76,7 +76,7 @@ if (!empty($this->entries)) {
 							$arUrl['params']['is_favorite'] = 0;
 						}
 						?><a class="bookmark" href="<?php echo Minz_Url::display($arUrl); ?>"><?php
-							echo FreshRSS_Themes::icon($item->isFavorite () ? 'starred' : 'non-starred'); ?></a><?php
+							echo _i($item->isFavorite () ? 'starred' : 'non-starred'); ?></a><?php
 					?></li><?php
 				}
 			}
@@ -90,7 +90,7 @@ if (!empty($this->entries)) {
 			?><li class="item website"><a href="<?php echo _url ('index', 'index', 'get', 'f_' . $feed->id ()); ?>"><img class="favicon" src="<?php echo $feed->favicon (); ?>" alt="✇" /> <span><?php echo $feed->name(); ?></span></a></li>
 			<li class="item title"><a target="_blank" href="<?php echo $item->link (); ?>"><?php echo $item->title (); ?></a></li>
 			<?php if ($topline_date) { ?><li class="item date"><?php echo $item->date (); ?> </li><?php } ?>
-			<?php if ($topline_link) { ?><li class="item link"><a target="_blank" href="<?php echo $item->link (); ?>"><?php echo FreshRSS_Themes::icon('link'); ?></a></li><?php } ?>
+			<?php if ($topline_link) { ?><li class="item link"><a target="_blank" href="<?php echo $item->link (); ?>"><?php echo _i('link'); ?></a></li><?php } ?>
 		</ul>
 
 		<div class="flux_content">
@@ -111,7 +111,7 @@ if (!empty($this->entries)) {
 								$arUrl['params']['is_read'] = 0;
 							}
 							?><a class="read" href="<?php echo Minz_Url::display($arUrl); ?>"><?php
-								echo FreshRSS_Themes::icon($item->isRead () ? 'read' : 'unread'); ?></a><?php
+								echo _i($item->isRead () ? 'read' : 'unread'); ?></a><?php
 						?></li><?php
 					}
 					if ($bottomline_favorite) {
@@ -121,7 +121,7 @@ if (!empty($this->entries)) {
 								$arUrl['params']['is_favorite'] = 0;
 							}
 							?><a class="bookmark" href="<?php echo Minz_Url::display($arUrl); ?>"><?php
-								echo FreshRSS_Themes::icon($item->isFavorite () ? 'starred' : 'non-starred'); ?></a><?php
+								echo _i($item->isFavorite () ? 'starred' : 'non-starred'); ?></a><?php
 						?></li><?php
 					}
 				} ?>
@@ -132,7 +132,7 @@ if (!empty($this->entries)) {
 					?><div class="dropdown">
 						<div id="dropdown-share-<?php echo $item->id ();?>" class="dropdown-target"></div>
 						<a class="dropdown-toggle" href="#dropdown-share-<?php echo $item->id ();?>">
-							<?php echo FreshRSS_Themes::icon('share'); ?>
+							<?php echo _i('share'); ?>
 							<?php echo _t('share'); ?>
 						</a>
 
@@ -171,7 +171,7 @@ if (!empty($this->entries)) {
 					?><li class="item date"><?php echo $item->date (); ?></li><?php
 				}
 				if ($bottomline_link) {
-					?><li class="item link"><a target="_blank" href="<?php echo $item->link (); ?>"><?php echo FreshRSS_Themes::icon('link'); ?></a></li><?php
+					?><li class="item link"><a target="_blank" href="<?php echo $item->link (); ?>"><?php echo _i('link'); ?></a></li><?php
 				} ?>
 			</ul>
 		</div>
-- 
cgit v1.2.3