jenkins-bot has submitted this change and it was merged.
Change subject: CommandHelpDialog: Move insertions into a separate group
......................................................................
CommandHelpDialog: Move insertions into a separate group
Also add table and comment insertions.
Change-Id: If87261bf3d01854ab1f7ce1b447589fa8098dcf2
---
M extension.json
M modules/ve-mw/i18n/en.json
M modules/ve-mw/i18n/qqq.json
M modules/ve-mw/ui/dialogs/ve.ui.MWCommandHelpDialog.js
4 files changed, 25 insertions(+), 3 deletions(-)
Approvals:
DLynch: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index fc60309..8701829 100644
--- a/extension.json
+++ b/extension.json
@@ -1102,6 +1102,7 @@
"visualeditor-saveerror",
"visualeditor-saveerror-titleblacklist",
"visualeditor-serializeerror",
+ "visualeditor-shortcuts-insert",
"visualeditor-recreate",
"visualeditor-toolbar-cite-label",
"visualeditor-toolbar-savedialog",
diff --git a/modules/ve-mw/i18n/en.json b/modules/ve-mw/i18n/en.json
index dca6150..eb88667 100644
--- a/modules/ve-mw/i18n/en.json
+++ b/modules/ve-mw/i18n/en.json
@@ -325,6 +325,7 @@
"visualeditor-saveerror-titleblacklist": "Error saving page: This
page's title is blacklisted",
"visualeditor-serializeerror": "Error loading data from server: $1.",
"visualeditor-settings-tool": "Page settings",
+ "visualeditor-shortcuts-insert": "Insert",
"visualeditor-special-characters-group-other": "Often used",
"visualeditor-timeout":"It looks like this editor is currently
unavailable. Would you like to edit in source mode instead?",
"visualeditor-toolbar-cite-label": "Cite",
diff --git a/modules/ve-mw/i18n/qqq.json b/modules/ve-mw/i18n/qqq.json
index dc4a814..280d0d0 100644
--- a/modules/ve-mw/i18n/qqq.json
+++ b/modules/ve-mw/i18n/qqq.json
@@ -335,6 +335,7 @@
"visualeditor-saveerror-titleblacklist": "Text shown when the editor
fails to save properly due to the TitleBlacklist extension.",
"visualeditor-serializeerror": "Text shown when the editor fails to
load the wikitext for saving.\n\nParameters:\n* $1 is an error message, in
English.",
"visualeditor-settings-tool": "Text of tool in the toolbar the lets
users set specific page settings.\n{{Identical|Page settings}}",
+ "visualeditor-shortcuts-insert": "Heading for insertion shortcuts",
"visualeditor-special-characters-group-other": "Label of the special
character group shown if the wiki has visualeditor-quick-access-characters.json
set up.",
"visualeditor-timeout": "Text (JavaScript confirm()) shown when the
editor fails to load properly due to a 504 Gateway Timeout error.",
"visualeditor-toolbar-cite-label": "Label text for the toolbar button
for inserting customized references.\n{{Identical|Cite}}",
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWCommandHelpDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWCommandHelpDialog.js
index c10ab50..814aab3 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWCommandHelpDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWCommandHelpDialog.js
@@ -23,6 +23,17 @@
OO.inheritClass( ve.ui.MWCommandHelpDialog, ve.ui.CommandHelpDialog );
+/* Static properties */
+
+ve.ui.MWCommandHelpDialog.static.commandGroups = ve.extendObject(
ve.ui.CommandHelpDialog.static.commandGroups, {
+ insert: {
+ title: 'visualeditor-shortcuts-insert',
+ commands: {},
+ promote: [],
+ demote: []
+ }
+} );
+
/* Registration */
ve.ui.windowFactory.register( ve.ui.MWCommandHelpDialog );
@@ -38,14 +49,22 @@
sequence: [ 'wikitextHeading' ],
msg: 'visualeditor-formatdropdown-format-heading2'
} );
- ve.ui.MWCommandHelpDialog.static.registerCommand( 'other', 'template', {
+ ve.ui.MWCommandHelpDialog.static.registerCommand( 'insert', 'template',
{
sequence: [ 'wikitextTemplate' ],
- msg: 'visualeditor-dialog-transclusion-add-template'
+ msg: 'visualeditor-dialog-template-title'
} );
- ve.ui.MWCommandHelpDialog.static.registerCommand( 'other', 'ref', {
+ ve.ui.MWCommandHelpDialog.static.registerCommand( 'insert', 'ref', {
sequence: [ 'wikitextRef' ],
msg: 'visualeditor-dialog-reference-title'
} );
+ ve.ui.MWCommandHelpDialog.static.registerCommand( 'insert', 'table', {
+ sequence: [ 'wikitextTable' ],
+ msg: 'visualeditor-table-insert-table'
+ } );
+ ve.ui.MWCommandHelpDialog.static.registerCommand( 'insert', 'comment', {
+ sequence: [ 'wikitextComment' ],
+ msg: 'visualeditor-commentinspector-title'
+ } );
if ( save !== '-' && save !== '' ) {
ve.ui.MWCommandHelpDialog.static.registerCommand( 'other',
'save', {
--
To view, visit https://gerrit.wikimedia.org/r/250664
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If87261bf3d01854ab1f7ce1b447589fa8098dcf2
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
Gerrit-Reviewer: DLynch <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: Jforrester <[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
