Преглед изворни кода

Fix i18n strings for sharing

Fix https://github.com/FreshRSS/FreshRSS/issues/728
Marien Fressinaud пре 11 година
родитељ
комит
7f4ca35fc3

+ 0 - 2
app/Controllers/entryController.php

@@ -34,8 +34,6 @@ class FreshRSS_entry_Controller extends Minz_ActionController {
 	 *   - nextGet (default: $get)
 	 *   - nextGet (default: $get)
 	 *   - idMax (default: 0)
 	 *   - idMax (default: 0)
 	 *   - is_read (default: true)
 	 *   - is_read (default: true)
-	 *
-	 * @todo nextGet system should not be present here... or should be?
 	 */
 	 */
 	public function readAction() {
 	public function readAction() {
 		$id = Minz_Request::param('id');
 		$id = Minz_Request::param('id');

+ 0 - 2
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.
 	 * 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.
 	 * 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) {
 	private function guessFileType($filename) {
 		if (substr_compare($filename, '.zip', -4) === 0) {
 		if (substr_compare($filename, '.zip', -4) === 0) {

+ 6 - 2
app/views/index/normal.phtml

@@ -140,10 +140,14 @@ if (!empty($this->entries)) {
 
 
 						<ul class="dropdown-menu">
 						<ul class="dropdown-menu">
 							<li class="dropdown-close"><a href="#close">❌</a></li>
 							<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">
 								<li class="item share">
 									<a target="_blank" href="<?php echo FreshRSS_Share::generateUrl(FreshRSS_Context::$conf->shares, $share, $item->link(), $item->title() . ' . ' . $feed->name())?>">
 									<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>
 									</a>
 								</li>
 								</li>
 							<?php endforeach;?>
 							<?php endforeach;?>