jenkins-bot has submitted this change and it was merged.
Change subject: Move toolbar cancel message to VE specific message
......................................................................
Move toolbar cancel message to VE specific message
Be consistent with all other button messages.
Change-Id: Icbab46aff210b79db59de688d539b8e69a13ec0d
---
M VisualEditor.i18n.php
M VisualEditor.php
M modules/ve/init/mw/targets/ve.init.mw.ViewPageTarget.js
3 files changed, 5 insertions(+), 2 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/VisualEditor.i18n.php b/VisualEditor.i18n.php
index 522f014..2152583 100644
--- a/VisualEditor.i18n.php
+++ b/VisualEditor.i18n.php
@@ -33,6 +33,7 @@
'visualeditor-dialog-action-apply' => 'Apply changes',
'visualeditor-dialog-action-cancel' => 'Cancel',
'visualeditor-dialog-action-close' => 'Close',
+ 'visualeditor-toolbar-cancel' => 'Cancel',
'visualeditor-toolbar-savedialog' => 'Review and save',
'visualeditor-savedialog-title-conflict' => 'Conflict',
'visualeditor-savedialog-title-nochanges' => 'No changes',
@@ -153,6 +154,8 @@
See also:
* {{msg-mw|Visualeditor-dialog-action-apply}}
{{Identical|Close}}',
+ 'visualeditor-toolbar-cancel' => 'Label text for button to cancel
editing in the VisualEditor
+{{Identical|Close}}',
'visualeditor-toolbar-savedialog' => 'Label text for button to trigger
review and save interface',
'visualeditor-savedialog-title-conflict' => 'Title for edit conflict
slide',
'visualeditor-savedialog-title-nochanges' => 'Title for no changes
slide',
diff --git a/VisualEditor.php b/VisualEditor.php
index f12ff5f..b3f18ba 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -140,7 +140,6 @@
'user.tokens',
),
'messages' => array(
- 'cancel',
'accesskey-ca-editsource',
'accesskey-ca-ve-edit',
'tooltip-ca-editsource',
@@ -162,6 +161,7 @@
'visualeditor-restore-page',
'visualeditor-create-page',
'visualeditor-save-title',
+ 'visualeditor-toolbar-cancel',
'visualeditor-toolbar-savedialog',
'visualeditor-savedialog-title-conflict',
'visualeditor-savedialog-title-nochanges',
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 64b4e1e..9f6c784 100644
--- a/modules/ve/init/mw/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve/init/mw/targets/ve.init.mw.ViewPageTarget.js
@@ -895,7 +895,7 @@
ve.init.mw.ViewPageTarget.prototype.setupToolbarButtons = function () {
var editNoticeCount = ve.getObjectKeys( this.editNotices ).length;
- this.toolbarCancelButton = new ve.ui.ButtonWidget( { 'label': ve.msg(
'cancel' ) } );
+ this.toolbarCancelButton = new ve.ui.ButtonWidget( { 'label': ve.msg(
'visualeditor-toolbar-cancel' ) } );
this.toolbarSaveButton = new ve.ui.ButtonWidget( {
'label': ve.msg( 'visualeditor-toolbar-savedialog' ),
'flags': ['constructive'],
--
To view, visit https://gerrit.wikimedia.org/r/64296
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icbab46aff210b79db59de688d539b8e69a13ec0d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
