diff options
-rw-r--r-- | combined.js | 16 | ||||
-rw-r--r-- | js/Linear/CLSS.js | 2 | ||||
-rw-r--r-- | js/Linear/DLSS.js | 2 | ||||
-rw-r--r-- | js/Sinks/WFILE_f.js | 4 | ||||
-rw-r--r-- | js/Sources/IN_f.js | 8 | ||||
-rwxr-xr-x | sci2jslex.py | 3 |
6 files changed, 18 insertions, 17 deletions
diff --git a/combined.js b/combined.js index 1335903f..d9ff226a 100644 --- a/combined.js +++ b/combined.js @@ -6181,7 +6181,7 @@ function CLSS() { } } if (ms!=ns||!okD) { - message(_("Matrix A is not square or D has wrong dimension")); + message("Matrix A is not square or D has wrong dimension"); } else { var tmpvar1 = check_io(this.model,this.graphics,in1,out,[],[]); this.model = tmpvar1[0]; @@ -6845,7 +6845,7 @@ function DLSS() { } } if (ms!=ns||!okD) { - message(_("Matrix A is not square or D has wrong dimension")); + message("Matrix A is not square or D has wrong dimension"); } else { var tmpvar1 = check_io(this.model,this.graphics,in1,out,1,[]); this.model = tmpvar1[0]; @@ -18039,8 +18039,8 @@ function WFILE_f() { } WFILE_f.prototype.set = function WFILE_f() { warnobsolete("WRITEC_f","6.0.0"); - var warnMessage = msprintf(_("Feature %s is obsolete."),"WFILE_f"); - var warnAdvise = msprintf(_("Please use %s instead."),"WRITEC_f"); + var warnMessage = msprintf("Feature %s is obsolete.","WFILE_f"); + var warnAdvise = msprintf("Please use %s instead.","WRITEC_f"); var warnXcosMessage = msprintf("%s %s",warnMessage,warnAdvise); this.exprs = this.graphics.exprs; var dstate = this.model.dstate; @@ -19537,7 +19537,7 @@ function IN_f() { this.exprs = [[this.exprs[1-1]],["[-1 -2]"],["-1"]]; } while (true) { - var tmpvar0 = getvalue(_("Set Input block parameters"),[[_("Port number")],[_("Outport size ([-1 -2] for inherit)")],[_("Outport Type (-1 for inherit)")]],list("vec",1,"vec",-1,"vec",1),this.exprs); + var tmpvar0 = getvalue("Set Input block parameters",[["Port number"],["Outport size ([-1 -2] for inherit)"],["Outport Type (-1 for inherit)"]],list("vec",1,"vec",-1,"vec",1),this.exprs); var ok = tmpvar0[0]; var prt = tmpvar0[1]; var otsz = tmpvar0[2]; @@ -19548,11 +19548,11 @@ function IN_f() { } var prt = int(prt); if (prt<=0) { - message(_("Port number must be a positive integer")); + message("Port number must be a positive integer"); } else if (!isequal(size(otsz,"*"),2)) { - message(_("Outport Size must be a 2 elements vector")); + message("Outport Size must be a 2 elements vector"); } else if (((ot<1||ot>9)&&(ot!=-1))) { - message(_("Outport type must be a number between 1 and 9, or -1 for inheritance.")); + message("Outport type must be a number between 1 and 9, or -1 for inheritance."); } else { if (this.model.ipar!=prt) { var needcompile = 4; diff --git a/js/Linear/CLSS.js b/js/Linear/CLSS.js index 2c15ea95..2a1d1eab 100644 --- a/js/Linear/CLSS.js +++ b/js/Linear/CLSS.js @@ -71,7 +71,7 @@ function CLSS() { } } if (ms!=ns||!okD) { - message(_("Matrix A is not square or D has wrong dimension")); + message("Matrix A is not square or D has wrong dimension"); } else { var tmpvar1 = check_io(this.model,this.graphics,in1,out,[],[]); this.model = tmpvar1[0]; diff --git a/js/Linear/DLSS.js b/js/Linear/DLSS.js index 89598080..c63a7a49 100644 --- a/js/Linear/DLSS.js +++ b/js/Linear/DLSS.js @@ -70,7 +70,7 @@ function DLSS() { } } if (ms!=ns||!okD) { - message(_("Matrix A is not square or D has wrong dimension")); + message("Matrix A is not square or D has wrong dimension"); } else { var tmpvar1 = check_io(this.model,this.graphics,in1,out,1,[]); this.model = tmpvar1[0]; diff --git a/js/Sinks/WFILE_f.js b/js/Sinks/WFILE_f.js index 10f61dbe..19f166b5 100644 --- a/js/Sinks/WFILE_f.js +++ b/js/Sinks/WFILE_f.js @@ -34,8 +34,8 @@ function WFILE_f() { } WFILE_f.prototype.set = function WFILE_f() { warnobsolete("WRITEC_f","6.0.0"); - var warnMessage = msprintf(_("Feature %s is obsolete."),"WFILE_f"); - var warnAdvise = msprintf(_("Please use %s instead."),"WRITEC_f"); + var warnMessage = msprintf("Feature %s is obsolete.","WFILE_f"); + var warnAdvise = msprintf("Please use %s instead.","WRITEC_f"); var warnXcosMessage = msprintf("%s %s",warnMessage,warnAdvise); this.exprs = this.graphics.exprs; var dstate = this.model.dstate; diff --git a/js/Sources/IN_f.js b/js/Sources/IN_f.js index 96059541..67fa7614 100644 --- a/js/Sources/IN_f.js +++ b/js/Sources/IN_f.js @@ -30,7 +30,7 @@ function IN_f() { this.exprs = [[this.exprs[1-1]],["[-1 -2]"],["-1"]]; } while (true) { - var tmpvar0 = getvalue(_("Set Input block parameters"),[[_("Port number")],[_("Outport size ([-1 -2] for inherit)")],[_("Outport Type (-1 for inherit)")]],list("vec",1,"vec",-1,"vec",1),this.exprs); + var tmpvar0 = getvalue("Set Input block parameters",[["Port number"],["Outport size ([-1 -2] for inherit)"],["Outport Type (-1 for inherit)"]],list("vec",1,"vec",-1,"vec",1),this.exprs); var ok = tmpvar0[0]; var prt = tmpvar0[1]; var otsz = tmpvar0[2]; @@ -41,11 +41,11 @@ function IN_f() { } var prt = int(prt); if (prt<=0) { - message(_("Port number must be a positive integer")); + message("Port number must be a positive integer"); } else if (!isequal(size(otsz,"*"),2)) { - message(_("Outport Size must be a 2 elements vector")); + message("Outport Size must be a 2 elements vector"); } else if (((ot<1||ot>9)&&(ot!=-1))) { - message(_("Outport type must be a number between 1 and 9, or -1 for inheritance.")); + message("Outport type must be a number between 1 and 9, or -1 for inheritance."); } else { if (this.model.ipar!=prt) { var needcompile = 4; diff --git a/sci2jslex.py b/sci2jslex.py index 3542c048..a7723cbc 100755 --- a/sci2jslex.py +++ b/sci2jslex.py @@ -18,6 +18,7 @@ import ply.lex as lex BRACKET_STACK = [' '] SYNTAX_TOKENS = { + '_': 'GETTEXT', 'break': 'BREAK', 'case': 'CASE', 'catch': 'CATCH', @@ -336,7 +337,7 @@ tokens = [ 'SPACE', 'TRANSPOSE', 'VAR', -] + list(SYNTAX_TOKENS.values()) + list(set(PREDEFINED_VARIABLES.values())) + list(OBJECTS.values()) + list(JOBTYPES.values()) +] + list(set(SYNTAX_TOKENS.values())) + list(set(PREDEFINED_VARIABLES.values())) + list(OBJECTS.values()) + list(JOBTYPES.values()) states = ( ('qstring', 'exclusive'), |