From fee1ae997af678cb834d9db25a636032f43a5674 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 11 Dec 2014 19:02:05 +0100
Subject: Fix i18n for conf, entry, error, feed Controllers

---
 app/Controllers/entryController.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'app/Controllers/entryController.php')

diff --git a/app/Controllers/entryController.php b/app/Controllers/entryController.php
index b4beed619..c894ae9aa 100755
--- a/app/Controllers/entryController.php
+++ b/app/Controllers/entryController.php
@@ -85,7 +85,7 @@ class FreshRSS_entry_Controller extends Minz_ActionController {
 		}
 
 		if (!$this->ajax) {
-			Minz_Request::good(_t('feeds_marked_read'), array(
+			Minz_Request::good(_t('feedback.sub.feed.marked_read'), array(
 				'c' => 'index',
 				'a' => 'index',
 				'params' => $params,
@@ -144,7 +144,7 @@ class FreshRSS_entry_Controller extends Minz_ActionController {
 		$feedDAO->updateCachedValues();
 
 		invalidateHttpCache();
-		Minz_Request::good(_t('optimization_complete'), $url_redirect);
+		Minz_Request::good(_t('feedback.admin.optimization_complete'), $url_redirect);
 	}
 
 	/**
@@ -185,7 +185,7 @@ class FreshRSS_entry_Controller extends Minz_ActionController {
 		$feedDAO->updateCachedValues();
 
 		invalidateHttpCache();
-		Minz_Request::good(_t('purge_completed', $nb_total), array(
+		Minz_Request::good(_t('feedback.sub.purge_completed', $nb_total), array(
 			'c' => 'configure',
 			'a' => 'archiving'
 		));
-- 
cgit v1.2.3


From 7f4ca35fc331ca4ce5e097d574e99417da0ef73e Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 17 Dec 2014 17:21:41 +0100
Subject: Fix i18n strings for sharing

Fix https://github.com/FreshRSS/FreshRSS/issues/728
---
 app/Controllers/entryController.php        | 2 --
 app/Controllers/importExportController.php | 2 --
 app/views/index/normal.phtml               | 8 ++++++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'app/Controllers/entryController.php')

diff --git a/app/Controllers/entryController.php b/app/Controllers/entryController.php
index c894ae9aa..aae08c413 100755
--- a/app/Controllers/entryController.php
+++ b/app/Controllers/entryController.php
@@ -34,8 +34,6 @@ class FreshRSS_entry_Controller extends Minz_ActionController {
 	 *   - nextGet (default: $get)
 	 *   - idMax (default: 0)
 	 *   - is_read (default: true)
-	 *
-	 * @todo nextGet system should not be present here... or should be?
 	 */
 	public function readAction() {
 		$id = Minz_Request::param('id');
diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php
index f29051f34..6eefa0f6f 100644
--- a/app/Controllers/importExportController.php
+++ b/app/Controllers/importExportController.php
@@ -125,8 +125,6 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
 	 *
 	 * Itis a *very* basic guess file type function. Only based on filename.
 	 * That's could be improved but should be enough for what we have to do.
-	 *
-	 * @todo move into lib_rss.php
 	 */
 	private function guessFileType($filename) {
 		if (substr_compare($filename, '.zip', -4) === 0) {
diff --git a/app/views/index/normal.phtml b/app/views/index/normal.phtml
index 3a27a702b..66111397c 100644
--- a/app/views/index/normal.phtml
+++ b/app/views/index/normal.phtml
@@ -140,10 +140,14 @@ if (!empty($this->entries)) {
 
 						<ul class="dropdown-menu">
 							<li class="dropdown-close"><a href="#close">❌</a></li>
-							<?php foreach ($sharing as $share) :?>
+							<?php
+								foreach ($sharing as $share) :
+									$type_share = FreshRSS_Context::$conf->shares[$share['type']];
+									$has_specific_title = ($type_share['form'] === 'advanced');
+							?>
 								<li class="item share">
 									<a target="_blank" href="<?php echo FreshRSS_Share::generateUrl(FreshRSS_Context::$conf->shares, $share, $item->link(), $item->title() . ' . ' . $feed->name())?>">
-										<?php echo _t('index.share.' . $share['name']);?>
+										<?php echo $has_specific_title ? $share['name'] : _t('index.share.' . $share['name']); ?>
 									</a>
 								</li>
 							<?php endforeach;?>
-- 
cgit v1.2.3