Quellcode durchsuchen

Fix lots of i18n files keys so they know are more informative on what they actually mean

Lucas de Souza vor 5 Jahren
Ursprung
Commit
feb741d162

+ 20 - 52
i18n/pt/ui.json

@@ -10,18 +10,18 @@
   "btn_break":"Pare",
   "btn_case":"Caso",
   "start": "inicio",
-  "void": "vazio",
-  "integer": "inteiro",
-  "and": "E",
-  "or": "OU",
-  "not": "nao",
-  "real": "real",
+  "type_void": "vazio",
+  "type_integer": "inteiro",
+  "logic_operator_and": "E",
+  "logic_operator_or": "OU",
+  "logic_operator_not": "nao",
+  "type_real": "real",
   "program": "programa",
-  "text": "cadeia",
-  "text_start": "texto",
-  "boolean": "logico",
-  "true": "verdadeiro",
-  "false": "falso",
+  "type_text": "cadeia",
+  "textvar_default_value": "texto",
+  "type_boolean": "logico",
+  "logic_value_true": "verdadeiro",
+  "logic_value_false": "falso",
   "variable": "Variável",
   "command": "Comando",
   "new_parameter": "parametro",
@@ -39,8 +39,8 @@
   "text_btn_return":"Retorno",
   "text_comment": "Comentário",
   "string_join_or": "ou",
-  "matrix_string": "matriz de $0",
-  "vector_string": "vetor de $0",
+  "matrix_info_string": "matriz de $0",
+  "vector_info_string": "vetor de $0",
   "text_attribution": "Atribuição",
   "text_if":"se",
   "text_break":"pare",
@@ -80,10 +80,10 @@
   "text_header_ivprog_functions": "Funções do iVProg",
   "text_menu_functions_math":"Matemática",
   "text_menu_functions_text":"Texto",
-  "text_menu_functions_arrangement":"Arranjo",
+  "text_menu_functions_array":"Arranjo",
   "text_menu_functions_conversion":"Conversão",
-  "text_none_variable":"Nenhuma variável declarada",
-  "text_none_variable_instruction":"Antes de utilizar uma variável, é necessário criá-la",
+  "text_no_variable":"Nenhuma variável declarada",
+  "text_no_variable_instruction":"Antes de utilizar uma variável, é necessário criá-la",
   "text_ivprog_description":"Programação Visual interativa na Internet",
   "tooltip_visual": "Programação visual",
   "tooltip_textual": "Programação textual",
@@ -95,51 +95,19 @@
   "tooltip_evaluate": "Avaliar o programa",
   "tooltip_help": "Ajuda",
   "tooltip_add_global": "Adicionar variável global",
-  "tooltip_minimize": "Ocultar os elementos da função",
-  "tooltip_console": "Abrir/fechar o terminal",
+  "tooltip_hide_function": "Ocultar os elementos da função",
   "var_menu_select_var": "Selecione uma variável",
   "var_menu_select_all": "Selecione",
   "var_menu_select_function": "Selecione uma função",
   "expression_menu_select": "Construir uma expressão lógica",
-  "math": "Matematica",
-  "text_t": "Texto",
   "inform_valid_name": "Informe um nome válido!",
   "inform_valid_content": "Informe o conteúdo!",
   "inform_valid_expression": "Construa uma expressão lógica!",
   "inform_valid_name_duplicated": "Este nome já está em uso por outra função!",
   "inform_valid_global_duplicated": "Já existe uma variável global com o nome informado.",
   "inform_valid_variable_duplicated" : "Já existe uma variável local com o nome informado.",
-  "arrangement": "Arranjo",
-  "conversion": "Conversao",
-  "terminal_clear":"Limpa o terminal removendo todos os textos",
-  "terminal_show":"Exibe o terminal caso esteja escondido",
-  "terminal_hide":"Esconde o terminal caso não esteja escondido",
-  "$sin": "seno",
-  "$cos": "cosseno",
-  "$tan": "tangente",
-  "$sqrt": "raiz_quadrada",
-  "$pow": "potencia",
-  "$log": "logaritmo",
-  "$abs": "modulo",
-  "$negate": "trocar_sinal",
-  "$invert": "inverter_valor",
-  "$max": "maximo",
-  "$min": "minimo",
-  "$rand": "numero_aleatorio",
-  "$substring": "subcadeia",
-  "$length": "comprimento",
-  "$uppercase": "caixa_alta",
-  "$lowercase": "caixa_baixa",
-  "$charAt": "texto_na_posicao",
-  "$numElements": "total_de_elementos",
-  "$matrixLines": "total_de_linhas",
-  "$matrixColumns": "total_de_colunas",
-  "$isReal": "e_real",
-  "$isInt": "e_inteiro",
-  "$isBool": "e_logico",
-  "$castReal": "como_real",
-  "$castInt": "como_inteiro",
-  "$castBool": "como_logico",
-  "$castString": "como_cadeia",
+  "tooltip_terminal_clear":"Limpa o terminal removendo todos os textos",
+  "tooltip_terminal_show":"Exibe o terminal caso esteja escondido",
+  "tooltip_terminal_hide":"Esconde o terminal caso não esteja escondido",
   "text_ivprog_version":"Versão"
 }

+ 3 - 3
js/io/domConsole.js

@@ -119,9 +119,9 @@ export class DOMConsole {
     this.showBtn = bashNode.querySelector('#ivprog-console-showbtn');
     this._setupCursor();
     //Jquery tooltips....
-    $(this.clearBtn).popup({content:LocalizedStrings.getUI("terminal_clear")});
-    $(this.showBtn).popup({content:LocalizedStrings.getUI("terminal_show")});
-    $(this.hideBtn).popup({content:LocalizedStrings.getUI("terminal_hide")});
+    $(this.clearBtn).popup({content:LocalizedStrings.getUI("tooltip_terminal_clear")});
+    $(this.showBtn).popup({content:LocalizedStrings.getUI("tooltip_terminal_show")});
+    $(this.hideBtn).popup({content:LocalizedStrings.getUI("tooltip_terminal_hide")});
   }
 
   _setupCursor () {

+ 15 - 6
js/services/localizedStringsService.js

@@ -1,5 +1,6 @@
-import { LanguageService } from "./languageService";
 import line_i18n from 'line-i18n';
+import { LanguageService } from "./languageService";
+import { LanguageDefinedFunction } from "./../processor/definedFunctions";
 import Langs from './../../i18n';
 import { Operators } from "./../ast/operators";
 
@@ -12,13 +13,13 @@ class IVProgLocalizedStrings extends line_i18n.LocalizedStrings {
   translateType (type, dim) {
     switch (dim) {
       case 0:
-        return this.getUI(type);
+        return this.getUI(`type_${type}`);
       default:
-        const transType = this.getUI(type);
+        const transType = this.getUI(`type_${type}`);
         if(dim === 1)
-          return this.getUI("vector_string", [transType])
+          return this.getUI("matrix_info_string", [transType])
         else
-          return this.getUI("matrix_string", [transType])
+          return this.getUI("vector_info_string", [transType])
     }
   }
   
@@ -27,11 +28,19 @@ class IVProgLocalizedStrings extends line_i18n.LocalizedStrings {
       case Operators.AND.ord:
       case Operators.OR.ord:
       case Operators.NOT.ord:
-        return this.getUI(op.value);
+        return this.getUI(`logic_operator_${op.value}`);
       default:
         return op.value;
     }
   }
+
+  translateInternalFunction (name, category = null) {
+    if (category == null) {
+      return LanguageDefinedFunction.getLocalName(name);
+    } else {
+      return LanguageDefinedFunction.getLocalName(`${category}.${name}`);
+    }
+  }
 }
 
 export const LocalizedStrings = Object.freeze(new IVProgLocalizedStrings(LanguageService, Langs, true));

+ 33 - 33
js/visualUI/code_generator.js

@@ -41,19 +41,19 @@ function functionsCode (function_obj) {
 
 	switch (function_obj.return_type) {
 		case Types.INTEGER:
-			ret += LocalizedStrings.getUI('integer');
+			ret += LocalizedStrings.getUI('type_integer');
 			break;
 		case Types.REAL:
-			ret += LocalizedStrings.getUI('real');
+			ret += LocalizedStrings.getUI('type_real');
 			break;
 		case Types.TEXT:
-			ret += LocalizedStrings.getUI('text');
+			ret += LocalizedStrings.getUI('type_text');
 			break;
 		case Types.BOOLEAN:
-			ret += LocalizedStrings.getUI('boolean');
+			ret += LocalizedStrings.getUI('type_boolean');
 			break;
 		case Types.VOID:
-			ret += LocalizedStrings.getUI('void');
+			ret += LocalizedStrings.getUI('type_void');
 			break;
 	}
 	ret += ' ';
@@ -597,15 +597,15 @@ function elementExpressionCode (expression_obj) {
 					break;
 
 				case Models.LOGIC_COMPARISON.and:
-					ret += ' ' + LocalizedStrings.getUI('and') + ' ';
+					ret += ' ' + LocalizedStrings.getUI('logic_operator_and') + ' ';
 					break;
 
 				case Models.LOGIC_COMPARISON.or:
-					ret += ' ' + LocalizedStrings.getUI('or') + ' ';
+					ret += ' ' + LocalizedStrings.getUI('logic_operator_or') + ' ';
 					break;
 
 				case Models.LOGIC_COMPARISON.not:
-					ret += ' ' + LocalizedStrings.getUI('not') + ' ';
+					ret += ' ' + LocalizedStrings.getUI('logic_operator_not') + ' ';
 					break;
 
 				case Models.ARITHMETIC_COMPARISON.greater_than:
@@ -673,7 +673,7 @@ function variableValueMenuCode (variable_obj, is_return = false) {
 			if (variable_obj.function_called.name) {
 				ret += variable_obj.function_called.name + ' ( ';
 			} else {
-				ret += LocalizedStrings.getUI(variable_obj.function_called.category)+'.'+LocalizedStrings.getUI(variable_obj.function_called.identifier) + ' ( ';
+				ret += LocalizedStrings.translateInternalFunction(variable_obj.function_called.identifier,variable_obj.function_called.category) + ' ( ';
 			}
 
 			if (variable_obj.parameters_list) {
@@ -759,16 +759,16 @@ function parametersCode (parameter_obj) {
 	var ret = '';
 	switch (parameter_obj.type) {
 		case Types.INTEGER:
-			ret += ' '+LocalizedStrings.getUI('integer')+' ';
+			ret += ' '+LocalizedStrings.getUI('type_integer')+' ';
 			break;
 		case Types.REAL:
-			ret += ' '+LocalizedStrings.getUI('real')+' ';
+			ret += ' '+LocalizedStrings.getUI('type_real')+' ';
 			break;
 		case Types.TEXT:
-			ret += ' '+LocalizedStrings.getUI('text')+' ';
+			ret += ' '+LocalizedStrings.getUI('type_text')+' ';
 			break;
 		case Types.BOOLEAN:
-			ret += ' '+LocalizedStrings.getUI('boolean')+' ';
+			ret += ' '+LocalizedStrings.getUI('type_boolean')+' ';
 			break;
 	}
 	ret += parameter_obj.name + '';
@@ -793,16 +793,16 @@ function variablesCode (variable_obj) {
 	}
 	switch (temp.type) {
 		case Types.INTEGER:
-			ret += LocalizedStrings.getUI('integer')+' ';
+			ret += LocalizedStrings.getUI('type_integer')+' ';
 			break;
 		case Types.REAL:
-			ret += LocalizedStrings.getUI('real')+' ';
+			ret += LocalizedStrings.getUI('type_real')+' ';
 			break;
 		case Types.TEXT:
-			ret += LocalizedStrings.getUI('text')+' ';
+			ret += LocalizedStrings.getUI('type_text')+' ';
 			break;
 		case Types.BOOLEAN:
-			ret += LocalizedStrings.getUI('boolean')+' ';
+			ret += LocalizedStrings.getUI('type_boolean')+' ';
 			break;
 	}
 	ret += temp.name + ' ';
@@ -831,9 +831,9 @@ function variablesCode (variable_obj) {
 				ret += '= {';
 				for (var j = 0; j < temp.value.length; j++) {
 					if (temp.value[j]) {
-						ret += LocalizedStrings.getUI("true");
+						ret += LocalizedStrings.getUI('logic_value_true');
 					} else {
-						ret += LocalizedStrings.getUI("false");
+						ret += LocalizedStrings.getUI('logic_value_false');
 					}
 					if ((j + 1) < temp.value.length) {
 						ret += ',';
@@ -902,9 +902,9 @@ function variablesCode (variable_obj) {
 					for (var k = 0; k < temp.columns; k++) {
 						
 						if (temp.value[j][k]) {
-							ret += LocalizedStrings.getUI("true");
+							ret += LocalizedStrings.getUI('logic_value_true');
 						} else {
-							ret += LocalizedStrings.getUI("false");
+							ret += LocalizedStrings.getUI('logic_value_false');
 						}
 
 						if ((k + 1) < temp.columns) {
@@ -935,9 +935,9 @@ function variablesCode (variable_obj) {
 			case Types.BOOLEAN:
 				ret += '= ';
 				if (temp.value) {
-					ret += LocalizedStrings.getUI("true");
+					ret += LocalizedStrings.getUI('logic_value_true');
 				} else {
-					ret += LocalizedStrings.getUI("false");
+					ret += LocalizedStrings.getUI('logic_value_false');
 				}
 				break;
 		}
@@ -962,16 +962,16 @@ function globalsCode () {
 			}
 			switch (temp.type) {
 				case Types.INTEGER:
-					ret += LocalizedStrings.getUI('integer');
+					ret += LocalizedStrings.getUI('type_integer');
 					break;
 				case Types.REAL:
-					ret += LocalizedStrings.getUI('real');
+					ret += LocalizedStrings.getUI('type_real');
 					break;
 				case Types.TEXT:
-					ret += LocalizedStrings.getUI('text');
+					ret += LocalizedStrings.getUI('type_text');
 					break;
 				case Types.BOOLEAN:
-					ret += LocalizedStrings.getUI('boolean');
+					ret += LocalizedStrings.getUI('type_boolean');
 					break;
 			}
 			ret += ' ' + temp.name + ' ';
@@ -1007,9 +1007,9 @@ function globalsCode () {
 						ret += '= {';
 						for (var j = 0; j < temp.value.length; j++) {
 							if (temp.value[j]) {
-								ret += LocalizedStrings.getUI("true");
+								ret += LocalizedStrings.getUI('logic_value_true');
 							} else {
-								ret += LocalizedStrings.getUI("false");
+								ret += LocalizedStrings.getUI('logic_value_false');
 							}
 							if ((j + 1) < temp.value.length) {
 								ret += ',';
@@ -1087,9 +1087,9 @@ function globalsCode () {
 							for (var k = 0; k < temp.columns; k++) {
 								
 								if (temp.value[j][k]) {
-									ret += LocalizedStrings.getUI("true");
+									ret += LocalizedStrings.getUI('logic_value_true');
 								} else {
-									ret += LocalizedStrings.getUI("false");
+									ret += LocalizedStrings.getUI('logic_value_false');
 								}
 
 								if ((k + 1) < temp.columns) {
@@ -1120,9 +1120,9 @@ function globalsCode () {
 					case Types.BOOLEAN:
 						ret += '= ';
 						if (temp.value) {
-							ret += LocalizedStrings.getUI("true");;
+							ret += LocalizedStrings.getUI('logic_value_true');;
 						} else {
-							ret += LocalizedStrings.getUI("false");;
+							ret += LocalizedStrings.getUI('logic_value_false');;
 						}
 						break;
 				}

+ 3 - 3
js/visualUI/commands/generic_expression.js

@@ -830,9 +830,9 @@ function getLogicOperators () {
 	var logic_operators;
 	logic_operators = '<div class="item" data-type="'+Models.EXPRESSION_TYPES.exp_logic+'" data-value="'+Models.LOGIC_COMPARISON.equals_to+'">==</div>';
 	logic_operators += '<div class="item" data-type="'+Models.EXPRESSION_TYPES.exp_logic+'" data-value="'+Models.LOGIC_COMPARISON.not_equals_to+'">!=</div>';
-	logic_operators += '<div class="item" data-type="'+Models.EXPRESSION_TYPES.exp_logic+'" data-value="'+Models.LOGIC_COMPARISON.and+'">'+LocalizedStrings.getUI('and')+'</div>';
-	logic_operators += '<div class="item" data-type="'+Models.EXPRESSION_TYPES.exp_logic+'" data-value="'+Models.LOGIC_COMPARISON.or+'">'+LocalizedStrings.getUI('or')+'</div>';
-	logic_operators += '<div class="item" data-type="'+Models.EXPRESSION_TYPES.exp_logic+'" data-value="'+Models.LOGIC_COMPARISON.not+'">'+LocalizedStrings.getUI('not')+'</div>';
+	logic_operators += '<div class="item" data-type="'+Models.EXPRESSION_TYPES.exp_logic+'" data-value="'+Models.LOGIC_COMPARISON.and+'">'+LocalizedStrings.getUI('logic_operator_and')+'</div>';
+	logic_operators += '<div class="item" data-type="'+Models.EXPRESSION_TYPES.exp_logic+'" data-value="'+Models.LOGIC_COMPARISON.or+'">'+LocalizedStrings.getUI('logic_operator_or')+'</div>';
+	logic_operators += '<div class="item" data-type="'+Models.EXPRESSION_TYPES.exp_logic+'" data-value="'+Models.LOGIC_COMPARISON.not+'">'+LocalizedStrings.getUI('logic_operator_not')+'</div>';
 	return logic_operators;
 }
 

+ 8 - 8
js/visualUI/commands/variable_value_menu.js

@@ -277,7 +277,7 @@ function variableValueMenuCode (command, variable_obj, dom_object, function_obj,
 			if (variable_obj.function_called.name) {
 				parameters_menu = '<div class="parameters_function_called"> '+variable_obj.function_called.name+' <span> ( </span>';
 			} else {
-				parameters_menu = '<div class="parameters_function_called"> <i>'+LocalizedStrings.getUI(variable_obj.function_called.category)+'.'+LocalizedStrings.getUI(variable_obj.function_called.identifier)+'</i> <span> ( </span>';
+				parameters_menu = '<div class="parameters_function_called"> <i>'+ LocalizedStrings.translateInternalFunction(variable_obj.function_called.identifier, variable_obj.function_called.category)+'</i> <span> ( </span>';
 			}
 
 			parameters_menu += '<span> ) </span></div>';
@@ -336,7 +336,7 @@ function variableValueMenuCode (command, variable_obj, dom_object, function_obj,
 			if (variable_obj.function_called.name) {
 				parameters_menu = '<div class="parameters_function_called"> '+variable_obj.function_called.name+' <span> ( </span>';
 			} else {
-				parameters_menu = '<div class="parameters_function_called"> <i>'+LocalizedStrings.getUI(variable_obj.function_called.category)+'.'+LocalizedStrings.getUI(variable_obj.function_called.identifier)+'</i> <span> ( </span>';
+				parameters_menu = '<div class="parameters_function_called"> <i>'+LocalizedStrings.translateInternalFunction(variable_obj.function_called.identifier, variable_obj.function_called.category)+'</i> <span> ( </span>';
 			}
 
 			for (var j = 0; j < variable_obj.function_called.parameters_list.length; j++) {
@@ -659,7 +659,7 @@ function addIVProgFunctionsToMenu (function_obj, menu_var_or_value, ref_object,
 	sub_menu.append('<div class="divider"></div><div class="header">'+LocalizedStrings.getUI('text_header_ivprog_functions')+'</div>');
 	sub_menu.append('<div class="item"><i class="dropdown icon"></i>'+LocalizedStrings.getUI('text_menu_functions_math')+'<div class="menu menu_math_functions"></div></div>');
 	sub_menu.append('<div class="item"><i class="dropdown icon"></i>'+LocalizedStrings.getUI('text_menu_functions_text')+'<div class="menu menu_text_functions"></div></div>');
-	sub_menu.append('<div class="item"><i class="dropdown icon"></i>'+LocalizedStrings.getUI('text_menu_functions_arrangement')+'<div class="menu menu_arrangement_functions"></div></div>');
+	sub_menu.append('<div class="item"><i class="dropdown icon"></i>'+LocalizedStrings.getUI('text_menu_functions_array')+'<div class="menu menu_arrangement_functions"></div></div>');
 	sub_menu.append('<div class="item"><i class="dropdown icon"></i>'+LocalizedStrings.getUI('text_menu_functions_conversion')+'<div class="menu menu_conversion_functions"></div></div>');
 
 	// Insert Math functions:
@@ -667,7 +667,7 @@ function addIVProgFunctionsToMenu (function_obj, menu_var_or_value, ref_object,
 		var t = $('<div class="item"></div>');
 		t.data('function_reference', window.system_functions[i]);
 		t.data('option', VAR_OR_VALUE_TYPES.only_function);
-		t.text(LocalizedStrings.getUI(window.system_functions[i].identifier));
+		t.text(LocalizedStrings.translateInternalFunction(window.system_functions[i].identifier));
 		
 		switch(window.system_functions[i].category) {
 			case Models.SYSTEM_FUNCTIONS_CATEGORIES.math:
@@ -742,8 +742,8 @@ function addVariablesToMenu (function_obj, menu_var_or_value, ref_object, expres
 		}
 	}
 	if (!is_there) {
-		sub_menu.append($('<div class="header">'+LocalizedStrings.getUI('text_none_variable')+'</div>'));
-		sub_menu.append($('<div class="item disabled">'+LocalizedStrings.getUI('text_none_variable_instruction')+'</div>'));
+		sub_menu.append($('<div class="header">'+LocalizedStrings.getUI('text_no_variable')+'</div>'));
+		sub_menu.append($('<div class="item disabled">'+LocalizedStrings.getUI('text_no_variable_instruction')+'</div>'));
 	}
 
 }
@@ -824,7 +824,7 @@ function openInputToFunction (command, ref_object, dom_object, menu_var_or_value
 		if (function_selected.name) {
 			parameters_menu = '<div class="parameters_function_called"> '+function_selected.name+' <span> ( </span>';
 		} else {
-			parameters_menu = '<div class="parameters_function_called"> <i>'+LocalizedStrings.getUI(function_selected.category)+'.'+LocalizedStrings.getUI(function_selected.identifier)+'</i> <span> ( </span>';
+			parameters_menu = '<div class="parameters_function_called"> <i>'+LocalizedStrings.translateInternalFunction(function_selected.identifier, function_selected.category)+'</i> <span> ( </span>';
 		}
 		for (var j = 0; j < function_selected.parameters_list.length; j++) {
 			parameters_menu += '<div class="render_style_param parameter_'+j+'"></div>';
@@ -900,7 +900,7 @@ function openInputToFunction (command, ref_object, dom_object, menu_var_or_value
 		if (function_selected.name) {
 			parameters_menu = '<div class="parameters_function_called"> '+function_selected.name+' <span> ( </span>';
 		} else {
-			parameters_menu = '<div class="parameters_function_called"> <i>'+LocalizedStrings.getUI(function_selected.category)+'.'+LocalizedStrings.getUI(function_selected.identifier)+'</i> <span> ( </span>';
+			parameters_menu = '<div class="parameters_function_called"> <i>'+LocalizedStrings.translateInternalFunction(function_selected.identifier, function_selected.category)+'</i> <span> ( </span>';
 		}
 		
 		parameters_menu += '<span> ) </span></div>';

+ 14 - 14
js/visualUI/functions.js

@@ -252,7 +252,7 @@ function renderFunctionReturn (function_obj, function_element) {
   var ret = '<div class="ui dropdown function_return">';
     
     if (function_obj.return_dimensions > 0) {
-      ret += '<div class="text">'+ LocalizedStrings.getUI("vector") +':'+ LocalizedStrings.getUI(function_obj.return_type);
+      ret += '<div class="text">'+ LocalizedStrings.getUI("vector") +':'+ LocalizedStrings.getUI(`type_${function_obj.return_type}`);
       if (function_obj.return_dimensions == 1) {
         ret += ' [ ] ';
       } else {
@@ -260,14 +260,14 @@ function renderFunctionReturn (function_obj, function_element) {
       }
       ret += '</div>';
     } else {
-      ret += '<div class="text">'+LocalizedStrings.getUI(function_obj.return_type)+'</div>';
+      ret += '<div class="text">'+LocalizedStrings.getUI(`type_${function_obj.return_type}`)+'</div>';
     }
 
     ret += '<div class="menu">';
 
 
     for (var tm in Types) {
-      ret += '<div class="item ' + (function_obj.return_type == tm.toLowerCase()  && function_obj.return_dimensions < 1 ? ' selected ' : '') + '" data-type="'+tm+'" >'+LocalizedStrings.getUI(tm.toLowerCase())+'</div>';
+      ret += '<div class="item ' + (function_obj.return_type == tm.toLowerCase()  && function_obj.return_dimensions < 1 ? ' selected ' : '') + '" data-type="'+tm+'" >'+LocalizedStrings.getUI(`type_${tm.toLowerCase()}`)+'</div>';
     }
 
     for (var tm in Types) {
@@ -276,10 +276,10 @@ function renderFunctionReturn (function_obj, function_element) {
       }
       ret += '<div class="item">'
         + '<i class="dropdown icon"></i>'
-        +  LocalizedStrings.getUI('vector')+':'+LocalizedStrings.getUI(tm.toLowerCase())
+        +  LocalizedStrings.getUI('vector')+':'+LocalizedStrings.getUI(`type_${tm.toLowerCase()}`)
           +  '<div class="menu">'
-            + '<div class="item '+(function_obj.return_type == tm.toLowerCase()  && function_obj.return_dimensions > 0 ? ' selected ' : '')+'" data-text="'+ LocalizedStrings.getUI('vector')+':'+LocalizedStrings.getUI(tm.toLowerCase())+' [ ] " data-type="'+tm+'" data-dimensions="1">[ ]</div>'
-            + '<div class="item '+(function_obj.return_type == tm.toLowerCase()  && function_obj.return_dimensions > 0 ? ' selected ' : '')+'" data-text="'+ LocalizedStrings.getUI('vector')+':'+LocalizedStrings.getUI(tm.toLowerCase())+' [ ] [ ] " data-type="'+tm+'" data-dimensions="2">[ ] [ ] </div>'
+            + '<div class="item '+(function_obj.return_type == tm.toLowerCase()  && function_obj.return_dimensions > 0 ? ' selected ' : '')+'" data-text="'+ LocalizedStrings.getUI('vector')+':'+LocalizedStrings.getUI(`type_${tm.toLowerCase()}`)+' [ ] " data-type="'+tm+'" data-dimensions="1">[ ]</div>'
+            + '<div class="item '+(function_obj.return_type == tm.toLowerCase()  && function_obj.return_dimensions > 0 ? ' selected ' : '')+'" data-text="'+ LocalizedStrings.getUI('vector')+':'+LocalizedStrings.getUI(`type_${tm.toLowerCase()}`)+' [ ] [ ] " data-type="'+tm+'" data-dimensions="2">[ ] [ ] </div>'
           +  '</div>'
         + '</div>'; 
     }
@@ -309,7 +309,7 @@ export function renderFunction (function_obj) {
   appender += '<div class="function_signature_div">'+LocalizedStrings.getUI("function")+' ';
 
   if (function_obj.is_main) {
-      appender += '<div class="function_name_div">  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ' + LocalizedStrings.getUI('void') + ' &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="span_name_function" >'+function_obj.name+'</span> </div> '
+      appender += '<div class="function_name_div">  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ' + LocalizedStrings.getUI('type_void') + ' &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span class="span_name_function" >'+function_obj.name+'</span> </div> '
         + ' <span class="parethesis_function">( </span> <div class="ui large labels parameters_list">';
   } else {
       appender += '<div class="ui function_return"></div>';
@@ -380,7 +380,7 @@ export function renderFunction (function_obj) {
     CommandsManagement.renderCommand(function_obj.commands[j], $(appender.find('.commands_list_div')[0]), 3, function_obj);
   }
   $('.minimize_function_button').popup({
-    content : LocalizedStrings.getUI("tooltip_minimize"),
+    content : LocalizedStrings.getUI("tooltip_hide_function"),
     delay: {
       show: 750,
       hide: 0
@@ -1050,7 +1050,7 @@ function renderParameter (function_obj, parameter_obj, function_container) {
   ret += '<div class="ui dropdown parameter_type">';
 
   if (parameter_obj.dimensions > 0) {
-    ret += '<div class="text">'+ LocalizedStrings.getUI('vector')+':'+LocalizedStrings.getUI(parameter_obj.type);
+    ret += '<div class="text">'+ LocalizedStrings.getUI('vector')+':'+LocalizedStrings.getUI(`type_${parameter_obj.type}`);
     if (parameter_obj.dimensions == 1) {
       ret += ' [ ] ';
     } else {
@@ -1058,7 +1058,7 @@ function renderParameter (function_obj, parameter_obj, function_container) {
     }
     ret += '</div>';
   } else {
-    ret += '<div class="text">'+LocalizedStrings.getUI(parameter_obj.type)+'</div>';
+    ret += '<div class="text">'+LocalizedStrings.getUI(`type_${parameter_obj.type}`)+'</div>';
   }
 
   ret += '<div class="menu">';
@@ -1068,7 +1068,7 @@ function renderParameter (function_obj, parameter_obj, function_container) {
       if (tm == Types.VOID.toUpperCase()) {
         continue;
       }
-      ret += '<div class="item ' + (parameter_obj.type == tm.toLowerCase() ? ' selected ' : '') + '" data-type="'+tm+'" >'+LocalizedStrings.getUI(tm.toLowerCase())+'</div>';
+      ret += '<div class="item ' + (parameter_obj.type == tm.toLowerCase() ? ' selected ' : '') + '" data-type="'+tm+'" >'+LocalizedStrings.getUI(`type_${tm.toLowerCase()}`)+'</div>';
   }
 
   for (const tm in Types) {
@@ -1077,10 +1077,10 @@ function renderParameter (function_obj, parameter_obj, function_container) {
     }
     ret += '<div class="item">'
       + '<i class="dropdown icon"></i>'
-      +  LocalizedStrings.getUI('vector')+':'+LocalizedStrings.getUI(tm.toLowerCase())
+      +  LocalizedStrings.getUI('vector')+':'+LocalizedStrings.getUI(`type_${tm.toLowerCase()}`)
         +  '<div class="menu">'
-          + '<div class="item" data-text="'+ LocalizedStrings.getUI('vector')+':'+LocalizedStrings.getUI(tm.toLowerCase())+' [ ] " data-type="'+tm+'" data-dimensions="1">[ ]</div>'
-          + '<div class="item" data-text="'+ LocalizedStrings.getUI('vector')+':'+LocalizedStrings.getUI(tm.toLowerCase())+' [ ] [ ] " data-type="'+tm+'" data-dimensions="2">[ ] [ ] </div>'
+          + '<div class="item" data-text="'+ LocalizedStrings.getUI('vector')+':'+LocalizedStrings.getUI(`type_${tm.toLowerCase()}`)+' [ ] " data-type="'+tm+'" data-dimensions="1">[ ]</div>'
+          + '<div class="item" data-text="'+ LocalizedStrings.getUI('vector')+':'+LocalizedStrings.getUI(`type_${tm.toLowerCase()}`)+' [ ] [ ] " data-type="'+tm+'" data-dimensions="2">[ ] [ ] </div>'
         +  '</div>'
       + '</div>'; 
   }

+ 19 - 19
js/visualUI/globals.js

@@ -111,14 +111,14 @@ function updateInitialValues (global_var) {
 
 	if (global_var.type == Types.TEXT) {
 		if (global_var.dimensions == 0) {
-			global_var.value = LocalizedStrings.getUI('text_start');
+			global_var.value = LocalizedStrings.getUI('textvar_default_value');
 		}
 		if (global_var.dimensions == 1) {
-			global_var.value = [LocalizedStrings.getUI('text_start'), LocalizedStrings.getUI('text_start')];
+			global_var.value = [LocalizedStrings.getUI('textvar_default_value'), LocalizedStrings.getUI('textvar_default_value')];
 		}
 		if (global_var.dimensions == 2) {
-			global_var.value = [[LocalizedStrings.getUI('text_start'), LocalizedStrings.getUI('text_start')], 
-									[LocalizedStrings.getUI('text_start'), LocalizedStrings.getUI('text_start')]];
+			global_var.value = [[LocalizedStrings.getUI('textvar_default_value'), LocalizedStrings.getUI('textvar_default_value')], 
+									[LocalizedStrings.getUI('textvar_default_value'), LocalizedStrings.getUI('textvar_default_value')]];
 		}
 	}
 
@@ -139,12 +139,12 @@ function updateInitialValues (global_var) {
 
 function alternateBooleanGlobalValue (global_var, value_container) {
 	global_var.value = !global_var.value;
-	$(value_container).find('.span_value_variable').text(LocalizedStrings.getUI(global_var.value));
+	$(value_container).find('.span_value_variable').text(LocalizedStrings.getUI(`logic_value_${global_var.value}`));
 }
 
 function alternateBooleanGlobalVectorValue (global_var, index, value_container) {
 	global_var.value[index] = !global_var.value[index];
-	$(value_container).find('.span_value_variable').text(LocalizedStrings.getUI(global_var.value[index]));
+	$(value_container).find('.span_value_variable').text(LocalizedStrings.getUI(`logic_value_${global_var.value[index]}`));
 }
 
 function removeGlobalColumnVector (global_var) {
@@ -166,7 +166,7 @@ function addGlobalColumnVector (global_var) {
 		global_var.value.push(1.0);
 	}
 	if (global_var.type == Types.TEXT) {
-		global_var.value.push(LocalizedStrings.getUI('text_start'));
+		global_var.value.push(LocalizedStrings.getUI('textvar_default_value'));
 	}
 	if (global_var.type == Types.BOOLEAN) {
 		global_var.value.push(true);
@@ -200,7 +200,7 @@ function addColumnGlobalMatrix (global_var) {
 	}
 	if (global_var.type == Types.TEXT) {
 		for (var i = 0; i < global_var.rows; i++) {
-			global_var.value[i].push(LocalizedStrings.getUI('text_start'));
+			global_var.value[i].push(LocalizedStrings.getUI('textvar_default_value'));
 		}
 	}
 	if (global_var.type == Types.BOOLEAN) {
@@ -240,7 +240,7 @@ function addLineGlobalMatrix (global_var) {
 	if (global_var.type == Types.TEXT) {
 		var n_l = [];
 		for (i = 0; i < global_var.columns; i++) {
-			n_l.push(LocalizedStrings.getUI('text_start'));
+			n_l.push(LocalizedStrings.getUI('textvar_default_value'));
 		}
 		global_var.value.push(n_l);
 	}
@@ -256,7 +256,7 @@ function addLineGlobalMatrix (global_var) {
 
 function alternateBooleanGlobalMatrixValue (global_var, row, index, value_container) {
 	global_var.value[row][index] = !global_var.value[row][index];
-	$(value_container).find('.span_value_variable').text(LocalizedStrings.getUI(global_var.value[row][index]));
+	$(value_container).find('.span_value_variable').text(LocalizedStrings.getUI(`logic_value_${global_var.value[row][index]}`));
 }
 
 function renderValues (global_var, global_container) {
@@ -269,7 +269,7 @@ function renderValues (global_var, global_container) {
 			ret += '<div class="created_div_valor_var"><span class="span_value_variable simple_var">'+global_var.value.toFixed(1)+'</span>  </div> ';
 		} else {
 			if (global_var.type == Types.BOOLEAN) {
-				ret += '<div class="created_div_valor_var"><span class="span_value_variable boolean_simple_type">'+LocalizedStrings.getUI(global_var.value)+'</span>  </div> ';
+				ret += '<div class="created_div_valor_var"><span class="span_value_variable boolean_simple_type">'+LocalizedStrings.getUI(`logic_value_${global_var.value}`)+'</span>  </div> ';
 			} else {
 				ret += '<div class="created_div_valor_var"><span class="span_value_variable simple_var">'+global_var.value+'</span>  </div> ';
 			}
@@ -286,7 +286,7 @@ function renderValues (global_var, global_container) {
 			} else {
 				for (var k = 0; k < global_var.columns; k++) {
 					if (global_var.type == Types.BOOLEAN) {
-						ret += '<td><span class="span_value_variable boolean_vector_var" data-index="'+k+'">'+LocalizedStrings.getUI(global_var.value[k])+'</span></td>';
+						ret += '<td><span class="span_value_variable boolean_vector_var" data-index="'+k+'">'+LocalizedStrings.getUI(`logic_value_${global_var.value[k]}`)+'</span></td>';
 					} else {
 						ret += '<td><span class="span_value_variable vector_var" data-index="'+k+'">'+global_var.value[k]+'</span>'+'</td>';
 					}
@@ -314,7 +314,7 @@ function renderValues (global_var, global_container) {
     				ret += '<tr>';
     				for (var k = 0; k < global_var.columns; k++) {
     					if (global_var.type == Types.BOOLEAN) { 
-    						ret += '<td><span class="span_value_variable boolean_matrix_var" data-index="'+k+'" data-row="'+l+'">'+LocalizedStrings.getUI(global_var.value[l][k])+'</span></td>';
+    						ret += '<td><span class="span_value_variable boolean_matrix_var" data-index="'+k+'" data-row="'+l+'">'+LocalizedStrings.getUI(`logic_value_${global_var.value[l][k]}`)+'</span></td>';
     					} else {
     						ret += '<td><span class="span_value_variable matrix_var" data-index="'+k+'" data-row="'+l+'">'+global_var.value[l][k]+'</span></td>';
     					}
@@ -486,13 +486,13 @@ export function renderGlobal (global_var) {
  	element += '<div class="ui dropdown global_type">';
 
   	if (global_var.dimensions > 0) {
-  		element += '<div class="text">'+ LocalizedStrings.getUI('vector')+ ':' + LocalizedStrings.getUI(global_var.type);
+  		element += '<div class="text">'+ LocalizedStrings.getUI('vector')+ ':' + LocalizedStrings.getUI(`type_${global_var.type}`);
   		for (var i = 0; i < global_var.dimensions; i ++) {
   			element += ' [ <span class="dimensions_'+i+'"></span> ] ';
   		}
   		element += '</div>';
   	} else {
-  		element += '<div class="text">' + LocalizedStrings.getUI(global_var.type.toLowerCase()) + '</div>';
+  		element += '<div class="text">' + LocalizedStrings.getUI(`type_${global_var.type.toLowerCase()}`) + '</div>';
   	}
 	element += '<div class="menu">';
 
@@ -500,7 +500,7 @@ export function renderGlobal (global_var) {
   		if (tm == Types.VOID.toUpperCase()) {
   			continue;
   		}
-  		element += '<div class="item ' + (global_var.type == tm.toLowerCase() ? ' selected ' : '') + '" data-type="'+tm+'" >'+LocalizedStrings.getUI(tm.toLowerCase())+'</div>';
+  		element += '<div class="item ' + (global_var.type == tm.toLowerCase() ? ' selected ' : '') + '" data-type="'+tm+'" >'+LocalizedStrings.getUI(`type_${tm.toLowerCase()}`)+'</div>';
 	}
 
   	for (var tm in Types) {
@@ -509,10 +509,10 @@ export function renderGlobal (global_var) {
   		}
   		element += '<div class="item">'
 	    	+ '<i class="dropdown icon"></i>'
-	    	+  LocalizedStrings.getUI('vector')+':'+LocalizedStrings.getUI(tm.toLowerCase())
+	    	+  LocalizedStrings.getUI('vector')+':'+LocalizedStrings.getUI(`type_${tm.toLowerCase()}`)
 	      	+  '<div class="menu">'
-		        + '<div class="item" data-text="'+ LocalizedStrings.getUI('vector')+':'+LocalizedStrings.getUI(tm.toLowerCase())+' [ ] " data-type="'+tm+'" data-dimensions="1">[ ]</div>'
-		        + '<div class="item" data-text="'+ LocalizedStrings.getUI('vector')+':'+LocalizedStrings.getUI(tm.toLowerCase())+' [ ] [ ] " data-type="'+tm+'" data-dimensions="2">[ ] [ ] </div>'
+		        + '<div class="item" data-text="'+ LocalizedStrings.getUI('vector')+':'+LocalizedStrings.getUI(`type_${tm.toLowerCase()}`)+' [ ] " data-type="'+tm+'" data-dimensions="1">[ ]</div>'
+		        + '<div class="item" data-text="'+ LocalizedStrings.getUI('vector')+':'+LocalizedStrings.getUI(`type_${tm.toLowerCase()}`)+' [ ] [ ] " data-type="'+tm+'" data-dimensions="2">[ ] [ ] </div>'
 	      	+  '</div>'
 	    	+ '</div>';	
   	}

+ 1 - 2
js/visualUI/ivprog_elements.js

@@ -1,4 +1,3 @@
-import * as VariableValueMenuManagement from './commands/variable_value_menu';
 import { Types } from './types';
 import WatchJS from 'melanke-watchjs';
 import * as AlgorithmManagement from './algorithm';
@@ -17,7 +16,7 @@ export const ARITHMETIC_COMPARISON = Object.freeze({greater_than:"greater_than",
 
 export const LOGIC_COMPARISON = Object.freeze({equals_to:"equals_to", not_equals_to:"not_equals_to", and:"and", or:"or", not:"not"});
 
-export const SYSTEM_FUNCTIONS_CATEGORIES = Object.freeze({math:"math", text:"text_t", arrangement:"arrangement", conversion:"conversion"});
+export const SYSTEM_FUNCTIONS_CATEGORIES = Object.freeze({math:'$mathLib', text:'$strLib', arrangement:'$arrayLib', conversion:'$langLib'});
 
 export class Variable {
 

+ 19 - 19
js/visualUI/variables.js

@@ -133,13 +133,13 @@ export function renderVariable (function_container, new_var, function_obj) {
 	element += '<div class="ui dropdown variable_type">';
 
   	if (new_var.dimensions > 0) {
-  		element += '<div class="text">'+ LocalizedStrings.getUI('vector') + ':' + LocalizedStrings.getUI(new_var.type.toLowerCase());
+  		element += '<div class="text">'+ LocalizedStrings.getUI('vector') + ':' + LocalizedStrings.getUI(`type_${new_var.type.toLowerCase()}`);
   		for (var i = 0; i < new_var.dimensions; i ++) {
   			element += ' [ ] ';
   		}
   		element += '</div>';
   	} else {
-  		element += '<div class="text">' + LocalizedStrings.getUI(new_var.type.toLowerCase()) + '</div>';
+  		element += '<div class="text">' + LocalizedStrings.getUI(`type_${new_var.type.toLowerCase()}`) + '</div>';
   	}
 	element += '<div class="menu">';
 
@@ -147,7 +147,7 @@ export function renderVariable (function_container, new_var, function_obj) {
   		if (tm == Types.VOID.toUpperCase()) {
   			continue;
   		}
-  		element += '<div class="item ' + (new_var.type == tm.toLowerCase() ? ' selected ' : '') + '" data-type="'+tm+'" >'+LocalizedStrings.getUI(tm.toLowerCase())+'</div>';
+  		element += '<div class="item ' + (new_var.type == tm.toLowerCase() ? ' selected ' : '') + '" data-type="'+tm+'" >'+LocalizedStrings.getUI(`type_${tm.toLowerCase()}`)+'</div>';
 	}
 
   	for (var tm in Types) {
@@ -156,10 +156,10 @@ export function renderVariable (function_container, new_var, function_obj) {
   		}
   		element += '<div class="item">'
   			+ '<i class="dropdown icon"></i>'
-	    	+  LocalizedStrings.getUI('vector')+':'+LocalizedStrings.getUI(tm.toLowerCase())
+	    	+  LocalizedStrings.getUI('vector')+':'+LocalizedStrings.getUI(`type_${tm.toLowerCase()}`)
 	      	+  '<div class="menu">'
-		        + '<div class="item" data-text="'+ LocalizedStrings.getUI('vector')+':'+LocalizedStrings.getUI(tm.toLowerCase())+' [ ] " data-type="'+tm+'" data-dimensions="1">[ ]</div>'
-		        + '<div class="item" data-text="'+ LocalizedStrings.getUI('vector')+':'+LocalizedStrings.getUI(tm.toLowerCase())+' [ ] [ ] " data-type="'+tm+'" data-dimensions="2">[ ] [ ] </div>'
+		        + '<div class="item" data-text="'+ LocalizedStrings.getUI('vector')+':'+LocalizedStrings.getUI(`type_${tm.toLowerCase()}`)+' [ ] " data-type="'+tm+'" data-dimensions="1">[ ]</div>'
+		        + '<div class="item" data-text="'+ LocalizedStrings.getUI('vector')+':'+LocalizedStrings.getUI(`type_${tm.toLowerCase()}`)+' [ ] [ ] " data-type="'+tm+'" data-dimensions="2">[ ] [ ] </div>'
 	      	+  '</div>'
 	    	+ '</div>';	
   	}
@@ -209,7 +209,7 @@ function renderValues (new_var, variable_container, function_name) {
 			ret += '<div class="created_div_valor_var"><span class="span_value_variable simple_var">'+new_var.value.toFixed(1)+'</span> </div> ';
 		} else {
 			if (new_var.type == Types.BOOLEAN) {
-				ret += '<div class="created_div_valor_var"><span class="span_value_variable boolean_simple_type">'+LocalizedStrings.getUI(new_var.value)+'</span> </div> ';
+				ret += '<div class="created_div_valor_var"><span class="span_value_variable boolean_simple_type">'+LocalizedStrings.getUI(`logic_value_${new_var.value}`)+'</span> </div> ';
 			} else {
 				ret += '<div class="created_div_valor_var"><span class="span_value_variable simple_var">'+new_var.value+'</span> </div> ';
 			}
@@ -226,7 +226,7 @@ function renderValues (new_var, variable_container, function_name) {
 			} else {
 				for (var k = 0; k < new_var.columns; k++) {
 					if (new_var.type == Types.BOOLEAN) {
-						ret += '<td><span class="span_value_variable boolean_vector_var" data-index="'+k+'">'+LocalizedStrings.getUI(new_var.value[k])+'</span></td>';
+						ret += '<td><span class="span_value_variable boolean_vector_var" data-index="'+k+'">'+LocalizedStrings.getUI(`logic_value_${new_var.value[k]}`)+'</span></td>';
 					} else {
 						ret += '<td><span class="span_value_variable vector_var" data-index="'+k+'">'+new_var.value[k]+'</span>'+'</td>';
 					}
@@ -254,7 +254,7 @@ function renderValues (new_var, variable_container, function_name) {
     				ret += '<tr>';
     				for (var k = 0; k < new_var.columns; k++) {
     					if (new_var.type == Types.BOOLEAN) { 
-    						ret += '<td><span class="span_value_variable boolean_matrix_var" data-index="'+k+'" data-row="'+l+'">'+LocalizedStrings.getUI(new_var.value[l][k])+'</span></td>';
+    						ret += '<td><span class="span_value_variable boolean_matrix_var" data-index="'+k+'" data-row="'+l+'">'+LocalizedStrings.getUI(`logic_value_${new_var.value[l][k]}`)+'</span></td>';
     					} else {
     						ret += '<td><span class="span_value_variable matrix_var" data-index="'+k+'" data-row="'+l+'">'+new_var.value[l][k]+'</span></td>';
     					}
@@ -369,7 +369,7 @@ function renderValues (new_var, variable_container, function_name) {
 
 function alternateBooleanMatrixValue (var_obj, row, index, value_container) {
 	var_obj.value[row][index] = !var_obj.value[row][index];
-	$(value_container).find('.span_value_variable').text(LocalizedStrings.getUI(var_obj.value[row][index]));
+	$(value_container).find('.span_value_variable').text(LocalizedStrings.getUI(`logic_value_${var_obj.value[row][index]}`));
 }
 
 function addLineMatrix (var_obj) {
@@ -393,7 +393,7 @@ function addLineMatrix (var_obj) {
 	if (var_obj.type == Types.TEXT) {
 		var n_l = [];
 		for (i = 0; i < var_obj.columns; i++) {
-			n_l.push(LocalizedStrings.getUI('text_start'));
+			n_l.push(LocalizedStrings.getUI('textvar_default_value'));
 		}
 		var_obj.value.push(n_l);
 	}
@@ -431,7 +431,7 @@ function addColumnMatrix (var_obj) {
 	}
 	if (var_obj.type == Types.TEXT) {
 		for (var i = 0; i < var_obj.rows; i++) {
-			var_obj.value[i].push(LocalizedStrings.getUI('text_start'));
+			var_obj.value[i].push(LocalizedStrings.getUI('textvar_default_value'));
 		}
 	}
 	if (var_obj.type == Types.BOOLEAN) {
@@ -463,7 +463,7 @@ function addColumnVector (var_obj) {
 		var_obj.value.push(1.0);
 	}
 	if (var_obj.type == Types.TEXT) {
-		var_obj.value.push(LocalizedStrings.getUI('text_start'));
+		var_obj.value.push(LocalizedStrings.getUI('textvar_default_value'));
 	}
 	if (var_obj.type == Types.BOOLEAN) {
 		var_obj.value.push(true);
@@ -481,12 +481,12 @@ function removeColumnVector (var_obj) {
 
 function alternateBooleanValue (var_obj, value_container) {
 	var_obj.value = !var_obj.value;
-	$(value_container).find('.span_value_variable').text(LocalizedStrings.getUI(var_obj.value));
+	$(value_container).find('.span_value_variable').text(LocalizedStrings.getUI(`logic_value_${var_obj.value}`));
 }
 
 function alternateBooleanVectorValue (var_obj, index, value_container) {
 	var_obj.value[index] = !var_obj.value[index];
-	$(value_container).find('.span_value_variable').text(LocalizedStrings.getUI(var_obj.value[index]));
+	$(value_container).find('.span_value_variable').text(LocalizedStrings.getUI(`logic_value_${var_obj.value[index]}`));
 }
 
 function updateInitialValues (variable_obj, function_name) {
@@ -516,14 +516,14 @@ function updateInitialValues (variable_obj, function_name) {
 
 	if (variable_obj.type == Types.TEXT) {
 		if (variable_obj.dimensions == 0) {
-			variable_obj.value = LocalizedStrings.getUI('text_start');
+			variable_obj.value = LocalizedStrings.getUI('textvar_default_value');
 		}
 		if (variable_obj.dimensions == 1) {
-			variable_obj.value = [LocalizedStrings.getUI('text_start'), LocalizedStrings.getUI('text_start')];
+			variable_obj.value = [LocalizedStrings.getUI('textvar_default_value'), LocalizedStrings.getUI('textvar_default_value')];
 		}
 		if (variable_obj.dimensions == 2) {
-			variable_obj.value = [[LocalizedStrings.getUI('text_start'), LocalizedStrings.getUI('text_start')], 
-									[LocalizedStrings.getUI('text_start'), LocalizedStrings.getUI('text_start')]];
+			variable_obj.value = [[LocalizedStrings.getUI('textvar_default_value'), LocalizedStrings.getUI('textvar_default_value')], 
+									[LocalizedStrings.getUI('textvar_default_value'), LocalizedStrings.getUI('textvar_default_value')]];
 		}
 	}
 

+ 3 - 3
package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "ivprog",
-  "version": "1.1.0",
+  "version": "4.3.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -4923,8 +4923,8 @@
       }
     },
     "line-i18n": {
-      "version": "git+https://git.lcalion.com/LInE/line-i18n.git#26eef66020a63cfc2431dd8260ceff28243e4936",
-      "from": "git+https://git.lcalion.com/LInE/line-i18n.git",
+      "version": "git+http://200.144.254.107/git/LInE/line-i18n.git#5cb79a76f43abef6b3b70035f735e47599e90251",
+      "from": "git+http://200.144.254.107/git/LInE/line-i18n.git",
       "requires": {
         "ts-loader": "^5.*",
         "typescript": "^3.*",

+ 1 - 1
package.json

@@ -48,7 +48,7 @@
   "dependencies": {
     "antlr4": "^4.7.2",
     "decimal.js": "^10.1.1",
-    "line-i18n": "git+https://git.lcalion.com/LInE/line-i18n.git",
+    "line-i18n": "git+http://200.144.254.107/git/LInE/line-i18n.git",
     "melanke-watchjs": "^1.5.0",
     "server": "^1.0.18"
   }