Roll back r46059, r46062 "(bug 1433) Add meta-information to pages with language...

Localization issues with the description text should be ironed out first... also test use of rel="alternate" on the main links if that works, could save the extra metadata.

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index e4d32af..0513f14 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -1542,21 +1542,6 @@ class OutputPage {
                        $tags[] = Xml::element( 'link', $tag );
                }
 
-               // Language Links
-               global $wgContLang;
-               $langLinks = $this->getLanguageLinks();
-               foreach( $langLinks as $link ) {
-                       $t = Title::newFromText( $link );
-                       $tags[] = Xml::element( 'link', array(
-                                       'title' => wfMsg( 'language-link-title', $wgContLang->getLanguageName( $t->getInterwiki() ) ),
-                                       'rel' => 'alternate',
-                                       'lang' => $t->getInterwiki(),
-                                       'xml:lang' => $t->getInterwiki(),
-                                       'hreflang' => $t->getInterwiki(),
-                                       'href' => $t->getFullURL()
-                               ) );
-               }
-
                if( $wgFeed ) {
                        global $wgTitle;
                        foreach( $this->getSyndicationLinks() as $format => $link ) {

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 533584f..e4102a4 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -3801,7 +3801,4 @@ Enter the filename without the "{{ns:file}}:" prefix.',
 
 #Put all regex fragments above this line. Leave this line exactly as it is</pre>',
 
-# Language links
-'language-link-title' => '$1 version',
-
 );