From dce34aaa2e0675fa96fe7382c8782cc2aec78b12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Mon, 26 Oct 2015 23:16:21 +0100 Subject: [PATCH] Version 15.25.1 --- swad_changelog.h | 3 +- swad_layout.c | 2 +- swad_statistic.c | 22 +++++++++++-- swad_text.c | 83 +++++++++++++++++++++++++++++++++++------------- 4 files changed, 83 insertions(+), 27 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index 59a37c1ef..5072a44ea 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -108,11 +108,12 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.25 (2015/10/26)" +#define Log_PLATFORM_VERSION "SWAD 15.25.1 (2015/10/26)" // 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 15.25.1: Oct 26, 2015 Warning about stats computed in server time instead of user's local time. (186263 lines) Version 15.25: Oct 26, 2015 Clicks in real time are displayed as time ago. (186211 lines) Version 15.24.2: Oct 26, 2015 Change in function that write clock. (186219 lines) Version 15.24.1: Oct 26, 2015 Remove unused code related to date-times. (186217 lines) diff --git a/swad_layout.c b/swad_layout.c index e90384534..82f01bf8e 100644 --- a/swad_layout.c +++ b/swad_layout.c @@ -1370,7 +1370,7 @@ void Lay_RefreshNotifsAndConnected (void) for (NumUsr = 0; NumUsr < Gbl.Usrs.Connected.NumUsrsToList; NumUsr++) - fprintf (Gbl.F.Out,"%u|",Gbl.Usrs.Connected.Lst[NumUsr].Seconds); + fprintf (Gbl.F.Out,"%ld|",Gbl.Usrs.Connected.Lst[NumUsr].TimeDiff); /***** All the output is made, so don't write anymore *****/ Gbl.Layout.TablEndWritten = Gbl.Layout.HTMLEndWritten = true; diff --git a/swad_statistic.c b/swad_statistic.c index 4356a563e..28fc58142 100644 --- a/swad_statistic.c +++ b/swad_statistic.c @@ -445,6 +445,7 @@ void Sta_AskShowCrsHits (void) extern const char *Txt_distributed_by; extern const char *Txt_STAT_CLICKS_GROUPED_BY[Sta_NUM_CLICKS_GROUPED_BY]; extern const char *Txt_results_per_page; + extern const char *Txt_The_statistics_marked_with_; extern const char *Txt_Show_hits; extern const char *Txt_No_teachers_or_students_found; static unsigned long RowsPerPage[] = {10,20,30,40,50,100,500,1000,5000,10000,50000,100000}; @@ -578,6 +579,10 @@ void Sta_AskShowCrsHits (void) "" ""); + /***** Warning *****/ + fprintf (Gbl.F.Out,"

%s

", + Txt_The_statistics_marked_with_); + /***** Send button *****/ Lay_PutConfirmButton (Txt_Show_hits); @@ -616,6 +621,7 @@ void Sta_AskShowGblHits (void) extern const char *Txt_Show; extern const char *Txt_distributed_by; extern const char *Txt_STAT_CLICKS_GROUPED_BY[Sta_NUM_CLICKS_GROUPED_BY]; + extern const char *Txt_The_statistics_marked_with_; extern const char *Txt_Show_hits; Sta_Role_t RoleStat; Sta_ClicksGroupedBy_t ClicksGroupedBy; @@ -640,7 +646,9 @@ void Sta_AskShowGblHits (void) /***** Start frame *****/ fprintf (Gbl.F.Out,"
"); - Lay_StartRoundFrameTable (NULL,2,Txt_Statistics_of_all_visits); + Lay_StartRoundFrame (NULL,Txt_Statistics_of_all_visits); + fprintf (Gbl.F.Out,""); /***** Start and end dates for the search *****/ Dat_PutFormStartEndClientLocalDateTimesWithYesterdayToday (); @@ -718,10 +726,18 @@ void Sta_AskShowGblHits (void) } fprintf (Gbl.F.Out,"" "" - ""); + "" + "
"); + + /***** Warning *****/ + fprintf (Gbl.F.Out,"

