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

Clarify error message for login manager access failure in Firefox

Browse source 
Fixes , Inappropriate error message when master password times out
This commit is contained in:
Dan Stillman 2013-04-07 16:28:40 -04:00
parent 0d6dc81112
commit 5878dac132
2 changed files with 16 additions and 4 deletions
chrome
content/zotero/xpcom
sync.js
locale/en-US/zotero
zotero.properties

15
chrome/content/zotero/xpcom/sync.js
View file

@ -1228,9 +1228,18 @@ Zotero.Sync.Server = new function () {
}
catch (e) {
Zotero.debug(e);
var msg = Zotero.getString('sync.error.loginManagerCorrupted1', Zotero.appName) + "\n\n"
+ Zotero.getString('sync.error.loginManagerCorrupted2', [Zotero.appName, Zotero.appName]);
alert(msg);
if (Zotero.isStandalone) {
var msg = Zotero.getString('sync.error.loginManagerCorrupted1', Zotero.appName) + "\n\n"
+ Zotero.getString('sync.error.loginManagerCorrupted2', [Zotero.appName, Zotero.appName]);
}
else {
var msg = Zotero.getString('sync.error.loginManagerInaccessible') + "\n\n"
+ Zotero.getString('sync.error.checkMasterPassword', Zotero.appName) + "\n\n"
+ Zotero.getString('sync.error.corruptedLoginManager', Zotero.appName);
}
var ps = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
.getService(Components.interfaces.nsIPromptService);
ps.alert(null, Zotero.getString('general.error'), msg);
return '';
}

5
chrome/locale/en-US/zotero/zotero.properties
View file

@ -751,7 +751,10 @@ sync.error.passwordNotSet = Password not set
sync.error.invalidLogin = Invalid username or password
sync.error.invalidLogin.text = The Zotero sync server did not accept your username and password.\n\nPlease check that you have entered your zotero.org login information correctly in the Zotero sync preferences.
sync.error.enterPassword = Please enter a password.
sync.error.loginManagerCorrupted1 = Zotero cannot access your login information, likely due to a corrupted %S login manager database.
sync.error.loginManagerInaccessible = Zotero cannot access your login information.
sync.error.checkMasterPassword = If you are using a master password in %S, make sure you have entered it successfully.
sync.error.corruptedLoginManager = This could also be due to a corrupted %1$S login manager database. To check, close %1$S, back up and delete signons.* from your %1$S profile, and re-enter your Zotero login information in the Sync pane of the Zotero preferences.
sync.error.loginManagerCorrupted1 = Zotero cannot access your login information, possibly due to a corrupted %S login manager database.
sync.error.loginManagerCorrupted2 = Close %1$S, back up and delete signons.* from your %2$S profile, and re-enter your Zotero login information in the Sync pane of the Zotero preferences.
sync.error.syncInProgress = A sync operation is already in progress.
sync.error.syncInProgress.wait = Wait for the previous sync to complete or restart %S.