jenkins-bot has submitted this change and it was merged.
Change subject: Label 'insert' buttons with just "Insert" instead of varying by
content
......................................................................
Label 'insert' buttons with just "Insert" instead of varying by content
Depends on VE-core change I23b0772a
Change-Id: Ia8fb88d3501ffa2c26add4419da5463a926f45d1
---
M VisualEditor.php
M modules/ve-mw/i18n/en.json
M modules/ve-mw/i18n/qqq.json
M modules/ve-mw/ui/dialogs/ve.ui.MWCitationDialog.js
M modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
M modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
M modules/ve-mw/ui/dialogs/ve.ui.MWReferenceListDialog.js
M modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js
M modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js
9 files changed, 6 insertions(+), 33 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/VisualEditor.php b/VisualEditor.php
index 21ad9b7..3132c29 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -591,7 +591,6 @@
'visualeditor-clipboard-paste',
'visualeditor-clipboard-paste-special',
'visualeditor-commentinspector-edit',
- 'visualeditor-commentinspector-insert',
'visualeditor-commentinspector-title',
'visualeditor-commentinspector-tooltip',
'visualeditor-dialog-action-apply',
@@ -877,8 +876,6 @@
'visualeditor-dialog-media-alttext-section',
'visualeditor-dialog-media-change-image',
'visualeditor-dialog-media-content-section',
- 'visualeditor-dialog-media-insert-button',
- 'visualeditor-dialog-media-insert-title',
'visualeditor-dialog-media-noresults',
'visualeditor-dialog-media-page-advanced',
'visualeditor-dialog-media-page-general',
@@ -1096,9 +1093,6 @@
'ext.visualEditor.mwtransclusion',
),
'messages' => array(
- 'visualeditor-dialog-citation-insert-citation',
- 'visualeditor-dialog-reference-insert-button',
- 'visualeditor-dialog-reference-insert-title',
'visualeditor-dialog-reference-options-group-label',
'visualeditor-dialog-reference-options-group-placeholder',
'visualeditor-dialog-reference-options-name-label',
@@ -1107,7 +1101,6 @@
'visualeditor-dialog-reference-useexisting-label',
'visualeditor-dialog-reference-useexisting-tool',
'visualeditor-dialog-referencelist-title',
- 'visualeditor-dialog-referencelist-insert-button',
'visualeditor-dialogbutton-reference-tooltip',
'visualeditor-dialogbutton-referencelist-tooltip',
'visualeditor-reference-input-placeholder',
@@ -1185,8 +1178,6 @@
'visualeditor-dialog-transclusion-content',
'visualeditor-dialog-transclusion-deprecated-parameter',
'visualeditor-dialog-transclusion-deprecated-parameter-description',
- 'visualeditor-dialog-transclusion-insert-template',
- 'visualeditor-dialog-transclusion-insert-transclusion',
'visualeditor-dialog-transclusion-loading',
'visualeditor-dialog-transclusion-multiple-mode',
'visualeditor-dialog-transclusion-no-template-description',
diff --git a/modules/ve-mw/i18n/en.json b/modules/ve-mw/i18n/en.json
index 0604e53..fecb0ec 100644
--- a/modules/ve-mw/i18n/en.json
+++ b/modules/ve-mw/i18n/en.json
@@ -45,13 +45,10 @@
"visualeditor-dialog-beta-welcome-action-continue": "Continue",
"visualeditor-dialog-beta-welcome-content": "This is our new, easier way
to edit. It's still in beta, which means you might find parts of the page you
can't edit, or encounter issues that need to be fixed. We encourage you to
review your changes, and we welcome reports about any issues you might
encounter in using VisualEditor (click the \"{{int:visualeditor-help-tool}}\"
button to submit feedback). You can keep using the wikitext editor by clicking
the \"$1\" tab instead – unsaved changes will be lost.",
"visualeditor-dialog-beta-welcome-title": "{{GENDER:$1|Welcome}} to
VisualEditor",
- "visualeditor-dialog-citation-insert-citation": "Insert citation",
"visualeditor-dialog-media-alttext-section": "Alternative text",
"visualeditor-dialog-media-change-image": "Choose a different image",
"visualeditor-dialog-media-content-section": "Caption",
"visualeditor-dialog-media-goback": "Go back",
- "visualeditor-dialog-media-insert-button": "Insert media",
- "visualeditor-dialog-media-insert-title": "Insert media",
"visualeditor-dialog-media-noresults": "No results found.",
"visualeditor-dialog-media-page-advanced": "Advanced settings",
"visualeditor-dialog-media-page-general": "General settings",
@@ -118,8 +115,6 @@
"visualeditor-dialog-meta-settings-toc-force": "Always",
"visualeditor-dialog-meta-settings-toc-label": "Show the Table of
Contents",
"visualeditor-dialog-meta-title": "Options",
- "visualeditor-dialog-reference-insert-button": "Insert reference",
- "visualeditor-dialog-reference-insert-title": "Insert reference",
"visualeditor-dialog-reference-options-group-label": "Use this group",
"visualeditor-dialog-reference-options-group-placeholder": "General
references",
"visualeditor-dialog-reference-options-name-label": "Re-use by this name",
@@ -127,7 +122,6 @@
"visualeditor-dialog-reference-title": "Reference",
"visualeditor-dialog-reference-useexisting-label": "Use an existing
reference",
"visualeditor-dialog-reference-useexisting-tool": "Re-use",
- "visualeditor-dialog-referencelist-insert-button": "Insert references
list",
"visualeditor-dialog-referencelist-title": "References list",
"visualeditor-dialog-template-title": "Template",
"visualeditor-dialog-transclusion-add-content": "Add content",
@@ -136,8 +130,6 @@
"visualeditor-dialog-transclusion-content": "Content",
"visualeditor-dialog-transclusion-deprecated-parameter": "Deprecated
field",
"visualeditor-dialog-transclusion-deprecated-parameter-description":
"Field is deprecated. $1",
- "visualeditor-dialog-transclusion-insert-template": "Insert template",
- "visualeditor-dialog-transclusion-insert-transclusion": "Insert
transclusion",
"visualeditor-dialog-transclusion-loading": "Loading...",
"visualeditor-dialog-transclusion-multiple-mode": "Show options",
"visualeditor-dialog-transclusion-no-template-description":
"{{GENDER:$3|You are adding}} the \"$1\" template to this page. It doesn't yet
have a description, but there might be some information on the <a $2>template's
page</a>.",
diff --git a/modules/ve-mw/i18n/qqq.json b/modules/ve-mw/i18n/qqq.json
index 9045196..aabc0ce 100644
--- a/modules/ve-mw/i18n/qqq.json
+++ b/modules/ve-mw/i18n/qqq.json
@@ -53,13 +53,10 @@
"visualeditor-dialog-beta-welcome-action-continue": "Used as label for
the Continue button which is used to close the dialog and continue using
VisualEditor.\n{{Identical|Continue}}",
"visualeditor-dialog-beta-welcome-content": "Text explaining
VisualEditor is in beta.\n\nRefers to
{{msg-mw|Visualeditor-help-tool}}.\n\nParameters:\n* $1 - {{msg-mw|Edit}}",
"visualeditor-dialog-beta-welcome-title": "Title of the beta welcome
dialog. Parameters:\n* $1 - username or empty string, for GENDER support",
- "visualeditor-dialog-citation-insert-citation": "Label for a 'submit'
button in the citation insertion dialog, which inserts the citation and closes
the dialog. Citation means a rich, formatted reference to a source using a
template, which is commonly called a \"citation\" on Wikimedia projects. It
should ''not'' be translated as \"footnote\" as that implies a location of the
representation which is unlikely to remain consistent.",
"visualeditor-dialog-media-alttext-section": "Label for the image
alternative text sub-section.",
"visualeditor-dialog-media-change-image": "Label for the button to
change image in the media edit dialog.",
"visualeditor-dialog-media-content-section": "Label for the image
content sub-section.\n{{Identical|Caption}}",
"visualeditor-dialog-media-goback": "Label for the button to go back to
edit settings in the media dialog.\n{{Identical|Go back}}",
- "visualeditor-dialog-media-insert-button": "Used as label for the
button.\n{{Identical|Insert media}}",
- "visualeditor-dialog-media-insert-title": "Media insert dialog title
text.\n{{Identical|Insert media}}",
"visualeditor-dialog-media-noresults": "Label notifying the user no
results were found for the media search.",
"visualeditor-dialog-media-page-advanced": "Label for the advanced
settings page in the media edit dialog.\n{{Identical|Advanced settings}}",
"visualeditor-dialog-media-page-general": "Label for the general
settings page in the media edit dialog.\n{{Identical|General settings}}",
@@ -126,8 +123,6 @@
"visualeditor-dialog-meta-settings-toc-force": "Label for the TOC
behavior option to always
show.\n{{Related|Visualeditor-dialog-meta-settings-toc}}",
"visualeditor-dialog-meta-settings-toc-label": "Prompt to let the user
set the Table Of Contents (TOC) behaviour.",
"visualeditor-dialog-meta-title": "Text of the title for the meta
dialog to set categories, language links and other page
settings.\n{{Identical|Options}}",
- "visualeditor-dialog-reference-insert-button": "Used as label for the
button to insert a new reference.\n{{Identical|Insert reference}}",
- "visualeditor-dialog-reference-insert-title": "Reference insert dialog
title text.\n{{Identical|Insert reference}}",
"visualeditor-dialog-reference-options-group-label": "Label for the
reference group input",
"visualeditor-dialog-reference-options-group-placeholder": "Placeholder
for the reference group input",
"visualeditor-dialog-reference-options-name-label": "Label for the
reference name input",
@@ -135,7 +130,6 @@
"visualeditor-dialog-reference-title": "{{Identical|Reference}}",
"visualeditor-dialog-reference-useexisting-label": "Label for button in
reference dialog to insert a re-use of an existing reference",
"visualeditor-dialog-reference-useexisting-tool": "Used as label for
the button to let the user pick an existing reference from a list to insert a
duplicate\n{{Identical|Re-use}}",
- "visualeditor-dialog-referencelist-insert-button": "Used as label for
the button to insert a new references list.",
"visualeditor-dialog-referencelist-title": "{{Identical|References
list}}",
"visualeditor-dialog-template-title": "{{Identical|Template}}",
"visualeditor-dialog-transclusion-add-content": "Label for button that
adds parameter content to a transclusion.",
@@ -144,8 +138,6 @@
"visualeditor-dialog-transclusion-content": "Label for editor of
content between transclusion parts.\n{{Identical|Content}}",
"visualeditor-dialog-transclusion-deprecated-parameter": "Tooltip for
deprecated parameter indicator",
"visualeditor-dialog-transclusion-deprecated-parameter-description":
"Label describing that a parameter is deprecated.\n\nParameters:\n* $1 -
Description given in TemplateData for why parameter is deprecated, which may be
empty.",
- "visualeditor-dialog-transclusion-insert-template": "Label for button
in the transclusion dialog while in single mode that closes the dialog inserts
a template.\n{{Identical|Insert template}}",
- "visualeditor-dialog-transclusion-insert-transclusion": "Label for
button in the transclusion dialog while in multiple mode that closes the dialog
inserts a transclusion",
"visualeditor-dialog-transclusion-loading": "Title for the transclusion
dialog while its contents are loading.\n{{Identical|Loading}}",
"visualeditor-dialog-transclusion-multiple-mode": "Label for button
that shows advanced options in transclusion dialog",
"visualeditor-dialog-transclusion-no-template-description": "Message to
user that no template information is available for the
template.\n\nParameters:\n* $1 - the title of the template\n* $2 - contains
attributes for the link to the template's page. e.g. 'target=\"_blank\"
href=\"...\"'\n* $3 - user object for GENDER.",
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWCitationDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWCitationDialog.js
index b1d5bec..4c55d61 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWCitationDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWCitationDialog.js
@@ -100,7 +100,7 @@
}
}
this.actions.forEach( { 'actions': 'insert' }, function
( action ) {
- action.setLabel( ve.msg(
'visualeditor-dialog-citation-insert-citation' ) );
+ action.setLabel( ve.msg(
'visualeditor-dialog-action-insert' ) );
} );
}, this );
};
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
index f401f2e..30129af 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
@@ -52,7 +52,7 @@
},
{
'action': 'insert',
- 'label': OO.ui.deferMsg(
'visualeditor-dialog-media-insert-button' ),
+ 'label': OO.ui.deferMsg( 'visualeditor-dialog-action-insert' ),
'flags': [ 'primary', 'constructive' ],
'modes': 'insert'
},
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
index 696d486..4426e40 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
@@ -45,7 +45,7 @@
},
{
'action': 'insert',
- 'label': OO.ui.deferMsg(
'visualeditor-dialog-reference-insert-button' ),
+ 'label': OO.ui.deferMsg( 'visualeditor-dialog-action-insert' ),
'flags': [ 'primary', 'constructive' ],
'modes': 'insert'
},
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceListDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceListDialog.js
index 75c843c..f504bf1 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceListDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceListDialog.js
@@ -46,7 +46,7 @@
},
{
'action': 'insert',
- 'label': OO.ui.deferMsg(
'visualeditor-dialog-referencelist-insert-button' ),
+ 'label': OO.ui.deferMsg( 'visualeditor-dialog-action-insert' ),
'flags': [ 'primary', 'constructive' ],
'modes': 'insert'
},
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js
index 49ce531..1c1c873 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js
@@ -45,7 +45,7 @@
},
{
'action': 'insert',
- 'label': OO.ui.deferMsg(
'visualeditor-dialog-transclusion-insert-template' ),
+ 'label': OO.ui.deferMsg( 'visualeditor-dialog-action-insert' ),
'flags': [ 'primary', 'constructive' ],
'modes': 'insert'
},
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js
index da63f4a..780cc22 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js
@@ -163,9 +163,7 @@
ve.ui.MWTransclusionDialog.super.prototype.onReplacePart.call( this,
removed, added );
single = this.isSingleTemplateTransclusion();
- label = single ?
- ve.msg( 'visualeditor-dialog-transclusion-insert-template' ) :
- ve.msg( 'visualeditor-dialog-transclusion-insert-transclusion'
);
+ label = ve.msg( 'visualeditor-dialog-action-insert' );
this.actions
.setAbilities( { 'mode': single } )
--
To view, visit https://gerrit.wikimedia.org/r/155352
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia8fb88d3501ffa2c26add4419da5463a926f45d1
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester <[email protected]>
Gerrit-Reviewer: Catrope <[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
