Trevor Parscal has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/111682

Change subject: (Stand back again) Even moar label manias! (label refactoring)
......................................................................

(Stand back again) Even moar label manias! (label refactoring)

Update calling code as per changes in OOUI

Depends on Ic967b88d55daf48d365487e17f76488b3f02c60f and 
Ib599b9bd5028e2df084fcc3da657aeb7f1569d2a

Change-Id: Ie7d58472619509782f23a7dedc1ec27c3dcc7543
---
M modules/syntaxhighlight/ve.ui.MWSyntaxHighlightDialog.js
M modules/syntaxhighlight/ve.ui.MWSyntaxHighlightTool.js
M modules/ve-mw/init/ve.init.mw.Target.js
M modules/ve-mw/ui/dialogs/ve.ui.MWAdvancedTransclusionDialog.js
M modules/ve-mw/ui/dialogs/ve.ui.MWBetaWelcomeDialog.js
M modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
M modules/ve-mw/ui/dialogs/ve.ui.MWMediaInsertDialog.js
M modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.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.MWSaveDialog.js
M modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js
M modules/ve-mw/ui/inspectors/ve.ui.MWGalleryInspector.js
M modules/ve-mw/ui/inspectors/ve.ui.MWHieroInspector.js
M modules/ve-mw/ui/inspectors/ve.ui.MWMathInspector.js
M modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js
M modules/ve-mw/ui/pages/ve.ui.MWLanguagesPage.js
M modules/ve-mw/ui/pages/ve.ui.MWSettingsPage.js
M modules/ve-mw/ui/pages/ve.ui.MWTemplatePage.js
M modules/ve-mw/ui/pages/ve.ui.MWTemplateParameterPage.js
M modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js
M modules/ve-mw/ui/pages/ve.ui.MWTransclusionContentPage.js
M modules/ve-mw/ui/tools/ve.ui.MWAlienExtensionInspectorTool.js
M modules/ve-mw/ui/tools/ve.ui.MWDialogTool.js
M modules/ve-mw/ui/tools/ve.ui.MWEditModeTool.js
M modules/ve-mw/ui/tools/ve.ui.MWFormatTool.js
M modules/ve-mw/ui/tools/ve.ui.MWGalleryInspectorTool.js
M modules/ve-mw/ui/tools/ve.ui.MWHieroInspectorTool.js
M modules/ve-mw/ui/tools/ve.ui.MWMathInspectorTool.js
M modules/ve-mw/ui/tools/ve.ui.MWPopupTool.js
30 files changed, 119 insertions(+), 66 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/82/111682/1

diff --git a/modules/syntaxhighlight/ve.ui.MWSyntaxHighlightDialog.js 
b/modules/syntaxhighlight/ve.ui.MWSyntaxHighlightDialog.js
index 07971f1..e23d1cd 100644
--- a/modules/syntaxhighlight/ve.ui.MWSyntaxHighlightDialog.js
+++ b/modules/syntaxhighlight/ve.ui.MWSyntaxHighlightDialog.js
@@ -26,7 +26,8 @@
 
 /* Static Properties */
 
-ve.ui.MWSyntaxHighlightDialog.static.titleMessage = 
'visualeditor-dialog-syntaxhighlight-title';
+ve.ui.MWSyntaxHighlightDialog.static.title =
+       OO.ui.deferMsg( 'visualeditor-dialog-syntaxhighlight-title' );
 
 ve.ui.MWSyntaxHighlightDialog.static.icon = 'syntaxHighlight';
 
diff --git a/modules/syntaxhighlight/ve.ui.MWSyntaxHighlightTool.js 
b/modules/syntaxhighlight/ve.ui.MWSyntaxHighlightTool.js
index 1702ae6..5472fbe 100644
--- a/modules/syntaxhighlight/ve.ui.MWSyntaxHighlightTool.js
+++ b/modules/syntaxhighlight/ve.ui.MWSyntaxHighlightTool.js
@@ -27,7 +27,8 @@
 
 ve.ui.MWSyntaxHighlightTool.static.name = 'mwSyntaxHighlight';
 ve.ui.MWSyntaxHighlightTool.static.icon = 'syntaxHighlight';
-ve.ui.MWSyntaxHighlightTool.static.titleMessage = 
'visualeditor-dialogbutton-syntaxhighlight-tooltip';
+ve.ui.MWSyntaxHighlightTool.static.title =
+       OO.ui.deferMsg( 'visualeditor-dialogbutton-syntaxhighlight-tooltip' );
 ve.ui.MWSyntaxHighlightTool.static.dialog = 'mwSyntaxHighlight';
 ve.ui.MWSyntaxHighlightTool.static.modelClasses = [ 
ve.dm.MWSyntaxHighlightNode ];
 ve.ui.MWSyntaxHighlightTool.static.group = 'syntaxHighlight';
@@ -71,7 +72,8 @@
 ve.ui.MWSynHiUndoTool.static.group = 'synhiEditorTool';
 ve.ui.MWSynHiUndoTool.static.method = 'undo';
 ve.ui.MWSynHiUndoTool.static.icon = 'undo';
-ve.ui.MWSynHiUndoTool.static.titleMessage = 
'visualeditor-historybutton-undo-tooltip';
+ve.ui.MWSynHiUndoTool.static.title =
+       OO.ui.deferMsg( 'visualeditor-historybutton-undo-tooltip' );
 ve.ui.MWSynHiUndoTool.static.autoAdd = false;
 ve.ui.syntaxHighlightEditorToolFactory.register( ve.ui.MWSynHiUndoTool );
 
@@ -83,7 +85,8 @@
 ve.ui.MWSynHiRedoTool.static.group = 'synhiEditorTool';
 ve.ui.MWSynHiRedoTool.static.method = 'redo';
 ve.ui.MWSynHiRedoTool.static.icon = 'redo';
