www

commit a6cfe6cd9a8c6b7de1c3baca9690078a7da377b1
parent 0ad459812876ca76186e9157afca0d2e7480e240
Author: Dan Stillman <dstillman@zotero.org>
Date:   Sun, 27 Nov 2016 17:11:05 -0500

Remove export charset checkbox in prefs

Instead, just always show the (greatly shortened, after 0609b62a) menu
on export when the translator supports it (which probably fewer
translators actually need to do).

This leaves the pref in place, but it can be removed eventually (and
changing the default for a while I believe will cause the existing pref
line to be removed for anyone who has it set to true already).

Diffstat:
M
chrome/content/zotero/preferences/preferences_export.xul
 | 
4
----
M
defaults/preferences/zotero.js
 | 
2
+-

2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/chrome/content/zotero/preferences/preferences_export.xul b/chrome/content/zotero/preferences/preferences_export.xul
@@ -39,7 +39,6 @@
 			<preference id="pref-quickCopy-setting" name="extensions.zotero.export.quickCopy.setting" type="string"/>
 			<preference id="pref-quickCopy-dragLimit" name="extensions.zotero.export.quickCopy.dragLimit" type="int"/>
 			<preference id="pref-quickCopy-locale" name="extensions.zotero.export.quickCopy.locale" type="string"/>
-			<preference id="pref-export-displayCharsetOption" name="extensions.zotero.export.displayCharsetOption" type="bool"/>
 			<preference id="pref-import-charset" name="extensions.zotero.import.charset" type="string"/>
 		</preferences>
 		
@@ -77,9 +76,6 @@
 		<groupbox>
 			<caption label="&zotero.preferences.charset;"/>
 			
-			<checkbox id="zotero-export-displayCharsetOption" label="&zotero.preferences.charset.displayExportOption;"
-				preference="pref-export-displayCharsetOption"/>
-			
 			<hbox align="center">
 				<label value="&zotero.preferences.charset.importCharset;:" control="zotero-import-charsetMenu"/>
 				<menulist id="zotero-import-charsetMenu" preference="pref-import-charset"/>
diff --git a/defaults/preferences/zotero.js b/defaults/preferences/zotero.js
@@ -106,7 +106,7 @@ pref("extensions.zotero.export.lastTranslator", '14763d24-8ba0-45df-8f52-b8d1108
 pref("extensions.zotero.export.translatorSettings", 'true,false');
 pref("extensions.zotero.export.lastStyle", 'http://www.zotero.org/styles/chicago-note-bibliography');
 pref("extensions.zotero.export.bibliographySettings", 'save-as-rtf');
-pref("extensions.zotero.export.displayCharsetOption", false);
+pref("extensions.zotero.export.displayCharsetOption", true);
 pref("extensions.zotero.export.citePaperJournalArticleURL", false);
 pref("extensions.zotero.cite.automaticJournalAbbreviations", true);
 pref("extensions.zotero.import.charset", "auto");