Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/64498
Change subject: Feedback link should use content language
......................................................................
Feedback link should use content language
Link is specific to the project language, not the user's preference.
Bug: 47730
Change-Id: I3804e6f91015ef9b8ae5196efb37475d714cd7d5
---
M VisualEditorMessagesModule.php
M modules/ve/init/mw/targets/ve.init.mw.ViewPageTarget.js
2 files changed, 25 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/98/64498/1
diff --git a/VisualEditorMessagesModule.php b/VisualEditorMessagesModule.php
index 5caed3f..b40f3f6 100644
--- a/VisualEditorMessagesModule.php
+++ b/VisualEditorMessagesModule.php
@@ -23,9 +23,16 @@
$msgInfo = $this->getMessageInfo();
$parsedMesssages = array();
foreach ( $msgInfo['args'] as $msgKey => $msgArgs ) {
- $parsedMesssages[ $msgKey ] = call_user_func_array(
'wfMessage', $msgArgs )
- ->inLanguage( $context->getLanguage() )
- ->parse();
+ $message = call_user_func_array( 'wfMessage', $msgArgs
);
+ if ( in_array( $msgKey, $msgInfo['contentLang'] ) ) {
+ $parsedMesssages[ $msgKey ] = $message
+ ->inContentLanguage()
+ ->parse();
+ } else {
+ $parsedMesssages[ $msgKey ] = $message
+ ->inLanguage( $context->getLanguage() )
+ ->parse();
+ }
}
return 've.init.platform.addParsedMessages(' .
FormatJson::encode( $parsedMesssages ) . ');';
}
@@ -38,6 +45,12 @@
'minoredit' => array( 'minoredit' ),
'watchthis' => array( 'watchthis' ),
'visualeditor-report-notice' => array(
'visualeditor-report-notice' ),
+ 'visualeditor-feedback-link' => array(
'visualeditor-feedback-link' ),
+ );
+
+ // Keys to be returned in content language e.g. project links
+ $msgContentLang = array(
+ 'visualeditor-feedback-link'
);
// Copyright warning (based on EditPage::getCopyrightWarning)
@@ -66,6 +79,7 @@
return array(
'keys' => $msgKeys,
'args' => $msgArgs,
+ 'contentLang' => $msgContentLang,
);
}
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..4aecf0c 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 parsed messages
+ this.feedback = new mw.Feedback( {
+ 'title': new mw.Title(
ve.init.platform.getParsedMessage( '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: newchange
Gerrit-Change-Id: I3804e6f91015ef9b8ae5196efb37475d714cd7d5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