-ve.ui.MWSynHiRedoTool.static.titleMessage = 
'visualeditor-historybutton-redo-tooltip';
+ve.ui.MWSynHiRedoTool.static.title =
+       OO.ui.deferMsg( 'visualeditor-historybutton-redo-tooltip' );
 ve.ui.MWSynHiRedoTool.static.autoAdd = false;
 ve.ui.syntaxHighlightEditorToolFactory.register( ve.ui.MWSynHiRedoTool );
 
@@ -95,7 +98,7 @@
 ve.ui.MWSynHiIndentTool.static.group = 'synhiEditorTool';
 ve.ui.MWSynHiIndentTool.static.method = 'indent';
 ve.ui.MWSynHiIndentTool.static.icon = 'indent-list';
-ve.ui.MWSynHiIndentTool.static.titleMessage = '';
+ve.ui.MWSynHiIndentTool.static.title = '';
 ve.ui.MWSynHiIndentTool.static.autoAdd = false;
 ve.ui.syntaxHighlightEditorToolFactory.register( ve.ui.MWSynHiIndentTool );
 
@@ -107,6 +110,6 @@
 ve.ui.MWSynHiBeautifyTool.static.group = 'synhiEditorTool';
 ve.ui.MWSynHiBeautifyTool.static.method = 'doBeautify';
 ve.ui.MWSynHiBeautifyTool.static.icon = 'reformat';
-ve.ui.MWSynHiBeautifyTool.static.titleMessage = '';
+ve.ui.MWSynHiBeautifyTool.static.title = '';
 ve.ui.MWSynHiBeautifyTool.static.autoAdd = false;
