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

- Don't display file sync verification alerts (e.g., "Please enter a URL.") during syncs -- just skip file sync

Browse source 
- Clarify file sync verification messages
This commit is contained in:
Dan Stillman 2009-07-26 07:25:31 +00:00
parent 1b0ec5d3be
commit 14c1e9d15e
1 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
chrome/content/zotero/xpcom/storage.js
View file

@ -1884,7 +1884,7 @@ Zotero.Sync.Storage = new function () {
return true; return true;
case Zotero.Sync.Storage.ERROR_NO_URL: case Zotero.Sync.Storage.ERROR_NO_URL:
var errorMessage = "Please enter a URL."; var errorMessage = "Please enter a WebDAV URL.";
break; break;
case Zotero.Sync.Storage.ERROR_NO_PASSWORD: case Zotero.Sync.Storage.ERROR_NO_PASSWORD:
@ -1901,7 +1901,7 @@ Zotero.Sync.Storage = new function () {
case Zotero.Sync.Storage.ERROR_AUTH_FAILED: case Zotero.Sync.Storage.ERROR_AUTH_FAILED:
var errorTitle = "Permission denied"; var errorTitle = "Permission denied";
var errorMessage = "The storage server did not accept the " var errorMessage = "The WebDAV server did not accept the "
+ "username and password you entered." + " " + "username and password you entered." + " "
+ "Please check your storage settings " + "Please check your storage settings "
+ "or contact your server administrator."; + "or contact your server administrator.";
@ -1910,8 +1910,8 @@ Zotero.Sync.Storage = new function () {
case Zotero.Sync.Storage.ERROR_FORBIDDEN: case Zotero.Sync.Storage.ERROR_FORBIDDEN:
var errorTitle = "Permission denied"; var errorTitle = "Permission denied";
var errorMessage = "You don't have permission to access " var errorMessage = "You don't have permission to access "
+ uri.path + " on the storage server." + " " + uri.path + " on the WebDAV server." + " "
+ "Please check your storage settings " + "Please check your file sync settings "
+ "or contact your server administrator."; + "or contact your server administrator.";
break; break;
@ -1925,7 +1925,7 @@ Zotero.Sync.Storage = new function () {
var create = promptService.confirmEx( var create = promptService.confirmEx(
window, window,
// TODO: localize // TODO: localize
"Storage directory not found", "Directory not found",
spec + " does not exist.\n\nDo you want to create it now?", spec + " does not exist.\n\nDo you want to create it now?",
promptService.BUTTON_POS_0 promptService.BUTTON_POS_0
* promptService.BUTTON_TITLE_IS_STRING * promptService.BUTTON_TITLE_IS_STRING
@ -1946,7 +1946,7 @@ Zotero.Sync.Storage = new function () {
promptService.alert( promptService.alert(
window, window,
"Server configuration verified", "Server configuration verified",
"File storage is successfully set up." "File sync is successfully set up."
); );
} }
Zotero.Prefs.set("sync.storage.verified", true); Zotero.Prefs.set("sync.storage.verified", true);
@ -1958,7 +1958,7 @@ Zotero.Sync.Storage = new function () {
+ "permission to create a Zotero directory " + "permission to create a Zotero directory "
+ "at the following address:" + "\n\n" + spec; + "at the following address:" + "\n\n" + spec;
errorMessage += "\n\n" errorMessage += "\n\n"
+ "Please check your storage settings or " + "Please check your file sync settings or "
+ "contact your server administrator."; + "contact your server administrator.";
break; break;
} }
@ -1973,14 +1973,16 @@ Zotero.Sync.Storage = new function () {
return false; return false;
} }
if (!errorTitle) { if (!skipSuccessMessage) {
var errorTitle = Zotero.getString("general.error"); if (!errorTitle) {
var errorTitle = Zotero.getString("general.error");
}
// TEMP
if (!errorMessage) {
var errorMessage = status;
}
promptService.alert(window, errorTitle, errorMessage);
} }
// TEMP
if (!errorMessage) {
var errorMessage = status;
}
promptService.alert(window, errorTitle, errorMessage);
return false; return false;
} }