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

Prompt to try manual data dir migration again if Firefox is open

Browse Source
This commit is contained in:
Dan Stillman 2016-12-17 07:42:03 -05:00
parent 6b0e3ac2d2
commit e34bf4d5cb
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
chrome/content/zotero/xpcom/dataDirectory.js
View File

@ -506,6 +506,25 @@ Zotero.DataDirectory = {
let foundPipe = yield Zotero.IPC.pipeExists(); let foundPipe = yield Zotero.IPC.pipeExists();
if (foundPipe) { if (foundPipe) {
Zotero.debug("Found existing pipe -- skipping migration"); Zotero.debug("Found existing pipe -- skipping migration");
if (!automatic) {
let ps = Services.prompt;
let buttonFlags = (ps.BUTTON_POS_0) * (ps.BUTTON_TITLE_IS_STRING)
+ (ps.BUTTON_POS_1) * (ps.BUTTON_TITLE_IS_STRING);
let index = ps.confirmEx(null,
Zotero.getString('dataDir.migration.failure.title'),
Zotero.getString('dataDir.migration.failure.full.firefoxOpen'),
buttonFlags,
Zotero.getString('general.tryAgain'),
Zotero.getString('general.tryLater'),
null, null, {}
);
if (index == 0) {
return this.checkForMigration(newDir, newDir);
}
}
return false; return false;
} }
} }

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

@ -147,6 +147,7 @@ dataDir.migration.failure.full.automatic.text1 = %S attempted to move your data
dataDir.migration.failure.full.automatic.text2 = It is recommended that you close %S and move your data directory manually. dataDir.migration.failure.full.automatic.text2 = It is recommended that you close %S and move your data directory manually.
dataDir.migration.failure.full.manual.text1 = Your %S data directory could not be migrated. dataDir.migration.failure.full.manual.text1 = Your %S data directory could not be migrated.
dataDir.migration.failure.full.manual.text2 = It is recommended that you close %S and manually move your data directory to the new default location. dataDir.migration.failure.full.manual.text2 = It is recommended that you close %S and manually move your data directory to the new default location.
dataDir.migration.failure.full.firefoxOpen = Your data directory cannot be migrated while Zotero for Firefox is open. Please close Firefox and try again.
dataDir.migration.failure.full.current = Current location: %S dataDir.migration.failure.full.current = Current location: %S
dataDir.migration.failure.full.recommended = Recommended location: %S dataDir.migration.failure.full.recommended = Recommended location: %S
dataDir.migration.failure.full.showCurrentDirectoryAndQuit = Show Current Directory and Quit dataDir.migration.failure.full.showCurrentDirectoryAndQuit = Show Current Directory and Quit