Florianschmidtwelzow has uploaded a new change for review. https://gerrit.wikimedia.org/r/190831
Change subject: TWN: Use own message for terms of use link in license warning (editor and talk) ...................................................................... TWN: Use own message for terms of use link in license warning (editor and talk) The Terms of use link message may be have another grammer as the link label used in editor or talk (in sentence). Also: Removed useless set of options in talk.js (licenseMsg). Change-Id: I2d4029456c69e126e7343811a979204f9e5df964 See: https://translatewiki.net/w/i.php?title=Thread:Support/MediaWiki:Mobile-frontend-editor-licensing-with-terms/en --- M i18n/en.json M i18n/qqq.json M includes/Resources.php M javascripts/modules/editor/EditorOverlayBase.js M javascripts/modules/talk/TalkSectionAddOverlay.js M javascripts/modules/talk/talk.js 6 files changed, 8 insertions(+), 12 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/31/190831/1 diff --git a/i18n/en.json b/i18n/en.json index 13b9c35..cb9d593 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -78,6 +78,7 @@ "mobile-frontend-editor-keep-editing": "Keep editing", "mobile-frontend-editor-licensing": "By saving changes, you agree to release your contribution under the $1 license.", "mobile-frontend-editor-licensing-with-terms": "By saving changes, you agree to the $1 and agree to release your contribution under the $2 license.", + "mobile-frontend-editor-terms-text": "Terms of Use", "mobile-frontend-editor-new-page-confirm": "{{GENDER:$1|Are you sure you want to create}} a new page on {{SITENAME}}?", "mobile-frontend-editor-newpage-prompt": "This page doesn't exist. Why not be bold and create it?", "mobile-frontend-editor-placeholder": "This section is empty. Be the first to expand it!", diff --git a/i18n/qqq.json b/i18n/qqq.json index 1708f88..33c87f3 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -105,7 +105,8 @@ "mobile-frontend-editor-error-preview": "Error message for when a preview fails to load for an unknown reason", "mobile-frontend-editor-keep-editing": "Caption for a button that takes you back to editing from edit preview screen.", "mobile-frontend-editor-licensing": "Text notifying user of license that text will be published under.\nParameters:\n* $1 - link to license", - "mobile-frontend-editor-licensing-with-terms": "Text notifying user of license that text will be published under.\nParameters:\n* $1 - link to terms of service\n* $2 - link to license", + "mobile-frontend-editor-licensing-with-terms": "Text notifying user of license that text will be published under.\nParameters:\n* $1 - link to terms of service, see {{mw-msg|Mobile-frontend-editor-terms-text}}\n* $2 - link to license", + "mobile-frontend-editor-terms-text": "Terms of Use link label used in {{mw-msg|Mobile-frontend-editor-licensing-with-terms}}.", "mobile-frontend-editor-new-page-confirm": "Question asking user if they are positive they want to create a new page.\nParameters:\n* $1 - the user name for GENDER", "mobile-frontend-editor-newpage-prompt": "Message shown when a page doesn't exist.", "mobile-frontend-editor-placeholder": "Placeholder text for empty sections.", diff --git a/includes/Resources.php b/includes/Resources.php index 9ca059b..0397a9b 100644 --- a/includes/Resources.php +++ b/includes/Resources.php @@ -471,6 +471,7 @@ 'mobile-frontend-editor-keep-editing', 'mobile-frontend-editor-licensing', 'mobile-frontend-editor-licensing-with-terms', + 'mobile-frontend-editor-terms-text', 'mobile-frontend-editor-placeholder', 'mobile-frontend-editor-placeholder-new-page', 'mobile-frontend-editor-summary', diff --git a/javascripts/modules/editor/EditorOverlayBase.js b/javascripts/modules/editor/EditorOverlayBase.js index 3969a4c..206107a 100644 --- a/javascripts/modules/editor/EditorOverlayBase.js +++ b/javascripts/modules/editor/EditorOverlayBase.js @@ -162,7 +162,8 @@ if ( $( '#footer-places-terms-use' ).length > 0 ) { options.licenseMsg = mw.msg( 'mobile-frontend-editor-licensing-with-terms', - $( '#footer-places-terms-use' ).html(), + '<a href="' + $( '#footer-places-terms-use a' ).attr( 'href' ) + '">' + + mw.msg( 'mobile-frontend-editor-terms-text' ) + '</a>', mw.config.get( 'wgMFLicenseLink' ) ); } else { diff --git a/javascripts/modules/talk/TalkSectionAddOverlay.js b/javascripts/modules/talk/TalkSectionAddOverlay.js index 455ffcb..c3c7cbf 100644 --- a/javascripts/modules/talk/TalkSectionAddOverlay.js +++ b/javascripts/modules/talk/TalkSectionAddOverlay.js @@ -42,7 +42,8 @@ if ( $( '#footer-places-terms-use' ).length > 0 ) { options.licenseMsg = mw.msg( 'mobile-frontend-editor-licensing-with-terms', - $( '#footer-places-terms-use' ).html(), + '<a href="' + $( '#footer-places-terms-use a' ).attr( 'href' ) + '">' + + mw.msg( 'mobile-frontend-editor-terms-text' ) + '</a>', mw.config.get( 'wgMFLicenseLink' ) ); } else { diff --git a/javascripts/modules/talk/talk.js b/javascripts/modules/talk/talk.js index 458051a..6ee8190 100644 --- a/javascripts/modules/talk/talk.js +++ b/javascripts/modules/talk/talk.js @@ -2,7 +2,6 @@ var loader = M.require( 'loader' ), LoadingOverlay = M.require( 'LoadingOverlay' ), user = M.require( 'user' ), - licenseLink = mw.config.get( 'wgMFLicenseLink' ), $talk = $( '.talk' ), page = M.getCurrentPage(), overlayManager = M.require( 'overlayManager' ), @@ -15,14 +14,6 @@ talkOptions = { title: $talk.data( 'title' ) || mw.config.get( 'wgPageName' ) }; - - // FIXME: cache this selector, it's used more than once - if ( $( '#footer-places-terms-use' ).length > 0 ) { - talkOptions.licenseMsg = mw.msg( 'mobile-frontend-editor-licensing-with-terms', - $( '#footer-places-terms-use' ).html(), licenseLink ); - } else { - talkOptions.licenseMsg = mw.msg( 'mobile-frontend-editor-licensing', licenseLink ); - } loader.loadModule( 'mobile.talk.overlays' ).done( function () { var Overlay; -- To view, visit https://gerrit.wikimedia.org/r/190831 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2d4029456c69e126e7343811a979204f9e5df964 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Florianschmidtwelzow <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
