suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

closes #875, Empty square appears after citation in OOo (Windows/Linux)

Browse Source 
closes #877, Display Zotero and plugin versions in incompatible version error message
This commit is contained in:
Simon Kornblith 2008-01-14 00:23:43 +00:00
parent c590e3fe4f
commit c40fbb0553
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chrome/content/zotero/bibliography.js
View File

@ -112,7 +112,7 @@ var Zotero_File_Interface_Bibliography = new function() {
// add border on Windows
if(Zotero.isWin) {
document.getElementById("zotero-bibliography-container").style.border = "1px solid black";
document.getElementById("doc-prefs-dialog").style.border = "1px solid black";
}
}
window.sizeToContent();

2
chrome/content/zotero/integrationDocPrefs.xul
View File

@ -5,7 +5,7 @@
<!DOCTYPE window SYSTEM "chrome://zotero/locale/zotero.dtd">
<dialog
id="add-citation-dialog"
id="doc-prefs-dialog"
orient="vertical"
buttons="accept"
title="&zotero.integration.docPrefs.title;"

4
chrome/content/zotero/xpcom/integration.js
View File

@ -454,7 +454,7 @@ Zotero.Integration.SOAP = new function() {
*/
function restoreSession(vars) {
if(!vars || !_checkVersion(vars[0])) {
return "ERROR:"+Zotero.getString("integration.incompatibleVersion");
return "ERROR:"+Zotero.getString("integration.incompatibleVersion", Zotero.version);
}
try {
@ -490,7 +490,7 @@ Zotero.Integration.SOAP = new function() {
*/
function setDocPrefs(vars) {
if(!vars || !vars.length || !_checkVersion(vars[1])) {
return "ERROR:"+Zotero.getString("integration.incompatibleVersion");
return "ERROR:"+Zotero.getString("integration.incompatibleVersion", Zotero.version);
}
var io = new function() {

2
chrome/locale/en-US/zotero/zotero.properties
View File

@ -476,7 +476,7 @@ annotations.collapse.tooltip = Collapse Annotation
annotations.expand.tooltip = Expand Annotation
annotations.oneWindowWarning = Annotations for a snapshot may only be opened in one browser window simultaneously. This snapshot will be opened without annotations.
integration.incompatibleVersion = This version of the Zotero Word plug-in is incompatible with the currently installed version of the Zotero Firefox extension. Please ensure you are using the latest versions of both components.
integration.incompatibleVersion = This version of the Zotero Word plug-in ($INTEGRATION_VERSION) is incompatible with the currently installed version of the Zotero Firefox extension (%1$S). Please ensure you are using the latest versions of both components.
integration.fields.label = Fields
integration.referenceMarks.label = ReferenceMarks
integration.fields.caption = Microsoft Word Fields are less likely to be accidentally modified, but cannot be shared with OpenOffice.org.