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

Merge pull request #1748 from node-red-hitachi/0.19-editor-diff-i18n-jp

Browse Source 
Add i18n support for project
This commit is contained in:
Nick O'Leary 2018-05-31 10:44:36 +01:00 committed by GitHub
commit 95b4c8d515
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1233,7 +1233,7 @@ RED.diff = (function() {
// currentDiff = diff;
var trayOptions = {
title: options.title||"Review Changes", //TODO: nls
title: options.title||RED._("diff.reviewChanges"),
width: Infinity,
overlay: true,
buttons: [
@ -1416,7 +1416,7 @@ RED.diff = (function() {
function showTextDiff(textA,textB) {
var trayOptions = {
title: "Compare Changes", //TODO: nls
title: RED._("diff.compareChanges"),
width: Infinity,
overlay: true,
buttons: [
@ -1747,7 +1747,7 @@ RED.diff = (function() {
try {
commonFlow = JSON.parse(commonVersion.content||"[]");
} catch(err) {
console.log("Common Version doesn't contain valid JSON:",commonVersionUrl);
console.log(RED._("diff.commonVersionError"),commonVersionUrl);
console.log(err);
return;
}
@ -1755,7 +1755,7 @@ RED.diff = (function() {
try {
oldFlow = JSON.parse(oldVersion.content||"[]");
} catch(err) {
console.log("Old Version doesn't contain valid JSON:",oldVersionUrl);
console.log(RED._("diff.oldVersionError"),oldVersionUrl);
console.log(err);
return;
}
@ -1765,7 +1765,7 @@ RED.diff = (function() {
try {
newFlow = JSON.parse(newVersion.content||"[]");
} catch(err) {
console.log("New Version doesn't contain valid JSON:",newFlow);
console.log(RED._("diff.newVersionError"),newFlow);
console.log(err);
return;
}
@ -1797,11 +1797,11 @@ RED.diff = (function() {
if (isBinary) {
var diffBinaryRow = $('<tr class="node-text-diff-header">').appendTo(codeBody);
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 {
if (commitOptions.unmerged) {
conflictHeader = $('<span style="float: right;"><span>'+resolvedConflicts+'</span> of <span>'+unresolvedConflicts+'</span> conflicts resolved</span>').appendTo(content);
conflictHeader = $('<span style="float: right;">'+RED._("diff.conflictHeader",{resolved:resolvedConflicts, unresolved:unresolvedConflicts})+'</span>').appendTo(content);
}
hunks.forEach(function(hunk) {
var diffRow = $('<tr class="node-text-diff-header">').appendTo(codeBody);
@ -1914,7 +1914,7 @@ RED.diff = (function() {
diffRow.remove();
addedRows.find(".linetext").addClass('added');
conflictHeader.empty();
$('<span><span>'+resolvedConflicts+'</span> of <span>'+unresolvedConflicts+'</span> conflicts resolved</span>').appendTo(conflictHeader);
$('<span>'+RED._("diff.conflictHeader",{resolved:resolvedConflicts, unresolved:unresolvedConflicts})+'</span>').appendTo(conflictHeader);
conflictResolutions[file.file] = conflictResolutions[file.file] || {};
conflictResolutions[file.file][hunk.localChangeStart] = {
@ -1946,7 +1946,7 @@ RED.diff = (function() {
function showCommitDiff(options) {
var commit = parseCommitDiff(options.commit);
var trayOptions = {
title: "View Commit Changes", //TODO: nls
title: RED._("diff.viewCommitDiff"),
width: Infinity,
overlay: true,
buttons: [
@ -2008,7 +2008,7 @@ RED.diff = (function() {
}
var trayOptions = {
title: title||"Compare Changes", //TODO: nls
title: title|| RED._("diff.compareChanges"),
width: Infinity,
overlay: true,
buttons: [
@ -2041,7 +2041,7 @@ RED.diff = (function() {
trayOptions.buttons.push(
{
id: "node-diff-view-resolve-diff",
text: "Save conflict resolution",
text: RED._("diff.saveConflict"),
class: "primary disabled",
click: function() {
if (!$("#node-diff-view-resolve-diff").hasClass('disabled')) {

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

@ -219,8 +219,16 @@
"nodeCount": "__count__ node",
"nodeCount_plural": "__count__ nodes",
"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",
"conflictHeader": "<span>__resolved__</span> of <span>__unresolved__</span> conflicts resolved",
"commonVersionError": "Common Version doesn't contain valid JSON:",
"oldVersionError": "Old Version doesn't contain valid JSON:",
"newVersionError": "New Version doesn't contain valid JSON:"
},
"subflow": {
"editSubflow": "Edit flow template: __name__",

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

@ -215,7 +215,16 @@
"nodeCount": "__count__ 個のノード",
"nodeCount_plural": "__count__ 個のノード",
"local": "ローカルの変更",
"remote": "リモートの変更"
"remote": "リモートの変更",
"reviewChanges": "変更を表示",
"noBinaryFileShowed": "バイナリファイルの中身は表示することができません",
"viewCommitDiff": "コミットの内容を表示",
"compareChanges": "変更を比較",
"saveConflict": "解決して保存",
"conflictHeader": "<span>__unresolved__</span> 個中 <span>__resolved__</span> 個のコンフリクトを解決",
"commonVersionError": "共通バージョンは正しいJSON形式ではありません:",
"oldVersionError": "古いバージョンは正しいJSON形式ではありません:",
"newVersionError": "新しいバージョンは正しいJSON形式ではありません:"
},
"subflow": {
"editSubflow": "フローのテンプレートを編集: __name__",