From 6777f2484576bb4bb9a31255d990dbb24e078664 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Mon, 29 Jun 2015 16:12:18 +0100
Subject: [PATCH] Ensure library export dialog is i18n'd

---
 editor/js/nodes.js         | 84 +++++++++++++++++++-------------------
 editor/js/ui/editor.js     |  2 +-
 editor/js/ui/library.js    | 51 ++++++++++++-----------
 editor/templates/index.mst |  8 ++--
 4 files changed, 73 insertions(+), 72 deletions(-)

diff --git a/editor/js/nodes.js b/editor/js/nodes.js
index 8cb1c0818..2333ed32d 100644
--- a/editor/js/nodes.js
+++ b/editor/js/nodes.js
@@ -22,20 +22,20 @@ RED.nodes = (function() {
     var defaultWorkspace;
     var workspaces = {};
     var subflows = {};
-    
+
     var dirty = false;
-    
+
     function setDirty(d) {
         dirty = d;
         eventHandler.emit("change",{dirty:dirty});
     }
-    
+
     var registry = (function() {
         var nodeList = [];
         var nodeSets = {};
         var typeToId = {};
         var nodeDefinitions = {};
-        
+
         var exports = {
             getNodeList: function() {
                 return nodeList;
@@ -109,7 +109,7 @@ 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";
@@ -144,7 +144,7 @@ RED.nodes = (function() {
         };
         return exports;
     })();
-    
+
     function getID() {
         return (1+Math.random()*4294967295).toString(16);
     }
@@ -284,7 +284,7 @@ RED.nodes = (function() {
             var subflowNames = Object.keys(subflows).map(function(sfid) {
                 return subflows[sfid].name;
             });
-            
+
             subflowNames.sort();
             var copyNumber = 1;
             var subflowName = sf.name;
@@ -296,7 +296,7 @@ RED.nodes = (function() {
             });
             sf.name = subflowName;
         }
-        
+
         subflows[sf.id] = sf;
         RED.nodes.registerType("subflow:"+sf.id, {
             defaults:{name:{value:""}},
@@ -307,10 +307,13 @@ RED.nodes = (function() {
             color: "#da9",
             label: function() { return this.name||RED.nodes.subflow(sf.id).name },
             labelStyle: function() { return this.name?"node_label_italic":""; },
-            paletteLabel: function() { return RED.nodes.subflow(sf.id).name }
+            paletteLabel: function() { return RED.nodes.subflow(sf.id).name },
+            set:{
+                module: "node-red"
+            }
         });
-        
-        
+
+
     }
     function getSubflow(id) {
         return subflows[id];
@@ -319,7 +322,7 @@ RED.nodes = (function() {
         delete subflows[sf.id];
         registry.removeNodeType("subflow:"+sf.id);
     }
-    
+
     function subflowContains(sfid,nodeid) {
         for (var i=0;i<nodes.length;i++) {
             var node = nodes[i];
@@ -339,7 +342,7 @@ RED.nodes = (function() {
         }
         return false;
     }
-    
+
     function getAllFlowNodes(node) {
         var visited = {};
         visited[node.id] = true;
@@ -430,7 +433,7 @@ RED.nodes = (function() {
         node.name = n.name;
         node.in = [];
         node.out = [];
-        
+
         n.in.forEach(function(p) {
             var nIn = {x:p.x,y:p.y,wires:[]};
             var wires = links.filter(function(d) { return d.source === p });
@@ -454,8 +457,8 @@ RED.nodes = (function() {
             }
             node.out.push(nOut);
         });
-            
-                
+
+
         return node;
     }
     /**
@@ -561,13 +564,12 @@ RED.nodes = (function() {
         for (i=0;i<newNodes.length;i++) {
             n = newNodes[i];
             // TODO: remove workspace in next release+1
-            if (n.type != "workspace" && 
-                n.type != "tab" && 
+            if (n.type != "workspace" &&
+                n.type != "tab" &&
                 n.type != "subflow" &&
                 !registry.getNodeType(n.type) &&
                 n.type.substring(0,8) != "subflow:" &&
                 unknownTypes.indexOf(n.type)==-1) {
-            
                     unknownTypes.push(n.type);
             }
         }
@@ -597,11 +599,11 @@ RED.nodes = (function() {
                         err.code = "NODE_RED";
                         throw err;
                     }
-                    
+
                 }
             }
         }
-        
+
         var new_workspaces = [];
         var workspace_map = {};
         var new_subflows = [];
@@ -800,14 +802,14 @@ RED.nodes = (function() {
                 delete output.wires;
             });
         }
-        
+
         return [new_nodes,new_links,new_workspaces,new_subflows];
     }
-    
+
     // TODO: supports filter.z|type
     function filterNodes(filter) {
         var result = [];
-        
+
         for (var n=0;n<nodes.length;n++) {
             var node = nodes[n];
             if (filter.hasOwnProperty("z") && node.z !== filter.z) {
@@ -822,7 +824,7 @@ RED.nodes = (function() {
     }
     function filterLinks(filter) {
         var result = [];
-        
+
         for (var n=0;n<links.length;n++) {
             var link = links[n];
             if (filter.source) {
@@ -848,11 +850,11 @@ RED.nodes = (function() {
         }
         return result;
     }
-    
+
     // TODO: DRY
     var eventHandler = (function() {
         var handlers = {};
-        
+
         return {
             on: function(evt,func) {
                 handlers[evt] = handlers[evt]||[];
@@ -863,43 +865,43 @@ RED.nodes = (function() {
                     for (var i=0;i<handlers[evt].length;i++) {
                         handlers[evt][i](arg);
                     }
-                    
+
                 }
             }
         }
     })();
-    
+
     return {
         on: eventHandler.on,
-        
+
         registry:registry,
         setNodeList: registry.setNodeList,
-        
+
         getNodeSet: registry.getNodeSet,
         addNodeSet: registry.addNodeSet,
         removeNodeSet: registry.removeNodeSet,
         enableNodeSet: registry.enableNodeSet,
         disableNodeSet: registry.disableNodeSet,
-        
+
         registerType: registry.registerNodeType,
         getType: registry.getNodeType,
         convertNode: convertNode,
-        
+
         add: addNode,
         remove: removeNode,
-        
+
         addLink: addLink,
         removeLink: removeLink,
-        
+
         addWorkspace: addWorkspace,
         removeWorkspace: removeWorkspace,
         workspace: getWorkspace,
-        
+
         addSubflow: addSubflow,
         removeSubflow: removeSubflow,
         subflow: getSubflow,
         subflowContains: subflowContains,
-        
+
         eachNode: function(cb) {
             for (var n=0;n<nodes.length;n++) {
                 cb(nodes[n]);
@@ -924,14 +926,14 @@ RED.nodes = (function() {
                 }
             }
         },
-        
+
         node: getNode,
-        
+
         filterNodes: filterNodes,
         filterLinks: filterLinks,
-        
+
         import: importNodes,
-        
+
         getAllFlowNodes: getAllFlowNodes,
         createExportableNodeSet: createExportableNodeSet,
         createCompleteNodeSet: createCompleteNodeSet,
diff --git a/editor/js/ui/editor.js b/editor/js/ui/editor.js
index 8ca102617..e7a46abdf 100644
--- a/editor/js/ui/editor.js
+++ b/editor/js/ui/editor.js
@@ -624,7 +624,7 @@ RED.editor = (function() {
                 if (node_def.defaults[d].value) {
                     configNode[d] = node_def.defaults[d].value;
                 }
-            }            
+            }
             configNode["_"] = node_def._;
         }
 
diff --git a/editor/js/ui/library.js b/editor/js/ui/library.js
index 7bf7a5ffd..a80ecd451 100644
--- a/editor/js/ui/library.js
+++ b/editor/js/ui/library.js
@@ -14,8 +14,8 @@
  * limitations under the License.
  **/
 RED.library = (function() {
-    
-    
+
+
     function loadFlowLibrary() {
         $.getJSON("library/flows",function(data) {
             //console.log(data);
@@ -66,12 +66,12 @@ RED.library = (function() {
             $("#menu-item-import-library-submenu").replaceWith(menu);
         });
     }
-    
+
     function createUI(options) {
         var libraryData = {};
         var selectedLibraryItem = null;
         var libraryEditor = null;
-        
+
         // Orion editor has set/getText
         // ACE editor has set/getValue
         // normalise to set/getValue
@@ -84,14 +84,14 @@ RED.library = (function() {
         if (options.editor.getText) {
             options.editor.getValue = options.editor.getText;
         }
-        
+
         function buildFileListItem(item) {
             var li = document.createElement("li");
             li.onmouseover = function(e) { $(this).addClass("list-hover"); };
             li.onmouseout = function(e) { $(this).removeClass("list-hover"); };
             return li;
         }
-        
+
         function buildFileList(root,data) {
             var ul = document.createElement("ul");
             var li;
@@ -104,7 +104,7 @@ RED.library = (function() {
                         var dirName = v;
                         return function(e) {
                             var bcli = $('<li class="active"><span class="divider">/</span> <a href="#">'+dirName+'</a></li>');
-                            $("a",bcli).click(function(e) { 
+                            $("a",bcli).click(function(e) {
                                 $(this).parent().nextAll().remove();
                                 $.getJSON("library/"+options.url+root+dirName,function(data) {
                                     $("#node-select-library").children().first().replaceWith(buildFileList(root+dirName+"/",data));
@@ -141,7 +141,7 @@ RED.library = (function() {
             }
             return ul;
         }
-    
+
         $('#node-input-name').addClass('input-append-left').css("width","65%").after(
             '<div class="btn-group" style="margin-left: 0px;">'+
             '<button id="node-input-'+options.type+'-lookup" class="btn input-append-right" data-toggle="dropdown"><i class="fa fa-book"></i> <i class="fa fa-caret-down"></i></button>'+
@@ -150,15 +150,15 @@ RED.library = (function() {
             '<li><a id="node-input-'+options.type+'-menu-save-library" tabindex="-1" href="#">'+RED._("library.saveToLibrary")+'</a></li>'+
             '</ul></div>'
         );
-    
-        
-        
+
+
+
         $('#node-input-'+options.type+'-menu-open-library').click(function(e) {
             $("#node-select-library").children().remove();
             var bc = $("#node-dialog-library-breadcrumbs");
             bc.children().first().nextAll().remove();
             libraryEditor.setValue('',-1);
-            
+
             $.getJSON("library/"+options.url,function(data) {
                 $("#node-select-library").append(buildFileList("/",data));
                 $("#node-dialog-library-breadcrumbs a").click(function(e) {
@@ -168,10 +168,10 @@ RED.library = (function() {
                 });
                 $( "#node-dialog-library-lookup" ).dialog( "open" );
             });
-            
+
             e.preventDefault();
         });
-    
+
         $('#node-input-'+options.type+'-menu-save-library').click(function(e) {
             //var found = false;
             var name = $("#node-input-name").val().replace(/(^\s*)|(\s*$)/g,"");
@@ -217,7 +217,7 @@ RED.library = (function() {
             $( "#node-dialog-library-save" ).dialog( "open" );
             e.preventDefault();
         });
-    
+
         libraryEditor = ace.edit('node-select-library-text');
         libraryEditor.setTheme("ace/theme/tomorrow");
         if (options.mode) {
@@ -230,7 +230,7 @@ RED.library = (function() {
         });
         libraryEditor.renderer.$cursorLayer.element.style.opacity=0;
         libraryEditor.$blockScrolling = Infinity;
-        
+
         $( "#node-dialog-library-lookup" ).dialog({
             title: RED._("library.typeLibrary", {type:options.type}),
             modal: true,
@@ -270,7 +270,7 @@ RED.library = (function() {
                 $(".form-row:last-child",form).children().height(form.height()-60);
             }
         });
-        
+
         function saveToLibrary(overwrite) {
             var name = $("#node-input-name").val().replace(/(^\s*)|(\s*$)/g,"");
             if (name === "") {
@@ -319,7 +319,7 @@ RED.library = (function() {
                     data[field] = $("#node-input-"+field).val();
                 }
             }
-            
+
             data.text = options.editor.getValue();
             $.ajax({
                 url:"library/"+options.url+'/'+fullpath,
@@ -378,15 +378,16 @@ RED.library = (function() {
         });
 
     }
-    
+
     function exportFlow() {
         //TODO: don't rely on the main dialog
         var nns = RED.nodes.createExportableNodeSet(RED.view.selection().nodes);
         $("#dialog-form").html($("script[data-template-name='export-library-dialog']").html());
         $("#node-input-filename").attr('nodes',JSON.stringify(nns));
-        $( "#dialog" ).dialog("option","title",RED._("library.exportToLibrary")).dialog( "open" );
+        $("#dialog").i18n();
+        $("#dialog").dialog("option","title",RED._("library.exportToLibrary")).dialog( "open" );
     }
-    
+
     return {
         init: function() {
             RED.view.on("selection-changed",function(selection) {
@@ -400,16 +401,14 @@ RED.library = (function() {
                     RED.menu.setDisabled("menu-item-export-library",false);
                 }
             });
-            
-            if (RED.settings.theme("menu.menu-item-import-library") !== false) { 
+
+            if (RED.settings.theme("menu.menu-item-import-library") !== false) {
                 loadFlowLibrary();
             }
         },
         create: createUI,
         loadFlowLibrary: loadFlowLibrary,
-        
+
         export: exportFlow
     }
 })();
-
-
diff --git a/editor/templates/index.mst b/editor/templates/index.mst
index 006d0df7b..4e9a34531 100644
--- a/editor/templates/index.mst
+++ b/editor/templates/index.mst
@@ -159,15 +159,15 @@
 
 <script type="text/x-red" data-template-name="export-library-dialog">
     <div class="form-row">
-        <label for="node-input-filename" data-i18n="[append]workspaces.libraryFilenamePlaceholder"><i class="fa fa-file"></i> </label>
-        <input type="text" id="node-input-filename" data-i18n="[placeholder]libraryFilenameLabel">
+        <label for="node-input-filename" data-i18n="[append]editor:workspaces.libraryFilenameLabel"><i class="fa fa-file"></i> </label>
+        <input type="text" id="node-input-filename" data-i18n="[placeholder]editor:workspaces.libraryFilenamePlaceholder">
     </div>
 </script>
 
 <script type="text/x-red" data-template-name="subflow">
     <div class="form-row">
-        <label for="node-input-name" data-i18n="[append]workspaces.libraryNameLabel"><i class="fa fa-tag"></i> </label>
-        <input type="text" id="node-input-name" data-i18n="[placeholder]workspaces.libraryNamePlaceholder">
+        <label for="node-input-name" data-i18n="[append]editor:workspaces.libraryNameLabel"><i class="fa fa-tag"></i> </label>
+        <input type="text" id="node-input-name" data-i18n="[placeholder]editor:workspaces.libraryNamePlaceholder">
     </div>
 </script>