Glaisher has uploaded a new change for review. https://gerrit.wikimedia.org/r/267449
Change subject: Remove intro text from some pages ...................................................................... Remove intro text from some pages Per design review, these pages are already self-explanatory so there is no need to add these. Bug: T124527 Bug: T116353 Change-Id: I393c4b05690d2f9bb1bddac4bd47d335e45dfdbd --- M i18n/en.json M i18n/qqq.json M includes/specials/SpecialNewsletter.php M includes/specials/SpecialNewsletters.php 4 files changed, 2 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter refs/changes/49/267449/1 diff --git a/i18n/en.json b/i18n/en.json index bda18d3..fc51aa4 100755 --- a/i18n/en.json +++ b/i18n/en.json @@ -31,7 +31,6 @@ "newsletter-notfound": "Newsletter not found", "newsletter-not-found-id": "A newsletter with this ID does not exist.", "newsletter-view": "View newsletter details", - "newsletter-view-text": "This page allows you to view details about specific newsletters. There is also an [[Special:Newsletters|overview of all newsletters]] on this wiki.", "newsletter-user-subscribed": "You are currently subscribed to this newsletter.", "newsletter-user-notsubscribed": "You are currently not subscribed to this newsletter. You may subscribe to this newsletter by pressing the \"{{int:newsletter-subscribe-button}}\" button if you wish to do so.", "newsletter-view-name": "Newsletter name:", @@ -111,7 +110,6 @@ "action-newsletter-delete": "delete newsletters", "right-newsletter-manage": "Add or remove publishers from newsletters", "action-newsletter-manage": "manage newsletters", - "newsletters-summary": "This page allows you to browse through a list of all newsletters on this wiki and allows users to subscribe to or unsubscribe from them. You can also choose your newsletter subscription options through the [[Special:Preferences#mw-prefsection-echo|preferences]] interface.", "apihelp-newslettersubscribe-description": "Subscribe to or unsubscribe from a newsletter.", "apihelp-newslettersubscribe-param-id": "ID of the newsletter for which the subscription should be changed.", "apihelp-newslettersubscribe-param-do": "Action to do. Should be either <kbd>subscribe</kbd> or <kbd>unsubscribe</kbd>.", diff --git a/i18n/qqq.json b/i18n/qqq.json index 155d9ae..e825232 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -35,7 +35,6 @@ "newsletter-notfound": "Header of Special:Newsletter/<id> if no newsletter by that id exists.\n\nSee also:\n* {{msg-mw|newsletter-not-found-id}}", "newsletter-not-found-id": "Error message shown on Special:Newsletter/<id> if no newsletter by that id exists.\n\nSee also:\n* {{msg-mw|newsletter-notfound}}", "newsletter-view": "Header message shown on Special:Newsletter/<id> if a newsletter by the specified id exists.\n\nSee also:\n* {{msg-mw|newsletter-delete}}", - "newsletter-view-text": "Introductory message Special:Newsletter/<id> if a newsletter by the specified id exists.", "newsletter-user-subscribed": "Message shown on Special:Newsletter/<id> if the current user is subscribed to the newsletter. Only shown for logged-in users.", "newsletter-user-notsubscribed": "Message shown on Special:Newsletter/<id> if the current user is not subscribed to the newsletter. Only shown for logged-in users. Has a reference to {{msg-mw|newsletter-subscribe-button}}", "newsletter-view-name": "Label for newsletter name field. Shown on Special:Newsletter/<id>", @@ -115,7 +114,6 @@ "action-newsletter-delete": "{{doc-action|newsletter-delete}}", "right-newsletter-manage": "{{doc-right|newsletter-manage}}", "action-newsletter-manage": "{{doc-action|newsletter-manage}}", - "newsletters-summary": "Introductory message shown on top of [[Special:Newsletters]]. Do not translate the anchor of Special:Preferences link. (\"#mw-prefsection-echo\" part).", "apihelp-newslettersubscribe-description": "{{doc-apihelp-description|newslettersubscribe}}", "apihelp-newslettersubscribe-param-id": "{{doc-apihelp-param|newslettersubscribe|id}}", "apihelp-newslettersubscribe-param-do": "{{doc-apihelp-param|newslettersubscribe|do}}", diff --git a/includes/specials/SpecialNewsletter.php b/includes/specials/SpecialNewsletter.php index c8c6034..89966bf 100644 --- a/includes/specials/SpecialNewsletter.php +++ b/includes/specials/SpecialNewsletter.php @@ -103,12 +103,11 @@ $user = $this->getUser(); $this->getOutput()->setPageTitle( $this->msg( 'newsletter-view' ) ); - $html = $this->msg( 'newsletter-view-text' )->parseAsBlock(); if ( $user->isLoggedIn() ) { // buttons are only shown for logged-in users - $html .= $this->getNewsletterActionButtons(); + $html = $this->getNewsletterActionButtons(); + $this->getOutput()->addHTML( $html ); } - $this->getOutput()->addHTML( $html ); $publishers = UserArray::newFromIDs( $this->newsletter->getPublishers() ); $mainTitle = Title::newFromID( $this->newsletter->getPageId() ); diff --git a/includes/specials/SpecialNewsletters.php b/includes/specials/SpecialNewsletters.php index 81b3d0b..a4d92a2 100644 --- a/includes/specials/SpecialNewsletters.php +++ b/includes/specials/SpecialNewsletters.php @@ -19,7 +19,6 @@ public function execute( $par ) { $this->setHeaders(); - $this->outputHeader(); $out = $this->getOutput(); if ( $this->getUser()->isLoggedIn() ) { -- To view, visit https://gerrit.wikimedia.org/r/267449 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I393c4b05690d2f9bb1bddac4bd47d335e45dfdbd Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Newsletter Gerrit-Branch: master Gerrit-Owner: Glaisher <glaisher.w...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits