Move toolbar cancel message to VE specific message

Be consistent with all other button messages.

Change-Id: Icbab46aff210b79db59de688d539b8e69a13ec0d
This commit is contained in:
Ed Sanders 2013-05-17 14:54:54 +01:00
parent 81e113b75b
commit f56bdf70fd
3 changed files with 5 additions and 2 deletions

View file

@ -33,6 +33,7 @@ $messages['en'] = array(
'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',
@ -152,6 +153,8 @@ See also:
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',

View file

@ -140,7 +140,6 @@ $wgResourceModules += array(
'user.tokens',
),
'messages' => array(
'cancel',
'accesskey-ca-editsource',
'accesskey-ca-ve-edit',
'tooltip-ca-editsource',
@ -162,6 +161,7 @@ $wgResourceModules += array(
'visualeditor-restore-page',
'visualeditor-create-page',
'visualeditor-save-title',
'visualeditor-toolbar-cancel',
'visualeditor-toolbar-savedialog',
'visualeditor-savedialog-title-conflict',
'visualeditor-savedialog-title-nochanges',

View file

@ -895,7 +895,7 @@ ve.init.mw.ViewPageTarget.prototype.setupSectionEditLinks = function () {
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'],