www

commit 17d7475f1d8535654a5667480cc831239edbdd2b
parent e5cb2875e6254066ebaa3c49033fe0f2e5c68648
Author: Simon Kornblith <simon@simonster.com>
Date:   Wed, 23 Mar 2011 01:56:17 +0000

- don't disregard selected exportCharset
- save translator settings


Diffstat:
M
chrome/content/zotero/exportOptions.js
 | 
3
+--
M
chrome/content/zotero/xpcom/translation/translate.js
 | 
2
+-

2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/chrome/content/zotero/exportOptions.js b/chrome/content/zotero/exportOptions.js
@@ -192,7 +192,6 @@ var Zotero_File_Interface_Export = new function() {
 		Zotero.Prefs.set("export.lastTranslator", window.arguments[0].translators[index].translatorID);
 		
 		// set options on selected translator and generate optionString
-		var optionString = "";
 		var optionsAvailable = window.arguments[0].selectedTranslator.displayOptions;
 		var displayOptions = window.arguments[0].displayOptions = {};
 		for(var option in optionsAvailable) {
@@ -209,7 +208,7 @@ var Zotero_File_Interface_Export = new function() {
 		}
 		
 		// save options
-		optionString = Zotero.JSON.serialize(optionsAvailable);
+		var optionString = Zotero.JSON.serialize(displayOptions);
 		Zotero.Prefs.set("export.translatorSettings", optionString);
 	}
 	
diff --git a/chrome/content/zotero/xpcom/translation/translate.js b/chrome/content/zotero/xpcom/translation/translate.js
@@ -1273,7 +1273,7 @@ Zotero.Translate.Export.prototype._prepareTranslation = function() {
 	} else {
 		this._io = new Zotero.Translate.IO.Write(this.location,
 			this.translator[0].configOptions["dataMode"],
-			this.translator[0].displayOptions["exportCharset"] ? this.translator[0].displayOptions["exportCharset"] : null);
+			this._displayOptions["exportCharset"] ? this._displayOptions["exportCharset"] : null);
 	}
 	
 	this._sandboxManager.importObject(this._io);