From 83acb66f005acb16e6be8f6c6ec310e499d9709a Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Wed, 4 Jan 2017 22:02:35 +0000 Subject: [PATCH] NLS the diff dialog --- editor/js/ui/diff.js | 79 +++++++++++-------------------- red/api/locales/en-US/editor.json | 17 ++++++- 2 files changed, 44 insertions(+), 52 deletions(-) diff --git a/editor/js/ui/diff.js b/editor/js/ui/diff.js index 8bfd8364c..553e73cd0 100644 --- a/editor/js/ui/diff.js +++ b/editor/js/ui/diff.js @@ -15,27 +15,7 @@ RED.diff = (function() { var toolbar = $('
'+ ' '+ - // ''+ - // 'previous'+ - // 'next'+ - // ''+ '
').prependTo(dialog); - // - // toolbar.find(".node-diff-filter").click(function(evt) { - // evt.preventDefault(); - // if (!$(this).hasClass('selected')) { - // $(this).siblings().removeClass('selected'); - // $(this).addClass('selected'); - // } - // if ($(this).attr('id') === 'node-diff-filter-all') { - // diffList.find('.node-diff-node-unchanged').parent().removeClass('hide'); - // diffList.find('.node-diff-tab-unchanged').parent().removeClass('hide'); - // } else { - // diffList.find('.node-diff-node-unchanged').parent().addClass('hide'); - // diffList.find('.node-diff-tab-unchanged').parent().addClass('hide'); - // $(".node-diff-tab.node-diff-tab-unchanged").addClass("collapsed"); - // } - // }) $("#node-dialog-view-diff").dialog({ title: RED._('deploy.confirm.button.review'), @@ -141,14 +121,14 @@ RED.diff = (function() { } else if (localDiff.added[tab.id]) { localNodeDiv.addClass("node-diff-node-added"); localChanged = true; - $(' added').appendTo(localNodeDiv); + $(' ').appendTo(localNodeDiv); } else if (localDiff.changed[tab.id]) { localNodeDiv.addClass("node-diff-node-changed"); localChanged = true; - $(' changed').appendTo(localNodeDiv); + $(' ').appendTo(localNodeDiv); } else { localNodeDiv.addClass("node-diff-node-unchanged"); - $(' unchanged').appendTo(localNodeDiv); + $(' ').appendTo(localNodeDiv); } var remoteNodeDiv; @@ -162,14 +142,14 @@ RED.diff = (function() { } else if (remoteDiff.added[tab.id]) { remoteNodeDiv.addClass("node-diff-node-added"); remoteChanged = true; - $(' added').appendTo(remoteNodeDiv); + $(' ').appendTo(remoteNodeDiv); } else if (remoteDiff.changed[tab.id]) { remoteNodeDiv.addClass("node-diff-node-changed"); remoteChanged = true; - $(' changed').appendTo(remoteNodeDiv); + $(' ').appendTo(remoteNodeDiv); } else { remoteNodeDiv.addClass("node-diff-node-unchanged"); - $(' unchanged').appendTo(remoteNodeDiv); + $(' ').appendTo(remoteNodeDiv); } } $('').appendTo(originalNodeDiv); @@ -235,10 +215,10 @@ RED.diff = (function() { }) if (localDiff.deleted[tab.id]) { - $(' flow deleted').appendTo(localCell); + $(' ').appendTo(localCell); } else if (object.newTab) { if (localDiff.added[tab.id]) { - $(' flow added').appendTo(localCell); + $(' ').appendTo(localCell); } else { if (tab.id) { if (localDiff.changed[tab.id]) { @@ -248,7 +228,7 @@ RED.diff = (function() { } } var localStats = $('',{class:"node-diff-tab-stats"}).appendTo(localCell); - $(''+localNodeCount+' nodes').appendTo(localStats); + $('').html(RED._('diff.nodeCount',{count:localNodeCount})).appendTo(localStats); if (flowStats.conflicts + flowStats.local.addedCount + flowStats.local.changedCount + flowStats.local.deletedCount > 0) { $(' [ ').appendTo(localStats); @@ -274,10 +254,10 @@ RED.diff = (function() { if (remoteDiff) { if (remoteDiff.deleted[tab.id]) { - $(' flow deleted').appendTo(remoteCell); + $(' ').appendTo(remoteCell); } else if (object.remoteTab) { if (remoteDiff.added[tab.id]) { - $(' flow added').appendTo(remoteCell); + $(' ').appendTo(remoteCell); } else { if (tab.id) { if (remoteDiff.changed[tab.id]) { @@ -287,7 +267,7 @@ RED.diff = (function() { } } var remoteStats = $('',{class:"node-diff-tab-stats"}).appendTo(remoteCell); - $(''+remoteNodeCount+' nodes').appendTo(remoteStats); + $('').html(RED._('diff.nodeCount',{count:remoteNodeCount})).appendTo(remoteStats); if (flowStats.conflicts + flowStats.remote.addedCount + flowStats.remote.changedCount + flowStats.remote.deletedCount > 0) { $(' [ ').appendTo(remoteStats); if (flowStats.conflicts > 0) { @@ -324,10 +304,7 @@ RED.diff = (function() { if (tabDiv.find(".node-diff-node-entry").length === 0) { tabDiv.addClass("node-diff-tab-empty"); } - // var statsInfo = ((flowStats.addedCount > 0)?''+flowStats.addedCount+' added ':'')+ - // ((flowStats.deletedCount > 0)?''+flowStats.deletedCount+' deleted ':'')+ - // ((flowStats.changedCount > 0)?''+flowStats.changedCount+' changed ':''); - // stats.html(statsInfo); + container.i18n(); } }); } @@ -456,11 +433,11 @@ RED.diff = (function() { stats.local.unchangedCount++; createNode(node,def).appendTo(originalNodeDiv); localNodeDiv.addClass("node-diff-node-unchanged"); - $(' unchanged').appendTo(localNodeDiv); + $(' ').appendTo(localNodeDiv); if (remoteDiff) { stats.remote.unchangedCount++; remoteNodeDiv.addClass("node-diff-node-unchanged"); - $(' unchanged').appendTo(remoteNodeDiv); + $(' ').appendTo(remoteNodeDiv); } div.addClass("node-diff-node-unchanged"); } else if (localDiff.added[node.id]) { @@ -468,12 +445,12 @@ RED.diff = (function() { if (remoteNodeDiv) { remoteNodeDiv.addClass("node-diff-empty"); } - $(' added').appendTo(localNodeDiv); + $(' ').appendTo(localNodeDiv); createNode(node,def).appendTo(originalNodeDiv); } else if (remoteDiff && remoteDiff.added[node.id]) { localNodeDiv.addClass("node-diff-empty"); remoteNodeDiv.addClass("node-diff-node-added"); - $(' added').appendTo(remoteNodeDiv); + $(' ').appendTo(remoteNodeDiv); createNode(node,def).appendTo(originalNodeDiv); } else { createNode(node,def).appendTo(originalNodeDiv); @@ -485,9 +462,9 @@ RED.diff = (function() { localNodeDiv.addClass("node-diff-node-moved"); var localMovedMessage = ""; if (node.z === localN.z) { - localMovedMessage = "moved from "+(localDiff.currentConfig.all[node.id].z||'global'); + localMovedMessage = RED._("diff.type.movedFrom",{id:(localDiff.currentConfig.all[node.id].z||'global')}); } else { - localMovedMessage = "moved to "+(localN.z||'global'); + localMovedMessage = RED._("diff.type.movedTo",{id:(localN.z||'global')}); } $(' '+localMovedMessage+'').appendTo(localNodeDiv); } @@ -497,14 +474,14 @@ RED.diff = (function() { localChanged = true; } else if (localDiff.deleted[node.id]) { localNodeDiv.addClass("node-diff-node-deleted"); - $(' deleted').appendTo(localNodeDiv); + $(' ').appendTo(localNodeDiv); localChanged = true; } else if (localDiff.changed[node.id]) { if (localDiff.newConfig.all[node.id].z !== node.z) { localNodeDiv.addClass("node-diff-empty"); } else { localNodeDiv.addClass("node-diff-node-changed"); - $(' changed').appendTo(localNodeDiv); + $(' ').appendTo(localNodeDiv); localChanged = true; } } else { @@ -513,7 +490,7 @@ RED.diff = (function() { } else { stats.local.unchangedCount++; localNodeDiv.addClass("node-diff-node-unchanged"); - $(' unchanged').appendTo(localNodeDiv); + $(' ').appendTo(localNodeDiv); } } @@ -526,9 +503,9 @@ RED.diff = (function() { remoteNodeDiv.addClass("node-diff-node-moved"); var remoteMovedMessage = ""; if (node.z === remoteN.z) { - remoteMovedMessage = "moved from "+(remoteDiff.currentConfig.all[node.id].z||'global'); + remoteMovedMessage = RED._("diff.type.movedFrom",{id:(remoteDiff.currentConfig.all[node.id].z||'global')}); } else { - remoteMovedMessage = "moved to "+(remoteN.z||'global'); + remoteMovedMessage = RED._("diff.type.movedTo",{id:(remoteN.z||'global')}); } $(' '+remoteMovedMessage+'').appendTo(remoteNodeDiv); } @@ -536,13 +513,13 @@ RED.diff = (function() { remoteNodeDiv.addClass("node-diff-empty"); } else if (remoteDiff.deleted[node.id]) { remoteNodeDiv.addClass("node-diff-node-deleted"); - $(' deleted').appendTo(remoteNodeDiv); + $(' ').appendTo(remoteNodeDiv); } else if (remoteDiff.changed[node.id]) { if (remoteDiff.newConfig.all[node.id].z !== node.z) { remoteNodeDiv.addClass("node-diff-empty"); } else { remoteNodeDiv.addClass("node-diff-node-changed"); - $(' changed').appendTo(remoteNodeDiv); + $(' ').appendTo(remoteNodeDiv); } } else { if (remoteDiff.newConfig.all[node.id].z !== node.z) { @@ -550,7 +527,7 @@ RED.diff = (function() { } else { stats.remote.unchangedCount++; remoteNodeDiv.addClass("node-diff-node-unchanged"); - $(' unchanged').appendTo(remoteNodeDiv); + $(' ').appendTo(remoteNodeDiv); } } } @@ -1079,7 +1056,7 @@ RED.diff = (function() { if (remoteDiff !== undefined) { $('#node-dialog-view-diff').addClass('node-diff-three-way'); - $('
Local
Remote
').appendTo("#node-dialog-view-diff-headers"); + $('
').i18n().appendTo("#node-dialog-view-diff-headers"); el.remoteTab = { n:{}, nodes:remoteDiff.newConfig.globals diff --git a/red/api/locales/en-US/editor.json b/red/api/locales/en-US/editor.json index 70abdc70a..cad166866 100644 --- a/red/api/locales/en-US/editor.json +++ b/red/api/locales/en-US/editor.json @@ -138,7 +138,22 @@ }, "diff": { "unresolvedCount": "__count__ unresolved conflict", - "unresolvedCount_plural": "__count__ unresolved conflicts" + "unresolvedCount_plural": "__count__ unresolved conflicts", + "type": { + "added": "added", + "changed": "changed", + "unchanged": "unchanged", + "deleted": "deleted", + "flowDeleted": "flow deleted", + "flowAdded": "flow added", + "movedTo": "moved to __id__", + "movedFrom": "moved from __id__" + }, + "nodeCount": "__count__ node", + "nodeCount_plural": "__count__ nodes", + "local":"Local", + "remote":"Remote" + }, "subflow": { "editSubflow": "Edit flow template: __name__",