frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2025-03-01 10:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

More node i18n tidy ups

Browse Source
This commit is contained in:
Nick O'Leary
2015-05-28 15:29:01 +01:00
parent 68bb8252af
commit 5ea68dafc4
7 changed files with 168 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nodes/core/storage/28-tail.html
View File

@@ -17,7 +17,7 @@
<script type="text/x-red" data-template-name="tail">
<div class="form-row node-input-filename">
<label for="node-input-filename"><i class="fa fa-file"></i> <span data-i18n="tail.label.filename"></span></label>
<input type="text" id="node-input-filename" data-i18n="[placeholder]tail.label.filename">
<input type="text" id="node-input-filename">
</div>
<div class="form-row">
<label>&nbsp;</label>

19
nodes/core/storage/50-file.html
View File

@@ -17,14 +17,14 @@
<script type="text/x-red" data-template-name="file">
<div class="form-row node-input-filename">
<label for="node-input-filename"><i class="fa fa-file"></i> <span data-i18n="file.label.filename"></span></label>
<input type="text" id="node-input-filename" data-i18n="[placeholder]file.label.filename">
<input type="text" id="node-input-filename">
</div>
<div class="form-row">
<label for="node-input-overwriteFile"><i class="fa fa-random"></i> <span data-i18n="file.label.action"></span></label>
<select type="text" id="node-input-overwriteFile" style="display: inline-block; width: 250px; vertical-align: top;">
<option value="false" data-i18n="file.append"></option>
<option value="true" data-i18n="file.overwrite"></option>
<option value="delete" data-i18n="file.delete"></option>
<option value="false" data-i18n="file.action.append"></option>
<option value="true" data-i18n="file.action.overwrite"></option>
<option value="delete" data-i18n="file.action.delete"></option>
</select>
</div>
<div class="form-row" id="node-appline">
@@ -54,8 +54,8 @@
<div class="form-row">
<label for="node-input-format"><i class="fa fa-sign-out"></i> <span data-i18n="file.label.outputas"></span></label>
<select id="node-input-format">
<option value="utf8" data-i18n="file.utf8"></option>
<option value="" data-i18n="file.buffer"></option>
<option value="utf8" data-i18n="file.output.utf8"></option>
<option value="" data-i18n="file.output.buffer"></option>
</select>
</div>
<div class="form-row">
@@ -84,8 +84,11 @@
icon: "file.png",
align: "right",
label: function() {
if (this.overwriteFile === this._("file.label.deletelabel")) { return this.name||this._("file.label.deletelabel")+" "+this.filename; }
else { return this.name||this.filename||this._("file.label.filelabel"); }
if (this.overwriteFile === "delete") {
return this.name||this._("file.label.deletelabel",{file:this.filename})
} else {
return this.name||this.filename||this._("file.label.filelabel");
}
},
labelStyle: function() {
return this.name?"node_label_italic":"";

17
nodes/core/storage/50-file.js
View File

@@ -27,7 +27,7 @@ module.exports = function(RED) {
this.on("input",function(msg) {
var filename = this.filename || msg.filename || "";
if (msg.filename && n.filename && (n.filename !== msg.filename)) {
node.warn(RED._("file.errors.nooverride"));
node.warn(RED._("common.errors.nooverride"));
}
if (!this.filename) {
node.status({fill:"grey",shape:"dot",text:filename});
@@ -36,9 +36,6 @@ module.exports = function(RED) {
node.warn(RED._("file.errors.nofilename"));
} else if (msg.hasOwnProperty('delete')) { // remove warning at some point in future
node.warn(RED._("file.errors.invaliddelete"));
//fs.unlink(filename, function (err) {
//if (err) { node.error(RED._("file.errors.deletefail")+' : '+err,msg); }
//});
} else if (msg.payload && (typeof msg.payload != "undefined")) {
var data = msg.payload;
if ((typeof data === "object")&&(!Buffer.isBuffer(data))) {
@@ -50,22 +47,22 @@ module.exports = function(RED) {
// using "binary" not {encoding:"binary"} to be 0.8 compatible for a while
//fs.writeFile(filename, data, {encoding:"binary"}, function (err) {
fs.writeFile(filename, data, "binary", function (err) {
if (err) { node.error(RED._("file.errors.writefail")+' : '+err,msg); }
else if (RED.settings.verbose) { node.log(RED._("file.errors.wrotefile")+': '+filename); }
if (err) { node.error(RED._("file.errors.writefail",{error:err}),msg); }
else if (RED.settings.verbose) { node.log(RED._("file.status.wrotefile",{file:filename})); }
});
}
else if (this.overwriteFile === "delete") {
fs.unlink(filename, function (err) {
if (err) { node.error(RED._("file.errors.deletefail")+' : '+err,msg); }
else if (RED.settings.verbose) { node.log(RED._("file.errors.deletedfile")+": "+filename); }
if (err) { node.error(RED._("file.errors.deletefail",{error:err}),msg); }
else if (RED.settings.verbose) { node.log(RED._("file.status.deletedfile",{file:filename})); }
});
}
else {
// using "binary" not {encoding:"binary"} to be 0.8 compatible for a while longer
//fs.appendFile(filename, data, {encoding:"binary"}, function (err) {
fs.appendFile(filename, data, "binary", function (err) {
if (err) { node.error(RED._("file.errors.appendfail")+' : '+err,msg); }
else if (RED.settings.verbose) { node.log(RED._("file.errors.appendedfile")+': '+filename); }
if (err) { node.error(RED._("file.errors.appendfail",{error:err}),msg); }
else if (RED.settings.verbose) { node.log(RED._("file.status.appendedfile",{file:filename})); }
});
}
}