From 950e9de80f01759c8fe5eaabf875f090e2fc5c3c Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Mon, 18 Feb 2019 14:36:53 -0500 Subject: [PATCH] Make starting from Mac disk image fatal --- chrome/content/zotero/xpcom/zotero.js | 14 +++++--------- chrome/locale/en-US/zotero/zotero.properties | 2 +- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js index b1aa6caa25..698da3c3fc 100644 --- a/chrome/content/zotero/xpcom/zotero.js +++ b/chrome/content/zotero/xpcom/zotero.js @@ -1766,23 +1766,19 @@ Services.scriptloader.loadSubScript("resource://zotero/polyfill.js"); // not to load and possibly other problems if (Zotero.isMac && OS.Constants.Path.libDir.includes('AppTranslocation')) { 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 buttonFlags = ps.BUTTON_POS_0 * ps.BUTTON_TITLE_IS_STRING; let index = ps.confirmEx( null, - Zotero.getString('general.warning'), + Zotero.getString('general.error'), Zotero.getString('startupError.startedFromDiskImage1', Zotero.clientName) + '\n\n' + Zotero.getString('startupError.startedFromDiskImage2', Zotero.clientName), buttonFlags, Zotero.getString('general.quitApp', Zotero.clientName), - Zotero.getString('general.notNow'), - null, null, {} + null, null, null, {} ); - if (index === 0) { - Zotero.Utilities.Internal.quit(); - return false; - } + Zotero.Utilities.Internal.quit(); + return false; } return true; diff --git a/chrome/locale/en-US/zotero/zotero.properties b/chrome/locale/en-US/zotero/zotero.properties index e26ed591bb..d4605eed95 100644 --- a/chrome/locale/en-US/zotero/zotero.properties +++ b/chrome/locale/en-US/zotero/zotero.properties @@ -193,7 +193,7 @@ startupError.zoteroVersionIsOlder.upgrade = Please upgrade to the latest ve startupError.databaseUpgradeError = Database upgrade error startupError.internetFunctionalityMayNotWork = Functionality that depends on an internet connection may not work. 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. date.relative.secondsAgo.one = 1 second ago