From bd75d95da9ef4a97caf6d7bae9c3353192cfdd9f Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Wed, 26 Sep 2012 21:57:40 -0400 Subject: [PATCH] Fix "(null)" in Firefox login manager corruption message (It turns out this also displays if the user clicks Cancel on a master password prompt, though.) --- chrome/content/zotero/xpcom/sync.js | 2 +- chrome/locale/en-US/zotero/zotero.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/chrome/content/zotero/xpcom/sync.js b/chrome/content/zotero/xpcom/sync.js index de594f232f..cff2afec98 100644 --- a/chrome/content/zotero/xpcom/sync.js +++ b/chrome/content/zotero/xpcom/sync.js @@ -1144,7 +1144,7 @@ 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.getString('sync.error.loginManagerCorrupted2', [Zotero.appName, Zotero.appName]); alert(msg); return ''; } diff --git a/chrome/locale/en-US/zotero/zotero.properties b/chrome/locale/en-US/zotero/zotero.properties index 7034184cb4..0d454ef540 100644 --- a/chrome/locale/en-US/zotero/zotero.properties +++ b/chrome/locale/en-US/zotero/zotero.properties @@ -657,7 +657,7 @@ sync.error.passwordNotSet = Password not set sync.error.invalidLogin = Invalid username or password 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.loginManagerCorrupted2 = Close %S, back up and delete signons.* from your %S profile, and re-enter your Zotero login information in the Sync pane of the Zotero preferences. +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. sync.error.writeAccessLost = You no longer have write access to the Zotero group '%S', and files you've added or edited cannot be synced to the server.