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

Show only UTF-8, UTF-8 w/o BOM, and Western for export charsets

Browse source 
See https://forums.zotero.org/discussion/comment/263644/#Comment_263644

We might want to consider removing the export charset checkbox in the
prefs and either always showing the charset option for translators or
always showing it for BibTeX (where "Western" really means "ASCII") but
nothing else.

Fixes #1124
This commit is contained in:
Dan Stillman 2016-11-27 15:36:37 -05:00
parent 5a6f1eef63
commit 0609b62a39
1 changed files with 63 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
chrome/content/zotero/charsetMenu.js
View file

@ -39,11 +39,32 @@ var Zotero_Charset_Menu = new function() {
// get charset popup and charset RDF // get charset popup and charset RDF
var charsetPopup = document.createElement("menupopup"); var charsetPopup = document.createElement("menupopup");
charsetMenu.appendChild(charsetPopup); charsetMenu.appendChild(charsetPopup);
var charsetSeparator = document.createElement("menuseparator");
charsetPopup.appendChild(charsetSeparator);
var charsets = []; var charsets = [];
// Only list UTF-8 and Western for export
if (exportMenu) {
charsets.push(
{ label: "Unicode (UTF-8)", value: "UTF-8" },
{ label: Zotero.getString("charset.UTF8withoutBOM"), value: "UTF-8xBOM" },
{ label: "Western", value: "windows-1252" }
);
for (let charset of charsets) {
let { label, value } = charset;
let itemNode = document.createElement("menuitem");
itemNode.setAttribute("label", label);
itemNode.setAttribute("value", value);
charsetMap[value] = itemNode;
charsetPopup.appendChild(itemNode);
}
}
else {
var charsetSeparator = document.createElement("menuseparator");
charsetPopup.appendChild(charsetSeparator);
Components.utils.import("resource://gre/modules/CharsetMenu.jsm"); Components.utils.import("resource://gre/modules/CharsetMenu.jsm");
var cmData = CharsetMenu.getData(); var cmData = CharsetMenu.getData();
for (let charsetList of [cmData.pinnedCharsets, cmData.otherCharsets]) { for (let charsetList of [cmData.pinnedCharsets, cmData.otherCharsets]) {
@ -78,26 +99,16 @@ var Zotero_Charset_Menu = new function() {
itemNode.setAttribute("value", charset); itemNode.setAttribute("value", charset);
charsetMap[charset] = itemNode; charsetMap[charset] = itemNode;
if(isUTF16 || (label.length >= 7 && if (label.length >= 7 && label.substr(0, 7) == "Western") {
label.substr(0, 7) == "Western")) {
charsetPopup.insertBefore(itemNode, charsetSeparator); charsetPopup.insertBefore(itemNode, charsetSeparator);
} else if(charset == "UTF-8") { } else if(charset == "UTF-8") {
var oldFirst = (charsetPopup.firstChild ? charsetPopup.firstChild : null); var oldFirst = (charsetPopup.firstChild ? charsetPopup.firstChild : null);
charsetPopup.insertBefore(itemNode, oldFirst); charsetPopup.insertBefore(itemNode, oldFirst);
// also add (without BOM) if requested
if(exportMenu) {
var itemNode = document.createElement("menuitem");
itemNode.setAttribute("label", Zotero.getString("charset.UTF8withoutBOM"));
itemNode.setAttribute("value", charset+"xBOM");
charsetMap[charset+"xBOM"] = itemNode;
charsetPopup.insertBefore(itemNode, oldFirst);
}
} else { } else {
charsetPopup.appendChild(itemNode); charsetPopup.appendChild(itemNode);
} }
} }
if(!exportMenu) {
var itemNode = document.createElement("menuitem"); var itemNode = document.createElement("menuitem");
itemNode.setAttribute("label", Zotero.getString("charset.autoDetect")); itemNode.setAttribute("label", Zotero.getString("charset.autoDetect"));
itemNode.setAttribute("value", "auto"); itemNode.setAttribute("value", "auto");