use plurals for comment/comments link in article, properly translate comments string...

diff --git a/classes/feeds.php b/classes/feeds.php
index 3b765d6bdbfb3c720d8eaeb1d6c9f89e05c10dcc..394444345a13d599642a8a5d250cc67f35b33f41 100644 (file)
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -701,10 +701,13 @@ class Feeds extends Handler_Protected {
                                                } 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>";
                                                }
                                        }
 

diff --git a/css/tt-rss.css b/css/tt-rss.css
index beba1d4b3e17acc1479a6581a334c2ada5c44617..51b18ead69ab867815b100de1bcb4547091bf6f7 100644 (file)
--- a/css/tt-rss.css
+++ b/css/tt-rss.css
@@ -1018,6 +1018,19 @@ body#ttrssZoom {
        background : #f9fbff;
 }
 
+body#ttrssZoom div.postHeader div.postFeedTitle {
+       float : left;
+       text-align : right;
+       padding-left : 0px;
+       font-size : 10px;
+}
+
+body#ttrssZoom div.postHeader a.postComments {
+       text-align : right;
+       padding-left : 0px;
+       font-size : 10px;
+}
+
 body#ttrssZoom div.postHeader div.postDate {
        float : none;
        text-align : right;

diff --git a/include/functions.php b/include/functions.php
index 8ede14a0bfa7a188b036d8ac704aff70dd7c22a9..4917bca2e226ca41313b3a3ead958ca441914e37 100644 (file)
--- 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"]);