jenkins-bot has submitted this change and it was merged.
Change subject: dm.MWTemplateSpecModel: Resolve translations through the
TemplateData API
......................................................................
dm.MWTemplateSpecModel: Resolve translations through the TemplateData API
Also removed comment in ui.MWTransclusionDialog that was
copied from dm.MWTemplateSpecModel.
Bug: 50888
Change-Id: I9dcfef3ae65fe716bae91f703f9169171448797a
---
M modules/ve-mw/dm/models/ve.dm.MWTemplateSpecModel.js
M modules/ve-mw/dm/models/ve.dm.MWTransclusionModel.js
M modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js
3 files changed, 6 insertions(+), 36 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/dm/models/ve.dm.MWTemplateSpecModel.js
b/modules/ve-mw/dm/models/ve.dm.MWTemplateSpecModel.js
index 30d5723..13b6be5 100644
--- a/modules/ve-mw/dm/models/ve.dm.MWTemplateSpecModel.js
+++ b/modules/ve-mw/dm/models/ve.dm.MWTemplateSpecModel.js
@@ -29,34 +29,6 @@
this.fill();
};
-/* Static Methods */
-
-/**
- * Get the correct value from a message property.
- *
- * @method
- * @static
- * @param {string|Object|null} val Messsage or object with messages keyed by
language
- * @param {Mixed} [fallback=null] Value to use if message is not available
- * @param {string} [lang] Language to prefer, user interface language will be
used by default
- * @returns {string} Message text or fallback if not available
- */
-ve.dm.MWTemplateSpecModel.getMessage = function ( val, fallback, lang ) {
- var i, len, langs = lang !== undefined ? [lang] :
ve.init.platform.getUserLanguages();
- if ( fallback === undefined ) {
- fallback = null;
- }
- if ( ve.isPlainObject( val ) ) {
- for ( i = 0, len = langs.length; i < len; i++ ) {
- if ( val[langs[i]] ) {
- return val[langs[i]];
- }
- }
- return fallback;
- }
- return typeof val === 'string' ? val : fallback;
-};
-
/* Methods */
/**
@@ -126,7 +98,7 @@
*/
ve.dm.MWTemplateSpecModel.prototype.getDefaultParameterSpec = function ( name
) {
return {
- 'label': { 'en': name },
+ 'label': name,
'description': null,
'default': '',
'type': 'string',
@@ -172,7 +144,7 @@
* @returns {string|null} Template description or null if not available
*/
ve.dm.MWTemplateSpecModel.prototype.getDescription = function () {
- return this.constructor.getMessage( this.description, null );
+ return this.description;
};
/**
@@ -207,7 +179,7 @@
* @returns {string} Parameter label
*/
ve.dm.MWTemplateSpecModel.prototype.getParameterLabel = function ( name ) {
- return this.constructor.getMessage( this.params[name].label, name );
+ return this.params[name].label || name;
};
/**
@@ -218,7 +190,7 @@
* @returns {string|null} Parameter description
*/
ve.dm.MWTemplateSpecModel.prototype.getParameterDescription = function ( name
) {
- return this.constructor.getMessage( this.params[name].description );
+ return this.params[name].description;
};
/**
diff --git a/modules/ve-mw/dm/models/ve.dm.MWTransclusionModel.js
b/modules/ve-mw/dm/models/ve.dm.MWTransclusionModel.js
index 5a306d7..af86c7b 100644
--- a/modules/ve-mw/dm/models/ve.dm.MWTransclusionModel.js
+++ b/modules/ve-mw/dm/models/ve.dm.MWTransclusionModel.js
@@ -164,7 +164,8 @@
'data': {
'format': 'json',
'action': 'templatedata',
- 'titles': titles.join( '|' )
+ 'titles': titles.join( '|' ),
+ 'lang': mw.config.get( 'wgUserLanguage' )
}
} )
.done( function ( data ) {
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js
index 0170c52..183b984 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWTransclusionDialog.js
@@ -8,9 +8,6 @@
/**
* Dialog for inserting and editing MediaWiki transclusions.
*
- * See
https://raw.github.com/wikimedia/mediawiki-extensions-TemplateData/master/spec.templatedata.json
- * for the latest version of the TemplateData specification.
- *
* @class
* @extends ve.ui.MWDialog
*
--
To view, visit https://gerrit.wikimedia.org/r/92826
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9dcfef3ae65fe716bae91f703f9169171448797a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
