| Index: trunk/phase3/maintenance/language/messages.inc |
| — | — | @@ -1003,7 +1003,6 @@ |
| 1004 | 1004 | 'booksources-isbn', |
| 1005 | 1005 | 'booksources-go', |
| 1006 | 1006 | 'booksources-text', |
| 1007 | | - 'booksources-language', |
| 1008 | 1007 | ), |
| 1009 | 1008 | 'specialpages2' => array( |
| 1010 | 1009 | 'categoriespagetext', |
| Index: trunk/phase3/includes/SpecialBooksources.php |
| — | — | @@ -31,7 +31,6 @@ |
| 32 | 32 | global $wgOut, $wgRequest; |
| 33 | 33 | $this->setHeaders(); |
| 34 | 34 | $this->isbn = $this->cleanIsbn( $isbn ? $isbn : $wgRequest->getText( 'isbn' ) ); |
| 35 | | - $this->lang = htmlspecialchars( $wgRequest->getText( 'uselang' ) ); |
| 36 | 35 | $wgOut->addWikiText( wfMsgNoTrans( 'booksources-summary' ) ); |
| 37 | 36 | $wgOut->addHtml( $this->makeForm() ); |
| 38 | 37 | if( strlen( $this->isbn ) > 0 ) |
| — | — | @@ -73,24 +72,16 @@ |
| 74 | 73 | * @return string |
| 75 | 74 | */ |
| 76 | 75 | private function showList() { |
| 77 | | - global $wgOut, $wgContLang, $wgUser, $wgContLanguageCode; |
| 78 | | - $this->userLanguage = $wgUser->getOption( 'language', $wgContLanguageCode ); |
| | 76 | + global $wgOut, $wgContLang; |
| 79 | 77 | |
| 80 | 78 | # Hook to allow extensions to insert additional HTML, |
| 81 | 79 | # e.g. for API-interacting plugins and so on |
| 82 | 80 | wfRunHooks( 'BookInformation', array( $this->isbn, &$wgOut ) ); |
| 83 | 81 | |
| 84 | 82 | # Check for a local page such as Project:Book_sources and use that if available |
| 85 | | - if ( $this->lang == '' || $this->lang == $wgContLanguageCode ) { |
| 86 | | - $title = Title::makeTitleSafe( NS_PROJECT, wfMsgForContent( 'booksources' ) ); # Show list in content language |
| 87 | | - } else { |
| 88 | | - $title = Title::makeTitleSafe( NS_PROJECT, wfMsg( 'booksources' ) ); # Show list in user language |
| 89 | | - } |
| | 83 | + $title = Title::makeTitleSafe( NS_PROJECT, wfMsgForContent( 'booksources' ) ); # Show list in content language |
| 90 | 84 | if( is_object( $title ) && $title->exists() ) { |
| 91 | 85 | $rev = Revision::newFromTitle( $title ); |
| 92 | | - if ( $this->userLanguage != $wgContLanguageCode && $this->lang == '' ) { |
| 93 | | - $wgOut->addWikiText( '<span class="plainlinks">' . wfMsgHtml( 'booksources-language', $this->isbn, $this->userLanguage ) . '</span>' ); |
| 94 | | - } |
| 95 | 86 | $wgOut->addWikiText( str_replace( 'MAGICNUMBER', $this->isbn, $rev->getText() ) ); |
| 96 | 87 | return true; |
| 97 | 88 | } |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -1608,7 +1608,6 @@ |
| 1609 | 1609 | 'booksources-go' => 'Go', |
| 1610 | 1610 | 'booksources-text' => 'Below is a list of links to other sites that sell new and used books, and may also have |
| 1611 | 1611 | further information about books you are looking for:', |
| 1612 | | -'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.''", |
| 1613 | 1612 | |
| 1614 | 1613 | 'categoriespagetext' => 'The following categories exist in the wiki.', |
| 1615 | 1614 | 'data' => 'Data', |
| Index: trunk/phase3/languages/messages/MessagesDe.php |
| — | — | @@ -1239,7 +1239,6 @@ |
| 1240 | 1240 | 'booksources-isbn' => 'ISBN:', |
| 1241 | 1241 | 'booksources-go' => 'Suche', |
| 1242 | 1242 | '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.', |
| 1243 | | -'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.''", |
| 1244 | 1243 | |
| 1245 | 1244 | 'categoriespagetext' => 'Die folgenden Kategorien existieren in {{SITENAME}}:', |
| 1246 | 1245 | 'data' => 'Daten', |