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

Include both DB version numbers in "newer than SQL file" dialog

Browse Source
This commit is contained in:
Dan Stillman 2015-04-15 16:03:47 -04:00
parent 96f3cc1861
commit a2b6df1014
1 changed files with 3 additions and 3 deletions

6
chrome/content/zotero/xpcom/zotero.js
View File

@ -610,12 +610,12 @@ Components.utils.import("resource://gre/modules/Services.jsm");
} }
catch (e) { catch (e) {
if (e.toString().match('newer than SQL file')) { if (e.toString().match('newer than SQL file')) {
let versions = e.toString().match(/\((\d+) < \d+\)/); let versions = e.toString().match(/\((\d+) < (\d+)\)/);
let kbURL = "https://www.zotero.org/support/kb/newer_db_version"; let kbURL = "https://www.zotero.org/support/kb/newer_db_version";
let msg = Zotero.getString('startupError.zoteroVersionIsOlder') + " " let msg = Zotero.getString('startupError.zoteroVersionIsOlder') + " "
+ Zotero.getString('startupError.zoteroVersionIsOlder.upgrade') + "\n\n" + Zotero.getString('startupError.zoteroVersionIsOlder.upgrade') + "\n\n"
+ Zotero.getString('startupError.zoteroVersionIsOlder.current', Zotero.version) + "\n" + Zotero.getString('startupError.zoteroVersionIsOlder.current', Zotero.version)
+ (versions ? "DB: " + versions[1] + "\n\n" : "\n") + (versions ? " (" + versions[1] + " < " + versions[2] + ")" : "") + "\n\n"
+ Zotero.getString('general.seeForMoreInformation', kbURL); + Zotero.getString('general.seeForMoreInformation', kbURL);
Zotero.startupError = msg; Zotero.startupError = msg;
_startupErrorHandler = function() { _startupErrorHandler = function() {