mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix translation error reporting in connectors

Browse source 
Closes zotero/zotero-connectors#101
This commit is contained in:
Adomas Venčkauskas 2017-02-02 16:16:20 -03:00
parent 0998c1d1da
commit 9ecfc31fd4
2 changed files with 30 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
chrome/content/zotero/xpcom/translation/translate.js
View file

@ -2119,9 +2119,17 @@ Zotero.Translate.Web.prototype.complete = function(returnValue, error) {
var oldState = this._currentState; var oldState = this._currentState;
var errorString = Zotero.Translate.Base.prototype.complete.apply(this, [returnValue, error]); var errorString = Zotero.Translate.Base.prototype.complete.apply(this, [returnValue, error]);
var promise;
if (Zotero.isConnector) {
promise = Zotero.Prefs.getAsync('reportTranslationFailure');
} else {
promise = Zotero.Promise.resolve(Zotero.Prefs.get("reportTranslationFailure"));
}
return promise.then(function(reportTranslationFailure) {
// Report translation failure if we failed // Report translation failure if we failed
if(oldState == "translate" && errorString && !this._parentTranslator && this.translator.length if(oldState == "translate" && errorString && !this._parentTranslator && this.translator.length
&& this.translator[0].inRepository && Zotero.Prefs.get("reportTranslationFailure")) { && this.translator[0].inRepository && reportTranslationFailure) {
// Don't report failure if in private browsing mode // Don't report failure if in private browsing mode
if(Zotero.isFx && !Zotero.isBookmarklet && !Zotero.isStandalone && Components.classes["@mozilla.org/privatebrowsing;1"]) { if(Zotero.isFx && !Zotero.isBookmarklet && !Zotero.isStandalone && Components.classes["@mozilla.org/privatebrowsing;1"]) {
var pbs = Components.classes["@mozilla.org/privatebrowsing;1"] var pbs = Components.classes["@mozilla.org/privatebrowsing;1"]
@ -2132,7 +2140,7 @@ Zotero.Translate.Web.prototype.complete = function(returnValue, error) {
} }
var translator = this.translator[0]; var translator = this.translator[0];
Zotero.getSystemInfo().then(function(info) { return Zotero.getSystemInfo().then(function(info) {
var postBody = "id=" + encodeURIComponent(translator.translatorID) + var postBody = "id=" + encodeURIComponent(translator.translatorID) +
"&lastUpdated=" + encodeURIComponent(translator.lastUpdated) + "&lastUpdated=" + encodeURIComponent(translator.lastUpdated) +
"&diagnostic=" + encodeURIComponent(info) + "&diagnostic=" + encodeURIComponent(info) +
@ -2140,6 +2148,7 @@ Zotero.Translate.Web.prototype.complete = function(returnValue, error) {
return Zotero.HTTP.doPost(ZOTERO_CONFIG.REPOSITORY_URL + "report", postBody); return Zotero.HTTP.doPost(ZOTERO_CONFIG.REPOSITORY_URL + "report", postBody);
}); });
} }
}.bind(this));
} }
/** /**

2
chrome/content/zotero/xpcom/translation/translator.js
View file

@ -35,7 +35,7 @@ var TRANSLATOR_OPTIONAL_PROPERTIES = ["targetAll", "browserSupport", "minVersion
"hiddenPrefs", "itemType"]; "hiddenPrefs", "itemType"];
// Properties that are passed from background to inject page in connector // Properties that are passed from background to inject page in connector
var TRANSLATOR_PASSING_PROPERTIES = TRANSLATOR_REQUIRED_PROPERTIES. var TRANSLATOR_PASSING_PROPERTIES = TRANSLATOR_REQUIRED_PROPERTIES.
concat(["targetAll", "browserSupport", "code", "runMode", "itemType"]); concat(["targetAll", "browserSupport", "code", "runMode", "itemType", "inRepository"]);
/** /**
* @class Represents an individual translator * @class Represents an individual translator