diff --git a/swad_changelog.h b/swad_changelog.h index f8f03fb83..8dd1cff57 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -548,10 +548,11 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - * En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 19.229.1 (2020-05-14)" +#define Log_PLATFORM_VERSION "SWAD 19.229.2 (2020-05-14)" #define CSS_FILE "swad19.217.css" #define JS_FILE "swad19.223.js" /* + Version 19.229.2: May 14, 2020 Some messages translated in exam results. (301070 lines) Version 19.229.1: May 14, 2020 Removed unused database tables in exams. Fixed bugs in exam prints. (301009 lines) 6 changes necessary in database: diff --git a/swad_exam_result.c b/swad_exam_result.c index 59345963d..81169d7e8 100644 --- a/swad_exam_result.c +++ b/swad_exam_result.c @@ -154,7 +154,7 @@ static void ExaRes_ListMyEvtResultsInCrs (struct Exa_Exams *Exams) void ExaRes_ShowMyExaResultsInExa (void) { - extern const char *Txt_Results_of_game_X; + extern const char *Txt_Results_of_exam_X; struct Exa_Exams Exams; struct Exa_Exam Exam; struct ExaEvt_Event Event; @@ -180,7 +180,7 @@ void ExaRes_ShowMyExaResultsInExa (void) /***** List my events results in exam *****/ ExaRes_ShowResultsBegin (&Exams, - Str_BuildStringStr (Txt_Results_of_game_X,Exam.Title), + Str_BuildStringStr (Txt_Results_of_exam_X,Exam.Title), false); // Do not list exams to select Str_FreeString (); ExaRes_ListMyEvtResultsInExa (&Exams,Exam.ExaCod); @@ -206,7 +206,7 @@ static void ExaRes_ListMyEvtResultsInExa (struct Exa_Exams *Exams,long ExaCod) void ExaRes_ShowMyExaResultsInEvt (void) { - extern const char *Txt_Results_of_match_X; + extern const char *Txt_Results_of_event_X; struct Exa_Exams Exams; struct Exa_Exam Exam; struct ExaEvt_Event Event; @@ -232,7 +232,7 @@ void ExaRes_ShowMyExaResultsInEvt (void) false); // Do not put form to start new event /***** List my events results in event *****/ - ExaRes_ShowResultsBegin (&Exams,Str_BuildStringStr (Txt_Results_of_match_X,Event.Title), + ExaRes_ShowResultsBegin (&Exams,Str_BuildStringStr (Txt_Results_of_event_X,Event.Title), false); // Do not list exams to select Str_FreeString (); ExaRes_ListMyEvtResultsInEvt (&Exams,Event.EvtCod); @@ -360,7 +360,7 @@ static void ExaRes_PutFormToSelUsrsToViewEvtResults (void *Exams) void ExaRes_ShowAllExaResultsInExa (void) { - extern const char *Txt_Results_of_game_X; + extern const char *Txt_Results_of_exam_X; struct Exa_Exams Exams; struct Exa_Exam Exam; struct ExaEvt_Event Event; @@ -384,7 +384,7 @@ void ExaRes_ShowAllExaResultsInExa (void) /***** List events results in exam *****/ ExaRes_ShowResultsBegin (&Exams, - Str_BuildStringStr (Txt_Results_of_game_X,Exam.Title), + Str_BuildStringStr (Txt_Results_of_exam_X,Exam.Title), false); // Do not list exams to select Str_FreeString (); ExaRes_ListAllEvtResultsInExa (&Exams,Exam.ExaCod); @@ -451,7 +451,7 @@ static void ExaRes_ListAllEvtResultsInExa (struct Exa_Exams *Exams,long ExaCod) void ExaRes_ShowAllExaResultsInEvt (void) { - extern const char *Txt_Results_of_match_X; + extern const char *Txt_Results_of_event_X; struct Exa_Exams Exams; struct Exa_Exam Exam; struct ExaEvt_Event Event; @@ -480,7 +480,7 @@ void ExaRes_ShowAllExaResultsInEvt (void) /***** List events results in event *****/ ExaRes_ShowResultsBegin (&Exams, - Str_BuildStringStr (Txt_Results_of_match_X,Event.Title), + Str_BuildStringStr (Txt_Results_of_event_X,Event.Title), false); // Do not list exams to select Str_FreeString (); ExaRes_ListAllEvtResultsInEvt (&Exams,Event.EvtCod); @@ -680,7 +680,7 @@ static void ExaRes_ListExamsToSelect (struct Exa_Exams *Exams) static void ExaRes_ShowHeaderEvtResults (Usr_MeOrOther_t MeOrOther) { extern const char *Txt_User[Usr_NUM_SEXS]; - extern const char *Txt_Match; + extern const char *Txt_Event; extern const char *Txt_START_END_TIME[Dat_NUM_START_END_TIME]; extern const char *Txt_Questions; extern const char *Txt_Non_blank_BR_questions; @@ -694,7 +694,7 @@ static void ExaRes_ShowHeaderEvtResults (Usr_MeOrOther_t MeOrOther) Usr_SEX_UNKNOWN]); HTM_TH (1,1,"LT",Txt_START_END_TIME[Dat_START_TIME]); HTM_TH (1,1,"LT",Txt_START_END_TIME[Dat_END_TIME ]); - HTM_TH (1,1,"LT",Txt_Match); + HTM_TH (1,1,"LT",Txt_Event); HTM_TH (1,1,"RT",Txt_Questions); HTM_TH (1,1,"RT",Txt_Non_blank_BR_questions); HTM_TH (1,1,"RT",Txt_Score); @@ -746,7 +746,7 @@ static void ExaRes_ShowEvtResults (struct Exa_Exams *Exams, long ExaCod, // <= 0 ==> any const char *ExamsSelectedCommas) { - extern const char *Txt_Match_result; + extern const char *Txt_Event_result; char *EvtSubQuery; char *ExaSubQuery; MYSQL_RES *mysql_res; @@ -984,7 +984,7 @@ static void ExaRes_ShowEvtResults (struct Exa_Exams *Exams, Usr_PutParamOtherUsrCodEncrypted (Gbl.Usrs.Other.UsrDat.EncryptedUsrCod); break; } - Ico_PutIconLink ("tasks.svg",Txt_Match_result); + Ico_PutIconLink ("tasks.svg",Txt_Event_result); Frm_EndForm (); } else diff --git a/swad_text.c b/swad_text.c index 31f9ac694..033822d8e 100644 --- a/swad_text.c +++ b/swad_text.c @@ -11424,7 +11424,7 @@ const char *Txt_Event_private_click_to_make_it_visible_to_the_users_of_your_cour #elif L==4 // es "Evento privado; pulse para hacerlo visible por los usuarios de sus asignaturas"; #elif L==5 // fr - "Event privat, cliquez pour le rendre visible aux utilisateurs de vos matières"; + "Événement privat, cliquez pour le rendre visible aux utilisateurs de vos matières"; #elif L==6 // gn "Evento privado; pulse para hacerlo visible por los usuarios de sus asignaturas"; // Okoteve traducción #elif L==7 // it @@ -11456,6 +11456,27 @@ const char *Txt_Event_X_removed = // Warning: it is very important to include %s "Evento %s removido."; #endif +const char *Txt_Event_result = +#if L==1 // ca + "Resultat del esdeveniment"; +#elif L==2 // de + "Ergebnis der Ereignis"; +#elif L==3 // en + "Event result"; +#elif L==4 // es + "Resultado del evento"; +#elif L==5 // fr + "Résultat de l'événement"; +#elif L==6 // gn + "Resultado del evento"; // Okoteve traducción +#elif L==7 // it + "Risultato dell'evento"; +#elif L==8 // pl + "Wynik wydarzenia"; +#elif L==9 // pt + "Resultado do evento"; +#endif + const char *Txt_Event_visible_to_the_users_of_your_courses_click_to_make_it_private = #if L==1 // ca "Esdeveniment visible pels usuaris de les seves assignatures; feu clic per fer-lo privat"; @@ -34714,6 +34735,48 @@ const char *Txt_Results_of_game_X = // Warning: it is very important to include "Resultados do jogo "%s""; #endif +const char *Txt_Results_of_event_X = // Warning: it is very important to include %s in the following sentences +#if L==1 // ca + "Resultats del esdeveniment "%s""; +#elif L==2 // de + "Ergebnisse von Ereignis "%s""; +#elif L==3 // en + "Results of event "%s""; +#elif L==4 // es + "Resultados del evento "%s""; +#elif L==5 // fr + "Résultats de l'événement "%s""; +#elif L==6 // gn + "Resultados del evento "%s""; // Okoteve traducción +#elif L==7 // it + "Risultati del evento "%s""; +#elif L==8 // pl + "Wyniki wydarzenie "%s""; +#elif L==9 // pt + "Resultados do evento "%s""; +#endif + +const char *Txt_Results_of_exam_X = // Warning: it is very important to include %s in the following sentences +#if L==1 // ca + "Resultats del examen "%s""; +#elif L==2 // de + "Ergebnisse von Prüfung "%s""; +#elif L==3 // en + "Results of exam "%s""; +#elif L==4 // es + "Resultados del examen "%s""; +#elif L==5 // fr + "Résultats de l'exam "%s""; +#elif L==6 // gn + "Resultados del examen "%s""; // Okoteve traducción +#elif L==7 // it + "Risultati del esame "%s""; +#elif L==8 // pl + "Wyniki egzamin "%s""; +#elif L==9 // pt + "Resultados do exame "%s""; +#endif + const char *Txt_Results_of_match_X = // Warning: it is very important to include %s in the following sentences #if L==1 // ca "Resultats de la partida "%s"";