wikimedia/mediawiki-extensions-DiscussionTools
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/DiscussionTools synced 2024-11-28 10:11:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Revise error messages when replying to comments affected by templates"

Browse source
This commit is contained in:
jenkins-bot 2020-04-28 22:35:47 +00:00 committed by Gerrit Code Review
parent 431716577b b1376413f0
commit bb096d8f50
3 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
i18n/en.json
View file

@ -21,8 +21,8 @@
"discussiontools-replywidget-terms-click": "By clicking \"$1\", you agree to the terms of use for this wiki.", "discussiontools-replywidget-terms-click": "By clicking \"$1\", you agree to the terms of use for this wiki.",
"discussiontools-replywidget-transcluded": "Your comment will be saved at [[$1]].", "discussiontools-replywidget-transcluded": "Your comment will be saved at [[$1]].",
"discussiontools-error-comment-disappeared": "Could not find the comment you're replying to on the page. It might have been deleted or moved to another page. Please reload the page and try again.", "discussiontools-error-comment-disappeared": "Could not find the comment you're replying to on the page. It might have been deleted or moved to another page. Please reload the page and try again.",
"discussiontools-error-comment-is-transcluded": "This comment can't be replied to using this tool. Please try using the full page editor instead.", "discussiontools-error-comment-is-transcluded": "The \"{{int:discussiontools-replylink}}\" link cannot be used to reply to this comment. To reply, please use the full page editor by clicking \"$1\".",
"discussiontools-error-comment-is-transcluded-title": "This comment can't be replied to here (yet), because it is loaded from another page. Please go to [[$1]] to reply to it.", "discussiontools-error-comment-is-transcluded-title": "The \"{{int:discussiontools-replylink}}\" link cannot be used to reply to this comment because it is loaded from another page. To reply, please go here: [[$1]].",
"discussiontools-error-lint": "Comments on this page can't be replied to because of an error in the wikitext. You can learn about this error by [$1 reading the documentation], ask for help by [$2 posting here] or fix the error by [$3 opening the full page editor].", "discussiontools-error-lint": "Comments on this page can't be replied to because of an error in the wikitext. You can learn about this error by [$1 reading the documentation], ask for help by [$2 posting here] or fix the error by [$3 opening the full page editor].",
"tag-discussiontools": "-", "tag-discussiontools": "-",
"tag-discussiontools-description": "Edit made using DiscussionTools", "tag-discussiontools-description": "Edit made using DiscussionTools",

2
i18n/qqq.json
View file

@ -26,7 +26,7 @@
"discussiontools-replywidget-terms-click": "Terms of use for posting a reply.\n\n* $1 is the label of the button to be clicked, e.g. {{msg-mw|discussiontools-replywidget-reply}}.", "discussiontools-replywidget-terms-click": "Terms of use for posting a reply.\n\n* $1 is the label of the button to be clicked, e.g. {{msg-mw|discussiontools-replywidget-reply}}.",
"discussiontools-replywidget-transcluded": "Message explaining that the comment will be saved on a different page than the one you're viewing right now (because it was transcluded from it). Parameter: $1 – page name", "discussiontools-replywidget-transcluded": "Message explaining that the comment will be saved on a different page than the one you're viewing right now (because it was transcluded from it). Parameter: $1 – page name",
"discussiontools-error-comment-disappeared": "Error message.", "discussiontools-error-comment-disappeared": "Error message.",
"discussiontools-error-comment-is-transcluded": "Error message.", "discussiontools-error-comment-is-transcluded": "Error message. Parameter: $1 – text of the 'Edit'/'Edit source' tab",
"discussiontools-error-comment-is-transcluded-title": "Error message. Parameter: $1 – page name", "discussiontools-error-comment-is-transcluded-title": "Error message. Parameter: $1 – page name",
"discussiontools-error-lint": "Error message. Parameters:\n* $1 – URL to documentation on mediawiki.org\n* $2 – URL to talk page on mediawiki.org\n* $3 – URL to the editor (action=edit)", "discussiontools-error-lint": "Error message. Parameters:\n* $1 – URL to documentation on mediawiki.org\n* $2 – URL to talk page on mediawiki.org\n* $3 – URL to the editor (action=edit)",
"tag-discussiontools": "{{ignored}}Short description of the discussiontools tag.\n\nShown on lists of changes (history, recentchanges, etc.) for each edit made using DiscussionTools.\n\nSee also:\n* {{msg-mw|Tag-discussiontools-description}}", "tag-discussiontools": "{{ignored}}Short description of the discussiontools tag.\n\nShown on lists of changes (history, recentchanges, etc.) for each edit made using DiscussionTools.\n\nSee also:\n* {{msg-mw|Tag-discussiontools-description}}",

12
modules/controller.js
View file

@ -440,10 +440,16 @@ function getParsoidCommentData( pageName, oldId, commentId ) {
follow = mwTitle && mwTitle.getNamespaceId() !== mw.config.get( 'wgNamespaceIds' ).template; follow = mwTitle && mwTitle.getNamespaceId() !== mw.config.get( 'wgNamespaceIds' ).template;
if ( follow ) { if ( follow ) {
transcludedErrMsg = mw.message( 'discussiontools-error-comment-is-transcluded-title', transcludedErrMsg = mw.message(
mwTitle.getPrefixedText() ).parse(); 'discussiontools-error-comment-is-transcluded-title',
mwTitle.getPrefixedText()
).parse();
} else { } else {
transcludedErrMsg = mw.message( 'discussiontools-error-comment-is-transcluded' ).parse(); transcludedErrMsg = mw.message(
'discussiontools-error-comment-is-transcluded',
// eslint-disable-next-line no-jquery/no-global-selector
$( '#ca-edit' ).text()
).parse();
} }
return $.Deferred().reject( 'comment-is-transcluded', { errors: [ { return $.Deferred().reject( 'comment-is-transcluded', { errors: [ {