-ve.ui.syntaxHighlightEditorToolFactory.register( ve.ui.MWSynHiBeautifyTool );
\ No newline at end of file
+ve.ui.syntaxHighlightEditorToolFactory.register( ve.ui.MWSynHiBeautifyTool );
diff --git a/modules/ve-mw/init/ve.init.mw.Target.js 
b/modules/ve-mw/init/ve.init.mw.Target.js
index 5c246a4..326bdd8 100644
--- a/modules/ve-mw/init/ve.init.mw.Target.js
+++ b/modules/ve-mw/init/ve.init.mw.Target.js
@@ -192,7 +192,7 @@
        },
        // Insert
        {
-               'label': 'visualeditor-toolbar-insert',
+               'label': OO.ui.deferMsg( 'visualeditor-toolbar-insert' ),
                'indicator': 'down',
                'include': '*',
                'promote': [ 'reference', 'mediaInsert' ],
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWAdvancedTransclusionDialog.js 
b/modules/ve-mw/ui/dialogs/ve.ui.MWAdvancedTransclusionDialog.js
index dd609ff..46a1c11 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWAdvancedTransclusionDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWAdvancedTransclusionDialog.js
@@ -33,7 +33,8 @@
 
 ve.ui.MWAdvancedTransclusionDialog.static.name = 'transclusion';
 
-ve.ui.MWAdvancedTransclusionDialog.static.titleMessage = 
'visualeditor-dialog-transclusion-title';
+ve.ui.MWAdvancedTransclusionDialog.static.title =
+       OO.ui.deferMsg( 'visualeditor-dialog-transclusion-title' );
 
 ve.ui.MWAdvancedTransclusionDialog.static.icon = 'template';
 
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWBetaWelcomeDialog.js 
b/modules/ve-mw/ui/dialogs/ve.ui.MWBetaWelcomeDialog.js
index ece7a33..09e50aa 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWBetaWelcomeDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWBetaWelcomeDialog.js
@@ -32,7 +32,8 @@
 
 ve.ui.MWBetaWelcomeDialog.static.name = 'betaWelcome';
 
-ve.ui.MWBetaWelcomeDialog.static.titleMessage = 
'visualeditor-dialog-beta-welcome-title';
+ve.ui.MWBetaWelcomeDialog.static.title =
+       OO.ui.deferMsg( 'visualeditor-dialog-beta-welcome-title' );
 
 ve.ui.MWBetaWelcomeDialog.static.icon = 'help';
 
@@ -45,7 +46,7 @@
  * @returns {string} Window title
  */
 ve.ui.MWBetaWelcomeDialog.prototype.getTitle = function () {
-       return ve.msg( this.constructor.static.titleMessage, mw.user );
+       return ve.msg( this.constructor.static.title, mw.user );
 };
 
 /**
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js 
b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
index d3eebea..afce429 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
@@ -33,7 +33,8 @@
 
 ve.ui.MWMediaEditDialog.static.name = 'mediaEdit';
 
-ve.ui.MWMediaEditDialog.static.titleMessage = 
'visualeditor-dialog-media-title';
+ve.ui.MWMediaEditDialog.static.title =
+       OO.ui.deferMsg( 'visualeditor-dialog-media-title' );
 
 ve.ui.MWMediaEditDialog.static.icon = 'picture';
 
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaInsertDialog.js 
b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaInsertDialog.js
index d502be4..2794d80 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaInsertDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaInsertDialog.js
@@ -37,7 +37,8 @@
 
 ve.ui.MWMediaInsertDialog.static.name = 'mediaInsert';
 
-ve.ui.MWMediaInsertDialog.static.titleMessage = 
'visualeditor-dialog-media-insert-title';
+ve.ui.MWMediaInsertDialog.static.title =
+       OO.ui.deferMsg( 'visualeditor-dialog-media-insert-title' );
 
 ve.ui.MWMediaInsertDialog.static.icon = 'picture';
 
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js 
b/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js
index 162396c..eead65b 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js
@@ -28,7 +28,8 @@
 
 ve.ui.MWMetaDialog.static.name = 'meta';
 
-ve.ui.MWMetaDialog.static.titleMessage = 'visualeditor-dialog-meta-title';
+ve.ui.MWMetaDialog.static.title =
+       OO.ui.deferMsg( 'visualeditor-dialog-meta-title' );
 
 ve.ui.MWMetaDialog.static.icon = 'window';
 
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js 
b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
index dcd07f3..a2cbfb4 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
@@ -31,7 +31,8 @@
 
 ve.ui.MWReferenceDialog.static.name = 'reference';
 
-ve.ui.MWReferenceDialog.static.titleMessage = 
'visualeditor-dialog-reference-title';
+ve.ui.MWReferenceDialog.static.title =
+       OO.ui.deferMsg( 'visualeditor-dialog-reference-title' );
 
 ve.ui.MWReferenceDialog.static.icon = 'reference';
 
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceListDialog.js 
b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceListDialog.js
index 412d52d..0c65652 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceListDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceListDialog.js
@@ -28,7 +28,8 @@
 
 ve.ui.MWReferenceListDialog.static.name = 'referenceList';
 
-ve.ui.MWReferenceListDialog.static.titleMessage = 
'visualeditor-dialog-referencelist-title';
+ve.ui.MWReferenceListDialog.static.title =
+       OO.ui.deferMsg( 'visualeditor-dialog-referencelist-title' );
 
 ve.ui.MWReferenceListDialog.static.icon = 'references';
 
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js 
b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
index d99c188..630a021 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
@@ -43,7 +43,8 @@
 
 ve.ui.MWSaveDialog.static.name = 'mwSave';
 
-ve.ui.MWSaveDialog.static.titleMessage = 'visualeditor-savedialog-title-save';
+ve.ui.MWSaveDialog.static.title =
+       OO.ui.deferMsg( 'visualeditor-savedialog-title-save' );
 
 /* Events */
 
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js 
b/modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js
index 1606a1a..6cfec20 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js
@@ -33,7 +33,8 @@
 
 ve.ui.MWTemplateDialog.static.name = 'transclusion';
 
-ve.ui.MWTemplateDialog.static.titleMessage = 
'visualeditor-dialog-transclusion-title';
+ve.ui.MWTemplateDialog.static.title =
+       OO.ui.deferMsg( 'visualeditor-dialog-transclusion-title' );
 
 ve.ui.MWTemplateDialog.static.icon = 'template';
 
diff --git a/modules/ve-mw/ui/inspectors/ve.ui.MWGalleryInspector.js 
b/modules/ve-mw/ui/inspectors/ve.ui.MWGalleryInspector.js
index f5ef2b3..5ed78e5 100644
--- a/modules/ve-mw/ui/inspectors/ve.ui.MWGalleryInspector.js
+++ b/modules/ve-mw/ui/inspectors/ve.ui.MWGalleryInspector.js
@@ -30,7 +30,8 @@
 
 ve.ui.MWGalleryInspector.static.icon = 'gallery';
 
-ve.ui.MWGalleryInspector.static.titleMessage = 
'visualeditor-mwgalleryinspector-title';
+ve.ui.MWGalleryInspector.static.title =
+       OO.ui.deferMsg( 'visualeditor-mwgalleryinspector-title' );
 
 ve.ui.MWGalleryInspector.static.placeholder = 
'visualeditor-mwgalleryinspector-placeholder';
 
diff --git a/modules/ve-mw/ui/inspectors/ve.ui.MWHieroInspector.js 
b/modules/ve-mw/ui/inspectors/ve.ui.MWHieroInspector.js
index f27f9d3..644e8e0 100644
--- a/modules/ve-mw/ui/inspectors/ve.ui.MWHieroInspector.js
+++ b/modules/ve-mw/ui/inspectors/ve.ui.MWHieroInspector.js
@@ -30,7 +30,8 @@
 
 ve.ui.MWHieroInspector.static.icon = 'hiero';
 
-ve.ui.MWHieroInspector.static.titleMessage = 
'visualeditor-mwhieroinspector-title';
+ve.ui.MWHieroInspector.static.title =
+       OO.ui.deferMsg( 'visualeditor-mwhieroinspector-title' );
 
 ve.ui.MWHieroInspector.static.nodeView = ve.ce.MWHieroNode;
 
diff --git a/modules/ve-mw/ui/inspectors/ve.ui.MWMathInspector.js 
b/modules/ve-mw/ui/inspectors/ve.ui.MWMathInspector.js
index 6b657a3..5a448da 100644
--- a/modules/ve-mw/ui/inspectors/ve.ui.MWMathInspector.js
+++ b/modules/ve-mw/ui/inspectors/ve.ui.MWMathInspector.js
@@ -32,7 +32,8 @@
 
 ve.ui.MWMathInspector.static.icon = 'math';
 
-ve.ui.MWMathInspector.static.titleMessage = 
'visualeditor-mwmathinspector-title';
+ve.ui.MWMathInspector.static.title =
+       OO.ui.deferMsg( 'visualeditor-mwmathinspector-title' );
 
 ve.ui.MWMathInspector.static.nodeView = ve.ce.MWMathNode;
 
diff --git a/modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js 
b/modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js
index 86b9eb8..4e1848e 100644
--- a/modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js
+++ b/modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js
@@ -21,7 +21,10 @@
  */
 ve.ui.MWCategoriesPage = function VeUiMWCategoriesPage( surface, name, config 
) {
        // Configuration initialization
-       config = ve.extendObject( { 'icon': 'tag' }, config );
+       config = ve.extendObject( {
+               'icon': 'tag',
+               'label': ve.msg( 'visualeditor-dialog-meta-categories-section' )
+       }, config );
 
        // Parent constructor
        OO.ui.PageLayout.call( this, name, config );
@@ -30,7 +33,6 @@
        this.metaList = surface.getModel().metaList;
        this.defaultSortKeyTouched = false;
        this.fallbackDefaultSortKey = mw.config.get( 'wgTitle' );
-       this.label = ve.msg( 'visualeditor-dialog-meta-categories-section' );
        this.categoriesFieldset = new OO.ui.FieldsetLayout( {
                '$': this.$,
                'label': ve.msg( 
'visualeditor-dialog-meta-categories-data-label' ),
diff --git a/modules/ve-mw/ui/pages/ve.ui.MWLanguagesPage.js 
b/modules/ve-mw/ui/pages/ve.ui.MWLanguagesPage.js
index 7f652dd..c3b1af7 100644
--- a/modules/ve-mw/ui/pages/ve.ui.MWLanguagesPage.js
+++ b/modules/ve-mw/ui/pages/ve.ui.MWLanguagesPage.js
@@ -19,13 +19,15 @@
  */
 ve.ui.MWLanguagesPage = function VeUiMWLanguagesPage( name, config ) {
        // Configuration initialization
-       config = ve.extendObject( { 'icon': 'language' }, config );
+       config = ve.extendObject( {
+               'icon': 'language',
+               'label': ve.msg( 'visualeditor-dialog-meta-languages-section' )
+       }, config );
 
        // Parent constructor
        OO.ui.PageLayout.call( this, name, config );
 
        // Properties
-       this.label = ve.msg( 'visualeditor-dialog-meta-languages-section' );
        this.languagesFieldset = new OO.ui.FieldsetLayout( {
                '$': this.$,
                'label': ve.msg( 'visualeditor-dialog-meta-languages-label' ),
diff --git a/modules/ve-mw/ui/pages/ve.ui.MWSettingsPage.js 
b/modules/ve-mw/ui/pages/ve.ui.MWSettingsPage.js
index cee8161..297f767 100644
--- a/modules/ve-mw/ui/pages/ve.ui.MWSettingsPage.js
+++ b/modules/ve-mw/ui/pages/ve.ui.MWSettingsPage.js
@@ -18,7 +18,10 @@
  */
 ve.ui.MWSettingsPage = function VeUiMWSettingsPage( surface, name, config ) {
        // Configuration initialization
-       config = ve.extendObject( config, { 'icon': 'settings' } );
+       config = ve.extendObject( {
+               'icon': 'settings',
+               'label': ve.msg( 'visualeditor-dialog-meta-settings-section' )
+       }, config );
 
        // Parent constructor
        OO.ui.PageLayout.call( this, name, config );
@@ -26,8 +29,6 @@
        // Properties
        this.metaList = surface.getModel().metaList;
        this.tocOptionTouched = false;
-       this.label = ve.msg( 'visualeditor-dialog-meta-settings-section' );
-
        this.settingsFieldset = new OO.ui.FieldsetLayout( {
                '$': this.$,
                'label': ve.msg( 'visualeditor-dialog-meta-settings-label' ),
diff --git a/modules/ve-mw/ui/pages/ve.ui.MWTemplatePage.js 
b/modules/ve-mw/ui/pages/ve.ui.MWTemplatePage.js
index f998513..1171d55 100644
--- a/modules/ve-mw/ui/pages/ve.ui.MWTemplatePage.js
+++ b/modules/ve-mw/ui/pages/ve.ui.MWTemplatePage.js
@@ -17,16 +17,21 @@
  * @param {Object} [config] Configuration options
  */
 ve.ui.MWTemplatePage = function VeUiMWTemplatePage( template, name, config ) {
+       var spec = template.getSpec();
+
        // Configuration initialization
-       config = ve.extendObject( { 'icon': 'template', 'movable': true }, 
config );
+       config = ve.extendObject( {
+               'icon': 'template',
+               'movable': true,
+               'label': spec.getLabel()
+       }, config );
 
        // Parent constructor
        OO.ui.PageLayout.call( this, name, config );
 
        // Properties
        this.template = template;
-       this.spec = this.template.getSpec();
-       this.label = this.spec.getLabel();
+       this.spec = spec;
        this.addParameterSearch = new ve.ui.MWParameterSearchWidget( 
this.template, { '$': this.$ } )
                .connect( this, { 'select': 'onParameterSelect' } );
        this.removeButton = new OO.ui.ButtonWidget( {
diff --git a/modules/ve-mw/ui/pages/ve.ui.MWTemplateParameterPage.js 
b/modules/ve-mw/ui/pages/ve.ui.MWTemplateParameterPage.js
index a9fb0bd..1600ed5 100644
--- a/modules/ve-mw/ui/pages/ve.ui.MWTemplateParameterPage.js
+++ b/modules/ve-mw/ui/pages/ve.ui.MWTemplateParameterPage.js
@@ -17,13 +17,20 @@
  * @param {Object} [config] Configuration options
  */
 ve.ui.MWTemplateParameterPage = function VeUiMWTemplateParameter( parameter, 
name, config ) {
+       var spec = parameter.getTemplate().getSpec();
+
        // Configuration initialization
        config = ve.extendObject(
                parameter.isRequired() ? {
                        'indicator': 'required',
                        'indicatorTitle': ve.msg( 
'visualeditor-dialog-transclusion-required-parameter' )
                } : {},
-               { 'icon': 'parameter', 'movable': false, 'level': 1 },
+               {
+                       'icon': 'parameter',
+                       'movable': false,
+                       'level': 1,
+                       'label': spec.getParameterLabel( parameter.getName() )
+               },
                config
        );
 
@@ -32,8 +39,7 @@
 
        // Properties
        this.parameter = parameter;
-       this.spec = parameter.getTemplate().getSpec();
-       this.label = this.spec.getParameterLabel( this.parameter.getName() );
+       this.spec = spec;
        this.textInput = new OO.ui.TextInputWidget( {
                        '$': this.$,
                        'multiline': true,
diff --git a/modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js 
b/modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js
index a59270b..e7802c0 100644
--- a/modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js
+++ b/modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js
@@ -24,10 +24,10 @@
        OO.ui.PageLayout.call( this, name, config );
 
        // Properties
-       this.placeholder = placeholder;
        this.label = this.$( '<span>' )
-                       .addClass( 
've-ui-mwTransclusionDialog-placeholder-label' )
-                       .text( ve.msg( 
'visualeditor-dialog-transclusion-placeholder' ) );
+               .addClass( 've-ui-mwTransclusionDialog-placeholder-label' )
+               .text( ve.msg( 'visualeditor-dialog-transclusion-placeholder' ) 
);
+       this.placeholder = placeholder;
        this.addTemplateInput = new ve.ui.MWTitleInputWidget( {
                        '$': this.$, '$overlay': this.$overlay, 'namespace': 10
                } )
diff --git a/modules/ve-mw/ui/pages/ve.ui.MWTransclusionContentPage.js 
b/modules/ve-mw/ui/pages/ve.ui.MWTransclusionContentPage.js
index 7dd843e..89286e0 100644
--- a/modules/ve-mw/ui/pages/ve.ui.MWTransclusionContentPage.js
+++ b/modules/ve-mw/ui/pages/ve.ui.MWTransclusionContentPage.js
@@ -18,14 +18,17 @@
  */
 ve.ui.MWTransclusionContentPage = function VeUiMWTransclusionContent( content, 
name, config ) {
        // Configuration initialization
-       config = ve.extendObject( { 'icon': 'source', 'movable': true }, config 
);
+       config = ve.extendObject( {
+               'icon': 'source',
+               'movable': true,
+               'label': ve.msg( 'visualeditor-dialog-transclusion-content' )
+       }, config );
 
        // Parent constructor
        OO.ui.PageLayout.call( this, name, config );
 
        // Properties
        this.content = content;
-       this.label = ve.msg( 'visualeditor-dialog-transclusion-content' );
        this.textInput = new OO.ui.TextInputWidget( {
                        '$': this.$,
                        'multiline': true,
diff --git a/modules/ve-mw/ui/tools/ve.ui.MWAlienExtensionInspectorTool.js 
b/modules/ve-mw/ui/tools/ve.ui.MWAlienExtensionInspectorTool.js
index c68add5..1f5ff5a 100644
--- a/modules/ve-mw/ui/tools/ve.ui.MWAlienExtensionInspectorTool.js
+++ b/modules/ve-mw/ui/tools/ve.ui.MWAlienExtensionInspectorTool.js
@@ -21,8 +21,8 @@
 ve.ui.MWAlienExtensionInspectorTool.static.name = 'alienExtension';
 ve.ui.MWAlienExtensionInspectorTool.static.group = 'object';
 ve.ui.MWAlienExtensionInspectorTool.static.icon = 'alienextension';
-ve.ui.MWAlienExtensionInspectorTool.static.titleMessage =
-       'visualeditor-mwalienextensioninspector-title';
+ve.ui.MWAlienExtensionInspectorTool.static.title =
+       OO.ui.deferMsg( 'visualeditor-mwalienextensioninspector-title' );
 ve.ui.MWAlienExtensionInspectorTool.static.inspector = 'alienExtension';
 ve.ui.MWAlienExtensionInspectorTool.static.modelClasses = [ 
ve.dm.MWAlienExtensionNode ];
 ve.ui.MWAlienExtensionInspectorTool.static.autoAdd = false;
diff --git a/modules/ve-mw/ui/tools/ve.ui.MWDialogTool.js 
b/modules/ve-mw/ui/tools/ve.ui.MWDialogTool.js
index 1ec57fb..cdb19eb 100644
--- a/modules/ve-mw/ui/tools/ve.ui.MWDialogTool.js
+++ b/modules/ve-mw/ui/tools/ve.ui.MWDialogTool.js
@@ -21,7 +21,8 @@
 ve.ui.MWMediaEditDialogTool.static.name = 'mediaEdit';
 ve.ui.MWMediaEditDialogTool.static.group = 'object';
 ve.ui.MWMediaEditDialogTool.static.icon = 'picture';
-ve.ui.MWMediaEditDialogTool.static.titleMessage = 
'visualeditor-dialogbutton-media-tooltip';
+ve.ui.MWMediaEditDialogTool.static.title =
+       OO.ui.deferMsg( 'visualeditor-dialogbutton-media-tooltip' );
 ve.ui.MWMediaEditDialogTool.static.dialog = 'mediaEdit';
 ve.ui.MWMediaEditDialogTool.static.modelClasses = [ ve.dm.MWBlockImageNode ];
 ve.ui.MWMediaEditDialogTool.static.autoAdd = false;
@@ -44,7 +45,8 @@
 ve.ui.MWMediaInsertDialogTool.static.name = 'mediaInsert';
 ve.ui.MWMediaInsertDialogTool.static.group = 'object';
 ve.ui.MWMediaInsertDialogTool.static.icon = 'picture';
-ve.ui.MWMediaInsertDialogTool.static.titleMessage = 
'visualeditor-dialogbutton-media-tooltip';
+ve.ui.MWMediaInsertDialogTool.static.title =
+       OO.ui.deferMsg( 'visualeditor-dialogbutton-media-tooltip' );
 ve.ui.MWMediaInsertDialogTool.static.dialog = 'mediaInsert';
 ve.ui.toolFactory.register( ve.ui.MWMediaInsertDialogTool );
 
@@ -65,7 +67,8 @@
 ve.ui.MWReferenceDialogTool.static.name = 'reference';
 ve.ui.MWReferenceDialogTool.static.group = 'object';
 ve.ui.MWReferenceDialogTool.static.icon = 'reference';
-ve.ui.MWReferenceDialogTool.static.titleMessage = 
'visualeditor-dialogbutton-reference-tooltip';
+ve.ui.MWReferenceDialogTool.static.title =
+       OO.ui.deferMsg( 'visualeditor-dialogbutton-reference-tooltip' );
 ve.ui.MWReferenceDialogTool.static.dialog = 'reference';
 ve.ui.MWReferenceDialogTool.static.modelClasses = [ ve.dm.MWReferenceNode ];
 ve.ui.toolFactory.register( ve.ui.MWReferenceDialogTool );
@@ -86,8 +89,8 @@
 ve.ui.MWReferenceListDialogTool.static.name = 'referenceList';
 ve.ui.MWReferenceListDialogTool.static.group = 'object';
 ve.ui.MWReferenceListDialogTool.static.icon = 'references';
-ve.ui.MWReferenceListDialogTool.static.titleMessage =
-       'visualeditor-dialogbutton-referencelist-tooltip';
+ve.ui.MWReferenceListDialogTool.static.title =
+       OO.ui.deferMsg( 'visualeditor-dialogbutton-referencelist-tooltip' );
 ve.ui.MWReferenceListDialogTool.static.dialog = 'referenceList';
 ve.ui.MWReferenceListDialogTool.static.modelClasses = [ 
ve.dm.MWReferenceListNode ];
 ve.ui.toolFactory.register( ve.ui.MWReferenceListDialogTool );
@@ -108,8 +111,8 @@
 ve.ui.MWTransclusionDialogTool.static.name = 'transclusion';
 ve.ui.MWTransclusionDialogTool.static.group = 'object';
 ve.ui.MWTransclusionDialogTool.static.icon = 'template';
-ve.ui.MWTransclusionDialogTool.static.titleMessage =
-       'visualeditor-dialogbutton-transclusion-tooltip';
+ve.ui.MWTransclusionDialogTool.static.title =
+       OO.ui.deferMsg( 'visualeditor-dialogbutton-transclusion-tooltip' );
 ve.ui.MWTransclusionDialogTool.static.dialog = 'transclusion';
 ve.ui.MWTransclusionDialogTool.static.modelClasses = [ 
ve.dm.MWTransclusionNode ];
 ve.ui.toolFactory.register( ve.ui.MWTransclusionDialogTool );
@@ -130,7 +133,8 @@
 ve.ui.MWMetaDialogTool.static.name = 'meta';
 ve.ui.MWMetaDialogTool.static.group = 'utility';
 ve.ui.MWMetaDialogTool.static.icon = 'window';
-ve.ui.MWMetaDialogTool.static.titleMessage = 'visualeditor-meta-tool';
+ve.ui.MWMetaDialogTool.static.title =
+       OO.ui.deferMsg( 'visualeditor-meta-tool' );
 ve.ui.MWMetaDialogTool.static.dialog = 'meta';
 ve.ui.MWMetaDialogTool.static.autoAdd = false;
 ve.ui.toolFactory.register( ve.ui.MWMetaDialogTool );
@@ -151,7 +155,8 @@
 ve.ui.MWPageSettingsDialogTool.static.name = 'settings';
 ve.ui.MWPageSettingsDialogTool.static.group = 'utility';
 ve.ui.MWPageSettingsDialogTool.static.icon = 'settings';
-ve.ui.MWPageSettingsDialogTool.static.titleMessage = 
'visualeditor-settings-tool';
+ve.ui.MWPageSettingsDialogTool.static.title =
+       OO.ui.deferMsg( 'visualeditor-settings-tool' );
 ve.ui.MWPageSettingsDialogTool.static.dialog = 'meta';
 ve.ui.MWPageSettingsDialogTool.static.config = { 'page': 'settings' };
 ve.ui.MWPageSettingsDialogTool.static.autoAdd = false;
@@ -173,7 +178,8 @@
 ve.ui.MWCategoriesDialogTool.static.name = 'categories';
 ve.ui.MWCategoriesDialogTool.static.group = 'utility';
 ve.ui.MWCategoriesDialogTool.static.icon = 'tag';
-ve.ui.MWCategoriesDialogTool.static.titleMessage = 
'visualeditor-categories-tool';
+ve.ui.MWCategoriesDialogTool.static.title =
+       OO.ui.deferMsg( 'visualeditor-categories-tool' );
 ve.ui.MWCategoriesDialogTool.static.dialog = 'meta';
 ve.ui.MWCategoriesDialogTool.static.config = { 'page': 'categories' };
 ve.ui.MWCategoriesDialogTool.static.autoAdd = false;
@@ -195,7 +201,8 @@
 ve.ui.MWLanguagesDialogTool.static.name = 'languages';
 ve.ui.MWLanguagesDialogTool.static.group = 'utility';
 ve.ui.MWLanguagesDialogTool.static.icon = 'language';
-ve.ui.MWLanguagesDialogTool.static.titleMessage = 
'visualeditor-languages-tool';
+ve.ui.MWLanguagesDialogTool.static.title =
+       OO.ui.deferMsg( 'visualeditor-languages-tool' );
 ve.ui.MWLanguagesDialogTool.static.dialog = 'meta';
 ve.ui.MWLanguagesDialogTool.static.config = { 'page': 'languages' };
 ve.ui.MWLanguagesDialogTool.static.autoAdd = false;
@@ -217,7 +224,8 @@
 ve.ui.MWCommandHelpDialogTool.static.name = 'commandHelp';
 ve.ui.MWCommandHelpDialogTool.static.group = 'utility';
 ve.ui.MWCommandHelpDialogTool.static.icon = 'help';
-ve.ui.MWCommandHelpDialogTool.static.titleMessage = 
'visualeditor-dialog-command-help-title';
+ve.ui.MWCommandHelpDialogTool.static.title =
+       OO.ui.deferMsg( 'visualeditor-dialog-command-help-title' );
 ve.ui.MWCommandHelpDialogTool.static.dialog = 'commandHelp';
 ve.ui.MWCommandHelpDialogTool.static.autoAdd = false;
 ve.ui.toolFactory.register( ve.ui.MWCommandHelpDialogTool );
diff --git a/modules/ve-mw/ui/tools/ve.ui.MWEditModeTool.js 
b/modules/ve-mw/ui/tools/ve.ui.MWEditModeTool.js
index 1b10bea..7490e82 100644
--- a/modules/ve-mw/ui/tools/ve.ui.MWEditModeTool.js
+++ b/modules/ve-mw/ui/tools/ve.ui.MWEditModeTool.js
@@ -49,7 +49,8 @@
 OO.inheritClass( ve.ui.MWEditModeSourceTool, ve.ui.MWEditModeTool );
 ve.ui.MWEditModeSourceTool.static.name = 'editModeSource';
 ve.ui.MWEditModeSourceTool.static.icon = 'source';
-ve.ui.MWEditModeSourceTool.static.titleMessage = 
'visualeditor-mweditmodesource-title';
+ve.ui.MWEditModeSourceTool.static.title =
+       OO.ui.deferMsg( 'visualeditor-mweditmodesource-title' );
 
 ve.ui.MWEditModeSourceTool.prototype.onSelect = function () {
        this.setActive( false );
diff --git a/modules/ve-mw/ui/tools/ve.ui.MWFormatTool.js 
b/modules/ve-mw/ui/tools/ve.ui.MWFormatTool.js
index fcd0779..fe9e614 100644
--- a/modules/ve-mw/ui/tools/ve.ui.MWFormatTool.js
+++ b/modules/ve-mw/ui/tools/ve.ui.MWFormatTool.js
@@ -18,7 +18,8 @@
        ve.ui.Heading1FormatTool.call( this, toolGroup, config );
 };
 OO.inheritClass( ve.ui.MWHeading1FormatTool, ve.ui.Heading1FormatTool );
-ve.ui.MWHeading1FormatTool.static.titleMessage = 
'visualeditor-formatdropdown-format-mw-heading1';
+ve.ui.MWHeading1FormatTool.static.title =
+       OO.ui.deferMsg( 'visualeditor-formatdropdown-format-mw-heading1' );
 ve.ui.MWHeading1FormatTool.static.format = { 'type': 'mwHeading', 
'attributes': { 'level': 1 } };
 ve.ui.toolFactory.register( ve.ui.MWHeading1FormatTool );
 ve.ui.commandRegistry.register( new ve.ui.Command( 'heading1', 'format', 
'convert', 'mwHeading', { 'level': 1 } ) );
@@ -36,7 +37,8 @@
        ve.ui.Heading2FormatTool.call( this, toolGroup, config );
 };
 OO.inheritClass( ve.ui.MWHeading2FormatTool, ve.ui.Heading2FormatTool );
-ve.ui.MWHeading2FormatTool.static.titleMessage = 
'visualeditor-formatdropdown-format-mw-heading2';
+ve.ui.MWHeading2FormatTool.static.title =
+       OO.ui.deferMsg( 'visualeditor-formatdropdown-format-mw-heading2' );
 ve.ui.MWHeading2FormatTool.static.format = { 'type': 'mwHeading', 
'attributes': { 'level': 2 } };
 ve.ui.toolFactory.register( ve.ui.MWHeading2FormatTool );
 ve.ui.commandRegistry.register( new ve.ui.Command( 'heading2', 'format', 
'convert', 'mwHeading', { 'level': 2 } ) );
@@ -54,7 +56,8 @@
        ve.ui.Heading3FormatTool.call( this, toolGroup, config );
 };
 OO.inheritClass( ve.ui.MWHeading3FormatTool, ve.ui.Heading3FormatTool );
-ve.ui.MWHeading3FormatTool.static.titleMessage = 
'visualeditor-formatdropdown-format-mw-heading3';
+ve.ui.MWHeading3FormatTool.static.title =
+       OO.ui.deferMsg( 'visualeditor-formatdropdown-format-mw-heading3' );
 ve.ui.MWHeading3FormatTool.static.format = { 'type': 'mwHeading', 
'attributes': { 'level': 3 } };
 ve.ui.toolFactory.register( ve.ui.MWHeading3FormatTool );
 ve.ui.commandRegistry.register( new ve.ui.Command( 'heading3', 'format', 
'convert', 'mwHeading', { 'level': 3 } ) );
@@ -72,7 +75,8 @@
        ve.ui.Heading4FormatTool.call( this, toolGroup, config );
 };
 OO.inheritClass( ve.ui.MWHeading4FormatTool, ve.ui.Heading4FormatTool );
-ve.ui.MWHeading4FormatTool.static.titleMessage = 
'visualeditor-formatdropdown-format-mw-heading4';
+ve.ui.MWHeading4FormatTool.static.title =
+       OO.ui.deferMsg( 'visualeditor-formatdropdown-format-mw-heading4' );
 ve.ui.MWHeading4FormatTool.static.format = { 'type': 'mwHeading', 
'attributes': { 'level': 4 } };
 ve.ui.toolFactory.register( ve.ui.MWHeading4FormatTool );
 ve.ui.commandRegistry.register( new ve.ui.Command( 'heading4', 'format', 
'convert', 'mwHeading', { 'level': 4 } ) );
@@ -90,7 +94,8 @@
        ve.ui.Heading5FormatTool.call( this, toolGroup, config );
 };
 OO.inheritClass( ve.ui.MWHeading5FormatTool, ve.ui.Heading5FormatTool );
-ve.ui.MWHeading5FormatTool.static.titleMessage = 
'visualeditor-formatdropdown-format-mw-heading5';
+ve.ui.MWHeading5FormatTool.static.title =
+       OO.ui.deferMsg( 'visualeditor-formatdropdown-format-mw-heading5' );
 ve.ui.MWHeading5FormatTool.static.format = { 'type': 'mwHeading', 
'attributes': { 'level': 5 } };
 ve.ui.toolFactory.register( ve.ui.MWHeading5FormatTool );
 ve.ui.commandRegistry.register( new ve.ui.Command( 'heading5', 'format', 
'convert', 'mwHeading', { 'level': 5 } ) );
@@ -108,7 +113,8 @@
        ve.ui.Heading6FormatTool.call( this, toolGroup, config );
 };
 OO.inheritClass( ve.ui.MWHeading6FormatTool, ve.ui.Heading6FormatTool );
-ve.ui.MWHeading6FormatTool.static.titleMessage = 
'visualeditor-formatdropdown-format-mw-heading6';
+ve.ui.MWHeading6FormatTool.static.title =
+       OO.ui.deferMsg( 'visualeditor-formatdropdown-format-mw-heading6' );
 ve.ui.MWHeading6FormatTool.static.format = { 'type': 'mwHeading', 
'attributes': { 'level': 6 } };
 ve.ui.toolFactory.register( ve.ui.MWHeading6FormatTool );
 ve.ui.commandRegistry.register( new ve.ui.Command( 'heading6', 'format', 
'convert', 'mwHeading', { 'level': 6 } ) );
diff --git a/modules/ve-mw/ui/tools/ve.ui.MWGalleryInspectorTool.js 
b/modules/ve-mw/ui/tools/ve.ui.MWGalleryInspectorTool.js
index f16d204..c948ce1 100644
--- a/modules/ve-mw/ui/tools/ve.ui.MWGalleryInspectorTool.js
+++ b/modules/ve-mw/ui/tools/ve.ui.MWGalleryInspectorTool.js
@@ -21,7 +21,8 @@
 ve.ui.MWGalleryInspectorTool.static.name = 'gallery';
 ve.ui.MWGalleryInspectorTool.static.group = 'object';
 ve.ui.MWGalleryInspectorTool.static.icon = 'gallery';
-ve.ui.MWGalleryInspectorTool.static.titleMessage = 
'visualeditor-mwgalleryinspector-title';
+ve.ui.MWGalleryInspectorTool.static.title =
+       OO.ui.deferMsg( 'visualeditor-mwgalleryinspector-title' );
 ve.ui.MWGalleryInspectorTool.static.inspector = 'gallery';
 ve.ui.MWGalleryInspectorTool.static.modelClasses = [ ve.dm.MWGalleryNode ];
 ve.ui.toolFactory.register( ve.ui.MWGalleryInspectorTool );
diff --git a/modules/ve-mw/ui/tools/ve.ui.MWHieroInspectorTool.js 
b/modules/ve-mw/ui/tools/ve.ui.MWHieroInspectorTool.js
index 04fe81f..3abd912 100644
--- a/modules/ve-mw/ui/tools/ve.ui.MWHieroInspectorTool.js
+++ b/modules/ve-mw/ui/tools/ve.ui.MWHieroInspectorTool.js
@@ -21,7 +21,8 @@
 ve.ui.MWHieroInspectorTool.static.name = 'hiero';
 ve.ui.MWHieroInspectorTool.static.group = 'object';
 ve.ui.MWHieroInspectorTool.static.icon = 'hiero';
-ve.ui.MWHieroInspectorTool.static.titleMessage = 
'visualeditor-mwhieroinspector-title';
+ve.ui.MWHieroInspectorTool.static.title =
+       OO.ui.deferMsg( 'visualeditor-mwhieroinspector-title' );
 ve.ui.MWHieroInspectorTool.static.inspector = 'hiero';
 ve.ui.MWHieroInspectorTool.static.modelClasses = [ ve.dm.MWHieroNode ];
 ve.ui.toolFactory.register( ve.ui.MWHieroInspectorTool );
diff --git a/modules/ve-mw/ui/tools/ve.ui.MWMathInspectorTool.js 
b/modules/ve-mw/ui/tools/ve.ui.MWMathInspectorTool.js
index 74bf902..44f0427 100644
--- a/modules/ve-mw/ui/tools/ve.ui.MWMathInspectorTool.js
+++ b/modules/ve-mw/ui/tools/ve.ui.MWMathInspectorTool.js
@@ -21,7 +21,8 @@
 ve.ui.MWMathInspectorTool.static.name = 'math';
 ve.ui.MWMathInspectorTool.static.group = 'object';
 ve.ui.MWMathInspectorTool.static.icon = 'math';
-ve.ui.MWMathInspectorTool.static.titleMessage = 
'visualeditor-mwmathinspector-title';
+ve.ui.MWMathInspectorTool.static.title =
+       OO.ui.deferMsg( 'visualeditor-mwmathinspector-title' );
 ve.ui.MWMathInspectorTool.static.inspector = 'math';
 ve.ui.MWMathInspectorTool.static.modelClasses = [ ve.dm.MWMathNode ];
 ve.ui.toolFactory.register( ve.ui.MWMathInspectorTool );
diff --git a/modules/ve-mw/ui/tools/ve.ui.MWPopupTool.js 
b/modules/ve-mw/ui/tools/ve.ui.MWPopupTool.js
index a653306..a0c491c 100644
--- a/modules/ve-mw/ui/tools/ve.ui.MWPopupTool.js
+++ b/modules/ve-mw/ui/tools/ve.ui.MWPopupTool.js
@@ -62,7 +62,7 @@
 ve.ui.MWNoticesPopupTool.static.name = 'notices';
 ve.ui.MWNoticesPopupTool.static.group = 'utility';
 ve.ui.MWNoticesPopupTool.static.icon = 'alert';
-ve.ui.MWNoticesPopupTool.static.titleMessage = 'visualeditor-editnotices-tool';
+ve.ui.MWNoticesPopupTool.static.title = OO.ui.deferMsg( 
'visualeditor-editnotices-tool' );
 ve.ui.MWNoticesPopupTool.static.autoAdd = false;
 
 /* Methods */
@@ -76,7 +76,7 @@
        var items = this.toolbar.getTarget().getEditNotices(),
                count = ve.getObjectKeys( items ).length;
 
-       return ve.msg( this.constructor.static.titleMessage, count );
+       return ve.msg( this.constructor.static.title, count );
 };
 
 /* Registration */
@@ -172,7 +172,7 @@
 ve.ui.MWHelpPopupTool.static.name = 'help';
 ve.ui.MWHelpPopupTool.static.group = 'utility';
 ve.ui.MWHelpPopupTool.static.icon = 'help';
-ve.ui.MWHelpPopupTool.static.titleMessage = 'visualeditor-help-tool';
+ve.ui.MWHelpPopupTool.static.title = OO.ui.deferMsg( 'visualeditor-help-tool' 
);
 ve.ui.MWHelpPopupTool.static.autoAdd = false;
 
 /* Methods */

-- 
To view, visit https://gerrit.wikimedia.org/r/111682
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie7d58472619509782f23a7dedc1ec27c3dcc7543
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Trevor Parscal <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to