From c29c855d28d08487aeb1ef9cb207a7b2851b31af Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Tue, 14 May 2019 23:50:47 -0400 Subject: [PATCH] Document import/export: Additional text tweaks --- chrome/content/zotero/bibliography.js | 4 +++- chrome/content/zotero/xpcom/integration.js | 4 ++-- chrome/locale/en-US/zotero/zotero.properties | 4 +++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/chrome/content/zotero/bibliography.js b/chrome/content/zotero/bibliography.js index 86e3e25a46..7fce28acfb 100644 --- a/chrome/content/zotero/bibliography.js +++ b/chrome/content/zotero/bibliography.js @@ -252,7 +252,9 @@ var Zotero_File_Interface_Bibliography = new function() { + (ps.BUTTON_POS_2) * (ps.BUTTON_TITLE_IS_STRING); var result = ps.confirmEx(null, Zotero.getString('integration.exportDocument'), - Zotero.getString('integration.exportDocument.description'), + Zotero.getString('integration.exportDocument.description1') + + "\n\n" + + Zotero.getString('integration.exportDocument.description2'), buttonFlags, Zotero.getString('general.export'), null, diff --git a/chrome/content/zotero/xpcom/integration.js b/chrome/content/zotero/xpcom/integration.js index 0bef2fc9df..476ac16693 100644 --- a/chrome/content/zotero/xpcom/integration.js +++ b/chrome/content/zotero/xpcom/integration.js @@ -1624,14 +1624,14 @@ Zotero.Integration.Session.prototype.importDocument = async function() { const importExportWikiURL = "https://www.zotero.org/support/kb/export_import_document"; var ps = Services.prompt; - var buttonFlags = (ps.BUTTON_POS_0) * (ps.BUTTON_TITLE_OK) + var buttonFlags = ps.BUTTON_POS_0 * ps.BUTTON_TITLE_IS_STRING + (ps.BUTTON_POS_1) * (ps.BUTTON_TITLE_CANCEL) + (ps.BUTTON_POS_2) * (ps.BUTTON_TITLE_IS_STRING); var result = ps.confirmEx(null, Zotero.getString('integration.importDocument'), Zotero.getString('integration.importDocument.description'), buttonFlags, - null, + Zotero.getString('general.import'), null, Zotero.getString('general.moreInformation'), null, {}); if (result == 1) { diff --git a/chrome/locale/en-US/zotero/zotero.properties b/chrome/locale/en-US/zotero/zotero.properties index 35f2bfe3a1..40e8d1173e 100644 --- a/chrome/locale/en-US/zotero/zotero.properties +++ b/chrome/locale/en-US/zotero/zotero.properties @@ -41,6 +41,7 @@ general.character.plural = characters general.create = Create general.delete = Delete general.remove = Remove +general.import = Import general.export = Export general.moreInformation = More Information general.seeForMoreInformation = See %S for more information. @@ -901,7 +902,8 @@ integration.delayCitationUpdates.bibliography.tab = Automatic citation updates a integration.importDocument = Import Document integration.importDocument.description = Would you like to import this document for use with Zotero? integration.exportDocument = Export Document -integration.exportDocument.description = Exporting the document will allow you to open it in a different Zotero-supported word processor and retain citation links.\n\nYou should make a backup of the document before proceeding. +integration.exportDocument.description1 = Exporting the document will allow you to open it in a different Zotero-supported word processor and retain citation links. +integration.exportDocument.description2 = You should make a backup of the document before proceeding. integration.importInstructions = This document contains exported Zotero citations. Open it with a Zotero-supported word processor and press Refresh in the Zotero plugin to import it. styles.install.title = Install Style