Index: openacs-4/packages/evaluation/evaluation.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/evaluation.info,v diff -u -r1.41.2.1 -r1.41.2.2 --- openacs-4/packages/evaluation/evaluation.info 16 Jun 2019 11:33:07 -0000 1.41.2.1 +++ openacs-4/packages/evaluation/evaluation.info 2 Jul 2019 08:18:25 -0000 1.41.2.2 @@ -7,7 +7,7 @@ f f - + Jose Pablo Escobedo Del Cid This package allows the users (professors and students) to use the system to submit and grade the tasks. 2017-08-06 @@ -16,7 +16,7 @@ 2 #evaluation.Evaluations# - + Index: openacs-4/packages/evaluation/catalog/evaluation.de_DE.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/catalog/evaluation.de_DE.ISO-8859-1.xml,v diff -u -r1.5 -r1.5.10.1 --- openacs-4/packages/evaluation/catalog/evaluation.de_DE.ISO-8859-1.xml 10 Dec 2007 09:12:33 -0000 1.5 +++ openacs-4/packages/evaluation/catalog/evaluation.de_DE.ISO-8859-1.xml 2 Jul 2019 08:18:25 -0000 1.5.10.1 @@ -236,8 +236,8 @@ Die gesch�tzte Zeit mu� gr��er als 0 sein. Die Dateiendung der Datei ist "%file_extension", sollte aber.CVS sein. Leider k�nnen wir die Datei nicht verarbeiten. } } } set page_title "<#_ Confirm Evaluation Die Dateiendung ist \"$file_extension\" und sollte .CSV sein. Leider k�nnen wir die Datei nicht verarbeiten. - Die Datei ist zu gro�. (Die maximale Dateigr��e betr�gt %pretty_maxnbytes% bytes)" return 0 } set errors 0 set errors_text "" set counter 0 set line_number 0 set file_handler [open $tmp_filename {RDWR}] while { ![eof $file_handler] } { incr line_number set one_line [gets $file_handler] # jump first two lines if { $line_number <= 2 } { continue } # replace enters (<-|) with semicolons (;) regsub -all {(,[\r\n])} $one_line "" clean_line regsub -all {[\r\n]} $clean_line "" clean_line set evaluation [split $clean_line ","] if { $line_number == 3 } { set max_grade [string trim [lindex $evaluation 1]] if { ![ad_var_type_check_number_p $max_grade] } { ad_return_error "<#_ Invalid Max Grade - Die Datei ist zu gro� (die maximale Gr��e f�r Dateien ist %pretty_maxnbytes% bytes) + Die Datei ist zu gro�. (Die maximale Dateigr��e betr�gt %pretty_maxnbytes%)" return 0 } set errors 0 set errors_text "" set counter 0 set line_number 0 set file_handler [open $tmp_filename {RDWR}] while { ![eof $file_handler] } { incr line_number set one_line [gets $file_handler] # jump first two lines if { $line_number <= 2 } { continue } # replace enters (<-|) with semicolons (;) regsub -all {(,[\r\n])} $one_line "" clean_line regsub -all {[\r\n]} $clean_line "" clean_line set evaluation [split $clean_line ","] if { $line_number == 3 } { set max_grade [string trim [lindex $evaluation 1]] if { ![ad_var_type_check_number_p $max_grade] } { ad_return_error "<#_ Invalid Max Grade + Die Datei ist zu gro� (die maximale Gr��e f�r Dateien ist %pretty_maxnbytes%) Die Datei sollte ein vordefiniertes Format haben, so dass das System es analysieren und Informationen daraus gewinnen kann. Wenn Sie diese Funktionalit�t nutzen m�chten, m�ssen Sie folgenden Schritten folgen: Die Bewertung muss eine g�ltige Zahl sein: %wrong_grade% Die Bewertung muss eine reele Nummer sein. Index: openacs-4/packages/evaluation/catalog/evaluation.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/catalog/evaluation.en_US.ISO-8859-1.xml,v diff -u -r1.34.2.3 -r1.34.2.4 --- openacs-4/packages/evaluation/catalog/evaluation.en_US.ISO-8859-1.xml 16 Jun 2019 11:49:35 -0000 1.34.2.3 +++ openacs-4/packages/evaluation/catalog/evaluation.en_US.ISO-8859-1.xml 2 Jul 2019 08:18:25 -0000 1.34.2.4 @@ -382,7 +382,7 @@ set page_title "<#_ Confirm Evaluation The file extension of the file is "%file_extension%" and it should be .CSV, we can't process it - The file is too large. (The maximun file size is %pretty_maxnbytes% bytes)" + The file is too large. (The maximun file size is %pretty_maxnbytes%)" return 0 } @@ -412,7 +412,7 @@ set max_grade [string trim [lindex $evaluation 1]] if { ![ad_var_type_check_number_p $max_grade] } { ad_return_error "<#_ Invalid Max Grade - The file is too large. (The maximun file size is %pretty_maxnbytes% bytes) + The file is too large. (The maximun file size is %pretty_maxnbytes%) The file should have a pre-defined format so the system can parse it and obtain the information. If you want to use this functionality you must follow the following steps: The grade most be a valid number: %wrong_grade% The grade must be a REAL NUMBER. Index: openacs-4/packages/evaluation/catalog/evaluation.es_ES.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/catalog/evaluation.es_ES.ISO-8859-1.xml,v diff -u -r1.12.8.1 -r1.12.8.2 --- openacs-4/packages/evaluation/catalog/evaluation.es_ES.ISO-8859-1.xml 16 Jun 2019 11:33:07 -0000 1.12.8.1 +++ openacs-4/packages/evaluation/catalog/evaluation.es_ES.ISO-8859-1.xml 2 Jul 2019 08:18:25 -0000 1.12.8.2 @@ -414,7 +414,7 @@ set page_title &quot;&lt;#_ Confirm Evaluation La extensi�n del archivo \"$file_extension\" debe de ser .CSV, lo sentimos, no podemos procesarlo - El fichero es demasiado grande. (El tama�o m�ximo del fichero es %pretty_maxnbytes% bytes)&quot; + El fichero es demasiado grande. (El tama�o m�ximo del fichero es %pretty_maxnbytes%)&quot; return 0 } @@ -444,7 +444,7 @@ set max_grade [string trim [lindex $evaluation 1]] if { ![ad_var_type_check_number_p $max_grade] } { ad_return_error &quot;&lt;#_ Invalid Max Grade - El archivo es muy grande. (El tama�o m�ximo es de %pretty_maxnbytes% bytes) + El archivo es muy grande. (El tama�o m�ximo es de %pretty_maxnbytes%) El archivo debe de tener un formato predefinido para que el sistema pueda leerlo y obtener la informaci�n. Si usted desea utilizar esta herramienta debe de seguir los siguientes pasos: La nota debe de ser un NUMERO VALIDO: %wrong_grade% La nota debe de ser un NUMERO REAL. Index: openacs-4/packages/evaluation/catalog/evaluation.es_GT.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/catalog/evaluation.es_GT.ISO-8859-1.xml,v diff -u -r1.9 -r1.9.10.1 --- openacs-4/packages/evaluation/catalog/evaluation.es_GT.ISO-8859-1.xml 10 Dec 2007 09:12:33 -0000 1.9 +++ openacs-4/packages/evaluation/catalog/evaluation.es_GT.ISO-8859-1.xml 2 Jul 2019 08:18:25 -0000 1.9.10.1 @@ -284,7 +284,7 @@ El tiempo estimado debe ser mayor o igual a 0 La extensi�n del archivo es "%file_extension" y deber�a ser .CSV. Lo siento, pero no podemos procesarlo" } } } set page_title "<#_ Confirm Evaluation La extensi�n del archivo \"$file_extension\" debe de ser .CSV, lo sentimos, no podemos procesarlo - El archivo es muy grande. (El tama�o m�ximo es de %pretty_maxnbytes% bytes) + El archivo es muy grande. (El tama�o m�ximo es de %pretty_maxnbytes%) El archivo debe de tener un formato predefinido para que el sistema pueda leerlo y obtener la informaci�n. Si usted desea utilizar esta herramienta debe de seguir los siguientes pasos: La nota debe de ser un NUMERO VALIDO: %wrong_grade% La nota debe de ser un NUMERO REAL. Index: openacs-4/packages/evaluation/catalog/evaluation.pt_BR.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/catalog/evaluation.pt_BR.ISO-8859-1.xml,v diff -u -r1.5.10.1 -r1.5.10.2 --- openacs-4/packages/evaluation/catalog/evaluation.pt_BR.ISO-8859-1.xml 16 Jun 2019 11:33:07 -0000 1.5.10.1 +++ openacs-4/packages/evaluation/catalog/evaluation.pt_BR.ISO-8859-1.xml 2 Jul 2019 08:18:25 -0000 1.5.10.2 @@ -271,7 +271,7 @@ O tempo estimado deve ser maior que 0 A extens�o do arquivo � "%file_extension" e deveria ser CSV. Sinto muito, n�o podemos process�-lo"}}} set page_title "<#_ Confirm Evaluation A extens�o do arquivo � "%file_extension" e deveria ser CSV. Sinto muito, n�o podemos process�-lo - O arquivo � muito grande. (O tamanho m�ximo para arquivos � %pretty_maxnbytes% bytes) + O arquivo � muito grande. (O tamanho m�ximo para arquivos � %pretty_maxnbytes%) O arquivo deveria ter um formato pr�-definido para que o sistema possa analis�-lo e obter a informa��o. Se voc� quiser usar esta funcionalidade precisa seguir os seguintes passos: A nota precisa ser um n�mero v�lido: %wrong_grade% A nota precisa ser um N�MERO REAL. Index: openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-parse.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-parse.tcl,v diff -u -r1.17.2.3 -r1.17.2.4 --- openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-parse.tcl 16 Jun 2019 12:33:40 -0000 1.17.2.3 +++ openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-parse.tcl 2 Jul 2019 08:18:25 -0000 1.17.2.4 @@ -42,7 +42,7 @@ set tmp_filename [ns_queryget upload_file.tmpfile] if { $max_n_bytes ne "" && ([file size "$tmp_filename"] > $max_n_bytes) } { - set pretty_maxnbytes [lc_numeric $max_n_bytes] + set pretty_maxnbytes [lc_content_size_pretty -size $max_n_bytes] ad_return_complaint 1 "[_ evaluation.lt_The_file_is_too_large_1]" return 0 }