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

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 043c4ad..c4328ae 100644 (file)
--- 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 ff3c1d1..0503684 100644 (file)
--- 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 abf9072..df2a0b8 100644 (file)
--- 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 c0a5241..a457dab 100644 (file)
--- 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' => '-',