From 780b55c17ebd010931ebced329ff070a0b6c34b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Mon, 26 Dec 2016 14:02:19 +0100 Subject: [PATCH] Version 16.106.20 --- swad_changelog.h | 3 ++- swad_syllabus.c | 12 ++++++------ swad_test.c | 43 ++++++++++++++++--------------------------- swad_text.c | 42 +++++++++++++++++++++--------------------- 4 files changed, 45 insertions(+), 55 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index 612d13db7..e3d308bbb 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -188,13 +188,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.106.19 (2016-12-26)" +#define Log_PLATFORM_VERSION "SWAD 16.106.20 (2016-12-26)" #define CSS_FILE "swad16.106.5.css" #define JS_FILE "swad16.101.js" // Number of lines (includes comments but not blank lines) has been got with the following command: // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*?.h sql/swad*.sql | tail -1 /* + Version 16.106.20:Dec 26, 2016 Changes in warning about next time to take a test. (211486 lines) Version 16.106.19:Dec 26, 2016 Changes in login form (autofocus). (211494 lines) Version 16.106.18:Dec 25, 2016 Changes in behaviour of labels in forms. (211496 lines) Version 16.106.17:Dec 25, 2016 Changes in behaviour of labels in forms. (211486 lines) diff --git a/swad_syllabus.c b/swad_syllabus.c index 567e906a2..96d81a07c 100644 --- a/swad_syllabus.c +++ b/swad_syllabus.c @@ -943,14 +943,14 @@ static void Syl_PutFormItemSyllabus (bool NewItem,unsigned NumItem,int Level,int (Gbl.CurrentCrs.Info.Type == Inf_LECTURES ? ActModIteSylLec : ActModIteSylPra)); Syl_PutParamNumItem (NumItem); - fprintf (Gbl.F.Out,"", - Syl_MAX_LENGTH_TEXT_ITEM,Text, - Txt_Enter_a_new_item_here, + fprintf (Gbl.F.Out," onchange=\"document.getElementById('%s').submit();\" />", Gbl.Form.Id); Act_FormEnd (); fprintf (Gbl.F.Out,""); diff --git a/swad_test.c b/swad_test.c index dcd14f917..5b5cbdcb7 100644 --- a/swad_test.c +++ b/swad_test.c @@ -435,13 +435,17 @@ void Tst_ShowNewTest (void) fprintf (Gbl.F.Out,""); /***** Test result will be saved? *****/ - fprintf (Gbl.F.Out,"
" - "" + "%s" + fprintf (Gbl.F.Out," />" + " %s" + "" "
", Txt_Allow_teachers_to_consult_this_test); @@ -621,7 +625,7 @@ static bool Tst_CheckIfNextTstAllowed (void) { extern const char *Hlp_ASSESSMENT_Tests; extern const char *Txt_Test; - extern const char *Txt_You_can_not_make_a_new_test_in_the_course_X_until; + extern const char *Txt_You_can_not_take_a_new_test_until; extern const char *Txt_Today; char Query[512]; MYSQL_RES *mysql_res; @@ -660,29 +664,15 @@ static bool Tst_CheckIfNextTstAllowed (void) /***** Check if access is allowed *****/ if (NumSecondsFromNowToNextAccTst > 0) { - /***** Start frame *****/ - Lay_StartRoundFrame (NULL,Txt_Test,NULL,Hlp_ASSESSMENT_Tests); - Lay_WriteHeaderClassPhoto (false,false, - Gbl.CurrentIns.Ins.InsCod, - Gbl.CurrentDeg.Deg.DegCod, - Gbl.CurrentCrs.Crs.CrsCod); - /***** Write warning *****/ - fprintf (Gbl.F.Out,"
"); - fprintf (Gbl.F.Out,Txt_You_can_not_make_a_new_test_in_the_course_X_until, - Gbl.CurrentCrs.Crs.FullName); - fprintf (Gbl.F.Out,": " - "" - "" - "" - "
", + sprintf (Gbl.Message,"%s:
." + "", + Txt_You_can_not_take_a_new_test_until, (long) TimeNextTestUTC,Txt_Today); - - /***** End frame *****/ - Lay_EndRoundFrame (); + Lay_ShowAlert (Lay_WARNING,Gbl.Message); return false; } @@ -1079,8 +1069,7 @@ static void Tst_PutFormToEditQstImage (struct Image *Image,int NumImgInForm, fprintf (Gbl.F.Out," disabled=\"disabled\""); fprintf (Gbl.F.Out," />" "%s" - "" - "
", + "
", Txt_No_image); /***** Choice 2: Current image *****/ diff --git a/swad_text.c b/swad_text.c index a3292a114..f99fa8de6 100644 --- a/swad_text.c +++ b/swad_text.c @@ -52910,27 +52910,6 @@ const char *Txt_You_can_not_leave_the_web_address_empty = "You can not leave the web address empty."; // Necessita de tradução #endif -const char *Txt_You_can_not_make_a_new_test_in_the_course_X_until = // Warning: it is very important to include %s in the following sentences -#if L==1 - "No puede hacer un nuevo test en la asignatura %s hasta"; // Necessita traduccio -#elif L==2 - "You can not make a new test in the course %s until"; // Need Übersetzung -#elif L==3 - "You can not make a new test in the course %s until"; -#elif L==4 - "No puede hacer un nuevo test en la asignatura %s hasta"; -#elif L==5 - "You can not make a new test in the course %s until"; // Besoin de traduction -#elif L==6 - "No puede hacer un nuevo test en la asignatura %s hasta"; // Okoteve traducción -#elif L==7 - "Non puoi fare un nuovo test nel corso %s fino"; -#elif L==8 - "You can not make a new test in the course %s until"; // Potrzebujesz tlumaczenie -#elif L==9 - "You can not make a new test in the course %s until"; // Necessita de tradução -#endif - const char *Txt_You_can_not_paste_file_or_folder_here = #if L==1 "No puede pegar un archivo o carpeta aquí."; // Necessita traduccio @@ -53066,6 +53045,27 @@ const char *Txt_You_can_not_send_a_message_to_so_many_recipients_ = " Better use the forums."; // Necessita de tradução #endif +const char *Txt_You_can_not_take_a_new_test_until = +#if L==1 + "No podrà fer un test fins"; +#elif L==2 + "Sie können nicht einen neuen Test bis"; +#elif L==3 + "You can not take a new test until"; +#elif L==4 + "No podrá hacer un nuevo test hasta"; +#elif L==5 + "Vous ne pouvez pas passer un nouveau test avant"; +#elif L==6 + "No podrá hacer un nuevo test hasta"; // Okoteve traducción +#elif L==7 + "Non si può fare un nuovo test fino"; +#elif L==8 + "Nie można wykonać nowy test do"; +#elif L==9 + "Você não pode fazer um novo teste até"; +#endif + const char *Txt_You_can_only_perform_X_further_actions_ = // Warning: it is very important to include %u in the following sentences #if L==1 "Solo podrá realizar %u acciones más"