From: Jimmy Collins <collinj@users.mediawiki.org>
Date: Sun, 22 Oct 2006 11:31:03 +0000 (+0000)
Subject: * (bug 7606) MediaWiki messages for "rss" and "atom" missing
X-Git-Tag: 1.31.0-rc.0~55400
X-Git-Url: http://git.cyclocoop.org//%22javascript:ModifierStyle%28%27%22.%24id.%22%27%29/%22?a=commitdiff_plain;h=8d826d4ad82d8d90cd8353165697de5cfdf0b6e3;p=lhc%2Fweb%2Fwiklou.git

* (bug 7606) MediaWiki messages for "rss" and "atom" missing
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 043c4ad25f..c4328ae715 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -76,6 +76,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 7607) Add Karakalpak (kaa) to Names.php and stub message file for linktrail
 * (bug 7582) Add 'tog-nolangconversion' to MessagesEn.php.
   This key is need for languages with variants (zh, sr, kk)
+* (bug 7606) MediaWiki messages for "rss" and "atom" missing
 
 
 == Languages updated ==
diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index ff3c1d11ac..050368432f 100644
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -220,8 +220,14 @@ class SkinTemplate extends Skin {
 		if( $wgOut->isSyndicated() ) {
 			$feeds = array();
 			foreach( $wgFeedClasses as $format => $class ) {
+				$linktext = $format;
+				if ( $format == "atom" ) {
+					$linktext = wfMsg( 'feed-atom' );
+				} else if ( $format == "rss" ) {
+					$linktext = wfMsg( 'feed-rss' );
+				}
 				$feeds[$format] = array(
-					'text' => $format,
+					'text' => $linktext,
 					'href' => $wgRequest->appendQuery( "feed=$format" )
 				);
 			}
diff --git a/languages/messages/MessagesDe.php b/languages/messages/MessagesDe.php
index abf9072b23..df2a0b8efb 100644
--- a/languages/messages/MessagesDe.php
+++ b/languages/messages/MessagesDe.php
@@ -302,6 +302,8 @@ $messages = array(
 'restorelink'		=> '{{PLURAL:$1|einer gelöschten Version|$1 gelöschten Versionen}}',
 "feedlinks" => "Feed:",
 'feed-invalid'		=> 'Ungültiger Abonnement-Typ.',
+'feed-atom'		=> 'Atom',
+'feed-rss'		=> 'RSS',
 'permalink'     => 'Permanentlink',
 "listingcontinuesabbrev" => "(Forts.)",
 
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index c0a524104b..a457dabfc6 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -571,6 +571,8 @@ parent class in order maintain consistency across languages.
 'restorelink' => '{{PLURAL:$1|one deleted edit|$1 deleted edits}}',
 'feedlinks' => 'Feed:',
 'feed-invalid' => 'Invalid subscription feed type.',
+'feed-atom' => 'Atom',
+'feed-rss' => 'RSS',
 'sitenotice'	=> '-', # the equivalent to wgSiteNotice
 'anonnotice' => '-',