Index: openacs-4/packages/assessment/assessment.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/assessment.info,v
diff -u -r1.57.2.1 -r1.57.2.2
--- openacs-4/packages/assessment/assessment.info	16 Jun 2019 12:01:21 -0000	1.57.2.1
+++ openacs-4/packages/assessment/assessment.info	2 Jul 2019 08:03:42 -0000	1.57.2.2
@@ -7,7 +7,7 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>f</singleton-p>
     
-    <version name="2.10.0d3" url="http://openacs.org/repository/download/apm/assessment-2.10.0d3.apm">
+    <version name="2.10.0d4" url="http://openacs.org/repository/download/apm/assessment-2.10.0d4.apm">
         <owner url="mailto:eperez@it.uc3m.es">Eduardo Perez Ureta</owner>
         <summary>Assessment package that will replace the surveys
     quizz, complex survey, poll and other data collection packages
@@ -18,7 +18,7 @@
         <maturity>2</maturity>
         <package_instance_name>#assessment.Assessment#</package_instance_name>
 
-        <provides url="assessment" version="2.10.0d3"/>
+        <provides url="assessment" version="2.10.0d4"/>
         <requires url="acs-content-repository" version="5.9.1"/>
 	<requires url="acs-tcl" version="5.9.1"/>
         <requires url="acs-kernel" version="5.9.1"/>
