diff options
author | Andrew Dolgov <[email protected]> | 2013-09-02 12:58:14 +0400 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2013-09-02 12:58:14 +0400 |
commit | ff04fe06250b7640b62379708b27ae31630150a0 (patch) | |
tree | 8c2dd2159829c084cac463c08999cf67117e03e6 /include/functions.php | |
parent | 9e04187845472b24d40eb364205f8ea8bedeceba (diff) |
use plurals for comment/comments link in article, properly translate comments string, add feed title to article in zoom mode
Diffstat (limited to 'include/functions.php')
-rw-r--r-- | include/functions.php | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/include/functions.php b/include/functions.php index 8ede14a0b..4917bca2e 100644 --- a/include/functions.php +++ b/include/functions.php @@ -3182,6 +3182,7 @@ $result = db_query("SELECT id,title,link,content,feed_id,comments,int_id,lang, ".SUBSTRING_FOR_DATE."(updated,1,16) as updated, (SELECT site_url FROM ttrss_feeds WHERE id = feed_id) as site_url, + (SELECT title FROM ttrss_feeds WHERE id = feed_id) as feed_title, (SELECT hide_images FROM ttrss_feeds WHERE id = feed_id) as hide_images, (SELECT always_display_enclosures FROM ttrss_feeds WHERE id = feed_id) as always_display_enclosures, num_comments, @@ -3218,10 +3219,13 @@ } else { $comments_url = htmlspecialchars($line["link"]); } - $entry_comments = "<a target='_blank' href=\"$comments_url\">$num_comments comments</a>"; + $entry_comments = "<a class=\"postComments\" + target='_blank' href=\"$comments_url\">$num_comments ". + _ngettext("comment", "comments", $num_comments)."</a>"; + } else { if ($line["comments"] && $line["link"] != $line["comments"]) { - $entry_comments = "<a target='_blank' href=\"".htmlspecialchars($line["comments"])."\">comments</a>"; + $entry_comments = "<a class=\"postComments\" target='_blank' href=\"".htmlspecialchars($line["comments"])."\">".__("comments")."</a>"; } } @@ -3276,8 +3280,15 @@ $rv['content'] .= "<div class='postTitle'>" . $line["title"] . "$entry_author</div>"; } - if ($zoom_mode) + if ($zoom_mode) { + $feed_title = "<a href=\"".htmlspecialchars($line["site_url"]). + "\" target=\"_blank\">". + htmlspecialchars($line["feed_title"])."</a>"; + + $rv['content'] .= "<div class=\"postFeedTitle\">$feed_title</div>"; + $rv['content'] .= "<div class=\"postDate\">$parsed_updated</div>"; + } $tags_str = format_tags_string($line["tags"], $id); $tags_str_full = join(", ", $line["tags"]); |