www

commit e3648dfda00371e4f83615772be73f7d754b4ae5
parent 25d8898ab0421bb765b6a7e8ca961d5653ed8847
Author: Adomas Venčkauskas <adomas.ven@gmail.com>
Date:   Wed, 14 Mar 2018 19:08:38 +0200

Ensure delayed citation prompt strings are localizable

Diffstat:
M
chrome/content/zotero/xpcom/integration.js
 | 
8
+++-----
M
chrome/locale/en-US/zotero/zotero.properties
 | 
9
++++-----

2 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/chrome/content/zotero/xpcom/integration.js b/chrome/content/zotero/xpcom/integration.js
@@ -950,10 +950,9 @@ Zotero.Integration.Fields.prototype.updateDocument = Zotero.Promise.coroutine(fu
 		}
 		
 		var result = this._session.displayAlert(
-				Zotero.getString('integration.delayCitationUpdates.alert.text1', 
-					Zotero.getString(`integration.interfaceType.${interfaceType}`))
+				Zotero.getString('integration.delayCitationUpdates.alert.text1')
 					+ "\n\n"
-					+ Zotero.getString('integration.delayCitationUpdates.alert.text2')
+					+ Zotero.getString(`integration.delayCitationUpdates.alert.text2.${interfaceType}`)
 					+ "\n\n"
 					+ Zotero.getString('integration.delayCitationUpdates.alert.text3'),
 				DIALOG_ICON_WARNING,
@@ -1636,8 +1635,7 @@ Zotero.Integration.Session.prototype.writeDelayedCitation = Zotero.Promise.corou
 				interfaceType = 'toolbar';
 			}
 		
-			field.setText(Zotero.getString('integration.delayCitationUpdates.bibliography',
-				Zotero.getString(`integration.interfaceType.${interfaceType}`)), false)
+			field.setText(Zotero.getString(`integration.delayCitationUpdates.bibliography.${interfaceType}`), false)
 			break;
 		}
 	}
diff --git a/chrome/locale/en-US/zotero/zotero.properties b/chrome/locale/en-US/zotero/zotero.properties
@@ -811,9 +811,6 @@ integration.fields.fileFormatNotice = The document must be saved as .doc or .doc
 integration.referenceMarks.caption	= ReferenceMarks cannot be shared with Word.
 integration.referenceMarks.fileFormatNotice = The document must be saved as .odt.
 
-integration.interfaceType.toolbar   = toolbar
-integration.interfaceType.tab       = tab
-
 integration.regenerate.title		= Do you want to regenerate the citation?
 integration.regenerate.body			= The changes you have made in the citation editor will be lost.
 integration.regenerate.saveBehavior	= Always follow this selection.
@@ -865,9 +862,11 @@ integration.citationChanged				= You have modified this citation since Zotero ge
 integration.citationChanged.description	= Clicking "Yes" will prevent Zotero from updating this citation if you add additional citations, switch styles, or modify the item to which it refers. Clicking "No" will erase your changes.
 integration.citationChanged.edit		= You have modified this citation since Zotero generated it. Editing will clear your modifications. Do you want to continue?
 integration.delayCitationUpdates.alert.text1 = Updating citations in this document is taking a long time. Would you like to disable automatic citation updates?
-integration.delayCitationUpdates.alert.text2 = You will need to click Refresh in the Zotero %S when you are done inserting citations.
+integration.delayCitationUpdates.alert.text2.toolbar = You will need to click Refresh in the Zotero toolbar when you are done inserting citations.
+integration.delayCitationUpdates.alert.text2.tab = You will need to click Refresh in the Zotero tab when you are done inserting citations.
 integration.delayCitationUpdates.alert.text3 = You can change this setting later in the document preferences.
-integration.delayCitationUpdates.bibliography	= Automatic citation updates are disabled. To see the bibliography, click Refresh in the Zotero %S.
+integration.delayCitationUpdates.bibliography.toolbar	= Automatic citation updates are disabled. To see the bibliography, click Refresh in the Zotero toolbar.
+integration.delayCitationUpdates.bibliography.tab	= Automatic citation updates are disabled. To see the bibliography, click Refresh in the Zotero tab.
 
 styles.install.title				= Install Style
 styles.install.unexpectedError		= An unexpected error occurred while installing "%1$S"