jenkins-bot has submitted this change and it was merged.
Change subject: Make legend easier to read
......................................................................
Make legend easier to read
Moves the legend table into a system message for easier editing, and reformats
the overall layout as well as changing some of the individual explanations.
Change-Id: I744dce4bbfb9d8623fc4df83def3860626482330
---
M Interwiki.css
M Interwiki_body.php
M i18n/en.json
M i18n/qqq.json
4 files changed, 10 insertions(+), 43 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, but someone else must approve
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Interwiki.css b/Interwiki.css
index e4f9299..065a6dc 100755
--- a/Interwiki.css
+++ b/Interwiki.css
@@ -41,7 +41,7 @@
}
.mw-special-Interwiki .mw-collapsible-toggle {
- float: left;
+ float: none;
}
.mw-collapsible-content {
diff --git a/Interwiki_body.php b/Interwiki_body.php
index 75dcf6d..555cec3 100755
--- a/Interwiki_body.php
+++ b/Interwiki_body.php
@@ -306,24 +306,11 @@
'data-collapsetext' => $this->msg(
'interwiki-legend-hide' )->escaped(),
'data-expandtext' =>
$this->msg('interwiki-legend-show' )->escaped()
) ) );
- $this->getOutput()->addHTML(
- Html::rawElement(
- 'table', array( 'class' => 'mw-interwikitable
wikitable intro' ),
- $this->addInfoRow( 'start', 'interwiki_prefix',
'interwiki_prefix_intro' ) . "\n" .
- $this->addInfoRow( 'start', 'interwiki_url',
'interwiki_url_intro' ) . "\n" .
- $this->addInfoRow( 'start', 'interwiki_local',
'interwiki_local_intro' ) . "\n" .
- $this->addInfoRow( 'end', 'interwiki_0',
'interwiki_local_0_intro' ) . "\n" .
- $this->addInfoRow( 'end', 'interwiki_1',
'interwiki_local_1_intro' ) . "\n" .
- $this->addInfoRow( 'start', 'interwiki_trans',
'interwiki_trans_intro' ) . "\n" .
- $this->addInfoRow( 'end', 'interwiki_0',
'interwiki_trans_0_intro' ) . "\n" .
- $this->addInfoRow( 'end', 'interwiki_1',
'interwiki_trans_1_intro' ) . "\n"
- )
- );
-
+ $this->getOutput()->addWikiMsg( 'interwiki_legend' );
$this->getOutput()->addHTML( Html::closeElement( 'div' ) ); //
end collapsible.
if ( $canModify ) {
- $this->getOutput()->addHTML( "<br />" . $this->msg(
'interwiki_intro_footer' )->parse() );
+ $this->getOutput()->addWikiMsg(
'interwiki_intro_footer' );
$addtext = $this->msg( 'interwiki_addtext' )->escaped();
$addlink = Linker::linkKnown( $this->getPageTitle(
'add' ), $addtext );
$this->getOutput()->addHTML( '<p
class="mw-interwiki-addlink">' . $addlink . '</p>' );
@@ -411,26 +398,6 @@
$out .= Html::closeElement( 'table' );
$this->getOutput()->addHTML( $out );
- }
-
- /**
- * Adds a row to the documentation table on the top of
Special:Interwiki.
- * @param $align string
- * @param $title string
- * @param $text string
- * @return string
- */
- private function addInfoRow( $align = 'start', $title, $text ) {
- return Html::rawElement( 'tr', null,
- // The classes mw-align-start and mw-align-end are used
here.
- Html::rawElement(
- 'th',
- array( 'class' => 'mw-align-' . $align ),
- $this->msg( $title )->escaped()
- ) .
- // This message is expected to have wiki syntax
- Html::rawElement( 'td', null, $this->msg( $text
)->parse() )
- );
}
function error() {
diff --git a/i18n/en.json b/i18n/en.json
old mode 100644
new mode 100755
index d9d9cb8..7ef1225
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -12,22 +12,21 @@
"interwiki_intro": "This is an overview of the interwiki table.",
"interwiki-legend-show": "Show legend",
"interwiki-legend-hide": "Hide legend",
+ "interwiki_legend": "{|
class=\"wikitable\"\n|-\n!{{int:interwiki_prefix}}\n|colspan=2|{{int:interwiki_prefix_intro}}\n|-\n!{{int:interwiki_url}}\n|colspan=2|{{int:interwiki_url_intro}}\n|-\n!rowspan=2|{{int:interwiki_local}}\n!{{int:interwiki_1}}\n|{{int:interwiki_local_1_intro}}\n|-\n!{{int:interwiki_0}}\n|{{int:interwiki_local_0_intro}}\n|-\n!rowspan=2|Transclude\n!{{int:interwiki_1}}\n|{{int:interwiki_trans_1_intro}}\n|-\n!{{int:interwiki_0}}\n|{{int:interwiki_trans_0_intro}}\n|-\n|}",
"interwiki_prefix": "Prefix",
"interwiki-prefix-label": "Prefix:",
"interwiki_prefix_intro": "Interwiki prefix to be used in <code>[<nowiki
/>[prefix:<em>pagename</em>]]</code> wikitext syntax.",
"interwiki_url": "URL",
"interwiki-url-label": "URL:",
- "interwiki_url_intro": "Template for URLs. The placeholder $1 will be
replaced by the <em>pagename</em> of the wikitext, when the abovementioned
wikitext syntax is used.",
+ "interwiki_url_intro": "Template for URLs. The placeholder $1 will be
replaced by the <em>pagename</em> in <code>[<nowiki
/>[prefix:<em>pagename</em>]]</code>.",
"interwiki_local": "Forward",
"interwiki-local-label": "Forward:",
- "interwiki_local_intro": "An HTTP request to the local wiki with this
interwiki prefix in the URL is:",
- "interwiki_local_0_intro": "not honored, a \"{{int:badtitle}}\" error page
will be displayed instead.",
- "interwiki_local_1_intro": "redirected to the target URL given in the
interwiki link definitions (i.e. treated like links to local pages).",
+ "interwiki_local_0_intro": "External HTTP requests to the local wiki using
this interwiki prefix in the URL will result in a \"{{int:badtitle}}\" error
page.",
+ "interwiki_local_1_intro": "External HTTP requests to the local wiki using
this interwiki prefix will be redirected to the target URL of the interwiki
(i.e. treated like links to local pages).",
"interwiki_trans": "Transclude",
"interwiki-trans-label": "Transclude:",
- "interwiki_trans_intro": "If wikitext syntax <code>{<nowiki
/>{prefix:<em>pagename</em>}}</code> is used, then:",
- "interwiki_trans_1_intro": "allow transclusion from the foreign wiki, if
interwiki transclusions are generally permitted in this wiki.",
- "interwiki_trans_0_intro": "do not allow it, rather look for a page in the
template namespace.",
+ "interwiki_trans_1_intro": "If wikitext syntax <code>{<nowiki
/>{prefix:<em>pagename</em>}}</code> is used, allow template/page transclusion
from the foreign wiki if interwiki transclusions are enabled in general
([//www.mediawiki.org/wiki/Manual:$wgEnableScaryTranscluding scary
transclusion]).",
+ "interwiki_trans_0_intro": "Do not allow <code>{<nowiki
/>{prefix:<em>pagename</em>}}</code> to transclude foreign templates/pages,
rather look for a local page in the template namespace.",
"interwiki_intro_footer": "See
[//www.mediawiki.org/wiki/Manual:Interwiki_table MediaWiki.org] for more
information about the interwiki table.\nThere is a [[Special:Log/interwiki|log
of changes]] to the interwiki table.",
"interwiki_1": "yes",
"interwiki_0": "no",
diff --git a/i18n/qqq.json b/i18n/qqq.json
old mode 100644
new mode 100755
index 5f548c8..20ee7ba
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -21,6 +21,7 @@
"interwiki_intro": "Part of the interwiki extension. Shown as
introductory text on [[Special:Interwiki]].",
"interwiki-legend-show": "Link text for toggle to display the legend on
[[Special:Interwiki]].",
"interwiki-legend-hide": "Link text for toggle to hide the legend on
[[Special:Interwiki]].",
+ "interwiki-legend": "{{notranslate}}\nLegend on [[Special:Interwiki]].",
"interwiki_prefix": "Used on [[Special:Interwiki]] as a column header
of the table.",
"interwiki-prefix-label": "Used on [[Special:Interwiki]] as a field
label in a form.",
"interwiki_prefix_intro": "Used on [[Special:Interwiki]] so as to
explain the data in the {{msg-mw|Interwiki prefix}} column of the table.\n\nDo
translate both words inside the square brackets as placeholders, where
\"prefix\" should be identical to, or clearly linked to, the column header.",
--
To view, visit https://gerrit.wikimedia.org/r/155696
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I744dce4bbfb9d8623fc4df83def3860626482330
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Interwiki
Gerrit-Branch: master
Gerrit-Owner: Isarra <zhoris...@gmail.com>
Gerrit-Reviewer: Bartosz Dziewoński <matma....@gmail.com>
Gerrit-Reviewer: Nikerabbit <niklas.laxst...@gmail.com>
Gerrit-Reviewer: Raimond Spekking <raimond.spekk...@gmail.com>
Gerrit-Reviewer: Siebrand <siebr...@kitano.nl>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
