jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/328563 )
Change subject: Wrong message-key used in NewsletterDiffEngine.php
......................................................................
Wrong message-key used in NewsletterDiffEngine.php
Adds following missing diff i18n messages:
* newsletter-diff-descheader
* newsletter-diff-mainpageheader
* newsletter-diff-publishersheader
Bug: T153530
Change-Id: Iafa1ee7da21fed932d7be3b044313dae67c44663
---
M i18n/en.json
M i18n/qqq.json
M includes/content/NewsletterDiffEngine.php
3 files changed, 15 insertions(+), 7 deletions(-)
Approvals:
01tonythomas: Looks good to me, approved
jenkins-bot: Verified
diff --git a/i18n/en.json b/i18n/en.json
old mode 100755
new mode 100644
index 21a59d1..71ff0f0
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -3,7 +3,8 @@
"authors": [
"Tina Johnson",
"Thomas Arrow",
- "Glaisher"
+ "Glaisher",
+ "Divadsn"
]
},
"newsletter-extension-desc": "Enables users to publish and subscribe to
newsletters",
@@ -145,5 +146,8 @@
"log-action-filter-newsletter-newsletter-added": "Newsletter creation",
"log-action-filter-newsletter-newsletter-removed": "Newsletter
deletion",
"log-action-filter-newsletter-issue-added": "New issue announcements",
- "newsletter-restore-failure": "\"$1\" newsletter could not be restored.
Please try again."
+ "newsletter-restore-failure": "\"$1\" newsletter could not be restored.
Please try again.",
+ "newsletter-diff-descheader": "Changes in the description:",
+ "newsletter-diff-mainpageheader": "Changes in Main Page:",
+ "newsletter-diff-publishersheader": "Changes in publishers:"
}
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 6e2da62..41173b1 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -10,7 +10,8 @@
"Umherirrender",
"Verdy p",
"Amire80",
- "Base"
+ "Base",
+ "Divadsn"
]
},
"newsletter-extension-desc": "Description of the extension",
@@ -152,5 +153,8 @@
"log-action-filter-newsletter-newsletter-added":
"{{doc-log-action-filter-action|newsletter|newsletter-added}}",
"log-action-filter-newsletter-newsletter-removed":
"{{doc-log-action-filter-action|newsletter|newsletter-removed}}",
"log-action-filter-newsletter-issue-added":
"{{doc-log-action-filter-action|newsletter|issue-added}}",
- "newsletter-restore-failure": "Error message shown on
title=Special:Undelete&target=Newsletter:<name>&action=submit when the
newsletter restoration fails.\n\nParameters:\n* $1 - Newsletter name"
+ "newsletter-restore-failure": "Error message shown on
title=Special:Undelete&target=Newsletter:<name>&action=submit when the
newsletter restoration fails.\n\nParameters:\n* $1 - Newsletter name",
+ "newsletter-diff-descheader": "Header for the diff of the description
between two revisions",
+ "newsletter-diff-mainpageheader": "Header for the diff of Main Page
between two revisions",
+ "newsletter-diff-publishersheader": "Header for the diff of publishers
between two revisions"
}
diff --git a/includes/content/NewsletterDiffEngine.php
b/includes/content/NewsletterDiffEngine.php
index 939c81d..ddad524 100644
--- a/includes/content/NewsletterDiffEngine.php
+++ b/includes/content/NewsletterDiffEngine.php
@@ -51,9 +51,9 @@
if ( trim( $publishersDiff ) !== '' ) {
$output .= Html::openElement( 'tr' );
$output .= Html::openElement( 'td',
- [ 'colspan' => 4, 'id' =>
'mw-massmessage-diffpublishersheader' ] );
+ [ 'colspan' => 4, 'id' =>
'mw-newsletter-diffpublishersheader' ] );
$output .= Html::element( 'h4', [],
- $this->msg( 'massmessage-diff-publishersheader'
)->text() );
+ $this->msg( 'newsletter-diff-publishersheader'
)->text() );
$output .= Html::closeElement( 'td' );
$output .= Html::closeElement( 'tr' );
$output .= $publishersDiff;
@@ -61,4 +61,4 @@
return $output;
}
-}
\ No newline at end of file
+}
--
To view, visit https://gerrit.wikimedia.org/r/328563
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iafa1ee7da21fed932d7be3b044313dae67c44663
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Divadsn <divad.nnamtd...@gmail.com>
Gerrit-Reviewer: 01tonythomas <01tonytho...@gmail.com>
Gerrit-Reviewer: Addshore <addshorew...@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