%s

", + Txt_The_statistics_marked_with_); + + /***** Send button *****/ + Lay_PutConfirmButton (Txt_Show_hits); /***** End frame *****/ - Lay_EndRoundFrameTableWithButton (Lay_CONFIRM_BUTTON,Txt_Show_hits); + Lay_EndRoundFrame (); fprintf (Gbl.F.Out,"
"); /***** End form *****/ diff --git a/swad_text.c b/swad_text.c index 012481297..19d7e3305 100644 --- a/swad_text.c +++ b/swad_text.c @@ -9450,6 +9450,27 @@ const char *Txt_eg_Lectures_Practicals = "ex.: Teoria, Prática,..."; #endif +const char *Txt_ELAPSED_TIME = +#if L==0 + "Fa"; +#elif L==1 + "Vor"; +#elif L==2 + "Ago"; +#elif L==3 + "Hace"; +#elif L==4 + "Y a"; +#elif L==5 + "Hace"; // Okoteve traducción +#elif L==6 + "Fa"; +#elif L==7 + "Temu"; +#elif L==8 + "Atrás"; +#endif + const char *Txt_Eliminate = #if L==0 "Eliminar"; @@ -13271,27 +13292,6 @@ const char *Txt_Home_PAGE = "Home"; #endif -const char *Txt_ELAPSED_TIME = -#if L==0 - "Fa"; -#elif L==1 - "Vor"; -#elif L==2 - "Ago"; -#elif L==3 - "Hace"; -#elif L==4 - "Y a"; -#elif L==5 - "Hace"; // Okoteve traducción -#elif L==6 - "Fa"; -#elif L==7 - "Temu"; -#elif L==8 - "Atrás"; -#endif - const char *Txt_hour = #if L==0 "hora"; @@ -42034,11 +42034,50 @@ const char *Txt_The_session_has_expired_due_to_inactivity = // Expired due to ti #elif L==6 "La sessione è scaduta per inattività."; #elif L==7 - "Sesja wygasła z powodu bezczynności"; + "Sesja wygasła z powodu bezczynności."; #elif L==8 "A sessão expirou devido à inatividade."; #endif +const char *Txt_The_statistics_marked_with_ = +#if L==0 + "Les estadístiques marcades amb *" + " es calculen segons l'hora del servidor," + " que pot no coincidir amb la seva hora local."; +#elif L==1 + "Die mit * gekennzeichneten Statistiken" + " werden nach der Serverzeit," + " die nicht Ihrer lokalen Zeit entsprechen berechnet."; +#elif L==2 + "The statistics marked with *" + " are calculated according to the server time," + " which may not match your local time."; +#elif L==3 + "Las estadísticas marcadas con *" + " se calculan según la hora del servidor," + " que puede no coincidir con su hora local."; +#elif L==4 + "Les statistiques marqués d'une *" + " sont calculés selon l'heure du serveur," + " qui peut ne pas correspondre à votre heure locale."; +#elif L==5 + "Las estadísticas marcadas con *" + " se calculan según la hora del servidor," + " que puede no coincidir con su hora local."; // Okoteve traducción +#elif L==6 + "Le statistiche contrassegnati con *" + " sono calcolati secondo l'ora del server," + " che non può corrispondere l'ora locale."; +#elif L==7 + "Statystyki oznaczone *" + " są obliczane według czasu serwera," + " które mogą nie odpowiadać czasu lokalnego."; +#elif L==8 + "As estatísticas marcados com *" + " são calculados de acordo com a hora do servidor," + " que pode não coincidir com a hora local."; +#endif + const char *Txt_The_status_of_the_centre_X_has_changed = // Warning: it is very important to include %s in the following sentences #if L==0 "El estado del centro %s ha cambiado."; // Necessita traduccio