Index: openacs-4/packages/news/catalog/news.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/catalog/news.en_US.ISO-8859-1.xml,v diff -u -r1.26 -r1.27 --- openacs-4/packages/news/catalog/news.en_US.ISO-8859-1.xml 10 Oct 2009 22:38:10 -0000 1.26 +++ openacs-4/packages/news/catalog/news.en_US.ISO-8859-1.xml 2 Feb 2010 18:57:30 -0000 1.27 @@ -124,6 +124,7 @@ <msg key="Show_live_news">Show live news</msg> <msg key="Status">Status</msg> <msg key="Submit_a_news_item">Submit a news item</msg> + <msg key="system_name_News">%system_name% News</msg> <msg key="Thank_You">Thank You</msg> <msg key="The_action">The action</msg> <msg key="The_text_is_formatted_as">The text is formatted as</msg> Index: openacs-4/packages/news/catalog/news.es_ES.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/catalog/news.es_ES.ISO-8859-1.xml,v diff -u -r1.19 -r1.20 --- openacs-4/packages/news/catalog/news.es_ES.ISO-8859-1.xml 10 Oct 2009 22:38:10 -0000 1.19 +++ openacs-4/packages/news/catalog/news.es_ES.ISO-8859-1.xml 2 Feb 2010 18:57:30 -0000 1.20 @@ -120,6 +120,7 @@ <msg key="Show_live_news">Mostrar noticias actuales</msg> <msg key="Status">Estado</msg> <msg key="Submit_a_news_item">Enviar una noticia</msg> + <msg key="system_name_News">Noticias de %system_name%</msg> <msg key="Thank_You">�Gracias!</msg> <msg key="The_action">La acci�n</msg> <msg key="The_text_is_formatted_as">Formato del texto</msg> Index: openacs-4/packages/news/tcl/news-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/tcl/news-procs.tcl,v diff -u -r1.32 -r1.33 --- openacs-4/packages/news/tcl/news-procs.tcl 30 Dec 2009 23:13:36 -0000 1.32 +++ openacs-4/packages/news/tcl/news-procs.tcl 2 Feb 2010 18:57:30 -0000 1.33 @@ -258,9 +258,10 @@ db_foreach get_news_items {} { set entry_url [export_vars -base "[ad_url]${package_url}item" {item_id}] - set content_as_text [ad_html_text_convert -from $mime_type -to text/plain -- $content] - # for now, support only full content in feed - set description $content_as_text + # content doesn't need to be convert to plain text. moreover it will look much + # better in HTML + set content_as_html [ad_html_text_convert -from $mime_type -to text/html -- $content] + set description $content_as_html # Always convert timestamp to GMT set entry_date_ansi [lc_time_tz_convert -from [lang::system::timezone] -to "Etc/GMT" -time_value $last_modified] @@ -270,16 +271,19 @@ link $entry_url \ title $title \ description $description \ - value $content_as_text \ + value $content_as_html \ timestamp $entry_timestamp] if { $counter == 0 } { set column_array(channel_lastBuildDate) $entry_timestamp incr counter } } - set column_array(channel_title) "OpenACS News" - set column_array(channel_description) "OpenACS News" + + set news_title [_ news.system_name_News [list system_name [ad_system_name]]] + + set column_array(channel_title) $news_title + set column_array(channel_description) $news_title set column_array(items) $items set column_array(channel_language) "" set column_array(channel_copyright) ""