From: Raimond Spekking <raymond@users.mediawiki.org>
Date: Wed, 6 Jun 2007 11:42:02 +0000 (+0000)
Subject: Per talk with River on IRC:
X-Git-Tag: 1.31.0-rc.0~52640
X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=84ca3c02845ea01bd28929d0bd2c2b573d774ed7;p=lhc%2Fweb%2Fwiklou.git

Per talk with River on IRC:
Removing extra message from r22793, seem to be just unintuitive.
---

diff --git a/includes/SpecialBooksources.php b/includes/SpecialBooksources.php
index 3538289124..dad4cffc2c 100644
--- a/includes/SpecialBooksources.php
+++ b/includes/SpecialBooksources.php
@@ -31,7 +31,6 @@ class SpecialBookSources extends SpecialPage {
 		global $wgOut, $wgRequest;
 		$this->setHeaders();
 		$this->isbn = $this->cleanIsbn( $isbn ? $isbn : $wgRequest->getText( 'isbn' ) );
-		$this->lang = htmlspecialchars( $wgRequest->getText( 'uselang' ) );
 		$wgOut->addWikiText( wfMsgNoTrans( 'booksources-summary' ) );
 		$wgOut->addHtml( $this->makeForm() );
 		if( strlen( $this->isbn ) > 0 )
@@ -73,24 +72,16 @@ class SpecialBookSources extends SpecialPage {
 	 * @return string
 	 */
 	private function showList() {
-		global $wgOut, $wgContLang, $wgUser, $wgContLanguageCode;
-		$this->userLanguage = $wgUser->getOption( 'language', $wgContLanguageCode );
+		global $wgOut, $wgContLang;
 
 		# Hook to allow extensions to insert additional HTML,
 		# e.g. for API-interacting plugins and so on
 		wfRunHooks( 'BookInformation', array( $this->isbn, &$wgOut ) );
 
 		# Check for a local page such as Project:Book_sources and use that if available
-		if ( $this->lang == '' || $this->lang == $wgContLanguageCode ) {
-			$title = Title::makeTitleSafe( NS_PROJECT, wfMsgForContent( 'booksources' ) ); # Show list in content language
-		} else {
-			$title = Title::makeTitleSafe( NS_PROJECT, wfMsg( 'booksources' ) ); # Show list in user language
-		}
+		$title = Title::makeTitleSafe( NS_PROJECT, wfMsgForContent( 'booksources' ) ); # Show list in content language
 		if( is_object( $title ) && $title->exists() ) {
 			$rev = Revision::newFromTitle( $title );
-			if ( $this->userLanguage != $wgContLanguageCode && $this->lang == '' ) {
-				$wgOut->addWikiText( '<span class="plainlinks">' . wfMsgHtml( 'booksources-language', $this->isbn, $this->userLanguage ) . '</span>' );
-			}
 			$wgOut->addWikiText( str_replace( 'MAGICNUMBER', $this->isbn, $rev->getText() ) );
 			return true;
 		}
diff --git a/languages/messages/MessagesDe.php b/languages/messages/MessagesDe.php
index fd7a669166..0a4b6d2523 100644
--- a/languages/messages/MessagesDe.php
+++ b/languages/messages/MessagesDe.php
@@ -1239,7 +1239,6 @@ Davon {{PLURAL:$2|hat|haben}} '''$2''' (=$4%) $5-Rechte.",
 'booksources-isbn'          => 'ISBN:',
 'booksources-go'            => 'Suche',
 'booksources-text'          => 'Dies ist eine Liste mit Links zu Internetseiten, die neue und gebrauchte Bücher verkaufen. Dort kann es auch weitere Informationen über die Bücher geben. {{SITENAME}} ist mit keinem dieser Anbieter geschäftlich verbunden.',
-'booksources-language'      => "''Die nachfolgende Liste wird in der Sprache des Wikis ausgegeben. [{{fullurl:{{FULLPAGENAMEE}}|isbn=$1&uselang=$2}} Eine Liste in Ihrer Benutzersprache] enthält in der Regel nur wenige Einträge.''",
 
 'categoriespagetext' => 'Die folgenden Kategorien existieren in {{SITENAME}}:',
 'data'               => 'Daten',
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index cec80319ed..0b4f7a8614 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1608,7 +1608,6 @@ in active use.</p>',
 'booksources-go'            => 'Go',
 'booksources-text'          => 'Below is a list of links to other sites that sell new and used books, and may also have
 further information about books you are looking for:',
-'booksources-language'      => "''The following list is written in the content language of this wiki. [{{fullurl:{{FULLPAGENAMEE}}|isbn=$1&uselang=$2}} A translations into your user language] contains normally a shortened list only.''",
 
 'categoriespagetext' => 'The following categories exist in the wiki.',
 'data'               => 'Data',
diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 945f125777..8b78c040b9 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -1003,7 +1003,6 @@ $wgMessageStructure = array(
 		'booksources-isbn',
 		'booksources-go',
 		'booksources-text',
-		'booksources-language',
 	),
 	'specialpages2' => array(
 		'categoriespagetext',