Cleanup to $wgFeedClasses:

* Remove 2 unused globals
* (bug 17488) Link in toolbar to feeds should be localized (already have the feed-$format messages) Patch by Marcin Cieślak.
* Tangentially, can $wgFeedClasses be moved from Defines to DefaultSettings? Seems to make more sense in the latter.

diff --git a/CREDITS b/CREDITS
index 2c8f12a..280654c 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -67,6 +67,7 @@ following names for their contribution to the product.
 * Juliano F. Ravasi
 * Lucas Garczewski
 * Louperivois
+* Marcin Cieślak
 * Marooned
 * Max Semenik
 * Michael De La Rue

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 9059596..40693b0 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -169,6 +169,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 12746) Do not allow new password e-mails when wiki is in read-only mode
 * (bug 17478) Fixed a PHP Strict standards error in
   maintenance/cleanupWatchlist.php
+* (bug 17488) RSS/Atom links in left toolbar are now localized
 
 == API changes in 1.15 ==
 * (bug 16858) Revamped list=deletedrevs to make listing deleted contributions

diff --git a/includes/ChangesFeed.php b/includes/ChangesFeed.php
index 33a1f05..a0c2767 100644 (file)
--- a/includes/ChangesFeed.php
+++ b/includes/ChangesFeed.php
@@ -20,7 +20,7 @@ class ChangesFeed {
 
        public function execute( $feed, $rows, $limit=0, $hideminor=false, $lastmod=false, $target='' ) {
                global $messageMemc, $wgFeedCacheTimeout;
-               global $wgFeedClasses, $wgSitename, $wgContLanguageCode;
+               global $wgSitename, $wgContLanguageCode;
 
                if ( !FeedUtils::checkFeedOutput( $this->format ) ) {
                        return;

diff --git a/includes/Skin.php b/includes/Skin.php
index c6b40e9..6cba23e 100644 (file)
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -1020,7 +1020,8 @@ END;
                if( $wgOut->isSyndicated() ) {
                        foreach( $wgFeedClasses as $format => $class ) {
                                $feedurl = $wgRequest->escapeAppendQuery( "feed=$format" );
-                               $s[] = "<a href=\"$feedurl\" rel=\"alternate\" type=\"application/{$format}+xml\" class=\"feedlink\">{$format}</a>";
+                               $s[] = "<a href=\"$feedurl\" rel=\"alternate\" type=\"application/{$format}+xml\""
+                                               . " class=\"feedlink\">" . wfMsg( "feed-$format" ) . "</a>";
                        }
                }
                return $wgLang->pipeList( $s );

diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 60b3eaa..d2892e0 100644 (file)
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -138,7 +138,7 @@ class SkinTemplate extends Skin {
                global $wgScript, $wgStylePath, $wgContLanguageCode;
                global $wgMimeType, $wgJsMimeType, $wgOutputEncoding, $wgRequest;
                global $wgXhtmlDefaultNamespace, $wgXhtmlNamespaces;
-               global $wgDisableCounters, $wgLogo, $action, $wgFeedClasses, $wgHideInterlanguageLinks;
+               global $wgDisableCounters, $wgLogo, $action, $wgHideInterlanguageLinks;
                global $wgMaxCredits, $wgShowCreditsIfMax;
                global $wgPageShowWatchingUsers;
                global $wgUseTrackbacks, $wgUseSiteJs;