diff --git a/js/kiri-lang.js b/js/kiri-lang.js
index b866fe94..c90801e3 100644
--- a/js/kiri-lang.js
+++ b/js/kiri-lang.js
@@ -45,6 +45,7 @@ var gs_kiri_lang = exports;
// map for any missing key/value pairs
LANG.en = {
version: "version",
+
dev_name: "name",
dev_fil: "filament",
dev_fil_desc: "diameter in millimeters",
@@ -63,7 +64,32 @@ var gs_kiri_lang = exports;
dev_orgc: "origin center",
dev_orgc_desc: "bed origin center",
dev_orgt: "origin top",
- dev_orgt_desc: "part z origin top"
+ dev_orgt_desc: "part z origin top",
+ dev_fanp: "fan power",
+ dev_fanp_desc: "set cooling fan power",
+ dev_prog: "progress",
+ dev_prog_desc: "output on each % progress",
+ dev_layer: "layer",
+ dev_layer_desc: "output at each\nlayer change",
+ dev_token: "token spacing",
+ dev_token_desc: "gcode token spacer",
+ dev_strip: "strip comments",
+ dev_strip_desc: "strip gcode comments",
+ dev_fext: "file ext",
+ dev_fext_desc: "file name extension",
+ dev_dwell: "dwell",
+ dev_dwell_desc: "gcode dwell script",
+ dev_tool: "tool change",
+ dev_tool_desc: "tool change script",
+ dev_speed: "spindle speed",
+ dev_speed_desc: "set spindle speed",
+ dev_pause: "pause",
+ dev_pause_desc: "gcode pause script",
+ dev_head: "header",
+ dev_head_desc: "gcode header script",
+ dev_foot: "footer",
+ dev_foot_desc: "gcode footer script"
+
};
LANG.test = {
diff --git a/js/kiri.js b/js/kiri.js
index 6cfa154b..aa5e33ae 100644
--- a/js/kiri.js
+++ b/js/kiri.js
@@ -530,7 +530,7 @@ self.kiri.license = exports.LICENSE;
if (SETUP.rm) renderMode = parseInt(SETUP.rm[0]);
if (SETUP.ln) KIRI.lang.set(SETUP.ln[0]);
- var alerts = [ [ `${LANG.version} ${kiri.version}`, Date.now() ] ];
+ var alerts = [ [ `${LANG.version} ${KIRI.version}`, Date.now() ] ];
KIRI.api = {
ui : UI,
@@ -2144,7 +2144,7 @@ self.kiri.license = exports.LICENSE;
ajax(local, function(html) {
UI.help.innerHTML = html;
$('help-close').onclick = hideModal;
- $('kiri-version').innerHTML = 'version '+kiri.version+"";
+ $('kiri-version').innerHTML = `${LANG.version} ${KIRI.version}`;
showModal('help');
STATS.add('d-help');
});
@@ -2324,18 +2324,18 @@ self.kiri.license = exports.LICENSE;
setDeviceOriginTop: UC.newBoolean(LANG.dev_orgt, onBooleanClick, {title:LANG.dev_orgt_desc, modes:CAM}),
setDevice: UC.newGroup("gcode", $('device')),
- setDeviceFan: UC.newInput("fan power", {title:"set cooling fan power", modes:FDM, size:15}),
- setDeviceTrack: UC.newInput("progress", {title:"output on each % progress", modes:FDM, size:15}),
- setDeviceLayer: UC.newText("layer", {title:"output at each layer change", modes:FDM, size:14, height: 2}),
- setDeviceToken: UC.newBoolean("token spacing", null, {title:"gcode token spacing", modes:CAM}),
- setDeviceStrip: UC.newBoolean("strip comments", null, {title:"strip gcode comments", modes:CAM}),
- setDeviceFExt: UC.newInput("file ext", {title:"file name exension", modes:CAM, size:5}),
- setDeviceDwell: UC.newText("dwell", {title:"gcode dwell script", modes:CAM, size:14, height:2}),
- setDeviceChange: UC.newText("tool change", {title:"tool change script", modes:CAM, size:14, height:2}),
- setDeviceSpindle: UC.newText("spindle speed", {title:"set spindle speed", modes:CAM, size:14, height:2}),
- setDevicePause: UC.newText("pause", {title:"gcode pause script", modes:FDM, size:14, height:3}),
- setDevicePre: UC.newText("header", {title:"gcode header script", modes:FDM_CAM, size:14, height:3}),
- setDevicePost: UC.newText("footer", {title:"gcode footer script", modes:FDM_CAM, size:14, height:3}),
+ setDeviceFan: UC.newInput(LANG.dev_fanp, {title:LANG.dev_fanp_desc, modes:FDM, size:15}),
+ setDeviceTrack: UC.newInput(LANG.dev_prog, {title:LANG.dev_prog_desc, modes:FDM, size:15}),
+ setDeviceLayer: UC.newText(LANG.dev_layer, {title:LANG.dev_layer_desc, modes:FDM, size:14, height: 2}),
+ setDeviceToken: UC.newBoolean(LANG.dev_token, null, {title:LANG.dev_token_desc, modes:CAM}),
+ setDeviceStrip: UC.newBoolean(LANG.dev_strip, null, {title:LANG.dev_strip_desc, modes:CAM}),
+ setDeviceFExt: UC.newInput(LANG.dev_fext, {title:LANG.dev_fext_desc, modes:CAM, size:5}),
+ setDeviceDwell: UC.newText(LANG.dev_dwell, {title:LANG.dev_dwell_desc, modes:CAM, size:14, height:2}),
+ setDeviceChange: UC.newText(LANG.dev_tool, {title:LANG.dev_tool_desc, modes:CAM, size:14, height:2}),
+ setDeviceSpindle: UC.newText(LANG.dev_speed, {title:LANG.dev_speed_desc, modes:CAM, size:14, height:2}),
+ setDevicePause: UC.newText(LANG.dev_pause, {title:LANG.dev_pause_desc, modes:FDM, size:14, height:3}),
+ setDevicePre: UC.newText(LANG.dev_head, {title:LANG.dev_head_desc, modes:FDM_CAM, size:14, height:3}),
+ setDevicePost: UC.newText(LANG.dev_foot, {title:LANG.dev_foot_desc, modes:FDM_CAM, size:14, height:3}),
tools: $('tools'),
toolsSave: $('tools-save'),
@@ -3662,13 +3662,13 @@ self.kiri.license = exports.LICENSE;
if (STATS.get('upgrade')) DBUG.log("kiri | version upgrade");
STATS.del('upgrade');
- if (!SETUP.s) console.log("kiri | init main | "+kiri.version);
+ if (!SETUP.s) console.log(`kiri | init main | ${KIRI.version}`);
STATS.set('seed', SDB[SEED]);
STATS.add('init');
// updateActive(true);
// place version number a couple of places to help users
- UI.helpButton.title = "version " + KIRI.version;
+ UI.helpButton.title = `${LANG.version} ` + KIRI.version;
// setup tab visibility watcher
// DOC.addEventListener('visibilitychange', function() { document.title = document.hidden });
diff --git a/js/license.js b/js/license.js
index 52e7d240..031f4f7b 100644
--- a/js/license.js
+++ b/js/license.js
@@ -1,7 +1,7 @@
var exports = {
COPYRIGHT:"Copyright (C) 2014-2019 Stewart Allen - All Rights Reserved",
LICENSE:"See the license.md file included with the source distribution",
- VERSION:"1.3.2"
+ VERSION:"1.3.3"
};
if (!module) var module = {};
module.exports = exports;