Index: openacs-4/packages/assessment/catalog/assessment.ca_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/catalog/assessment.ca_ES.ISO-8859-1.xml,v
diff -u -r1.6 -r1.6.2.1
--- openacs-4/packages/assessment/catalog/assessment.ca_ES.ISO-8859-1.xml	29 Mar 2018 00:19:04 -0000	1.6
+++ openacs-4/packages/assessment/catalog/assessment.ca_ES.ISO-8859-1.xml	2 Jul 2019 08:03:42 -0000	1.6.2.1
@@ -243,7 +243,7 @@
   <msg key="Field_Code_help">S'empra una etiqueta breu quan s'exporta una pregunta en QTI (per exemple, el nom d'una columna o una fila en un full de c�lcul) </msg>
   <msg key="Field_Name">Nom del camp CSV </msg>
   <msg key="Field_Name_help">S'empra una etiqueta curta en exportar respostes a preguntes en arxiu CSV </msg>
-  <msg key="file_too_large">L'arxiu �s massa gran. La grand�ria dels arxius es limita a %pretty_max_size% bytes. </msg>
+  <msg key="file_too_large">L'arxiu �s massa gran. La grand�ria dels arxius es limita a %pretty_max_size%. </msg>
   <msg key="file_zero_size">L'arxiu est� buit. Potser heu intentat pujar un arxiu buit, un arxiu inexistent o s'ha produ�t un error durant la transfer�ncia. </msg>
   <msg key="filter">Filtre </msg>
   <msg key="filter_add">Afegeix filtre nou</msg>
Index: openacs-4/packages/assessment/catalog/assessment.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/catalog/assessment.en_US.ISO-8859-1.xml,v
diff -u -r1.94.2.1 -r1.94.2.2
--- openacs-4/packages/assessment/catalog/assessment.en_US.ISO-8859-1.xml	16 Jun 2019 12:01:22 -0000	1.94.2.1
+++ openacs-4/packages/assessment/catalog/assessment.en_US.ISO-8859-1.xml	2 Jul 2019 08:03:42 -0000	1.94.2.2
@@ -284,7 +284,7 @@
   <msg key="Field_Code_help">A short label used when exporting question in QTI</msg>
   <msg key="Field_Name">CSV Field Name&lt;br&gt;(Optional)</msg>
   <msg key="Field_Name_help">A short label used when exporting question answers to spreadsheets (will be generated if you do not create it)</msg>
-  <msg key="file_too_large">Your file is too large. Files are limited to %pretty_max_size% bytes.\n</msg>
+  <msg key="file_too_large">Your file is too large. Files are limited to %pretty_max_size%.\n</msg>
   <msg key="File_Upload">File Upload</msg>
   <msg key="file_zero_size">Your file is zero-length. Either you attempted to upload a zero length file, a file which does not exists, or something went wrong during the transfer.\n</msg>
   <msg key="filter">Filter</msg>
Index: openacs-4/packages/assessment/catalog/assessment.es_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/catalog/assessment.es_ES.ISO-8859-1.xml,v
diff -u -r1.29 -r1.29.2.1
--- openacs-4/packages/assessment/catalog/assessment.es_ES.ISO-8859-1.xml	29 Mar 2018 00:19:04 -0000	1.29
+++ openacs-4/packages/assessment/catalog/assessment.es_ES.ISO-8859-1.xml	2 Jul 2019 08:03:42 -0000	1.29.2.1
@@ -279,7 +279,7 @@
   <msg key="Field_Code_help">Breve etiqueta usada cuando se exporta una pregunta (por ejemplo, el nombre de una columna o una fila en una hoja de c�lculo)</msg>
   <msg key="Field_Name">CSV Nombre del Campo</msg>
   <msg key="Field_Name_help">Nombre corto usado en la exportaci�n de preguntas y respuestas en archivo CSV</msg>
-  <msg key="file_too_large">Tu archivo es demasiado grande. El tama�o de los archivos est� limitado a %pretty_max_size% bytes.</msg>
+  <msg key="file_too_large">Tu archivo es demasiado grande. El tama�o de los archivos est� limitado a %pretty_max_size%.</msg>
   <msg key="File_Upload">Fichero Subido</msg>
   <msg key="file_zero_size">Tu archivo tiene 0 bytes. Puede que hayas intentado subir un archivo de 0 bytes, un archivo que no exista o puede que haya ocurrido un error durante la transferencia.</msg>
   <msg key="filter">Filtro</msg>
Index: openacs-4/packages/assessment/catalog/assessment.es_GT.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/catalog/assessment.es_GT.ISO-8859-1.xml,v
diff -u -r1.13 -r1.13.2.1
--- openacs-4/packages/assessment/catalog/assessment.es_GT.ISO-8859-1.xml	29 Mar 2018 00:19:04 -0000	1.13
+++ openacs-4/packages/assessment/catalog/assessment.es_GT.ISO-8859-1.xml	2 Jul 2019 08:03:42 -0000	1.13.2.1
@@ -238,7 +238,7 @@
   <msg key="Field_Code_help">Breve etiqueta usada cuando se exporta una pregunta (por ejemplo, el nombre de una columna o una fila en una hoja de c�lculo)</msg>
   <msg key="Field_Name">CSV Nombre del Campo</msg>
   <msg key="Field_Name_help">Nombre corto usado en la exportaci�n de preguntas y respuestas en archivo CSV</msg>
-  <msg key="file_too_large">Tu archivo es demasiado grande. El tama�o de los archivos est� limitado a %pretty_max_size% bytes.</msg>
+  <msg key="file_too_large">Tu archivo es demasiado grande. El tama�o de los archivos est� limitado a %pretty_max_size%.</msg>
   <msg key="file_zero_size">Tu archivo tiene 0 bytes. Puede que hayas intentado subir un archivo de 0 bytes, un archivo que no exista o puede que haya ocurrido un error durante la transferencia.</msg>
   <msg key="filter">Filtro</msg>
   <msg key="filter_add">Agregar nuevo Filtro</msg>
Index: openacs-4/packages/assessment/catalog/assessment.gl_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/catalog/assessment.gl_ES.ISO-8859-1.xml,v
diff -u -r1.5 -r1.5.2.1
--- openacs-4/packages/assessment/catalog/assessment.gl_ES.ISO-8859-1.xml	29 Mar 2018 00:19:04 -0000	1.5
+++ openacs-4/packages/assessment/catalog/assessment.gl_ES.ISO-8859-1.xml	2 Jul 2019 08:03:42 -0000	1.5.2.1
@@ -249,7 +249,7 @@
   <msg key="Field_Code_help">Breve etiqueta usada cando se exporta unha pregunta(por exemplo, o nome dunha columna ou unha fila nunha folla de c�lculo)</msg>
   <msg key="Field_Name">CSV Nome do Campo</msg>
   <msg key="Field_Name_help">Nome corto usado na exportaci�n de preguntas e respostas en arquivo CSV</msg>
-  <msg key="file_too_large">O teu arquivo � demasiado longo. O tama�o dos arquivos est� limitado a %pretty_max_size% bytes.</msg>
+  <msg key="file_too_large">O teu arquivo � demasiado longo. O tama�o dos arquivos est� limitado a %pretty_max_size%.</msg>
   <msg key="file_zero_size">O teu arquivo ten 0 bytes. Pode que intentaras subir un arquivo de 0 bytes, un arquivo que non exista ou pode que ocurrira un erro durante a transferencia.</msg>
   <msg key="filter">Filtro</msg>
   <msg key="filter_add">Agregar novo filtro</msg>
Index: openacs-4/packages/assessment/catalog/assessment.pt_BR.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/catalog/assessment.pt_BR.ISO-8859-1.xml,v
diff -u -r1.5 -r1.5.2.1
--- openacs-4/packages/assessment/catalog/assessment.pt_BR.ISO-8859-1.xml	29 Mar 2018 00:19:04 -0000	1.5
+++ openacs-4/packages/assessment/catalog/assessment.pt_BR.ISO-8859-1.xml	2 Jul 2019 08:03:42 -0000	1.5.2.1
@@ -247,7 +247,7 @@
   <msg key="Field_Code_help">Um r�tulo curto usado quando for exportar a quest�o em QTI</msg>
   <msg key="Field_Name">Nome do Campo CSV</msg>
   <msg key="Field_Name_help">Um r�tulo curto usado quando for exportar a resposta da quest�o em arquivo CSV</msg>
-  <msg key="file_too_large">Seu arquivo � muito grande. O Tamanho � limitado a %pretty_max_size% bytes.\n</msg>
+  <msg key="file_too_large">Seu arquivo � muito grande. O Tamanho � limitado a %pretty_max_size%.\n</msg>
   <msg key="file_zero_size">Seu arquivo est� com o tamanho igual a zero. Voc� tentou transferir um arquivo est� com o tamanho igual a zero, ou um arquivo que n�o existe, ou aconteceu alguma coisa errada durante a transfer�ncia do arquivo.\n</msg>
   <msg key="filter">Filtro</msg>
   <msg key="filter_add">Adicionar Novo Filtro</msg>
Index: openacs-4/packages/assessment/www/asm-admin/item-add-mc-choices.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add-mc-choices.tcl,v
diff -u -r1.15 -r1.15.2.1
--- openacs-4/packages/assessment/www/asm-admin/item-add-mc-choices.tcl	29 Jun 2018 17:27:18 -0000	1.15
+++ openacs-4/packages/assessment/www/asm-admin/item-add-mc-choices.tcl	2 Jul 2019 08:03:42 -0000	1.15.2.1
@@ -53,7 +53,7 @@
 if { $type == 1} {
     set max_file_size 10000000
     # [parameter::get -parameter MaxAttachmentSize]
-    set pretty_max_size [util_commify_number $max_file_size]
+    set pretty_max_size [lc_content_size_pretty -size $max_file_size]
     set folder_id [as::assessment::folder_id -package_id $package_id]
 
     db_transaction {
@@ -127,7 +127,7 @@
 } -edit_data {
     set max_file_size 10000000
     # [parameter::get -parameter MaxAttachmentSize]
-    set pretty_max_size [util_commify_number $max_file_size]
+    set pretty_max_size [lc_content_size_pretty -size $max_file_size]
     set folder_id [as::assessment::folder_id -package_id $package_id]
 
     db_transaction {
Index: openacs-4/packages/assessment/www/asm-admin/item-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-add.tcl,v
diff -u -r1.27.2.1 -r1.27.2.2
--- openacs-4/packages/assessment/www/asm-admin/item-add.tcl	14 Feb 2019 16:15:01 -0000	1.27.2.1
+++ openacs-4/packages/assessment/www/asm-admin/item-add.tcl	2 Jul 2019 08:03:42 -0000	1.27.2.2
@@ -260,7 +260,7 @@
             set n_bytes [file size $tmp_filename]
             set max_file_size 10000000
             # [parameter::get -parameter MaxAttachmentSize]
-            set pretty_max_size [util_commify_number $max_file_size]
+            set pretty_max_size [lc_content_size_pretty -size $max_file_size]
 
             if { $n_bytes > $max_file_size && $max_file_size > 0 } {
                 ad_return_complaint 1 "[_ assessment.file_too_large]"
Index: openacs-4/packages/assessment/www/asm-admin/item-edit-general.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-general.tcl,v
diff -u -r1.26.2.1 -r1.26.2.2
--- openacs-4/packages/assessment/www/asm-admin/item-edit-general.tcl	30 Mar 2019 20:19:52 -0000	1.26.2.1
+++ openacs-4/packages/assessment/www/asm-admin/item-edit-general.tcl	2 Jul 2019 08:03:42 -0000	1.26.2.2
@@ -292,7 +292,7 @@
                 set n_bytes [file size $tmp_filename]
                 set max_file_size 10000000
                 # [parameter::get -parameter MaxAttachmentSize]
-                set pretty_max_size [util_commify_number $max_file_size]
+                set pretty_max_size [lc_content_size_pretty -size $max_file_size]
 
                 if { $n_bytes > $max_file_size && $max_file_size > 0 } {
                     ad_return_complaint 1 "[_ assessment.file_too_large]"
Index: openacs-4/packages/assessment/www/asm-admin/item-edit-mc-choices.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/item-edit-mc-choices.tcl,v
diff -u -r1.13.2.1 -r1.13.2.2
--- openacs-4/packages/assessment/www/asm-admin/item-edit-mc-choices.tcl	30 Mar 2019 20:19:52 -0000	1.13.2.1
+++ openacs-4/packages/assessment/www/asm-admin/item-edit-mc-choices.tcl	2 Jul 2019 08:03:42 -0000	1.13.2.2
@@ -101,7 +101,7 @@
     db_transaction {
         set max_file_size 10000000
         # [parameter::get -parameter MaxAttachmentSize]
-        set pretty_max_size [util_commify_number $max_file_size]
+        set pretty_max_size [lc_content_size_pretty -size $max_file_size]
         set folder_id [as::assessment::folder_id -package_id $package_id]
 
         set count 0