[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[wmf/1.29.0-wmf.4]: Allow template editor even if parameter mapping fails comple...

2016-11-30 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Allow template editor even if parameter mapping fails completely
..


Allow template editor even if parameter mapping fails completely

If there is an equivalent template, but parameter mapping fails
completely, currently no editor is shown and it is unclear to the
translator why this happens. I don't see a reason not to show a
template editor even in this case.

Bug: T151868
Change-Id: Iada2d82357df1483b84a5b1e73b2343905e2794f
(cherry picked from commit 2c5f6a2ff6c1b0f0fec8b23c49b6eb48d2ca11d9)
---
M modules/tools/ext.cx.tools.template.js
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Dereckson: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/tools/ext.cx.tools.template.js 
b/modules/tools/ext.cx.tools.template.js
index aaf9fe7..f41ef30 100644
--- a/modules/tools/ext.cx.tools.template.js
+++ b/modules/tools/ext.cx.tools.template.js
@@ -826,7 +826,7 @@
mw.log( '[CX] None of template params 
were able to map for ' + self.sourceTemplate.title );
// Manually adaptable, but not 
automatically adaptable.
self.status = 'adaptable';
-   return $.Deferred().reject().promise();
+   return $.Deferred().resolve().promise();
}
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iada2d82357df1483b84a5b1e73b2343905e2794f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: wmf/1.29.0-wmf.4
Gerrit-Owner: KartikMistry 
Gerrit-Reviewer: Dereckson 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits


[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[wmf/1.29.0-wmf.4]: Allow template editor even if parameter mapping fails comple...

2016-11-29 Thread KartikMistry (Code Review)
KartikMistry has uploaded a new change for review.

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

Change subject: Allow template editor even if parameter mapping fails completely
..

Allow template editor even if parameter mapping fails completely

If there is an equivalent template, but parameter mapping fails
completely, currently no editor is shown and it is unclear to the
translator why this happens. I don't see a reason not to show a
template editor even in this case.

Bug: T151868
Change-Id: Iada2d82357df1483b84a5b1e73b2343905e2794f
(cherry picked from commit 2c5f6a2ff6c1b0f0fec8b23c49b6eb48d2ca11d9)
---
M modules/tools/ext.cx.tools.template.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation 
refs/changes/77/324377/1

diff --git a/modules/tools/ext.cx.tools.template.js 
b/modules/tools/ext.cx.tools.template.js
index aaf9fe7..f41ef30 100644
--- a/modules/tools/ext.cx.tools.template.js
+++ b/modules/tools/ext.cx.tools.template.js
@@ -826,7 +826,7 @@
mw.log( '[CX] None of template params 
were able to map for ' + self.sourceTemplate.title );
// Manually adaptable, but not 
automatically adaptable.
self.status = 'adaptable';
-   return $.Deferred().reject().promise();
+   return $.Deferred().resolve().promise();
}
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iada2d82357df1483b84a5b1e73b2343905e2794f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: wmf/1.29.0-wmf.4
Gerrit-Owner: KartikMistry 
Gerrit-Reviewer: Nikerabbit 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits