[Gforge-commits] gforge/www/news news_utils.php,1.18,1.19

[gsmet]

Update of /cvsroot/gforge/gforge/www/news
In directory db.perdue.net:/tmp/cvs-serv27071/www/news

Modified Files:
        news_utils.php 
Log Message:
fixed localization


Index: news_utils.php
===================================================================
RCS file: /cvsroot/gforge/gforge/www/news/news_utils.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- news_utils.php      15 Mar 2004 23:56:57 -0000      1.18
+++ news_utils.php      31 Mar 2004 16:54:45 -0000      1.19
@@ -126,14 +126,14 @@
                                        $num_comments = '0';
                                }
 
-                               if ($num_comments == 1) {
-                                       $comments_txt = " Comment";
+                               if ($num_comments <= 1) {
+                                       $comments_txt = 
$Language->getText('news_utils', 'comment_1');
                                } else {
-                                       $comments_txt = " Comments";
+                                       $comments_txt = 
$Language->getText('news_utils', 'comment_2');
                                }
 
                                if ($show_forum){
-                                       $return .= '<div align="center">(' . 
$num_comments . $comments_txt . ') <a href="/forum/forum.php?forum_id='. 
db_result($result,$i,'forum_id') .'">[' . $Language->getText('news_utils', 
'readmore') . ']</a></div><hr width="100%" size="1" />';
+                                       $return .= '<div align="center">(' . 
$num_comments .' '. $comments_txt . ') <a href="/forum/forum.php?forum_id='. 
db_result($result,$i,'forum_id') .'">[' . $Language->getText('news_utils', 
'readmore') . ']</a></div><hr width="100%" size="1" />';
                                } else {
                                        $return .= '<hr width="100%" size="1" 
/>';
                                }
@@ -146,7 +146,7 @@
                                $limit--;
                        }
                        if (!$limit && $i==$rows-1) {
-                               $return .= "</ul>\n";
+                               $return .= '</ul><hr width="100%" size="1" 
/>'."\n";
                        }
                }
        }
@@ -158,10 +158,6 @@
        }
 
        if ($show_forum) {
-               if ($tail_headlines) {
-                       $return .= '<hr width="100%" size="1" />'."\n";
-               }
-
                $return .= '<div align="center">'
                           .'<a href="'.$archive_url.'">[' . 
$Language->getText('news_utils', 'archive') . ']</a></div>';
        } else {