diff --git a/swad_agenda.c b/swad_agenda.c
index 6ba81d09..f97dc76c 100644
--- a/swad_agenda.c
+++ b/swad_agenda.c
@@ -713,7 +713,6 @@ static void Agd_ShowOneEvent (Agd_AgendaType_t AgendaType,long AgdCod)
{
extern const char *Dat_TimeStatusClassVisible[Dat_NUM_TIME_STATUS];
extern const char *Dat_TimeStatusClassHidden[Dat_NUM_TIME_STATUS];
- extern const char *Txt_Today;
char *Anchor = NULL;
static unsigned UniqueId = 0;
char *Id;
@@ -756,8 +755,8 @@ static void Agd_ShowOneEvent (Agd_AgendaType_t AgendaType,long AgdCod)
Dat_TimeStatusClassVisible[AgdEvent.TimeStatus],
Gbl.RowEvenOdd);
Dat_WriteLocalDateHMSFromUTC (Id,AgdEvent.TimeUTC[StartEndTime],
- Gbl.Prefs.DateFormat,"
",Txt_Today,
- true,true,0x6);
+ Gbl.Prefs.DateFormat,"
",
+ true,true,true,0x6);
HTM_TD_End ();
free ((void *) Id);
}
diff --git a/swad_assignment.c b/swad_assignment.c
index 29c14259..2abc9282 100644
--- a/swad_assignment.c
+++ b/swad_assignment.c
@@ -339,7 +339,6 @@ void Asg_PrintOneAssignment (void)
static void Asg_ShowOneAssignment (long AsgCod,bool PrintView)
{
- extern const char *Txt_Today;
char *Anchor = NULL;
static unsigned UniqueId = 0;
char *Id;
@@ -392,8 +391,8 @@ static void Asg_ShowOneAssignment (long AsgCod,bool PrintView)
"DATE_RED"),
Gbl.RowEvenOdd);
Dat_WriteLocalDateHMSFromUTC (Id,Asg.TimeUTC[StartEndTime],
- Gbl.Prefs.DateFormat,"
",Txt_Today,
- true,true,0x7);
+ Gbl.Prefs.DateFormat,"
",
+ true,true,true,0x7);
HTM_TD_End ();
free ((void *) Id);
}
diff --git a/swad_attendance.c b/swad_attendance.c
index 04c218b5..b984e49b 100644
--- a/swad_attendance.c
+++ b/swad_attendance.c
@@ -371,7 +371,6 @@ static void Att_PutParamsToCreateNewAttEvent (void)
static void Att_ShowOneAttEvent (struct AttendanceEvent *Att,bool ShowOnlyThisAttEventComplete)
{
- extern const char *Txt_Today;
extern const char *Txt_View_event;
char *Anchor = NULL;
static unsigned UniqueId = 0;
@@ -429,8 +428,8 @@ static void Att_ShowOneAttEvent (struct AttendanceEvent *Att,bool ShowOnlyThisAt
"DATE_RED"),
Gbl.RowEvenOdd);
Dat_WriteLocalDateHMSFromUTC (Id,Att->TimeUTC[StartEndTime],
- Gbl.Prefs.DateFormat,"
",Txt_Today,
- true,true,0x7);
+ Gbl.Prefs.DateFormat,"
",
+ true,true,true,0x7);
HTM_TD_End ();
free ((void *) Id);
}
@@ -3074,7 +3073,6 @@ static void Att_ListEventsToSelect (Att_TypeOfView_t TypeOfView)
extern const char *Txt_Events;
extern const char *Txt_Event;
extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
- extern const char *Txt_Today;
extern const char *Txt_Update_attendance;
unsigned UniqueId;
char *Id;
@@ -3145,8 +3143,8 @@ static void Att_ListEventsToSelect (Att_TypeOfView_t TypeOfView)
"",
NumAttEvent,Id);
Dat_WriteLocalDateHMSFromUTC (Id,Gbl.AttEvents.Lst[NumAttEvent].TimeUTC[Att_START_TIME],
- Gbl.Prefs.DateFormat,", ",Txt_Today,
- true,true,0x7);
+ Gbl.Prefs.DateFormat,", ",
+ true,true,true,0x7);
HTM_TD_End ();
free ((void *) Id);
@@ -3491,7 +3489,6 @@ static void Att_ListStdsWithAttEventsDetails (unsigned NumUsrsInList,
static void Att_ListAttEventsForAStd (unsigned NumUsr,struct UsrData *UsrDat)
{
- extern const char *Txt_Today;
extern const char *Txt_Student_comment;
extern const char *Txt_Teachers_comment;
char PhotoURL[PATH_MAX + 1];
@@ -3591,8 +3588,8 @@ static void Att_ListAttEventsForAStd (unsigned NumUsr,struct UsrData *UsrDat)
Id,
Gbl.AttEvents.Lst[NumAttEvent].Title);
Dat_WriteLocalDateHMSFromUTC (Id,Gbl.AttEvents.Lst[NumAttEvent].TimeUTC[Att_START_TIME],
- Gbl.Prefs.DateFormat,", ",Txt_Today,
- true,true,0x7);
+ Gbl.Prefs.DateFormat,", ",
+ true,true,true,0x7);
HTM_TD_End ();
free ((void *) Id);
diff --git a/swad_changelog.h b/swad_changelog.h
index 2c62fab6..16f11d97 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -487,7 +487,7 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - *
En OpenSWAD:
ps2pdf source.ps destination.pdf
*/
-#define Log_PLATFORM_VERSION "SWAD 19.50.2 (2019-11-01)"
+#define Log_PLATFORM_VERSION "SWAD 19.50.3 (2019-11-01)"
#define CSS_FILE "swad19.47.css"
#define JS_FILE "swad19.39.js"
/*
@@ -495,6 +495,7 @@ ps2pdf source.ps destination.pdf
// TODO: Impedir la creación y edición de proyectos si no son editables.
// TODO: Importante: filtrar proyectos por usuarios (igual que en trabajos o en asistencia)
+ Version 19.50.3: Nov 02, 2019 Code refactoring related with writing of local date-time. (246059 lines)
Version 19.50.2: Nov 01, 2019 Code refactoring related with writing of local date-time. (246079 lines)
Version 19.50.1: Nov 01, 2019 Code refactoring related with writing of local date-time. (246088 lines)
Version 19.50: Nov 01, 2019 Code refactoring related with writing of local date-time. (246016 lines)
diff --git a/swad_connected.c b/swad_connected.c
index 071a1a5d..ab65a731 100644
--- a/swad_connected.c
+++ b/swad_connected.c
@@ -104,8 +104,8 @@ void Con_ShowConnectedUsrs (void)
Box_BoxBegin (NULL,Gbl.Title,Con_PutIconToUpdateConnected,
Hlp_USERS_Connected,Box_NOT_CLOSABLE);
Dat_WriteLocalDateHMSFromUTC ("connected_current_time",Gbl.StartExecutionTimeUTC,
- Gbl.Prefs.DateFormat,", ","",
- false,true,0x7);
+ Gbl.Prefs.DateFormat,", ",
+ false,false,true,0x7);
/***** Number of connected users in the whole platform *****/
Con_ShowGlobalConnectedUsrs ();
diff --git a/swad_date.c b/swad_date.c
index df236265..26691ff2 100644
--- a/swad_date.c
+++ b/swad_date.c
@@ -171,8 +171,8 @@ void Dat_PutScriptDateFormat (Dat_Format_t Format)
if (asprintf (&Id,"date_format_%u",(unsigned) Format) < 0)
Lay_NotEnoughMemoryExit ();
Dat_WriteLocalDateHMSFromUTC (Id,Gbl.StartExecutionTimeUTC,
- Format,"","",
- true,false,0x0);
+ Format,"",
+ false,true,false,0x0);
free ((void *) Id);
}
@@ -1615,13 +1615,17 @@ void Dat_WriteHoursMinutesSeconds (struct Time *Time)
/*****************************************************************************/
void Dat_WriteLocalDateHMSFromUTC (const char *Id,time_t TimeUTC,
- Dat_Format_t DateFormat,const char *Separator,const char *StrToday,
- bool WriteDateOnSameDay,bool WriteWeekDay,unsigned WriteHMS)
+ Dat_Format_t DateFormat,const char *Separator,
+ bool WriteToday,bool WriteDateOnSameDay,
+ bool WriteWeekDay,unsigned WriteHMS)
{
+ extern const char *Txt_Today;
+
HTM_SCRIPT_Begin (NULL,NULL);
fprintf (Gbl.F.Out,"writeLocalDateHMSFromUTC('%s',%ld,%u,'%s','%s',%s,%s,0x%x);",
Id,(long) TimeUTC,(unsigned) DateFormat,Separator,
- StrToday,
+ WriteToday ? Txt_Today :
+ "",
WriteDateOnSameDay ? "true" :
"false",
WriteWeekDay ? "true" :
diff --git a/swad_date.h b/swad_date.h
index e8cf219c..8465f772 100644
--- a/swad_date.h
+++ b/swad_date.h
@@ -194,7 +194,8 @@ void Dat_WriteHoursMinutesSecondsFromSeconds (time_t Seconds);
void Dat_WriteHoursMinutesSeconds (struct Time *Time);
void Dat_WriteLocalDateHMSFromUTC (const char *Id,time_t TimeUTC,
- Dat_Format_t DateFormat,const char *Separator,const char *StrToday,
- bool WriteDateOnSameDay,bool WriteWeekDay,unsigned WriteHMS);
+ Dat_Format_t DateFormat,const char *Separator,
+ bool WriteToday,bool WriteDateOnSameDay,
+ bool WriteWeekDay,unsigned WriteHMS);
#endif
diff --git a/swad_file_browser.c b/swad_file_browser.c
index a7c2dcb3..fed1697b 100644
--- a/swad_file_browser.c
+++ b/swad_file_browser.c
@@ -6385,7 +6385,6 @@ void Brw_CreateTmpPublicLinkToPrivateFile (const char *FullPathIncludingFile,
static void Brw_WriteDatesAssignment (void)
{
- extern const char *Txt_Today;
extern const char *Txt_unknown_assignment;
static unsigned UniqueId = 0;
char *Id;
@@ -6404,8 +6403,8 @@ static void Brw_WriteDatesAssignment (void)
Lay_NotEnoughMemoryExit ();
fprintf (Gbl.F.Out,"",Id);
Dat_WriteLocalDateHMSFromUTC (Id,Gbl.FileBrowser.Asg.TimeUTC[Dat_START_TIME],
- Gbl.Prefs.DateFormat,", ",Txt_Today,
- true,false,0x7);
+ Gbl.Prefs.DateFormat,", ",
+ true,true,false,0x7);
fprintf (Gbl.F.Out,"");
free ((void *) Id);
@@ -6417,8 +6416,8 @@ static void Brw_WriteDatesAssignment (void)
Lay_NotEnoughMemoryExit ();
fprintf (Gbl.F.Out,"",Id);
Dat_WriteLocalDateHMSFromUTC (Id,Gbl.FileBrowser.Asg.TimeUTC[Dat_END_TIME],
- Gbl.Prefs.DateFormat,", ",Txt_Today,
- false,false,0x7);
+ Gbl.Prefs.DateFormat,", ",
+ true,false,false,0x7);
fprintf (Gbl.F.Out,"");
free ((void *) Id);
}
@@ -6433,7 +6432,6 @@ static void Brw_WriteDatesAssignment (void)
static void Brw_WriteFileSizeAndDate (struct FileMetadata *FileMetadata)
{
- extern const char *Txt_Today;
static unsigned UniqueId = 0;
char *Id;
char FileSizeStr[Fil_MAX_BYTES_FILE_SIZE_STRING + 1];
@@ -6460,8 +6458,8 @@ static void Brw_WriteFileSizeAndDate (struct FileMetadata *FileMetadata)
Lay_NotEnoughMemoryExit ();
fprintf (Gbl.F.Out,"",Id);
Dat_WriteLocalDateHMSFromUTC (Id,FileMetadata->Time,
- Gbl.Prefs.DateFormat,", ",Txt_Today,
- true,false,0x6);
+ Gbl.Prefs.DateFormat,", ",
+ true,true,false,0x6);
free ((void *) Id);
}
HTM_TD_End ();
@@ -9367,7 +9365,6 @@ void Brw_ShowFileMetadata (void)
extern const char *Txt_Uploaded_by;
extern const char *Txt_ROLES_SINGUL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
extern const char *Txt_Date_of_creation;
- extern const char *Txt_Today;
extern const char *Txt_Availability;
extern const char *Txt_Private_available_to_certain_users_identified;
extern const char *Txt_Public_open_educational_resource_OER_for_everyone;
@@ -9579,8 +9576,8 @@ void Brw_ShowFileMetadata (void)
HTM_TD_Begin ("id=\"filedate\" class=\"DAT LM\"");
Dat_WriteLocalDateHMSFromUTC ("filedate",FileMetadata.Time,
- Gbl.Prefs.DateFormat,", ",Txt_Today,
- true,true,0x7);
+ Gbl.Prefs.DateFormat,", ",
+ true,true,true,0x7);
HTM_TD_End ();
HTM_TR_End ();
diff --git a/swad_forum.c b/swad_forum.c
index 371255c2..3d7495c1 100644
--- a/swad_forum.c
+++ b/swad_forum.c
@@ -3331,7 +3331,6 @@ static void For_ListForumThrs (long ThrCods[Pag_ITEMS_PER_PAGE],
extern const char *Txt_Thread_with_posts_from_you;
extern const char *Txt_There_are_new_posts;
extern const char *Txt_No_new_posts;
- extern const char *Txt_Today;
unsigned NumThr;
unsigned NumThrInScreen; // From 0 to Pag_ITEMS_PER_PAGE-1
unsigned UniqueId;
@@ -3462,8 +3461,8 @@ static void For_ListForumThrs (long ThrCods[Pag_ITEMS_PER_PAGE],
Lay_NotEnoughMemoryExit ();
HTM_TD_Begin ("id=\"%s\" class=\"%s LT %s\"",Id,Style,BgColor);
Dat_WriteLocalDateHMSFromUTC (Id,TimeUTC,
- Gbl.Prefs.DateFormat,"
",Txt_Today,
- true,false,0x6);
+ Gbl.Prefs.DateFormat,"
",
+ true,true,false,0x6);
HTM_TD_End ();
free ((void *) Id);
}
diff --git a/swad_game.c b/swad_game.c
index f31683b3..6a1dff87 100644
--- a/swad_game.c
+++ b/swad_game.c
@@ -370,7 +370,6 @@ void Gam_ShowOneGame (long GamCod,
{
extern const char *Hlp_ASSESSMENT_Games;
extern const char *Txt_Game;
- extern const char *Txt_Today;
extern const char *Txt_View_game;
extern const char *Txt_No_of_questions;
extern const char *Txt_Matches;
@@ -433,8 +432,8 @@ void Gam_ShowOneGame (long GamCod,
Gbl.RowEvenOdd);
if (Game.TimeUTC[Dat_START_TIME])
Dat_WriteLocalDateHMSFromUTC (Id,Game.TimeUTC[StartEndTime],
- Gbl.Prefs.DateFormat,"
",Txt_Today,
- true,true,0x7);
+ Gbl.Prefs.DateFormat,"
",
+ true,true,true,0x7);
HTM_TD_End ();
free ((void *) Id);
}
diff --git a/swad_group.c b/swad_group.c
index c50d450d..57bdca24 100644
--- a/swad_group.c
+++ b/swad_group.c
@@ -2321,7 +2321,6 @@ static void Grp_ListGrpsForMultipleSelection (struct GroupType *GrpTyp,
static void Grp_WriteGrpHead (struct GroupType *GrpTyp)
{
extern const char *Txt_Opening_of_groups;
- extern const char *Txt_Today;
extern const char *Txt_Group;
extern const char *Txt_Classroom;
extern const char *Txt_Max_BR_students;
@@ -2345,8 +2344,8 @@ static void Grp_WriteGrpHead (struct GroupType *GrpTyp)
Txt_Opening_of_groups,
Id);
Dat_WriteLocalDateHMSFromUTC (Id,GrpTyp->OpenTimeUTC,
- Gbl.Prefs.DateFormat,", ",Txt_Today,
- true,true,0x7);
+ Gbl.Prefs.DateFormat,", ",
+ true,true,true,0x7);
free ((void *) Id);
}
HTM_TD_End ();
diff --git a/swad_match.c b/swad_match.c
index b099b134..a814d04b 100644
--- a/swad_match.c
+++ b/swad_match.c
@@ -542,7 +542,6 @@ static void Mch_ListOneOrMoreMatchesAuthor (const struct Match *Match)
static void Mch_ListOneOrMoreMatchesTimes (const struct Match *Match,unsigned UniqueId)
{
- extern const char *Txt_Today;
Dat_StartEndTime_t StartEndTime;
char *Id;
@@ -558,8 +557,8 @@ static void Mch_ListOneOrMoreMatchesTimes (const struct Match *Match,unsigned Un
"DATE_GREEN",
Gbl.RowEvenOdd);
Dat_WriteLocalDateHMSFromUTC (Id,Match->TimeUTC[StartEndTime],
- Gbl.Prefs.DateFormat,"
",Txt_Today,
- true,true,0x7);
+ Gbl.Prefs.DateFormat,"
",
+ true,true,true,0x7);
HTM_TD_End ();
free ((void *) Id);
}
diff --git a/swad_match_result.c b/swad_match_result.c
index fbfb19ed..84a710c6 100644
--- a/swad_match_result.c
+++ b/swad_match_result.c
@@ -352,7 +352,6 @@ static void McR_ShowHeaderMchResults (Usr_MeOrOther_t MeOrOther)
static void McR_ShowMchResults (Usr_MeOrOther_t MeOrOther)
{
- extern const char *Txt_Today;
extern const char *Txt_Match_result;
extern const char *Txt_Hidden_result;
MYSQL_RES *mysql_res;
@@ -437,8 +436,8 @@ static void McR_ShowMchResults (Usr_MeOrOther_t MeOrOther)
HTM_TD_Begin ("id =\"%s\" class=\"DAT LT COLOR%u\"",
Id,Gbl.RowEvenOdd);
Dat_WriteLocalDateHMSFromUTC (Id,TimeUTC[StartEndTime],
- Gbl.Prefs.DateFormat,"
",Txt_Today,
- true,false,0x7);
+ Gbl.Prefs.DateFormat,"
",
+ true,true,false,0x7);
HTM_TD_End ();
free ((void *) Id);
}
@@ -622,7 +621,6 @@ void McR_ShowOneMchResult (void)
extern const char *Txt_The_user_does_not_exist;
extern const char *Txt_ROLES_SINGUL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
extern const char *Txt_START_END_TIME[Dat_NUM_START_END_TIME];
- extern const char *Txt_Today;
extern const char *Txt_Questions;
extern const char *Txt_non_blank_QUESTIONS;
extern const char *Txt_Score;
@@ -793,8 +791,8 @@ void McR_ShowOneMchResult (void)
Lay_NotEnoughMemoryExit ();
HTM_TD_Begin ("id=\"%s\" class=\"DAT LT\"",Id);
Dat_WriteLocalDateHMSFromUTC (Id,TimeUTC[StartEndTime],
- Gbl.Prefs.DateFormat,", ",Txt_Today,
- true,true,0x7);
+ Gbl.Prefs.DateFormat,", ",
+ true,true,true,0x7);
HTM_TD_End ();
free ((void *) Id);
diff --git a/swad_message.c b/swad_message.c
index 1a7620e9..5ffe3d27 100644
--- a/swad_message.c
+++ b/swad_message.c
@@ -3610,7 +3610,6 @@ static void Msg_WriteMsgTo (long MsgCod)
void Msg_WriteMsgDate (time_t TimeUTC,const char *ClassBackground)
{
- extern const char *Txt_Today;
static unsigned UniqueId = 0;
char *Id;
@@ -3624,8 +3623,8 @@ void Msg_WriteMsgDate (time_t TimeUTC,const char *ClassBackground)
/***** Write date and time *****/
Dat_WriteLocalDateHMSFromUTC (Id,TimeUTC,
- Gbl.Prefs.DateFormat,", ",Txt_Today,
- true,false,0x6);
+ Gbl.Prefs.DateFormat,", ",
+ true,true,false,0x6);
/***** End cell *****/
HTM_TD_End ();
diff --git a/swad_notice.c b/swad_notice.c
index 0534a5c2..475b434c 100644
--- a/swad_notice.c
+++ b/swad_notice.c
@@ -613,7 +613,6 @@ static void Not_DrawANotice (Not_Listing_t TypeNoticesListing,
Not_Status_t Status)
{
extern const char *Txt_See_full_notice;
- extern const char *Txt_Today;
static const char *ContainerClass[Not_NUM_STATUS] =
{
"NOTICE_CONTAINER_ACTIVE", // Not_ACTIVE_NOTICE
@@ -701,8 +700,8 @@ static void Not_DrawANotice (Not_Listing_t TypeNoticesListing,
Frm_EndForm ();
}
Dat_WriteLocalDateHMSFromUTC (Id,TimeUTC,
- Gbl.Prefs.DateFormat,"
",Txt_Today,
- true,false,0x6);
+ Gbl.Prefs.DateFormat,"
",
+ true,true,false,0x6);
free ((void *) Id);
HTM_DIV_End ();
diff --git a/swad_profile.c b/swad_profile.c
index 644871d1..e49ef3b0 100644
--- a/swad_profile.c
+++ b/swad_profile.c
@@ -462,7 +462,6 @@ static void Prf_ShowTimeSinceFirstClick (const struct UsrData *UsrDat,
extern const char *Txt_months;
extern const char *Txt_day;
extern const char *Txt_days;
- extern const char *Txt_Today;
char IdFirstClickTime[Frm_MAX_BYTES_ID + 1];
int NumYears;
int NumMonths;
@@ -502,8 +501,8 @@ static void Prf_ShowTimeSinceFirstClick (const struct UsrData *UsrDat,
fprintf (Gbl.F.Out,")");
}
Dat_WriteLocalDateHMSFromUTC (IdFirstClickTime,UsrFigures->FirstClickTimeUTC,
- Gbl.Prefs.DateFormat,", ",Txt_Today,
- true,false,0x6);
+ Gbl.Prefs.DateFormat,", ",
+ true,true,false,0x6);
}
else // First click time is unknown or user never logged
/***** Button to fetch and store user's figures *****/
diff --git a/swad_project.c b/swad_project.c
index 675c38ee..55705c9e 100644
--- a/swad_project.c
+++ b/swad_project.c
@@ -1023,7 +1023,6 @@ void Prj_PrintOneProject (void)
static void Prj_ShowOneProject (unsigned NumIndex,struct Project *Prj,
Prj_ProjectView_t ProjectView)
{
- extern const char *Txt_Today;
extern const char *Txt_Project_files;
extern const char *Txt_Assigned_QUESTION;
extern const char *Txt_Yes;
@@ -1120,8 +1119,8 @@ static void Prj_ShowOneProject (unsigned NumIndex,struct Project *Prj,
break;
}
Dat_WriteLocalDateHMSFromUTC (Id,Prj->CreatTime,
- Gbl.Prefs.DateFormat,"
",Txt_Today,
- true,true,0x7);
+ Gbl.Prefs.DateFormat,"
",
+ true,true,true,0x7);
HTM_TD_End ();
free ((void *) Id);
@@ -1141,8 +1140,8 @@ static void Prj_ShowOneProject (unsigned NumIndex,struct Project *Prj,
break;
}
Dat_WriteLocalDateHMSFromUTC (Id,Prj->ModifTime,
- Gbl.Prefs.DateFormat,"
",Txt_Today,
- true,true,0x7);
+ Gbl.Prefs.DateFormat,"
",
+ true,true,true,0x7);
HTM_TD_End ();
free ((void *) Id);
@@ -1471,7 +1470,6 @@ static void Prj_PutIconToToggleProject (unsigned UniqueId,
static void Prj_ShowTableAllProjectsOneRow (struct Project *Prj)
{
- extern const char *Txt_Today;
extern const char *Txt_Yes;
extern const char *Txt_No;
extern const char *Txt_PROJECT_STATUS[Prj_NUM_PROPOSAL_TYPES];
@@ -1500,8 +1498,8 @@ static void Prj_ShowTableAllProjectsOneRow (struct Project *Prj)
HTM_TD_Begin ("id=\"%s\" class=\"LT %s COLOR%u\"",
Id,ClassDate,Gbl.RowEvenOdd);
Dat_WriteLocalDateHMSFromUTC (Id,Prj->CreatTime,
- Gbl.Prefs.DateFormat,"
",Txt_Today,
- true,true,0x7);
+ Gbl.Prefs.DateFormat,"
",
+ true,true,true,0x7);
HTM_TD_End ();
free ((void *) Id);
@@ -1512,8 +1510,8 @@ static void Prj_ShowTableAllProjectsOneRow (struct Project *Prj)
HTM_TD_Begin ("id=\"%s\" class=\"LT %s COLOR%u\"",
Id,ClassDate,Gbl.RowEvenOdd);
Dat_WriteLocalDateHMSFromUTC (Id,Prj->ModifTime,
- Gbl.Prefs.DateFormat,"
",Txt_Today,
- true,true,0x7);
+ Gbl.Prefs.DateFormat,"
",
+ true,true,true,0x7);
HTM_TD_End ();
free ((void *) Id);
diff --git a/swad_statistic.c b/swad_statistic.c
index b38c2898..8edd7c94 100644
--- a/swad_statistic.c
+++ b/swad_statistic.c
@@ -1535,7 +1535,6 @@ static void Sta_ShowDetailedAccessesList (unsigned long NumRows,MYSQL_RES *mysql
extern const char *Txt_Action;
extern const char *Txt_LOG_More_info;
extern const char *Txt_ROLES_SINGUL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
- extern const char *Txt_Today;
unsigned long NumRow;
unsigned long FirstRow; // First row to show
unsigned long LastRow; // Last rows to show
@@ -1720,8 +1719,8 @@ static void Sta_ShowDetailedAccessesList (unsigned long NumRows,MYSQL_RES *mysql
Lay_NotEnoughMemoryExit ();
HTM_TD_Begin ("id=\"%s\" class=\"LOG RT COLOR%u\"",Id,Gbl.RowEvenOdd);
Dat_WriteLocalDateHMSFromUTC (Id,Dat_GetUNIXTimeFromStr (row[3]),
- Gbl.Prefs.DateFormat,", ",Txt_Today,
- true,false,0x7);
+ Gbl.Prefs.DateFormat,", ",
+ true,true,false,0x7);
HTM_TD_End ();
free ((void *) Id);
diff --git a/swad_survey.c b/swad_survey.c
index a3105b7f..dea8b855 100644
--- a/swad_survey.c
+++ b/swad_survey.c
@@ -422,7 +422,6 @@ static void Svy_ShowOneSurvey (long SvyCod,struct SurveyQuestion *SvyQst,
{
extern const char *Hlp_ASSESSMENT_Surveys;
extern const char *Txt_Survey;
- extern const char *Txt_Today;
extern const char *Txt_View_survey;
extern const char *Txt_No_of_questions;
extern const char *Txt_No_of_users;
@@ -489,8 +488,8 @@ static void Svy_ShowOneSurvey (long SvyCod,struct SurveyQuestion *SvyQst,
"DATE_RED_LIGHT"),
Gbl.RowEvenOdd);
Dat_WriteLocalDateHMSFromUTC (Id,Svy.TimeUTC[Svy_START_TIME],
- Gbl.Prefs.DateFormat,"
",Txt_Today,
- true,true,0x7);
+ Gbl.Prefs.DateFormat,"
",
+ true,true,true,0x7);
HTM_TD_End ();
free ((void *) Id);
@@ -513,8 +512,8 @@ static void Svy_ShowOneSurvey (long SvyCod,struct SurveyQuestion *SvyQst,
"DATE_RED_LIGHT"),
Gbl.RowEvenOdd);
Dat_WriteLocalDateHMSFromUTC (Id,Svy.TimeUTC[Svy_END_TIME],
- Gbl.Prefs.DateFormat,"
",Txt_Today,
- false,true,0x7);
+ Gbl.Prefs.DateFormat,"
",
+ true,false,true,0x7);
HTM_TD_End ();
free ((void *) Id);
diff --git a/swad_test.c b/swad_test.c
index 74f10ec7..6f272a04 100644
--- a/swad_test.c
+++ b/swad_test.c
@@ -2802,7 +2802,6 @@ static void Tst_ListOneOrMoreQuestionsForEdition (unsigned long NumRows,
extern const char *Txt_TST_STR_ORDER_SHORT[Tst_NUM_TYPES_ORDER_QST];
extern const char *Txt_TST_STR_ANSWER_TYPES[Tst_NUM_ANS_TYPES];
extern const char *Txt_Shuffle;
- extern const char *Txt_Today;
Tst_QuestionsOrder_t Order;
unsigned long NumRow;
MYSQL_ROW row;
@@ -2936,8 +2935,8 @@ static void Tst_ListOneOrMoreQuestionsForEdition (unsigned long NumRows,
HTM_TD_Begin ("id=\"%s\" class=\"DAT_SMALL CT COLOR%u\"",
Id,Gbl.RowEvenOdd);
Dat_WriteLocalDateHMSFromUTC (Id,TimeUTC,
- Gbl.Prefs.DateFormat,"
",Txt_Today,
- true,false,0x7);
+ Gbl.Prefs.DateFormat,"
",
+ true,true,false,0x7);
HTM_TD_End ();
free ((void *) Id);
@@ -3062,7 +3061,6 @@ static void Tst_ListOneOrMoreQuestionsForSelection (unsigned long NumRows,
extern const char *Txt_TST_STR_ANSWER_TYPES[Tst_NUM_ANS_TYPES];
extern const char *Txt_Shuffle;
extern const char *Txt_Question;
- extern const char *Txt_Today;
extern const char *Txt_Add_questions;
unsigned long NumRow;
MYSQL_ROW row;
@@ -3148,8 +3146,8 @@ static void Tst_ListOneOrMoreQuestionsForSelection (unsigned long NumRows,
HTM_TD_Begin ("id=\"%s\" class=\"DAT_SMALL CT COLOR%u\">",
Id,Gbl.RowEvenOdd);
Dat_WriteLocalDateHMSFromUTC (Id,TimeUTC,
- Gbl.Prefs.DateFormat,"
",Txt_Today,
- true,false,0x7);
+ Gbl.Prefs.DateFormat,"
",
+ true,true,false,0x7);
HTM_TD_End ();
free ((void *) Id);
@@ -7685,7 +7683,6 @@ static void Tst_ShowHeaderTestResults (void)
static void Tst_ShowTstResults (struct UsrData *UsrDat)
{
- extern const char *Txt_Today;
extern const char *Txt_View_test;
MYSQL_RES *mysql_res;
MYSQL_ROW row;
@@ -7785,8 +7782,8 @@ static void Tst_ShowTstResults (struct UsrData *UsrDat)
HTM_TD_Begin ("id=\"%s\" class=\"%s RT COLOR%u\"",
Id,ClassDat,Gbl.RowEvenOdd);
Dat_WriteLocalDateHMSFromUTC (Id,TimeUTC,
- Gbl.Prefs.DateFormat,", ",Txt_Today,
- true,false,0x7);
+ Gbl.Prefs.DateFormat,", ",
+ true,true,false,0x7);
HTM_TD_End ();
free ((void *) Id);
@@ -7994,7 +7991,6 @@ void Tst_ShowOneTstResult (void)
extern const char *Txt_The_user_does_not_exist;
extern const char *Txt_ROLES_SINGUL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
extern const char *Txt_Date;
- extern const char *Txt_Today;
extern const char *Txt_Questions;
extern const char *Txt_non_blank_QUESTIONS;
extern const char *Txt_Score;
@@ -8123,8 +8119,8 @@ void Tst_ShowOneTstResult (void)
HTM_TD_Begin ("id=\"test\" class=\"DAT LT\"");
Dat_WriteLocalDateHMSFromUTC ("test",TstTimeUTC,
- Gbl.Prefs.DateFormat,", ",Txt_Today,
- true,true,0x7);
+ Gbl.Prefs.DateFormat,", ",
+ true,true,true,0x7);
HTM_TD_End ();
HTM_TR_End ();
diff --git a/swad_timeline.c b/swad_timeline.c
index 70282786..b88dd3d7 100644
--- a/swad_timeline.c
+++ b/swad_timeline.c
@@ -1776,7 +1776,6 @@ static void TL_WriteAuthorNote (const struct UsrData *UsrDat)
static void TL_WriteDateTime (time_t TimeUTC)
{
- extern const char *Txt_Today;
char IdDateTime[Frm_MAX_BYTES_ID + 1];
/***** Create unique Id *****/
@@ -1790,8 +1789,8 @@ static void TL_WriteDateTime (time_t TimeUTC)
// This must be out of the div where the output is written
// because it will be evaluated in a loop in JavaScript
Dat_WriteLocalDateHMSFromUTC (IdDateTime,TimeUTC,
- Gbl.Prefs.DateFormat,", ",Txt_Today,
- true,false,0x6);
+ Gbl.Prefs.DateFormat,", ",
+ true,true,false,0x6);
}
/*****************************************************************************/