From 9e16d7f4339cb4640d9f8bcd781c96046a758516 Mon Sep 17 00:00:00 2001 From: Kazuhito Yokoi Date: Tue, 5 Nov 2019 11:29:43 +0900 Subject: [PATCH] Move messages to editor.json --- .../editor-client/locales/en-US/editor.json | 11 +++++++++++ .../editor-client/locales/ja/editor.json | 11 +++++++++++ .../nodes/core/function/10-switch.html | 18 +++++++++--------- .../nodes/locales/en-US/messages.json | 9 --------- .../@node-red/nodes/locales/ja/messages.json | 9 --------- 5 files changed, 31 insertions(+), 27 deletions(-) diff --git a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json index fa347e6ea..e36629b9f 100755 --- a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json +++ b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json @@ -15,6 +15,17 @@ "next": "Next", "clone": "Clone project", "cont": "Continue" + }, + "type": { + "string": "string", + "number": "number", + "boolean": "boolean", + "array": "array", + "buffer": "buffer", + "object": "object", + "jsonString": "JSON string", + "undefined": "undefined", + "null": "null" } }, "workspace": { diff --git a/packages/node_modules/@node-red/editor-client/locales/ja/editor.json b/packages/node_modules/@node-red/editor-client/locales/ja/editor.json index a6aab331d..839e9bbd9 100755 --- a/packages/node_modules/@node-red/editor-client/locales/ja/editor.json +++ b/packages/node_modules/@node-red/editor-client/locales/ja/editor.json @@ -15,6 +15,17 @@ "next": "進む", "clone": "プロジェクトをクローン", "cont": "続ける" + }, + "type": { + "string": "文字列", + "number": "数値", + "boolean": "真偽値", + "array": "配列", + "buffer": "バッファ", + "object": "オブジェクト", + "jsonString": "JSON文字列", + "undefined": "undefined", + "null": "null" } }, "workspace": { diff --git a/packages/node_modules/@node-red/nodes/core/function/10-switch.html b/packages/node_modules/@node-red/nodes/core/function/10-switch.html index f89288afa..9f072ad8a 100644 --- a/packages/node_modules/@node-red/nodes/core/function/10-switch.html +++ b/packages/node_modules/@node-red/nodes/core/function/10-switch.html @@ -237,15 +237,15 @@ function createTypeValueField(){ return $('',{class:"node-input-rule-type-value",type:"text",style:"margin-left: 5px;"}).appendTo(row).typedInput({default:'string',types:[ - {value:"string",label:RED._("node-red:switch.label.string"),hasValue:false,icon:"red/images/typedInput/az.png"}, - {value:"number",label:RED._("node-red:switch.label.number"),hasValue:false,icon:"red/images/typedInput/09.png"}, - {value:"boolean",label:RED._("node-red:switch.label.boolean"),hasValue:false,icon:"red/images/typedInput/bool.png"}, - {value:"array",label:RED._("node-red:switch.label.array"),hasValue:false,icon:"red/images/typedInput/json.png"}, - {value:"buffer",label:RED._("node-red:switch.label.buffer"),hasValue:false,icon:"red/images/typedInput/bin.png"}, - {value:"object",label:RED._("node-red:switch.label.object"),hasValue:false,icon:"red/images/typedInput/json.png"}, - {value:"json",label:RED._("node-red:switch.label.jsonString"),hasValue:false,icon:"red/images/typedInput/json.png"}, - {value:"undefined",label:RED._("node-red:switch.label.undefined"),hasValue:false}, - {value:"null",label:RED._("node-red:switch.label.null"),hasValue:false} + {value:"string",label:RED._("common.type.string"),hasValue:false,icon:"red/images/typedInput/az.png"}, + {value:"number",label:RED._("common.type.number"),hasValue:false,icon:"red/images/typedInput/09.png"}, + {value:"boolean",label:RED._("common.type.boolean"),hasValue:false,icon:"red/images/typedInput/bool.png"}, + {value:"array",label:RED._("common.type.array"),hasValue:false,icon:"red/images/typedInput/json.png"}, + {value:"buffer",label:RED._("common.type.buffer"),hasValue:false,icon:"red/images/typedInput/bin.png"}, + {value:"object",label:RED._("common.type.object"),hasValue:false,icon:"red/images/typedInput/json.png"}, + {value:"json",label:RED._("common.type.jsonString"),hasValue:false,icon:"red/images/typedInput/json.png"}, + {value:"undefined",label:RED._("common.type.undefined"),hasValue:false}, + {value:"null",label:RED._("common.type.null"),hasValue:false} ]}); } diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json index 689b6f2b6..e1d7c6368 100755 --- a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json +++ b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json @@ -604,15 +604,6 @@ "label": { "property": "Property", "rule": "rule", - "string": "string", - "number": "number", - "boolean": "boolean", - "array": "array", - "buffer": "buffer", - "object": "object", - "jsonString": "JSON string", - "undefined": "undefined", - "null": "null", "repair": "recreate message sequences" }, "previous": "previous value", diff --git a/packages/node_modules/@node-red/nodes/locales/ja/messages.json b/packages/node_modules/@node-red/nodes/locales/ja/messages.json index a7d5c2bfa..adc033390 100755 --- a/packages/node_modules/@node-red/nodes/locales/ja/messages.json +++ b/packages/node_modules/@node-red/nodes/locales/ja/messages.json @@ -602,15 +602,6 @@ "label": { "property": "プロパティ", "rule": "条件", - "string": "文字列", - "number": "数値", - "boolean": "真偽値", - "array": "配列", - "buffer": "バッファ", - "object": "オブジェクト", - "jsonString": "JSON文字列", - "undefined": "undefined", - "null": "null", "repair": "メッセージ列の補正" }, "previous": "前回の値",