From 4b7cdddb4acd121fdcbb63a56a09ceaf36d58b4b Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Sat, 21 Sep 2019 01:32:39 -0400 Subject: [PATCH] Change apply-to-all checkbox text for some conflicts Say "Use the [local|remote] version for all remaining conflicts" for everything instead of saying "Use [local|remote] fields for all remaining conflicts" for some conflicts. This also fixes a test failure after 54343c49fb. --- chrome/content/zotero/merge.js | 16 +++------------- chrome/locale/en-US/zotero/zotero.properties | 2 -- test/tests/syncEngineTest.js | 8 ++++---- 3 files changed, 7 insertions(+), 19 deletions(-) diff --git a/chrome/content/zotero/merge.js b/chrome/content/zotero/merge.js index 309921f74f..ea1e47c109 100644 --- a/chrome/content/zotero/merge.js +++ b/chrome/content/zotero/merge.js @@ -293,21 +293,11 @@ var Zotero_Merge_Window = new function () { function _updateResolveAllCheckbox() { - if (_mergeGroup.type == 'file') { - if (_mergeGroup.rightpane.getAttribute("selected") == 'true') { - var label = 'resolveAllRemote'; - } - else { - var label = 'resolveAllLocal'; - } + if (_mergeGroup.rightpane.getAttribute("selected") == 'true') { + var label = 'resolveAllRemote'; } else { - if (_mergeGroup.rightpane.getAttribute("selected") == 'true') { - var label = 'resolveAllRemoteFields'; - } - else { - var label = 'resolveAllLocalFields'; - } + var label = 'resolveAllLocal'; } _resolveAllCheckbox.label = Zotero.getString('sync.conflict.' + label); } diff --git a/chrome/locale/en-US/zotero/zotero.properties b/chrome/locale/en-US/zotero/zotero.properties index 1695912888..c24b4cf6bd 100644 --- a/chrome/locale/en-US/zotero/zotero.properties +++ b/chrome/locale/en-US/zotero/zotero.properties @@ -1002,8 +1002,6 @@ sync.conflict.localFile = Local File sync.conflict.remoteFile = Remote File sync.conflict.resolveAllLocal = Use the local version for all remaining conflicts sync.conflict.resolveAllRemote = Use the remote version for all remaining conflicts -sync.conflict.resolveAllLocalFields = Use local fields for all remaining conflicts -sync.conflict.resolveAllRemoteFields = Use remote fields for all remaining conflicts sync.conflict.itemChanged = The following item has been changed in multiple locations. Click the version to use for resolving conflicting fields, and then click %S. sync.conflict.fileChanged = The following file has been changed in multiple locations. Choose the version you would like to keep, and then click %S. sync.conflict.chooseThisVersion = Choose this version diff --git a/test/tests/syncEngineTest.js b/test/tests/syncEngineTest.js index 36a87f4864..2e39ce2684 100644 --- a/test/tests/syncEngineTest.js +++ b/test/tests/syncEngineTest.js @@ -3476,7 +3476,7 @@ describe("Zotero.Sync.Data.Engine", function () { assert.equal(mergeGroup.rightpane.getAttribute('selected'), 'true'); assert.equal( resolveAll.label, - Zotero.getString('sync.conflict.resolveAllRemoteFields') + Zotero.getString('sync.conflict.resolveAllRemote') ); wizard.getButton('next').click(); @@ -3485,7 +3485,7 @@ describe("Zotero.Sync.Data.Engine", function () { mergeGroup.leftpane.click(); assert.equal( resolveAll.label, - Zotero.getString('sync.conflict.resolveAllLocalFields') + Zotero.getString('sync.conflict.resolveAllLocal') ); resolveAll.click(); @@ -3598,7 +3598,7 @@ describe("Zotero.Sync.Data.Engine", function () { assert.equal(mergeGroup.rightpane.getAttribute('selected'), 'true'); assert.equal( resolveAll.label, - Zotero.getString('sync.conflict.resolveAllRemoteFields') + Zotero.getString('sync.conflict.resolveAllRemote') ); wizard.getButton('next').click(); @@ -3606,7 +3606,7 @@ describe("Zotero.Sync.Data.Engine", function () { assert.equal(mergeGroup.rightpane.getAttribute('selected'), 'true'); assert.equal( resolveAll.label, - Zotero.getString('sync.conflict.resolveAllRemoteFields') + Zotero.getString('sync.conflict.resolveAllRemote') ); resolveAll.click();