jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/381947 )
Change subject: Implement TemplateParameterMapper.getAdaptedParameters
......................................................................
Implement TemplateParameterMapper.getAdaptedParameters
Change-Id: Ifa9a5ffd74f5630e573a75349a0d9a12b9495c84
---
M lib/adaptation/TemplateParameterMapper.js
M test/translationunits/MWTemplate.test.json
2 files changed, 22 insertions(+), 8 deletions(-)
Approvals:
jenkins-bot: Verified
Santhosh: Looks good to me, approved
diff --git a/lib/adaptation/TemplateParameterMapper.js
b/lib/adaptation/TemplateParameterMapper.js
index ddb05eb..66a1129 100644
--- a/lib/adaptation/TemplateParameterMapper.js
+++ b/lib/adaptation/TemplateParameterMapper.js
@@ -6,11 +6,19 @@
this.sourceTemplateData = sourceTemplateData;
this.targetTemplateData = targetTemplateData;
this.parameterMap = {};
+ this.paramatersAreMapped = false;
}
getAdaptedParameters() {
- // TODO: Use parameter map to copy values of sourceParams
- return this.sourceParams;
+ const adaptedParameters = {};
+ const parameterMap = this.getParameterMap();
+ for ( let name in this.sourceParams ) {
+ if ( name in parameterMap ) {
+ adaptedParameters[ parameterMap[ name ] ] =
this.sourceParams[ name ];
+ }
+ }
+
+ return adaptedParameters;
}
/**
@@ -18,6 +26,10 @@
* @return {Object} Object with mapping from each source param to param
name in target template.
*/
getParameterMap() {
+ if ( this.paramatersAreMapped ) {
+ return this.parameterMap;
+ }
+
for ( let name in this.sourceParams ) {
if ( !isNaN( name ) ) {
// Unnamed parameters, which are named 1, 2,
3...
@@ -58,6 +70,8 @@
}
}
}
+
+ this.paramatersAreMapped = true;
return this.parameterMap;
}
}
diff --git a/test/translationunits/MWTemplate.test.json
b/test/translationunits/MWTemplate.test.json
index a12272c..eb32e03 100644
--- a/test/translationunits/MWTemplate.test.json
+++ b/test/translationunits/MWTemplate.test.json
@@ -120,25 +120,25 @@
"url": {
"wt":
"http://www.example.org/ "
},
- "title": {
+ "titre": {
"wt":
"My Favorite Things, Part II "
},
- "last": {
+ "auteur1": {
"wt":
"Doe "
},
- "first": {
+ "prénom1": {
"wt":
"John "
},
- "publisher": {
+ "éditeur": {
"wt": "
Open Publishing "
},
"date": {
"wt":
"30 April 2005 "
},
- "website": {
+ "série": {
"wt":
"Encyclopedia of Things "
},
- "access-date ":
{
+ "consulté le": {
"wt":
"26 June 2016 "
}
},
--
To view, visit https://gerrit.wikimedia.org/r/381947
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifa9a5ffd74f5630e573a75349a0d9a12b9495c84
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/services/cxserver
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit <[email protected]>
Gerrit-Reviewer: Santhosh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
