mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Change apply-to-all checkbox text for some conflicts

Browse source 
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.
This commit is contained in:
Dan Stillman 2019-09-21 01:32:39 -04:00
parent 72234e0cb2
commit 4b7cdddb4a
3 changed files with 7 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

16
chrome/content/zotero/merge.js
View file

@ -293,21 +293,11 @@ var Zotero_Merge_Window = new function () {
function _updateResolveAllCheckbox() { function _updateResolveAllCheckbox() {
if (_mergeGroup.type == 'file') { if (_mergeGroup.rightpane.getAttribute("selected") == 'true') {
if (_mergeGroup.rightpane.getAttribute("selected") == 'true') { var label = 'resolveAllRemote';
var label = 'resolveAllRemote';
}
else {
var label = 'resolveAllLocal';
}
} }
else { else {
if (_mergeGroup.rightpane.getAttribute("selected") == 'true') { var label = 'resolveAllLocal';
var label = 'resolveAllRemoteFields';
}
else {
var label = 'resolveAllLocalFields';
}
} }
_resolveAllCheckbox.label = Zotero.getString('sync.conflict.' + label); _resolveAllCheckbox.label = Zotero.getString('sync.conflict.' + label);
} }

2
chrome/locale/en-US/zotero/zotero.properties
View file

@ -1002,8 +1002,6 @@ sync.conflict.localFile = Local File
sync.conflict.remoteFile = Remote File sync.conflict.remoteFile = Remote File
sync.conflict.resolveAllLocal = Use the local version for all remaining conflicts sync.conflict.resolveAllLocal = Use the local version for all remaining conflicts
sync.conflict.resolveAllRemote = Use the remote 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.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.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 sync.conflict.chooseThisVersion = Choose this version

8
test/tests/syncEngineTest.js
View file

@ -3476,7 +3476,7 @@ describe("Zotero.Sync.Data.Engine", function () {
assert.equal(mergeGroup.rightpane.getAttribute('selected'), 'true'); assert.equal(mergeGroup.rightpane.getAttribute('selected'), 'true');
assert.equal( assert.equal(
resolveAll.label, resolveAll.label,
Zotero.getString('sync.conflict.resolveAllRemoteFields') Zotero.getString('sync.conflict.resolveAllRemote')
); );
wizard.getButton('next').click(); wizard.getButton('next').click();
@ -3485,7 +3485,7 @@ describe("Zotero.Sync.Data.Engine", function () {
mergeGroup.leftpane.click(); mergeGroup.leftpane.click();
assert.equal( assert.equal(
resolveAll.label, resolveAll.label,
Zotero.getString('sync.conflict.resolveAllLocalFields') Zotero.getString('sync.conflict.resolveAllLocal')
); );
resolveAll.click(); resolveAll.click();
@ -3598,7 +3598,7 @@ describe("Zotero.Sync.Data.Engine", function () {
assert.equal(mergeGroup.rightpane.getAttribute('selected'), 'true'); assert.equal(mergeGroup.rightpane.getAttribute('selected'), 'true');
assert.equal( assert.equal(
resolveAll.label, resolveAll.label,
Zotero.getString('sync.conflict.resolveAllRemoteFields') Zotero.getString('sync.conflict.resolveAllRemote')
); );
wizard.getButton('next').click(); wizard.getButton('next').click();
@ -3606,7 +3606,7 @@ describe("Zotero.Sync.Data.Engine", function () {
assert.equal(mergeGroup.rightpane.getAttribute('selected'), 'true'); assert.equal(mergeGroup.rightpane.getAttribute('selected'), 'true');
assert.equal( assert.equal(
resolveAll.label, resolveAll.label,
Zotero.getString('sync.conflict.resolveAllRemoteFields') Zotero.getString('sync.conflict.resolveAllRemote')
); );
resolveAll.click(); resolveAll.click();