Misc minor details + a few i18n corrections

https://github.com/marienfressinaud/FreshRSS/issues/618

5 files changed, 17 insertions, 16 deletions

diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index 347b8392f..cdf8962cb 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -143,11 +143,12 @@ class FreshRSS extends Minz_FrontController {
 		$theme = FreshRSS_Themes::load($this->conf->theme);
 		if ($theme) {
 			foreach($theme['files'] as $file) {
-				$theme_id = $theme['id'];
-				$filename = $file;
-				if ($file[0] == '_') {
+				if ($file[0] === '_') {
 					$theme_id = 'base-theme';
 					$filename = substr($file, 1);
+				} else {
+					$theme_id = $theme['id'];
+					$filename = $file;
 				}
 				$filetime = @filemtime(PUBLIC_PATH . '/themes/' . $theme_id . '/' . $filename);
 				Minz_View::appendStyle(Minz_Url::display(
diff --git a/app/i18n/en.php b/app/i18n/en.php
index f84593cb5..b14b36b32 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -428,10 +428,10 @@ return array (
 	'update_system'			=> 'Update system',
 	'update_check'			=> 'Check for new updates',
 	'update_last'			=> 'Last verification: %s',
-	'update_can_apply'		=> 'There is an available update.',
+	'update_can_apply'		=> 'An update is available.',
 	'update_apply'			=> 'Apply',
 	'update_server_not_found'	=> 'Update server cannot be found. [%s]',
 	'no_update'			=> 'No update to apply',
-	'update_problem'		=> 'Update has encountered an error: %s',
-	'update_finished'		=> 'Update is now  finished!',
+	'update_problem'		=> 'The update process has encountered an error: %s',
+	'update_finished'		=> 'Update completed!',
 );
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index da5819529..3dc429bbb 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -428,7 +428,7 @@ return array (
 	'update_system'			=> 'Système de mise à jour',
 	'update_check'			=> 'Vérifier les mises à jour',
 	'update_last'			=> 'Dernière vérification : %s',
-	'update_can_apply'		=> 'Il y’a une mise à jour à appliquer.',
+	'update_can_apply'		=> 'Une mise à jour est disponible.',
 	'update_apply'			=> 'Appliquer la mise à jour',
 	'update_server_not_found'	=> 'Le serveur de mise à jour n’a pas été trouvé. [%s]',
 	'no_update'			=> 'Aucune mise à jour à appliquer',
diff --git a/app/i18n/install.en.php b/app/i18n/install.en.php
index 487b5073a..c422de90f 100644
--- a/app/i18n/install.en.php
+++ b/app/i18n/install.en.php
@@ -43,7 +43,7 @@ return array (
 	'persona_is_ok'			=> 'Permissions on Mozilla Persona directory are good',
 	'file_is_nok'			=> 'Check permissions on <em>%s</em> directory. HTTP server must have rights to write into',
 	'http_referer_is_ok'		=> 'Your HTTP REFERER is known and corresponds to your server.',
-	'http_referer_is_nok'		=> 'Please check you are not altering your HTTP REFERER.',
+	'http_referer_is_nok'		=> 'Please check that you are not altering your HTTP REFERER.',
 	'fix_errors_before'		=> 'Fix errors before skip to the next step.',
 
 	'general_conf_is_ok'		=> 'General configuration has been saved.',
diff --git a/app/layout/aside_configure.phtml b/app/layout/aside_configure.phtml
index 03bea4836..d5c9bf4c9 100644
--- a/app/layout/aside_configure.phtml
+++ b/app/layout/aside_configure.phtml
@@ -1,32 +1,32 @@
 <ul class="nav nav-list aside">
 	<li class="nav-header"><?php echo _t('configuration'); ?></li>
-	<li class="item<?php echo Minz_Request::actionName() == 'display' ? ' active' : ''; ?>">
+	<li class="item<?php echo Minz_Request::actionName() === 'display' ? ' active' : ''; ?>">
 		<a href="<?php echo _url('configure', 'display'); ?>"><?php echo _t('display_configuration'); ?></a>
 	</li>
-	<li class="item<?php echo Minz_Request::actionName() == 'reading' ? ' active' : ''; ?>">
+	<li class="item<?php echo Minz_Request::actionName() === 'reading' ? ' active' : ''; ?>">
 		<a href="<?php echo _url('configure', 'reading'); ?>"><?php echo _t('reading_configuration'); ?></a>
 	</li>
-	<li class="item<?php echo Minz_Request::actionName() == 'archiving' ? ' active' : ''; ?>">
+	<li class="item<?php echo Minz_Request::actionName() === 'archiving' ? ' active' : ''; ?>">
 		<a href="<?php echo _url('configure', 'archiving'); ?>"><?php echo _t('archiving_configuration'); ?></a>
 	</li>
-	<li class="item<?php echo Minz_Request::actionName() == 'sharing' ? ' active' : ''; ?>">
+	<li class="item<?php echo Minz_Request::actionName() === 'sharing' ? ' active' : ''; ?>">
 		<a href="<?php echo _url('configure', 'sharing'); ?>"><?php echo _t('sharing'); ?></a>
 	</li>
-	<li class="item<?php echo Minz_Request::actionName() == 'shortcut' ? ' active' : ''; ?>">
+	<li class="item<?php echo Minz_Request::actionName() === 'shortcut' ? ' active' : ''; ?>">
 		<a href="<?php echo _url('configure', 'shortcut'); ?>"><?php echo _t('shortcuts'); ?></a>
 	</li>
-	<li class="item<?php echo Minz_Request::actionName() == 'queries' ? ' active' : ''; ?>">
+	<li class="item<?php echo Minz_Request::actionName() === 'queries' ? ' active' : ''; ?>">
 		<a href="<?php echo _url('configure', 'queries'); ?>"><?php echo _t('queries'); ?></a>
 	</li>
 	<li class="separator"></li>
-	<li class="item<?php echo Minz_Request::actionName() == 'users' ? ' active' : ''; ?>">
+	<li class="item<?php echo Minz_Request::actionName() === 'users' ? ' active' : ''; ?>">
 		<a href="<?php echo _url('configure', 'users'); ?>"><?php echo _t('users'); ?></a>
 	</li>
 	<?php
 		$current_user = Minz_Session::param('currentUser', '');
 		if (Minz_Configuration::isAdmin($current_user)) {
 	?>
-	<li class="item<?php echo Minz_Request::controllerName() == 'update' ? ' active' : ''; ?>">
+	<li class="item<?php echo Minz_Request::controllerName() === 'update' ? ' active' : ''; ?>">
 		<a href="<?php echo _url('update', 'index'); ?>"><?php echo _t('update'); ?></a>
 	</li>
 	<?php } ?>