From 9bbd6a70b8231f825ee4030915bab0a32547e1b0 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 8 Jun 2015 11:37:36 +0100
Subject: [PATCH] Add namespaced i18n function to node definition

---
 editor/js/nodes.js     | 29 ++++++++++++++++-------------
 editor/js/ui/editor.js | 12 ++----------
 2 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/editor/js/nodes.js b/editor/js/nodes.js
index 04f101e9b..8cb1c0818 100644
--- a/editor/js/nodes.js
+++ b/editor/js/nodes.js
@@ -109,6 +109,21 @@ RED.nodes = (function() {
                 if (def.category != "subflows") {
                     def.set = nodeSets[typeToId[nt]];
                     nodeSets[typeToId[nt]].added = true;
+                    
+                    var ns;
+                    if (def.set.module === "node-red") {
+                        ns = "node-red";
+                    } else {
+                        ns = def.set.id;
+                    }
+                    def["_"] = function() {
+                        var args = Array.prototype.slice.call(arguments, 0);
+                        if (args[0].indexOf(":") === -1) {
+                            args[0] = ns+":"+args[0];
+                        }
+                        return RED._.apply(null,args);
+                    }
+
                     // TODO: too tightly coupled into palette UI
                 }
                 RED.palette.add(nt,def);
@@ -135,20 +150,8 @@ RED.nodes = (function() {
     }
 
     function addNode(n) {
-        var ns;
         if (n.type.indexOf("subflow") !== 0) {
-            if (n._def.set.module === "node-red") {
-                ns = "node-red";
-            } else {
-                ns = n._def.set.id;
-            }
-            n["_"] = function() {
-                var args = Array.prototype.slice.call(arguments, 0);
-                if (args[0].indexOf(":") === -1) {
-                    args[0] = ns+":"+args[0];
-                }
-                return RED._.apply(null,args);
-            }
+            n["_"] = n._def._;
         }
         if (n._def.category == "config") {
             configNodes[n.id] = n;
diff --git a/editor/js/ui/editor.js b/editor/js/ui/editor.js
index a3d961be0..8ca102617 100644
--- a/editor/js/ui/editor.js
+++ b/editor/js/ui/editor.js
@@ -624,16 +624,8 @@ RED.editor = (function() {
                 if (node_def.defaults[d].value) {
                     configNode[d] = node_def.defaults[d].value;
                 }
-            }
-            configNode["_"] = function() {
-                var args = Array.prototype.slice.call(arguments, 0);
-                if (args[0].indexOf(":") === -1) {
-                    args[0] = ns+":"+args[0];
-                }
-                return RED._.apply(null,args);
-            }
-
-
+            }            
+            configNode["_"] = node_def._;
         }
 
         $("#dialog-config-form").html($("script[data-template-name='"+type+"']").html());