Addshore has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/403668 )
Change subject: Fix IncompleteRevisionException comment must not be NULL! ...................................................................... Fix IncompleteRevisionException comment must not be NULL! Extracted from: https://gerrit.wikimedia.org/r/#/c/403082 I9787335523fcb4bd9fa11f1554842d4489bf305e Bug: T184691 Change-Id: I626b9b8d8fd02eae73797e34efbc85a6aa9dcd1c --- M i18n/en.json M i18n/qqq.json M includes/Import/OptInController.php 3 files changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/68/403668/1 diff --git a/i18n/en.json b/i18n/en.json index 3cbdb70..7726172 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -552,6 +552,7 @@ "flow-notification-enabled-on-talkpage-email-batch-body": "Structured Discussions, the new wiki discussion system, has been enabled on {{GENDER:$1|your}} user talk page on {{SITENAME}}. You can get more information, provide feedback or disable the new system any time from the Beta features section in {{GENDER:$1|your}} preferences.", "flow-beta-feature-add-archive-template-edit-summary": "Adding archive template", "flow-beta-feature-remove-archive-template-edit-summary": "Removing archive template", + "flow-beta-feature-add-current-template-edit-summary": "Adding current template", "flow-dialog-cancelconfirm-title": "Are {{GENDER:|you}} sure?", "flow-dialog-cancelconfirm-message": "Are {{GENDER:|you}} sure you want to cancel without saving first?", "flow-dialog-cancelconfirm-keep": "Continue editing", diff --git a/i18n/qqq.json b/i18n/qqq.json index 3becb1d..e9359db 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -566,6 +566,7 @@ "flow-notification-enabled-on-talkpage-email-batch-body": "Email body for notification when Structured Discussions was enabled on your talk page.\n Parameters:\n* $1 - the username. Can be used for GENDER.\n* $2 - Title where Structured Discussions was enabled.", "flow-beta-feature-add-archive-template-edit-summary": "Edit summary message for the revision adding the archive template to an archived talk page.", "flow-beta-feature-remove-archive-template-edit-summary": "Edit summary message for the revision removing the archive template to an archived talk page.", + "flow-beta-feature-add-current-template-edit-summary": "Edit summary message for the revision adding the template that indicates the page is current (not archived).", "flow-dialog-cancelconfirm-title": "Title of the dialog that appears when the user cancels an edit and verifies whether the user wants to discard their edits or continue editing.\n{{Identical|Are you sure?}}", "flow-dialog-cancelconfirm-message": "Title of the dialog that appears when the user cancels an edit, asking the user if they are sure they wants to discard their edits or continue editing.", "flow-dialog-cancelconfirm-keep": "Title for the keep option in the dialog that appears when the user cancels an edit.", diff --git a/includes/Import/OptInController.php b/includes/Import/OptInController.php index 6630302..7fd1171 100644 --- a/includes/Import/OptInController.php +++ b/includes/Import/OptInController.php @@ -571,7 +571,7 @@ $template = $this->getFormattedCurrentTemplate( $archivedTalkpageTitle ); $this->editWikitextContent( $currentTalkpageTitle, - null, + wfMessage( 'flow-beta-feature-add-current-template-edit-summary' )->inContentLanguage()->plain(), function ( $content ) use ( $template ) { return $template . "\n\n" . $content; }, -- To view, visit https://gerrit.wikimedia.org/r/403668 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I626b9b8d8fd02eae73797e34efbc85a6aa9dcd1c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: wmf/1.31.0-wmf.16 Gerrit-Owner: Addshore <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
