Make starting from Mac disk image fatal
This commit is contained in:
parent
0ea03ce72c
commit
950e9de80f
2 changed files with 6 additions and 10 deletions
|
@ -1766,24 +1766,20 @@ Services.scriptloader.loadSubScript("resource://zotero/polyfill.js");
|
||||||
// not to load and possibly other problems
|
// not to load and possibly other problems
|
||||||
if (Zotero.isMac && OS.Constants.Path.libDir.includes('AppTranslocation')) {
|
if (Zotero.isMac && OS.Constants.Path.libDir.includes('AppTranslocation')) {
|
||||||
let ps = Services.prompt;
|
let ps = Services.prompt;
|
||||||
let buttonFlags = ps.BUTTON_POS_0 * ps.BUTTON_TITLE_IS_STRING
|
let buttonFlags = ps.BUTTON_POS_0 * ps.BUTTON_TITLE_IS_STRING;
|
||||||
| ps.BUTTON_POS_1 * ps.BUTTON_TITLE_IS_STRING;
|
|
||||||
let index = ps.confirmEx(
|
let index = ps.confirmEx(
|
||||||
null,
|
null,
|
||||||
Zotero.getString('general.warning'),
|
Zotero.getString('general.error'),
|
||||||
Zotero.getString('startupError.startedFromDiskImage1', Zotero.clientName)
|
Zotero.getString('startupError.startedFromDiskImage1', Zotero.clientName)
|
||||||
+ '\n\n'
|
+ '\n\n'
|
||||||
+ Zotero.getString('startupError.startedFromDiskImage2', Zotero.clientName),
|
+ Zotero.getString('startupError.startedFromDiskImage2', Zotero.clientName),
|
||||||
buttonFlags,
|
buttonFlags,
|
||||||
Zotero.getString('general.quitApp', Zotero.clientName),
|
Zotero.getString('general.quitApp', Zotero.clientName),
|
||||||
Zotero.getString('general.notNow'),
|
null, null, null, {}
|
||||||
null, null, {}
|
|
||||||
);
|
);
|
||||||
if (index === 0) {
|
|
||||||
Zotero.Utilities.Internal.quit();
|
Zotero.Utilities.Internal.quit();
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -193,7 +193,7 @@ startupError.zoteroVersionIsOlder.upgrade = Please upgrade to the latest ve
|
||||||
startupError.databaseUpgradeError = Database upgrade error
|
startupError.databaseUpgradeError = Database upgrade error
|
||||||
startupError.internetFunctionalityMayNotWork = Functionality that depends on an internet connection may not work.
|
startupError.internetFunctionalityMayNotWork = Functionality that depends on an internet connection may not work.
|
||||||
startupError.bundledFileUpdateError = %S was unable to load translators and styles.
|
startupError.bundledFileUpdateError = %S was unable to load translators and styles.
|
||||||
startupError.startedFromDiskImage1 = %S was started from a disk image, which may break some functionality.
|
startupError.startedFromDiskImage1 = %S was started from a disk image, which can break some functionality.
|
||||||
startupError.startedFromDiskImage2 = To install %1$S properly, quit the program, open the disk image you downloaded, and drag “%1$S” to the alias of the Applications folder shown in the window. Then eject the disk image and launch Zotero by opening it from your Applications folder.
|
startupError.startedFromDiskImage2 = To install %1$S properly, quit the program, open the disk image you downloaded, and drag “%1$S” to the alias of the Applications folder shown in the window. Then eject the disk image and launch Zotero by opening it from your Applications folder.
|
||||||
|
|
||||||
date.relative.secondsAgo.one = 1 second ago
|
date.relative.secondsAgo.one = 1 second ago
|
||||||
|
|
Loading…
Add table
Reference in a new issue