frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

add translate project diff

Browse Source
This commit is contained in:
Yuma Matsuura 2018-05-28 16:00:32 +09:00
parent d4d9190919
commit 5a70bea67a
3 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
editor/js/ui/diff.js
View File

@ -1233,7 +1233,7 @@ RED.diff = (function() {
// currentDiff = diff; // currentDiff = diff;
var trayOptions = { var trayOptions = {
title: options.title||"Review Changes", //TODO: nls title: options.title||RED._("diff.reviewChanges"),
width: Infinity, width: Infinity,
overlay: true, overlay: true,
buttons: [ buttons: [
@ -1416,7 +1416,7 @@ RED.diff = (function() {
function showTextDiff(textA,textB) { function showTextDiff(textA,textB) {
var trayOptions = { var trayOptions = {
title: "Compare Changes", //TODO: nls title: RED._("diff.compareChanges"),
width: Infinity, width: Infinity,
overlay: true, overlay: true,
buttons: [ buttons: [
@ -1797,7 +1797,7 @@ RED.diff = (function() {
if (isBinary) { if (isBinary) {
var diffBinaryRow = $('<tr class="node-text-diff-header">').appendTo(codeBody); var diffBinaryRow = $('<tr class="node-text-diff-header">').appendTo(codeBody);
var binaryContent = $('<td colspan="3"></td>').appendTo(diffBinaryRow); var binaryContent = $('<td colspan="3"></td>').appendTo(diffBinaryRow);
$('<span></span>').text("Cannot show binary file contents").appendTo(binaryContent); $('<span></span>').text(RED._("diff.noBinaryFileShowed")).appendTo(binaryContent);
} else { } else {
if (commitOptions.unmerged) { if (commitOptions.unmerged) {
@ -1946,7 +1946,7 @@ RED.diff = (function() {
function showCommitDiff(options) { function showCommitDiff(options) {
var commit = parseCommitDiff(options.commit); var commit = parseCommitDiff(options.commit);
var trayOptions = { var trayOptions = {
title: "View Commit Changes", //TODO: nls title: RED._("diff.viewCommitDiff"),
width: Infinity, width: Infinity,
overlay: true, overlay: true,
buttons: [ buttons: [
@ -2008,7 +2008,7 @@ RED.diff = (function() {
} }
var trayOptions = { var trayOptions = {
title: title||"Compare Changes", //TODO: nls title: title|| RED._("diff.compareChanges"),
width: Infinity, width: Infinity,
overlay: true, overlay: true,
buttons: [ buttons: [
@ -2041,7 +2041,7 @@ RED.diff = (function() {
trayOptions.buttons.push( trayOptions.buttons.push(
{ {
id: "node-diff-view-resolve-diff", id: "node-diff-view-resolve-diff",
text: "Save conflict resolution", text: RED._("diff.saveConflict"),
class: "primary disabled", class: "primary disabled",
click: function() { click: function() {
if (!$("#node-diff-view-resolve-diff").hasClass('disabled')) { if (!$("#node-diff-view-resolve-diff").hasClass('disabled')) {

8
red/api/editor/locales/en-US/editor.json
View File

@ -193,8 +193,12 @@
"nodeCount": "__count__ node", "nodeCount": "__count__ node",
"nodeCount_plural": "__count__ nodes", "nodeCount_plural": "__count__ nodes",
"local":"Local changes", "local":"Local changes",
"remote":"Remote changes" "remote":"Remote changes",
"reviewChanges": "Review Changes",
"noBinaryFileShowed": "Cannot show binary file contents",
"viewCommitDiff": "View Commit Changes",
"compareChanges": "Compare Changes",
"saveConflict": "Save conflict resolution"
}, },
"subflow": { "subflow": {
"editSubflow": "Edit flow template: __name__", "editSubflow": "Edit flow template: __name__",

7
red/api/editor/locales/ja/editor.json
View File

@ -188,7 +188,12 @@
"nodeCount": "__count__ 個のノード", "nodeCount": "__count__ 個のノード",
"nodeCount_plural": "__count__ 個のノード", "nodeCount_plural": "__count__ 個のノード",
"local": "ローカルの変更", "local": "ローカルの変更",
"remote": "リモートの変更" "remote": "リモートの変更",
"reviewChanges": "変更を表示",
"noBinaryFileShowed": "バイナリファイルの中身は表示することができません",
"viewCommitDiff": "コミットの内容を表示",
"compareChanges": "変更を比較",
"saveConflict": "解決して保存"
}, },
"subflow": { "subflow": {
"editSubflow": "フローのテンプレートを編集: __name__", "editSubflow": "フローのテンプレートを編集: __name__",