jenkins-bot has submitted this change and it was merged.
Change subject: mw.ViewPageTarget: Get feedback url from content language
......................................................................
mw.ViewPageTarget: Get feedback url from content language
Link is specific to the project language, not the user's preference.
Bug: 47730
Change-Id: I3804e6f91015ef9b8ae5196efb37475d714cd7d5
---
M VisualEditor.php
M VisualEditorMessagesModule.php
M modules/ve/init/mw/targets/ve.init.mw.ViewPageTarget.js
3 files changed, 23 insertions(+), 8 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/VisualEditor.php b/VisualEditor.php
index 66795bc..81d638d 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -166,7 +166,6 @@
'visualeditor-problem',
'visualeditor-editnotices-tool',
'visualeditor-feedback-tool',
- 'visualeditor-feedback-link',
'visualeditor-restore-page',
'visualeditor-create-page',
'visualeditor-save-title',
diff --git a/VisualEditorMessagesModule.php b/VisualEditorMessagesModule.php
index 5caed3f..3f8394d 100644
--- a/VisualEditorMessagesModule.php
+++ b/VisualEditorMessagesModule.php
@@ -22,12 +22,19 @@
public function getScript( ResourceLoaderContext $context ) {
$msgInfo = $this->getMessageInfo();
$parsedMesssages = array();
+ $messages = array();
foreach ( $msgInfo['args'] as $msgKey => $msgArgs ) {
$parsedMesssages[ $msgKey ] = call_user_func_array(
'wfMessage', $msgArgs )
->inLanguage( $context->getLanguage() )
->parse();
}
- return 've.init.platform.addParsedMessages(' .
FormatJson::encode( $parsedMesssages ) . ');';
+ foreach ( $msgInfo['vals'] as $msgKey => $msgVal ) {
+ $messages[ $msgKey ] = $msgVal;
+ }
+ return
+ 've.init.platform.addParsedMessages(' .
FormatJson::encode( $parsedMesssages ) . ');'.
+ 've.init.platform.addMessages(' . FormatJson::encode(
$messages ) . ');'
+ ;
}
protected function getMessageInfo() {
@@ -38,6 +45,11 @@
'minoredit' => array( 'minoredit' ),
'watchthis' => array( 'watchthis' ),
'visualeditor-report-notice' => array(
'visualeditor-report-notice' ),
+ );
+
+ // Override message value
+ $msgVals = array(
+ 'visualeditor-feedback-link' => wfMessage(
'visualeditor-feedback-link' )->inContentLanguage()->text(),
);
// Copyright warning (based on EditPage::getCopyrightWarning)
@@ -61,11 +73,12 @@
// Normalise to 'copyrightwarning' so we have a consistent key
in the front-end.
$msgArgs[ 'copyrightwarning' ] = $copywarnMsg;
- $msgKeys = array_values( array_unique( array_merge( $msgKeys,
array_keys( $msgArgs ) ) ) );
+ $msgKeys = array_values( array_unique( array_merge( $msgKeys,
array_keys( $msgArgs ), array_keys( $msgVals ) ) ) );
return array(
'keys' => $msgKeys,
'args' => $msgArgs,
+ 'vals' => $msgVals,
);
}
diff --git a/modules/ve/init/mw/targets/ve.init.mw.ViewPageTarget.js
b/modules/ve/init/mw/targets/ve.init.mw.ViewPageTarget.js
index 8112f46..8a6531f 100644
--- a/modules/ve/init/mw/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve/init/mw/targets/ve.init.mw.ViewPageTarget.js
@@ -70,11 +70,6 @@
// * add: Adds #ca-ve-edit.
// * replace: Re-creates #ca-edit for VisualEditor and adds
#ca-editsource.
this.tabLayout = 'replace';
- this.feedback = new mw.Feedback( {
- 'title': new mw.Title( ve.msg( 'visualeditor-feedback-link' ) ),
- 'bugsLink': new mw.Uri(
'https://bugzilla.wikimedia.org/enter_bug.cgi?product=VisualEditor&component=General'
),
- 'bugsListLink': new mw.Uri(
'https://bugzilla.wikimedia.org/buglist.cgi?query_format=advanced&resolution=---&resolution=LATER&resolution=DUPLICATE&product=VisualEditor&list_id=166234'
)
- } );
// Events
this.connect( this, {
@@ -579,6 +574,14 @@
*/
ve.init.mw.ViewPageTarget.prototype.onToolbarFeedbackToolClick = function () {
this.$toolbarEditNotices.fadeOut( 'fast' );
+ if ( !this.feedback ) {
+ // This can't be constructed until the editor has loaded as it
uses special messages
+ this.feedback = new mw.Feedback( {
+ 'title': new mw.Title( ve.msg(
'visualeditor-feedback-link' ) ),
+ 'bugsLink': new mw.Uri(
'https://bugzilla.wikimedia.org/enter_bug.cgi?product=VisualEditor&component=General'
),
+ 'bugsListLink': new mw.Uri(
'https://bugzilla.wikimedia.org/buglist.cgi?query_format=advanced&resolution=---&resolution=LATER&resolution=DUPLICATE&product=VisualEditor&list_id=166234'
)
+ } );
+ }
this.feedback.launch();
};
--
To view, visit https://gerrit.wikimedia.org/r/64498
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3804e6f91015ef9b8ae5196efb37475d714cd7d5
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
