Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version 15.25.1

This commit is contained in:
Antonio Cañas Vargas 2015-10-26 23:16:21 +01:00
parent 26ba7642ef
commit dce34aaa2e
4 changed files with 83 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -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)

2
swad_layout.c
View File

@ -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;

22
swad_statistic.c
View File

@ -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)
"</tr>"
"</table>");
/***** Warning *****/
fprintf (Gbl.F.Out,"<p class=\"DAT_SMALL\">%s</p>",
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,"<section id=\"stat_form\">");
Lay_StartRoundFrameTable (NULL,2,Txt_Statistics_of_all_visits);
Lay_StartRoundFrame (NULL,Txt_Statistics_of_all_visits);
fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\""
" style=\"margin:0 auto;\">");
/***** Start and end dates for the search *****/
Dat_PutFormStartEndClientLocalDateTimesWithYesterdayToday ();
@ -718,10 +726,18 @@ void Sta_AskShowGblHits (void)
}
fprintf (Gbl.F.Out,"</select>"
"</td>"
"</tr>");
"</tr>"
"</table>");
/***** Warning *****/
fprintf (Gbl.F.Out,"<p class=\"DAT_SMALL\">%s</p>",
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,"</section>");
/***** End form *****/

83
swad_text.c
View File

@ -9450,6 +9450,27 @@ const char *Txt_eg_Lectures_Practicals =
"ex.: Teoria, Pr&aacute;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&aacute;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&aacute;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 &egrave; scaduta per inattivit&agrave;.";
#elif L==7
"Sesja wygas&lstrok;a z powodu bezczynno&sacute;ci";
"Sesja wygas&lstrok;a z powodu bezczynno&sacute;ci.";
#elif L==8
"A sess&atilde;o expirou devido &agrave; 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&iacute;sticas marcadas con *"
" se calculan seg&uacute;n la hora del servidor,"
" que puede no coincidir con su hora local.";
#elif L==4
"Les statistiques marqu&eacute;s d'une *"
" sont calcul&eacute;s selon l'heure du serveur,"
" qui peut ne pas correspondre &agrave; votre heure locale.";
#elif L==5
"Las estad&iacute;sticas marcadas con *"
" se calculan seg&uacute;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&ograve; corrispondere l'ora locale.";
#elif L==7
"Statystyki oznaczone *"
" s&aogon; obliczane wed&lstrok;ug czasu serwera,"
" kt&oacute;re mog&aogon; nie odpowiada&cacute; czasu lokalnego.";
#elif L==8
"As estat&iacute;sticas marcados com *"
" s&atilde;o calculados de acordo com a hora do servidor,"
" que pode n&atilde;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 <strong>%s</strong> ha cambiado."; // Necessita traduccio