From de9d4a14925a79ba8893b140dc4332ccb8caca73 Mon Sep 17 00:00:00 2001 From: Raimond Spekking Date: Wed, 23 Apr 2008 10:23:05 +0000 Subject: [PATCH] * Add a nice fieldset around the input form * Fix double escaping of some elements * Be smart to $wgCapitalLinks = true wikis and accept input with a lower case first character * Use the default -summary message as header --- includes/SpecialWithoutinterwiki.php | 42 ++++++++++----------------- languages/messages/MessagesDe.php | 7 +++-- languages/messages/MessagesEn.php | 4 +-- maintenance/language/messageTypes.inc | 1 - maintenance/language/messages.inc | 2 +- 5 files changed, 22 insertions(+), 34 deletions(-) diff --git a/includes/SpecialWithoutinterwiki.php b/includes/SpecialWithoutinterwiki.php index 44d6eb97d4..6900b16463 100644 --- a/includes/SpecialWithoutinterwiki.php +++ b/includes/SpecialWithoutinterwiki.php @@ -14,34 +14,18 @@ class WithoutInterwikiPage extends PageQueryPage { } function getPageHeader() { - global $wgScript, $wgContLang; + global $wgScript; $prefix = $this->prefix; $t = SpecialPage::getTitleFor( $this->getName() ); - $align = $wgContLang->isRtl() ? 'left' : 'right'; - $s = '

' . wfMsgExt( 'withoutinterwiki-header', array( 'parseinline' ) ) . '

'; - $s .= Xml::openElement( 'div', array( 'class' => 'namespaceoptions' ) ); - $s .= Xml::openElement( 'form', array( 'method' => 'get', 'action' => $wgScript ) ); - $s .= Xml::hidden( 'title', $t->getPrefixedText() ); - $s .= Xml::openElement( 'table', array( 'id' => 'nsselect', 'class' => 'withoutinterwiki' ) ); - $s .= " - " . - Xml::label( wfMsg( 'allpagesprefix' ), 'wiprefix' ) . - " - " . - Xml::input( 'prefix', 20, htmlspecialchars ( $prefix ), array( 'id' => 'wiprefix' ) ) . - " - - - - " . - Xml::submitButton( wfMsgHtml( 'withoutinterwiki-submit' ) ) . - " - "; - $s .= Xml::closeElement( 'table' ); - $s .= Xml::closeElement( 'form' ); - $s .= Xml::closeElement( 'div' ); - return $s; + return Xml::openElement( 'form', array( 'method' => 'get', 'action' => $wgScript ) ) . + Xml::openElement( 'fieldset' ) . + Xml::element( 'legend', null, wfMsg( 'withoutinterwiki-legend' ) ) . + Xml::hidden( 'title', $t->getPrefixedText() ) . + Xml::inputLabel( wfMsg( 'allpagesprefix' ), 'prefix', 'wiprefix', 20, $prefix ) . ' ' . + Xml::submitButton( wfMsg( 'withoutinterwiki-submit' ) ) . + Xml::closeElement( 'fieldset' ) . + Xml::closeElement( 'form' ); } function sortDescending() { @@ -81,9 +65,13 @@ class WithoutInterwikiPage extends PageQueryPage { } function wfSpecialWithoutinterwiki() { - global $wgRequest; + global $wgRequest, $wgContLang, $wgCapitalLinks; list( $limit, $offset ) = wfCheckLimits(); - $prefix = $wgRequest->getVal( 'prefix' ); + if( $wgCapitalLinks ) { + $prefix = $wgContLang->ucfirst( $wgRequest->getVal( 'prefix' ) ); + } else { + $prefix = $wgRequest->getVal( 'prefix' ); + } $wip = new WithoutInterwikiPage(); $wip->setPrefix( $prefix ); $wip->doQuery( $offset, $limit ); diff --git a/languages/messages/MessagesDe.php b/languages/messages/MessagesDe.php index c42b2dd4d6..064216596e 100644 --- a/languages/messages/MessagesDe.php +++ b/languages/messages/MessagesDe.php @@ -1361,9 +1361,10 @@ auf die bereits die erste Weiterleitung zeigen sollte.', 'brokenredirects-edit' => '(bearbeiten)', 'brokenredirects-delete' => '(löschen)', -'withoutinterwiki' => 'Seiten ohne Links zu anderen Sprachen', -'withoutinterwiki-header' => 'Die folgenden Seiten verlinken nicht auf andere Sprachversionen:', -'withoutinterwiki-submit' => 'Zeige', +'withoutinterwiki' => 'Seiten ohne Links zu anderen Sprachen', +'withoutinterwiki-summary' => 'Die folgenden Seiten verlinken nicht auf andere Sprachversionen:', +'withoutinterwiki-legend' => 'Präfix', +'withoutinterwiki-submit' => 'Zeige', 'fewestrevisions' => 'Seiten mit den wenigsten Versionen', 'fewestrevisions-summary' => 'Diese Spezialseite zeigt eine Liste von Seiten mit den wenigsten Bearbeitungen.', diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index 5347f8adec..35b1619d5c 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -1771,8 +1771,8 @@ A page is treated as disambiguation page if it uses a template which is linked f 'brokenredirects-delete' => '(delete)', 'withoutinterwiki' => 'Pages without language links', -'withoutinterwiki-header' => 'The following pages do not link to other language versions:', -'withoutinterwiki-summary' => '', # only translate this message to other languages if you have to change it +'withoutinterwiki-summary' => 'The following pages do not link to other language versions:', +'withoutinterwiki-legend' => 'Prefix', 'withoutinterwiki-submit' => 'Show', 'fewestrevisions' => 'Pages with the fewest revisions', diff --git a/maintenance/language/messageTypes.inc b/maintenance/language/messageTypes.inc index 673622377e..52510e58a3 100644 --- a/maintenance/language/messageTypes.inc +++ b/maintenance/language/messageTypes.inc @@ -160,7 +160,6 @@ $wgOptionalMessages = array( 'lonelypages-summary', 'unusedtemplates-summary', 'fewestrevisions-summary', - 'withoutinterwiki-summary', 'upload-summary', 'tog-nolangconversion', 'yourvariant', diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc index 56c88bda2f..403f797508 100644 --- a/maintenance/language/messages.inc +++ b/maintenance/language/messages.inc @@ -1099,7 +1099,7 @@ $wgMessageStructure = array( ), 'withoutinterwiki' => array( 'withoutinterwiki', - 'withoutinterwiki-header', + 'withoutinterwiki-legend', 'withoutinterwiki-summary', 'withoutinterwiki-submit', ), -- 2.20.1