Update more try-wrapped calls to getString
This commit is contained in:
parent
0842b16a51
commit
17d9f06b65
2 changed files with 16 additions and 5 deletions
|
@ -72,15 +72,20 @@ var Zotero_File_Interface_Export = new function() {
|
||||||
if(!addedOptions[option]) { // if this option is not already
|
if(!addedOptions[option]) { // if this option is not already
|
||||||
// presented to the user
|
// presented to the user
|
||||||
// get readable name for option
|
// get readable name for option
|
||||||
|
let optionLabel;
|
||||||
try {
|
try {
|
||||||
if (option == 'includeAppLinks') {
|
if (option == 'includeAppLinks') {
|
||||||
var optionLabel = Zotero.getString("exportOptions." + option, Zotero.appName);
|
optionLabel = Zotero.getString("exportOptions." + option, Zotero.appName);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
var optionLabel = Zotero.getString("exportOptions." + option);
|
optionLabel = Zotero.getString("exportOptions." + option);
|
||||||
}
|
}
|
||||||
} catch(e) {
|
if (optionLabel == "exportOptions." + option) {
|
||||||
var optionLabel = option;
|
optionLabel = option;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (e) {
|
||||||
|
optionLabel = option;
|
||||||
}
|
}
|
||||||
|
|
||||||
// right now, option interface supports only boolean values, which
|
// right now, option interface supports only boolean values, which
|
||||||
|
|
|
@ -20,7 +20,13 @@
|
||||||
for (let fieldID of fieldIDs) {
|
for (let fieldID of fieldIDs) {
|
||||||
var fieldObj = [/* name */Zotero.ItemFields.getName(fieldID)];
|
var fieldObj = [/* name */Zotero.ItemFields.getName(fieldID)];
|
||||||
try {
|
try {
|
||||||
fieldObj.push(/* localizedString */Zotero.getString("itemFields." + fieldObj.name));
|
// localizedString
|
||||||
|
let str = Zotero.getString("itemFields." + fieldObj.name);
|
||||||
|
if (str == "itemFields." + fieldObj.name) {
|
||||||
|
// Use name for localizedString
|
||||||
|
str = fieldObj[0];
|
||||||
|
}
|
||||||
|
fieldObj.push(str);
|
||||||
} catch(e) {
|
} catch(e) {
|
||||||
fieldObj.push(/* name -> localizedString */fieldObj[0]);
|
fieldObj.push(/* name -> localizedString */fieldObj[0]);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue