Skip to content

GitLab

Commit 051dbbbb authored by Ignacio Fagian's avatar Ignacio Fagian
Browse files

Merge branch 'master' of https://gitlab.fing.edu.uy/matefun/Frontend

parents 40933198 53a7bdd4
Show whitespace changes
Inline Side-by-side
Frontend Angular 4/src/app/shared/config.ts
View file @ 051dbbbb
...@@ -21,12 +21,12 @@ ...@@ -21,12 +21,12 @@
// export const GHCI_URL = 'ws://35.199.110.129:9090/endpoint'; // export const GHCI_URL = 'ws://35.199.110.129:9090/endpoint';
// Google cloud platform v2 // Google cloud platform v2
export const SERVER = 'http://35.198.52.82:9090'; // export const SERVER = 'http://35.198.52.82:9090';
export const GHCI_URL = 'ws://35.198.52.82:9090/endpoint'; // export const GHCI_URL = 'ws://35.198.52.82:9090/endpoint';
// psico // psico
// export const SERVER = 'https://matefun.math.psico.edu.uy'; export const SERVER = 'https://matefun.math.psico.edu.uy';
// export const GHCI_URL = 'wss://matefun.math.psico.edu.uy/endpoint'; export const GHCI_URL = 'wss://matefun.math.psico.edu.uy/endpoint';
//diego docker //diego docker
......
Servidor JEE/WebContent/WEB-INF/matefun.properties
View file @ 051dbbbb
#Deben definirse moodle_endpoint y moodle_group para conectar con el API de moodle. #Deben definirse moodle_endpoint y moodle_group para conectar con el API de moodle.
#De lo contrario solo se realizara login local. #De lo contrario solo se realizara login local.
moodle_endpoint=https://matefun.moodlecloud.com moodle_endpoint=https://cursos-matefun.moodlecloud.com
moodle_group=introduction to moodle moodle_group=MateFun
#El grupo se define como liceoId#grado#grupo#anio #El grupo se define como liceoId#grado#grupo#anio
#Si no se sefine default_group entonces no se asigna grupo para docente o alumno. #Si no se sefine default_group entonces no se asigna grupo para docente o alumno.
default_group=0#2#Año#2017 #default_group=0#2#Año#2017
Servidor JEE/src/main/java/edu/proygrado/binarios/internationalization/en.po 0 → 100644
View file @ 051dbbbb
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-01-13 06:05-0800\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"Language: en\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
# MateFun messages.pot file
#: src/MateFun/ReservedNames.hs:20
msgid "3D Figure"
msgstr "3D Figure"
#: src/MateFun.hs:346
msgid "3D Figures"
msgstr "3D Figures"
#: src/MateFun/ReservedNames.hs:79
msgid "<function>"
msgstr "<function>"
#: src/MateFun/ReservedNames.hs:78
msgid "<program>"
msgstr "<program>"
#: src/MateFun/ReservedNames.hs:81
msgid "<set>"
msgstr "<set>"
#: src/MateFun/ReservedNames.hs:80
msgid "<variable>"
msgstr "<variable>"
#: src/MateFun/Core.hs:195
msgid "Any"
msgstr "Any"
#: src/MateFun/Core.hs:182
msgid "Any Enumerate"
msgstr "Any Enumerate"
#: src/MateFun/Core.hs:183
msgid "Any Tuple"
msgstr "Any Tuple"
#: src/MateFun/ReservedNames.hs:15
msgid "Black"
msgstr "Black"
#: src/MateFun/ReservedNames.hs:11
msgid "Blue"
msgstr "Blue"
#: src/MateFun/Core.hs:108
msgid "Brain exploded!"
msgstr "Brain exploded!"
#: src/MateFun.hs:126 src/MateFun.hs:142
msgid "Bye!!"
msgstr "Bye!!"
#: src/MateFun/Parser.hs:217
msgid "Circular inclusion"
msgstr "Circular inclusion"
#: src/MateFun/ReservedNames.hs:21
msgid "Color"
msgstr "Color"
#: src/MateFun.hs:347
msgid "Colors"
msgstr "Colors"
#: src/MateFun/Parser.hs:222
msgid "Could not open file"
msgstr "Could not open file"
#: src/MateFun/TypeCheck.hs:75
msgid "Division is a partial function, not defined in 0."
msgstr "Division is a partial function, not defined in 0."
#: src/MateFun/ReservedNames.hs:103
msgid "Does not exist"
msgstr "Does not exist"
#: src/MateFun/TypeCheck.hs:76
msgid "Empty sequence."
msgstr "Empty sequence."
#: src/MateFun/ReservedNames.hs:22
msgid "EmptyFig"
msgstr "EmptyFig"
#: src/MateFun/ReservedNames.hs:23
msgid "EmptyFig3D"
msgstr "EmptyFig3D"
#: src/MateFun.hs:54
msgid "Enables arithmetic function usage warnings"
msgstr "Enables arithmetic function usage warnings"
#: src/MateFun.hs:52
msgid "Enables function usage warnings"
msgstr "Enables function usage warnings"
#: src/MateFun.hs:164
msgid "Error"
msgstr "Error"
#: src/MateFun.hs:309
msgid "Error in line"
msgstr "Error in line"
#: src/MateFun.hs:124
msgid "Error reading command to interpretate."
msgstr "Error reading command to interpretate."
#: src/MateFun/TypeCheck.hs:74
msgid "Evaluation steps limit exceeded."
msgstr "Evaluation steps limit exceeded."
#: src/MateFun/TypeCheck.hs:70
msgid "Expected elements of"
msgstr "Expected elements of"
#: src/MateFun.hs:47
msgid "FILE"
msgstr "FILE"
#: src/MateFun/ReservedNames.hs:19
msgid "Figure"
msgstr "Figure"
#: src/MateFun.hs:345
msgid "Figures"
msgstr "Figures"
#: src/MateFun.hs:287 src/MateFun.hs:288
msgid "Found"
msgstr "Found"
#: src/MateFun/ReservedNames.hs:102
msgid "Function"
msgstr "Function"
#: src/MateFun.hs:360
msgid "Graph"
msgstr "Graph"
#: src/MateFun/ReservedNames.hs:17
msgid "Gray"
msgstr "Gray"
#: src/MateFun/ReservedNames.hs:14
msgid "Green"
msgstr "Green"
#: src/MateFun.hs:343
msgid "Integer"
msgstr "Integer"
#: src/MateFun/TypeCheck.hs:83
msgid "Interpreter"
msgstr "Interpreter"
#: src/MateFun.hs:327
msgid "Interpreter Commands:"
msgstr "Interpreter Commands:"
#: src/MateFun/TypeCheck.hs:71
msgid "Invalid index."
msgstr "Invalid index."
#: src/MateFun.hs:163
msgid "Loading"
msgstr "Loading"
#: src/MateFun.hs:230
msgid "No File"
msgstr "No File"
#: src/MateFun.hs:140
msgid "OUTError reading command to interpretate."
msgstr "OUTError reading command to interpretate."
#: src/MateFun/ReservedNames.hs:97
msgid "On definition of"
msgstr "On definition of"
#: src/MateFun/TypeCheck.hs:57
msgid "On set definition"
msgstr "On set definition"
#: src/MateFun/TypeCheck.hs:72
msgid "Out of range index."
msgstr "Out of range index."
#: src/MateFun.hs:49
msgid "PATH"
msgstr "PATH"
#: src/MateFun/Core.hs:108
msgid "Please report this error with code"
msgstr "Please report this error with code"
#: src/MateFun.hs:344
msgid "Real"
msgstr "Real"
#: src/MateFun/ReservedNames.hs:13
msgid "Red"
msgstr "Red"
#: src/MateFun/ReservedNames.hs:101
msgid "Set"
msgstr "Set"
#: src/MateFun.hs:50
msgid "Sets a path PATH where to find the program to evaluate"
msgstr "Sets a path PATH where to find the program to evaluate"
#: src/MateFun.hs:48
msgid "Sets the file FILE with the program to evaluate"
msgstr "Sets the file FILE with the program to evaluate"
#: src/MateFun/TypeCheck.hs:63
msgid "The element"
msgstr "The element"
#: src/MateFun/ReservedNames.hs:98
msgid "The number of arguments does not match with domain of the function"
msgstr "The number of arguments does not match with domain of the function"
#: src/MateFun/ReservedNames.hs:106
msgid "There is a chance that its value is out of the set."
msgstr "There is a chance that its value is out of the set."
#: src/MateFun/TypeCheck.hs:73
msgid "Tuple length is not the expected"
msgstr "Tuple length is not the expected"
#: src/MateFun.hs:90
msgid "Usage: MateFun [-c FILE] [-p PATH] [-f] [-i]"
msgstr "Usage: MateFun [-c FILE] [-p PATH] [-f] [-i]"
#: src/MateFun/TypeCheck.hs:68
msgid "Value"
msgstr "Value"
#: src/MateFun/TypeCheck.hs:64
msgid "Variable"
msgstr "Variable"
#: src/MateFun/Warning.hs:21
msgid "Warning"
msgstr "Warning"
#: src/MateFun.hs:56
msgid "Web Mode"
msgstr "Web Mode"
#: src/MateFun/ReservedNames.hs:16
msgid "White"
msgstr "White"
#: src/MateFun/ReservedNames.hs:12
msgid "Yellow"
msgstr "Yellow"
#: src/MateFun/TypeCheck.hs:75
msgid "Zero division."
msgstr "Zero division."
#: src/MateFun/ReservedNames.hs:100
msgid "against"
msgstr "against"
#: src/MateFun/TypeCheck.hs:69
msgid "because the following condition is false"
msgstr "because the following condition is false"
#: src/MateFun.hs:268
msgid "but expected"
msgstr "but expected"
#: src/MateFun/TypeCheck.hs:70
msgid "but found"
msgstr "but found"
#: src/MateFun/ReservedNames.hs:33
msgid "circ"
msgstr "circ"
#: src/MateFun/ReservedNames.hs:37
msgid "color"
msgstr "color"
#: src/MateFun/ReservedNames.hs:50
msgid "color3D"
msgstr "color3D"
#: src/MateFun.hs:309 src/MateFun/TypeCheck.hs:85
msgid "column"
msgstr "column"
#: src/MateFun/ReservedNames.hs:28
msgid "cos"
msgstr "cos"
#: src/MateFun/ReservedNames.hs:47
msgid "cube"
msgstr "cube"
#: src/MateFun/ReservedNames.hs:46
msgid "cylinder"
msgstr "cylinder"
#: src/MateFun/Parser.hs:217
msgid "depends on itself."
msgstr "depends on itself."
#: src/MateFun/TypeCheck.hs:63
msgid "does not belong to any defined set."
msgstr "does not belong to any defined set."
#: src/MateFun/TypeCheck.hs:68
msgid "does not belong to set"
msgstr "does not belong to set"
#: src/MateFun/ReservedNames.hs:104
msgid "duplicate elements"
msgstr "duplicate elements"
#: src/MateFun/ReservedNames.hs:67 src/MateFun/ReservedNames.hs:83
msgid "exit"
msgstr "exit"
#: src/MateFun/Parser.hs:159
msgid "expression"
msgstr "expression"
#: src/MateFun.hs:164 src/MateFun/Parser.hs:217 src/MateFun/TypeCheck.hs:84
msgid "file"
msgstr "file"
#: src/MateFun/ReservedNames.hs:57
msgid "first"
msgstr "first"
#: src/MateFun/ReservedNames.hs:74
msgid "fun"
msgstr "fun"
#: src/MateFun/ReservedNames.hs:71
msgid "funs"
msgstr "funs"
#: src/MateFun/ReservedNames.hs:70
msgid "help"
msgstr "help"
#: src/MateFun/ReservedNames.hs:63
msgid "if"
msgstr "if"
#: src/MateFun/Core.hs:113 src/MateFun/ReservedNames.hs:62
msgid "in"
msgstr "in"
#: src/MateFun/ReservedNames.hs:60
msgid "include"
msgstr "include"
#: src/MateFun/ReservedNames.hs:99
msgid "is not defined."
msgstr "is not defined."
#: src/MateFun/TypeCheck.hs:76
msgid "is partial, not defined for empty sequences."
msgstr "is partial, not defined for empty sequences."
#: src/MateFun/ReservedNames.hs:59
msgid "isEmpty"
msgstr "isEmpty"
#: src/MateFun/ReservedNames.hs:36
msgid "join"
msgstr "join"
#: src/MateFun/ReservedNames.hs:49
msgid "join3D"
msgstr "join3D"
#: src/MateFun/ReservedNames.hs:34 src/MateFun/TypeCheck.hs:84
msgid "line"
msgstr "line"
#: src/MateFun/ReservedNames.hs:44
msgid "line3D"
msgstr "line3D"
#: src/MateFun/ReservedNames.hs:86
msgid "list functions"
msgstr "list functions"
#: src/MateFun/ReservedNames.hs:88
msgid "list sets"
msgstr "list sets"
#: src/MateFun/ReservedNames.hs:87
msgid "list variables and its values"
msgstr "list variables and its values"
#: src/MateFun/ReservedNames.hs:68
msgid "load"
msgstr "load"
#: src/MateFun/ReservedNames.hs:84
msgid "load a program"
msgstr "load a program"
#: src/MateFun/ReservedNames.hs:38
msgid "move"
msgstr "move"
#: src/MateFun/ReservedNames.hs:51
msgid "move3D"
msgstr "move3D"
#: src/MateFun/ReservedNames.hs:64
msgid "or"
msgstr "or"
#: src/MateFun/ReservedNames.hs:77
msgid "plot"
msgstr "plot"
#: src/MateFun/ReservedNames.hs:92
msgid "plot a function R -> R"
msgstr "plot a function R -> R"
#: src/MateFun/ReservedNames.hs:35
msgid "poli"
msgstr "poli"
#: src/MateFun.hs:347
msgid "predefined"
msgstr "predefined"
#: src/MateFun/ReservedNames.hs:56
msgid "range"
msgstr "range"
#: src/MateFun/ReservedNames.hs:32
msgid "rect"
msgstr "rect"
#: src/MateFun/ReservedNames.hs:69
msgid "reload"
msgstr "reload"
#: src/MateFun/ReservedNames.hs:85
msgid "reload actual program"
msgstr "reload actual program"
#: src/MateFun/ReservedNames.hs:105
msgid "required is a subset of resulting"
msgstr "required is a subset of resulting"
#: src/MateFun/ReservedNames.hs:58
msgid "rest"
msgstr "rest"
#: src/MateFun/ReservedNames.hs:30
msgid "rgb"
msgstr "rgb"
#: src/MateFun/ReservedNames.hs:48
msgid "ring"
msgstr "ring"
#: src/MateFun/ReservedNames.hs:39
msgid "rotate"
msgstr "rotate"
#: src/MateFun/ReservedNames.hs:52
msgid "rotate3D"
msgstr "rotate3D"
#: src/MateFun/ReservedNames.hs:26
msgid "round"
msgstr "round"
#: src/MateFun/ReservedNames.hs:40
msgid "scale"
msgstr "scale"
#: src/MateFun/ReservedNames.hs:53
msgid "scale3D"
msgstr "scale3D"
#: src/MateFun/ReservedNames.hs:61 src/MateFun/ReservedNames.hs:76
msgid "set"
msgstr "set"
#: src/MateFun/ReservedNames.hs:73
msgid "sets"
msgstr "sets"
#: src/MateFun/ReservedNames.hs:90
msgid "show a variable value"
msgstr "show a variable value"
#: src/MateFun/ReservedNames.hs:89
msgid "show domain and codomain of a function"
msgstr "show domain and codomain of a function"
#: src/MateFun/ReservedNames.hs:91
msgid "show set definition"
msgstr "show set definition"
#: src/MateFun/ReservedNames.hs:93
msgid "show this help message"
msgstr "show this help message"
#: src/MateFun/ReservedNames.hs:27
msgid "sin"
msgstr "sin"
#: src/MateFun/ReservedNames.hs:45
msgid "sphere"
msgstr "sphere"
#: src/MateFun/ReservedNames.hs:29
msgid "squareroot"
msgstr "squareroot"
#: src/MateFun/ReservedNames.hs:42
msgid "toFig"
msgstr "toFig"
#: src/MateFun/ReservedNames.hs:75
msgid "var"
msgstr "var"
#: src/MateFun/ReservedNames.hs:72
msgid "vars"
msgstr "vars"
#: src/MateFun/ReservedNames.hs:96
msgid "was defined more than once. Defined in:"
msgstr "was defined more than once. Defined in:"
Servidor JEE/src/main/java/edu/proygrado/binarios/internationalization/es.po 0 → 100644
View file @ 051dbbbb
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-01-13 06:05-0800\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
# MateFun messages.pot file
#: src/MateFun/ReservedNames.hs:20
msgid "3D Figure"
msgstr "Figura 3D"
#: src/MateFun.hs:346
msgid "3D Figures"
msgstr "Figuras 3D"
#: src/MateFun/ReservedNames.hs:79
msgid "<function>"