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 21.100: Jun 23, 2022 Changes in calendar.

This commit is contained in:
acanas 2022-06-24 14:37:25 +02:00
parent 4954b87086
commit 342acf9eb1
9 changed files with 509 additions and 5508 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5001
css/swad21.97.1.css
View File

File diff suppressed because it is too large Load Diff

8
swad_calendar.c
View File

@ -118,7 +118,7 @@ void Cal_ShowFormToSelFirstDayOfWeek (Act_Action_t Action,
void (*FuncParams) (void *Args),void *Args) void (*FuncParams) (void *Args),void *Args)
{ {
extern const char *Txt_First_day_of_the_week_X; extern const char *Txt_First_day_of_the_week_X;
extern const char *Txt_DAYS_SMALL[7]; extern const char *Txt_DAYS[7];
unsigned FirstDayOfWeek; unsigned FirstDayOfWeek;
char *Title; char *Title;
char Icon[32 + 1]; char Icon[32 + 1];
@ -136,7 +136,7 @@ void Cal_ShowFormToSelFirstDayOfWeek (Act_Action_t Action,
FuncParams (Args); FuncParams (Args);
snprintf (Icon,sizeof (Icon),"first-day-of-week-%u.png",FirstDayOfWeek); snprintf (Icon,sizeof (Icon),"first-day-of-week-%u.png",FirstDayOfWeek);
if (asprintf (&Title,Txt_First_day_of_the_week_X, if (asprintf (&Title,Txt_First_day_of_the_week_X,
Txt_DAYS_SMALL[FirstDayOfWeek]) < 0) Txt_DAYS[FirstDayOfWeek]) < 0)
Err_NotEnoughMemoryExit (); Err_NotEnoughMemoryExit ();
Ico_PutSettingIconLink (Icon,Ico_BLACK,Title); Ico_PutSettingIconLink (Icon,Ico_BLACK,Title);
free (Title); free (Title);
@ -341,7 +341,7 @@ void Cal_GetAndShowNumUsrsPerFirstDayOfWeek (void)
extern const char *Txt_FIGURE_TYPES[Fig_NUM_FIGURES]; extern const char *Txt_FIGURE_TYPES[Fig_NUM_FIGURES];
extern const char *Txt_Calendar; extern const char *Txt_Calendar;
extern const char *Txt_First_day_of_the_week_X; extern const char *Txt_First_day_of_the_week_X;
extern const char *Txt_DAYS_SMALL[7]; extern const char *Txt_DAYS[7];
extern const char *Txt_Number_of_users; extern const char *Txt_Number_of_users;
extern const char *Txt_PERCENT_of_users; extern const char *Txt_PERCENT_of_users;
unsigned FirstDayOfWeek; unsigned FirstDayOfWeek;
@ -393,7 +393,7 @@ void Cal_GetAndShowNumUsrsPerFirstDayOfWeek (void)
FirstDayOfWeek) < 0) FirstDayOfWeek) < 0)
Err_NotEnoughMemoryExit (); Err_NotEnoughMemoryExit ();
if (asprintf (&Title,Txt_First_day_of_the_week_X, if (asprintf (&Title,Txt_First_day_of_the_week_X,
Txt_DAYS_SMALL[FirstDayOfWeek]) < 0) Txt_DAYS[FirstDayOfWeek]) < 0)
Err_NotEnoughMemoryExit (); Err_NotEnoughMemoryExit ();
Ico_PutIcon (Icon,Ico_BLACK,Title,"ICOx20"); Ico_PutIcon (Icon,Ico_BLACK,Title,"ICOx20");
free (Title); free (Title);

8
swad_changelog.h
View File

@ -606,10 +606,12 @@ TODO: Fix bug: error al enviar un mensaje a dos recipientes, error on duplicate
TODO: Attach pdf files in multimedia. TODO: Attach pdf files in multimedia.
*/ */
#define Log_PLATFORM_VERSION "SWAD 21.99.1 (2022-06-23)" #define Log_PLATFORM_VERSION "SWAD 21.100 (2022-06-23)"
#define CSS_FILE "swad21.97.1.css" #define CSS_FILE "swad21.100.css"
#define JS_FILE "swad21.97.4.js" #define JS_FILE "swad21.100.js"
/* /*
Version 21.100: Jun 23, 2022 Changes in calendar.
Some messages translated. (331107 lines)
Version 21.99.1: Jun 23, 2022 Some messages translated. (331260 lines) Version 21.99.1: Jun 23, 2022 Some messages translated. (331260 lines)
Version 21.99: Jun 22, 2022 New language: Turkish. (331259 lines) Version 21.99: Jun 22, 2022 New language: Turkish. (331259 lines)
2 changes necessary in database: 2 changes necessary in database:

326
swad_help_URL.c
View File

File diff suppressed because it is too large Load Diff

12
swad_layout.c
View File

@ -481,8 +481,8 @@ static void Lay_WriteRedirToMyLangOnViewUsrAgd (void)
static void Lay_WriteScripts (void) static void Lay_WriteScripts (void)
{ {
extern const char *Txt_DAYS_CAPS[7]; extern const char *Txt_DAYS[7];
extern const char *Txt_DAYS_SMALL[7]; extern const char *Txt_DAYS2[7];
extern const char *Txt_Exam_of_X; extern const char *Txt_Exam_of_X;
struct Hld_Holidays Holidays; struct Hld_Holidays Holidays;
struct Cfe_CallsForExams ExamAnns; struct Cfe_CallsForExams ExamAnns;
@ -505,14 +505,14 @@ static void Lay_WriteScripts (void)
/***** Write script to initialize variables used to draw dates *****/ /***** Write script to initialize variables used to draw dates *****/
HTM_SCRIPT_Begin (NULL,NULL); HTM_SCRIPT_Begin (NULL,NULL);
HTM_Txt ("\tvar DAYS = ["); HTM_Txt ("\tvar DAYS2 = [");
for (DayOfWeek = 0; for (DayOfWeek = 0;
DayOfWeek < 7; DayOfWeek < 7;
DayOfWeek++) DayOfWeek++)
{ {
if (DayOfWeek) if (DayOfWeek)
HTM_Comma (); HTM_Comma ();
HTM_TxtF ("'%s'",Txt_DAYS_SMALL[DayOfWeek]); HTM_TxtF ("'%s'",Txt_DAYS2[DayOfWeek]);
} }
HTM_Txt ("];\n"); HTM_Txt ("];\n");
HTM_SCRIPT_End (); HTM_SCRIPT_End ();
@ -539,14 +539,14 @@ static void Lay_WriteScripts (void)
/***** Write script to initialize variables used to draw months *****/ /***** Write script to initialize variables used to draw months *****/
HTM_SCRIPT_Begin (NULL,NULL); HTM_SCRIPT_Begin (NULL,NULL);
HTM_Txt ("\tvar DAYS_CAPS = ["); HTM_Txt ("\tvar DAYS = [");
for (DayOfWeek = 0; for (DayOfWeek = 0;
DayOfWeek < 7; DayOfWeek < 7;
DayOfWeek++) DayOfWeek++)
{ {
if (DayOfWeek) if (DayOfWeek)
HTM_Comma (); HTM_Comma ();
HTM_TxtF ("'%c'",Txt_DAYS_CAPS[DayOfWeek][0]); HTM_TxtF ("'%s'",Txt_DAYS[DayOfWeek]);
} }
HTM_Txt ("];\n"); HTM_Txt ("];\n");

2
swad_setting.c
View File

@ -97,7 +97,7 @@ void Set_EditSettings (void)
HTM_DIV_End (); HTM_DIV_End ();
HTM_DIV_Begin ("class=\"FRAME_INLINE\""); HTM_DIV_Begin ("class=\"FRAME_INLINE\"");
Dat_PutBoxToSelectDateFormat (); // 3. Date format Dat_PutBoxToSelectDateFormat (); // 3. Date format
HTM_DIV_End (); HTM_DIV_End ();
Box_BoxEnd (); Box_BoxEnd ();

134
swad_statistic.c
View File

@ -756,7 +756,7 @@ static void Sta_ShowHits (Sta_GlobalOrCourseAccesses_t GlobalOrCourse)
extern const char *Txt_The_date_range_must_be_less_than_or_equal_to_X_days; extern const char *Txt_The_date_range_must_be_less_than_or_equal_to_X_days;
extern const char *Txt_There_are_no_accesses_with_the_selected_search_criteria; extern const char *Txt_There_are_no_accesses_with_the_selected_search_criteria;
extern const char *Txt_List_of_detailed_clicks; extern const char *Txt_List_of_detailed_clicks;
extern const char *Txt_STAT_TYPE_COUNT_CAPS[Sta_NUM_COUNT_TYPES]; extern const char *Txt_STAT_COUNT_TYPE[Sta_NUM_COUNT_TYPES];
extern const char *Txt_Time_zone_used_in_the_calculation_of_these_statistics; extern const char *Txt_Time_zone_used_in_the_calculation_of_these_statistics;
struct Sta_Stats Stats; struct Sta_Stats Stats;
MYSQL_RES *mysql_res; MYSQL_RES *mysql_res;
@ -937,7 +937,7 @@ static void Sta_ShowHits (Sta_GlobalOrCourseAccesses_t GlobalOrCourse)
NULL,NULL, NULL,NULL,
NULL,Box_NOT_CLOSABLE); NULL,Box_NOT_CLOSABLE);
else else
Box_BoxBegin (NULL,Txt_STAT_TYPE_COUNT_CAPS[Stats.CountType], Box_BoxBegin (NULL,Txt_STAT_COUNT_TYPE[Stats.CountType],
NULL,NULL, NULL,NULL,
NULL,Box_NOT_CLOSABLE); NULL,Box_NOT_CLOSABLE);
@ -1323,7 +1323,7 @@ static void Sta_ShowNumHitsPerUsr (Sta_CountType_t CountType,
extern const char *Txt_ID; extern const char *Txt_ID;
extern const char *Txt_Name; extern const char *Txt_Name;
extern const char *Txt_Role; extern const char *Txt_Role;
extern const char *Txt_STAT_TYPE_COUNT_CAPS[Sta_NUM_COUNT_TYPES]; extern const char *Txt_STAT_COUNT_TYPE[Sta_NUM_COUNT_TYPES];
extern const char *Txt_ROLES_SINGUL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS]; extern const char *Txt_ROLES_SINGUL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
static const char *ClassPhoto[PhoSha_NUM_SHAPES] = static const char *ClassPhoto[PhoSha_NUM_SHAPES] =
{ {
@ -1343,12 +1343,12 @@ static void Sta_ShowNumHitsPerUsr (Sta_CountType_t CountType,
/***** Write heading *****/ /***** Write heading *****/
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TH (Txt_No_INDEX ,HTM_HEAD_RIGHT ); HTM_TH (Txt_No_INDEX ,HTM_HEAD_RIGHT );
HTM_TH (Txt_Photo ,HTM_HEAD_CENTER); HTM_TH (Txt_Photo ,HTM_HEAD_CENTER);
HTM_TH (Txt_ID ,HTM_HEAD_LEFT ); HTM_TH (Txt_ID ,HTM_HEAD_LEFT );
HTM_TH (Txt_Name ,HTM_HEAD_LEFT ); HTM_TH (Txt_Name ,HTM_HEAD_LEFT );
HTM_TH (Txt_Role ,HTM_HEAD_CENTER); HTM_TH (Txt_Role ,HTM_HEAD_CENTER);
HTM_TH_Span (Txt_STAT_TYPE_COUNT_CAPS[CountType],HTM_HEAD_LEFT ,1,2,NULL); HTM_TH_Span (Txt_STAT_COUNT_TYPE[CountType],HTM_HEAD_LEFT ,1,2,NULL);
HTM_TR_End (); HTM_TR_End ();
/***** Write rows *****/ /***** Write rows *****/
@ -1443,8 +1443,8 @@ static void Sta_ShowNumHitsPerDay (Sta_CountType_t CountType,
{ {
extern const char *Txt_Date; extern const char *Txt_Date;
extern const char *Txt_Day; extern const char *Txt_Day;
extern const char *Txt_STAT_TYPE_COUNT_CAPS[Sta_NUM_COUNT_TYPES]; extern const char *Txt_STAT_COUNT_TYPE[Sta_NUM_COUNT_TYPES];
extern const char *Txt_DAYS_SMALL[7]; extern const char *Txt_DAYS[7];
unsigned NumHit; unsigned NumHit;
struct Dat_Date ReadDate; struct Dat_Date ReadDate;
struct Dat_Date LastDate; struct Dat_Date LastDate;
@ -1461,9 +1461,9 @@ static void Sta_ShowNumHitsPerDay (Sta_CountType_t CountType,
/***** Write heading *****/ /***** Write heading *****/
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TH (Txt_Date ,HTM_HEAD_CENTER); HTM_TH (Txt_Date ,HTM_HEAD_CENTER);
HTM_TH (Txt_Day ,HTM_HEAD_LEFT ); HTM_TH (Txt_Day ,HTM_HEAD_LEFT );
HTM_TH (Txt_STAT_TYPE_COUNT_CAPS[CountType],HTM_HEAD_LEFT ); HTM_TH (Txt_STAT_COUNT_TYPE[CountType],HTM_HEAD_LEFT );
HTM_TR_End (); HTM_TR_End ();
/***** Compute maximum number of pages generated per day *****/ /***** Compute maximum number of pages generated per day *****/
@ -1511,7 +1511,7 @@ static void Sta_ShowNumHitsPerDay (Sta_CountType_t CountType,
NumDayWeek == 6 ? "LOG_R" : NumDayWeek == 6 ? "LOG_R" :
"LOG", "LOG",
The_GetSuffix ()); The_GetSuffix ());
HTM_TxtF ("%s&nbsp;",Txt_DAYS_SMALL[NumDayWeek]); HTM_TxtF ("%s&nbsp;",Txt_DAYS[NumDayWeek]);
HTM_TD_End (); HTM_TD_End ();
/* Draw bar proportional to number of hits */ /* Draw bar proportional to number of hits */
@ -1555,7 +1555,7 @@ static void Sta_ShowNumHitsPerDay (Sta_CountType_t CountType,
NumDayWeek == 6 ? "LOG_R" : NumDayWeek == 6 ? "LOG_R" :
"LOG", "LOG",
The_GetSuffix ()); The_GetSuffix ());
HTM_TxtF ("%s&nbsp;",Txt_DAYS_SMALL[NumDayWeek]); HTM_TxtF ("%s&nbsp;",Txt_DAYS[NumDayWeek]);
HTM_TD_End (); HTM_TD_End ();
/* Draw bar proportional to number of hits */ /* Draw bar proportional to number of hits */
@ -1585,8 +1585,8 @@ static void Sta_ShowDistrAccessesPerDayAndHour (const struct Sta_Stats *Stats,
extern const char *Txt_STAT_COLOR_TYPES[Sta_NUM_COLOR_TYPES]; extern const char *Txt_STAT_COLOR_TYPES[Sta_NUM_COLOR_TYPES];
extern const char *Txt_Date; extern const char *Txt_Date;
extern const char *Txt_Day; extern const char *Txt_Day;
extern const char *Txt_STAT_TYPE_COUNT_CAPS[Sta_NUM_COUNT_TYPES]; extern const char *Txt_STAT_COUNT_TYPE[Sta_NUM_COUNT_TYPES];
extern const char *Txt_DAYS_SMALL[7]; extern const char *Txt_DAYS[7];
Sta_ColorType_t ColorType; Sta_ColorType_t ColorType;
unsigned ColorTypeUnsigned; unsigned ColorTypeUnsigned;
Sta_ColorType_t SelectedColorType; Sta_ColorType_t SelectedColorType;
@ -1660,9 +1660,9 @@ static void Sta_ShowDistrAccessesPerDayAndHour (const struct Sta_Stats *Stats,
/***** Write heading *****/ /***** Write heading *****/
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TH_Span (Txt_Date ,HTM_HEAD_CENTER,3, 1,NULL); HTM_TH_Span (Txt_Date ,HTM_HEAD_CENTER,3, 1,NULL);
HTM_TH_Span (Txt_Day ,HTM_HEAD_LEFT ,3, 1,NULL); HTM_TH_Span (Txt_Day ,HTM_HEAD_LEFT ,3, 1,NULL);
HTM_TH_Span (Txt_STAT_TYPE_COUNT_CAPS[Stats->CountType],HTM_HEAD_LEFT ,1,24,NULL); HTM_TH_Span (Txt_STAT_COUNT_TYPE[Stats->CountType],HTM_HEAD_LEFT ,1,24,NULL);
HTM_TR_End (); HTM_TR_End ();
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
@ -1740,7 +1740,7 @@ static void Sta_ShowDistrAccessesPerDayAndHour (const struct Sta_Stats *Stats,
NumDayWeek == 6 ? "LOG_R" : NumDayWeek == 6 ? "LOG_R" :
"LOG", "LOG",
The_GetSuffix ()); The_GetSuffix ());
HTM_TxtF ("%s&nbsp;",Txt_DAYS_SMALL[NumDayWeek]); HTM_TxtF ("%s&nbsp;",Txt_DAYS[NumDayWeek]);
HTM_TD_End (); HTM_TD_End ();
/* Draw a cell with the color proportional to the number of clicks */ /* Draw a cell with the color proportional to the number of clicks */
@ -1794,7 +1794,7 @@ static void Sta_ShowDistrAccessesPerDayAndHour (const struct Sta_Stats *Stats,
NumDayWeek == 6 ? "LOG_R" : NumDayWeek == 6 ? "LOG_R" :
"LOG", "LOG",
The_GetSuffix ()); The_GetSuffix ());
HTM_TxtF ("%s&nbsp;",Txt_DAYS_SMALL[NumDayWeek]); HTM_TxtF ("%s&nbsp;",Txt_DAYS[NumDayWeek]);
HTM_TD_End (); HTM_TD_End ();
/* Draw the color proporcional al number of clicks */ /* Draw the color proporcional al number of clicks */
@ -1836,7 +1836,7 @@ static void Sta_ShowDistrAccessesPerDayAndHour (const struct Sta_Stats *Stats,
NumDayWeek == 6 ? "LOG_R" : NumDayWeek == 6 ? "LOG_R" :
"LOG", "LOG",
The_GetSuffix ()); The_GetSuffix ());
HTM_TxtF ("%s&nbsp;",Txt_DAYS_SMALL[NumDayWeek]); HTM_TxtF ("%s&nbsp;",Txt_DAYS[NumDayWeek]);
HTM_TD_End (); HTM_TD_End ();
/* Draw the color proportional to number of clicks */ /* Draw the color proportional to number of clicks */
@ -2052,7 +2052,7 @@ static void Sta_ShowNumHitsPerWeek (Sta_CountType_t CountType,
MYSQL_RES *mysql_res) MYSQL_RES *mysql_res)
{ {
extern const char *Txt_Week; extern const char *Txt_Week;
extern const char *Txt_STAT_TYPE_COUNT_CAPS[Sta_NUM_COUNT_TYPES]; extern const char *Txt_STAT_COUNT_TYPE[Sta_NUM_COUNT_TYPES];
unsigned NumHit; unsigned NumHit;
struct Dat_Date ReadDate; struct Dat_Date ReadDate;
struct Dat_Date LastDate; struct Dat_Date LastDate;
@ -2068,8 +2068,8 @@ static void Sta_ShowNumHitsPerWeek (Sta_CountType_t CountType,
/***** Write heading *****/ /***** Write heading *****/
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TH (Txt_Week ,HTM_HEAD_LEFT); HTM_TH (Txt_Week ,HTM_HEAD_LEFT);
HTM_TH (Txt_STAT_TYPE_COUNT_CAPS[CountType],HTM_HEAD_LEFT); HTM_TH (Txt_STAT_COUNT_TYPE[CountType],HTM_HEAD_LEFT);
HTM_TR_End (); HTM_TR_End ();
/***** Compute maximum number of pages generated per week *****/ /***** Compute maximum number of pages generated per week *****/
@ -2152,7 +2152,7 @@ static void Sta_ShowNumHitsPerMonth (Sta_CountType_t CountType,
MYSQL_RES *mysql_res) MYSQL_RES *mysql_res)
{ {
extern const char *Txt_Month; extern const char *Txt_Month;
extern const char *Txt_STAT_TYPE_COUNT_CAPS[Sta_NUM_COUNT_TYPES]; extern const char *Txt_STAT_COUNT_TYPE[Sta_NUM_COUNT_TYPES];
unsigned NumHit; unsigned NumHit;
struct Dat_Date ReadDate; struct Dat_Date ReadDate;
struct Dat_Date LastDate; struct Dat_Date LastDate;
@ -2167,8 +2167,8 @@ static void Sta_ShowNumHitsPerMonth (Sta_CountType_t CountType,
/***** Write heading *****/ /***** Write heading *****/
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TH (Txt_Month ,HTM_HEAD_LEFT); HTM_TH (Txt_Month ,HTM_HEAD_LEFT);
HTM_TH (Txt_STAT_TYPE_COUNT_CAPS[CountType],HTM_HEAD_LEFT); HTM_TH (Txt_STAT_COUNT_TYPE[CountType],HTM_HEAD_LEFT);
HTM_TR_End (); HTM_TR_End ();
/***** Compute maximum number of pages generated per month *****/ /***** Compute maximum number of pages generated per month *****/
@ -2251,7 +2251,7 @@ static void Sta_ShowNumHitsPerYear (Sta_CountType_t CountType,
MYSQL_RES *mysql_res) MYSQL_RES *mysql_res)
{ {
extern const char *Txt_Year; extern const char *Txt_Year;
extern const char *Txt_STAT_TYPE_COUNT_CAPS[Sta_NUM_COUNT_TYPES]; extern const char *Txt_STAT_COUNT_TYPE[Sta_NUM_COUNT_TYPES];
unsigned NumHit; unsigned NumHit;
struct Dat_Date ReadDate; struct Dat_Date ReadDate;
struct Dat_Date LastDate; struct Dat_Date LastDate;
@ -2266,8 +2266,8 @@ static void Sta_ShowNumHitsPerYear (Sta_CountType_t CountType,
/***** Write heading *****/ /***** Write heading *****/
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TH (Txt_Year ,HTM_HEAD_LEFT); HTM_TH (Txt_Year ,HTM_HEAD_LEFT);
HTM_TH (Txt_STAT_TYPE_COUNT_CAPS[CountType],HTM_HEAD_LEFT); HTM_TH (Txt_STAT_COUNT_TYPE[CountType],HTM_HEAD_LEFT);
HTM_TR_End (); HTM_TR_End ();
/***** Compute maximum number of pages generated per year *****/ /***** Compute maximum number of pages generated per year *****/
@ -2684,7 +2684,7 @@ static void Sta_ShowNumHitsPerAction (Sta_CountType_t CountType,
{ {
extern Act_Action_t Act_FromActCodToAction[1 + Act_MAX_ACTION_COD]; extern Act_Action_t Act_FromActCodToAction[1 + Act_MAX_ACTION_COD];
extern const char *Txt_Action; extern const char *Txt_Action;
extern const char *Txt_STAT_TYPE_COUNT_CAPS[Sta_NUM_COUNT_TYPES]; extern const char *Txt_STAT_COUNT_TYPE[Sta_NUM_COUNT_TYPES];
unsigned NumHit; unsigned NumHit;
struct Sta_Hits Hits; struct Sta_Hits Hits;
MYSQL_ROW row; MYSQL_ROW row;
@ -2692,8 +2692,8 @@ static void Sta_ShowNumHitsPerAction (Sta_CountType_t CountType,
/***** Write heading *****/ /***** Write heading *****/
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TH (Txt_Action ,HTM_HEAD_RIGHT); HTM_TH (Txt_Action ,HTM_HEAD_RIGHT);
HTM_TH (Txt_STAT_TYPE_COUNT_CAPS[CountType],HTM_HEAD_LEFT ); HTM_TH (Txt_STAT_COUNT_TYPE[CountType],HTM_HEAD_LEFT );
HTM_TR_End (); HTM_TR_End ();
/***** Compute maximum number of pages generated per day *****/ /***** Compute maximum number of pages generated per day *****/
@ -2737,7 +2737,7 @@ static void Sta_ShowNumHitsPerPlugin (Sta_CountType_t CountType,
MYSQL_RES *mysql_res) MYSQL_RES *mysql_res)
{ {
extern const char *Txt_Plugin; extern const char *Txt_Plugin;
extern const char *Txt_STAT_TYPE_COUNT_CAPS[Sta_NUM_COUNT_TYPES]; extern const char *Txt_STAT_COUNT_TYPE[Sta_NUM_COUNT_TYPES];
unsigned NumHit; unsigned NumHit;
struct Sta_Hits Hits; struct Sta_Hits Hits;
MYSQL_ROW row; MYSQL_ROW row;
@ -2745,8 +2745,8 @@ static void Sta_ShowNumHitsPerPlugin (Sta_CountType_t CountType,
/***** Write heading *****/ /***** Write heading *****/
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TH (Txt_Plugin ,HTM_HEAD_RIGHT); HTM_TH (Txt_Plugin ,HTM_HEAD_RIGHT);
HTM_TH (Txt_STAT_TYPE_COUNT_CAPS[CountType],HTM_HEAD_LEFT ); HTM_TH (Txt_STAT_COUNT_TYPE[CountType],HTM_HEAD_LEFT );
HTM_TR_End (); HTM_TR_End ();
/***** Compute maximum number of pages generated per plugin *****/ /***** Compute maximum number of pages generated per plugin *****/
@ -2791,7 +2791,7 @@ static void Sta_ShowNumHitsPerWSFunction (Sta_CountType_t CountType,
MYSQL_RES *mysql_res) MYSQL_RES *mysql_res)
{ {
extern const char *Txt_Function; extern const char *Txt_Function;
extern const char *Txt_STAT_TYPE_COUNT_CAPS[Sta_NUM_COUNT_TYPES]; extern const char *Txt_STAT_COUNT_TYPE[Sta_NUM_COUNT_TYPES];
unsigned NumHit; unsigned NumHit;
struct Sta_Hits Hits; struct Sta_Hits Hits;
MYSQL_ROW row; MYSQL_ROW row;
@ -2799,8 +2799,8 @@ static void Sta_ShowNumHitsPerWSFunction (Sta_CountType_t CountType,
/***** Write heading *****/ /***** Write heading *****/
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TH (Txt_Function ,HTM_HEAD_LEFT); HTM_TH (Txt_Function ,HTM_HEAD_LEFT);
HTM_TH (Txt_STAT_TYPE_COUNT_CAPS[CountType],HTM_HEAD_LEFT); HTM_TH (Txt_STAT_COUNT_TYPE[CountType],HTM_HEAD_LEFT);
HTM_TR_End (); HTM_TR_End ();
/***** Compute maximum number of pages generated per function *****/ /***** Compute maximum number of pages generated per function *****/
@ -2842,7 +2842,7 @@ static void Sta_ShowNumHitsPerBanner (Sta_CountType_t CountType,
MYSQL_RES *mysql_res) MYSQL_RES *mysql_res)
{ {
extern const char *Txt_Banner; extern const char *Txt_Banner;
extern const char *Txt_STAT_TYPE_COUNT_CAPS[Sta_NUM_COUNT_TYPES]; extern const char *Txt_STAT_COUNT_TYPE[Sta_NUM_COUNT_TYPES];
unsigned NumHit; unsigned NumHit;
double NumClicks; double NumClicks;
double MaxClicks = 0.0; double MaxClicks = 0.0;
@ -2852,8 +2852,8 @@ static void Sta_ShowNumHitsPerBanner (Sta_CountType_t CountType,
/***** Write heading *****/ /***** Write heading *****/
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TH (Txt_Banner ,HTM_HEAD_CENTER); HTM_TH (Txt_Banner ,HTM_HEAD_CENTER);
HTM_TH (Txt_STAT_TYPE_COUNT_CAPS[CountType],HTM_HEAD_LEFT ); HTM_TH (Txt_STAT_COUNT_TYPE[CountType],HTM_HEAD_LEFT );
HTM_TR_End (); HTM_TR_End ();
/***** Compute maximum number of clicks per banner *****/ /***** Compute maximum number of clicks per banner *****/
@ -2914,7 +2914,7 @@ static void Sta_ShowNumHitsPerCountry (Sta_CountType_t CountType,
{ {
extern const char *Txt_No_INDEX; extern const char *Txt_No_INDEX;
extern const char *Txt_Country; extern const char *Txt_Country;
extern const char *Txt_STAT_TYPE_COUNT_CAPS[Sta_NUM_COUNT_TYPES]; extern const char *Txt_STAT_COUNT_TYPE[Sta_NUM_COUNT_TYPES];
unsigned NumHit; unsigned NumHit;
unsigned Ranking; unsigned Ranking;
struct Sta_Hits Hits; struct Sta_Hits Hits;
@ -2923,9 +2923,9 @@ static void Sta_ShowNumHitsPerCountry (Sta_CountType_t CountType,
/***** Write heading *****/ /***** Write heading *****/
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TH (Txt_No_INDEX ,HTM_HEAD_CENTER); HTM_TH (Txt_No_INDEX ,HTM_HEAD_CENTER);
HTM_TH (Txt_Country ,HTM_HEAD_CENTER); HTM_TH (Txt_Country ,HTM_HEAD_CENTER);
HTM_TH (Txt_STAT_TYPE_COUNT_CAPS[CountType],HTM_HEAD_LEFT ); HTM_TH (Txt_STAT_COUNT_TYPE[CountType],HTM_HEAD_LEFT );
HTM_TR_End (); HTM_TR_End ();
/***** Compute maximum number of hits per country *****/ /***** Compute maximum number of hits per country *****/
@ -3002,7 +3002,7 @@ static void Sta_ShowNumHitsPerInstitution (Sta_CountType_t CountType,
{ {
extern const char *Txt_No_INDEX; extern const char *Txt_No_INDEX;
extern const char *Txt_Institution; extern const char *Txt_Institution;
extern const char *Txt_STAT_TYPE_COUNT_CAPS[Sta_NUM_COUNT_TYPES]; extern const char *Txt_STAT_COUNT_TYPE[Sta_NUM_COUNT_TYPES];
unsigned NumHit; unsigned NumHit;
unsigned Ranking; unsigned Ranking;
struct Sta_Hits Hits; struct Sta_Hits Hits;
@ -3011,9 +3011,9 @@ static void Sta_ShowNumHitsPerInstitution (Sta_CountType_t CountType,
/***** Write heading *****/ /***** Write heading *****/
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TH (Txt_No_INDEX ,HTM_HEAD_CENTER); HTM_TH (Txt_No_INDEX ,HTM_HEAD_CENTER);
HTM_TH (Txt_Institution ,HTM_HEAD_CENTER); HTM_TH (Txt_Institution ,HTM_HEAD_CENTER);
HTM_TH (Txt_STAT_TYPE_COUNT_CAPS[CountType],HTM_HEAD_LEFT ); HTM_TH (Txt_STAT_COUNT_TYPE[CountType],HTM_HEAD_LEFT );
HTM_TR_End (); HTM_TR_End ();
/***** Compute maximum number of hits per institution *****/ /***** Compute maximum number of hits per institution *****/
@ -3093,7 +3093,7 @@ static void Sta_ShowNumHitsPerCenter (Sta_CountType_t CountType,
{ {
extern const char *Txt_No_INDEX; extern const char *Txt_No_INDEX;
extern const char *Txt_Center; extern const char *Txt_Center;
extern const char *Txt_STAT_TYPE_COUNT_CAPS[Sta_NUM_COUNT_TYPES]; extern const char *Txt_STAT_COUNT_TYPE[Sta_NUM_COUNT_TYPES];
unsigned NumHit; unsigned NumHit;
unsigned Ranking; unsigned Ranking;
struct Sta_Hits Hits; struct Sta_Hits Hits;
@ -3102,9 +3102,9 @@ static void Sta_ShowNumHitsPerCenter (Sta_CountType_t CountType,
/***** Write heading *****/ /***** Write heading *****/
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TH (Txt_No_INDEX ,HTM_HEAD_CENTER); HTM_TH (Txt_No_INDEX ,HTM_HEAD_CENTER);
HTM_TH (Txt_Center ,HTM_HEAD_CENTER); HTM_TH (Txt_Center ,HTM_HEAD_CENTER);
HTM_TH (Txt_STAT_TYPE_COUNT_CAPS[CountType],HTM_HEAD_LEFT ); HTM_TH (Txt_STAT_COUNT_TYPE[CountType],HTM_HEAD_LEFT );
HTM_TR_End (); HTM_TR_End ();
/***** Compute maximum number of hits per center *****/ /***** Compute maximum number of hits per center *****/
@ -3184,7 +3184,7 @@ static void Sta_ShowNumHitsPerDegree (Sta_CountType_t CountType,
{ {
extern const char *Txt_No_INDEX; extern const char *Txt_No_INDEX;
extern const char *Txt_Degree; extern const char *Txt_Degree;
extern const char *Txt_STAT_TYPE_COUNT_CAPS[Sta_NUM_COUNT_TYPES]; extern const char *Txt_STAT_COUNT_TYPE[Sta_NUM_COUNT_TYPES];
unsigned NumHit; unsigned NumHit;
unsigned Ranking; unsigned Ranking;
struct Sta_Hits Hits; struct Sta_Hits Hits;
@ -3193,9 +3193,9 @@ static void Sta_ShowNumHitsPerDegree (Sta_CountType_t CountType,
/***** Write heading *****/ /***** Write heading *****/
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TH (Txt_No_INDEX ,HTM_HEAD_CENTER); HTM_TH (Txt_No_INDEX ,HTM_HEAD_CENTER);
HTM_TH (Txt_Degree ,HTM_HEAD_CENTER); HTM_TH (Txt_Degree ,HTM_HEAD_CENTER);
HTM_TH (Txt_STAT_TYPE_COUNT_CAPS[CountType],HTM_HEAD_LEFT ); HTM_TH (Txt_STAT_COUNT_TYPE[CountType],HTM_HEAD_LEFT );
HTM_TR_End (); HTM_TR_End ();
/***** Compute maximum number of hits per degree *****/ /***** Compute maximum number of hits per degree *****/
@ -3277,7 +3277,7 @@ static void Sta_ShowNumHitsPerCourse (Sta_CountType_t CountType,
extern const char *Txt_Degree; extern const char *Txt_Degree;
extern const char *Txt_Year_OF_A_DEGREE; extern const char *Txt_Year_OF_A_DEGREE;
extern const char *Txt_Course; extern const char *Txt_Course;
extern const char *Txt_STAT_TYPE_COUNT_CAPS[Sta_NUM_COUNT_TYPES]; extern const char *Txt_STAT_COUNT_TYPE[Sta_NUM_COUNT_TYPES];
extern const char *Txt_YEAR_OF_DEGREE[1 + Deg_MAX_YEARS_PER_DEGREE]; // Declaration in swad_degree.c extern const char *Txt_YEAR_OF_DEGREE[1 + Deg_MAX_YEARS_PER_DEGREE]; // Declaration in swad_degree.c
unsigned NumHit; unsigned NumHit;
unsigned Ranking; unsigned Ranking;
@ -3288,11 +3288,11 @@ static void Sta_ShowNumHitsPerCourse (Sta_CountType_t CountType,
/***** Write heading *****/ /***** Write heading *****/
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TH (Txt_No_INDEX ,HTM_HEAD_CENTER); HTM_TH (Txt_No_INDEX ,HTM_HEAD_CENTER);
HTM_TH (Txt_Degree ,HTM_HEAD_CENTER); HTM_TH (Txt_Degree ,HTM_HEAD_CENTER);
HTM_TH (Txt_Year_OF_A_DEGREE ,HTM_HEAD_CENTER); HTM_TH (Txt_Year_OF_A_DEGREE ,HTM_HEAD_CENTER);
HTM_TH (Txt_Course ,HTM_HEAD_CENTER); HTM_TH (Txt_Course ,HTM_HEAD_CENTER);
HTM_TH (Txt_STAT_TYPE_COUNT_CAPS[CountType],HTM_HEAD_LEFT ); HTM_TH (Txt_STAT_COUNT_TYPE[CountType],HTM_HEAD_LEFT );
HTM_TR_End (); HTM_TR_End ();
/***** Compute maximum number of pages generated per course *****/ /***** Compute maximum number of pages generated per course *****/

522
swad_text.c
View File

File diff suppressed because it is too large Load Diff

4
swad_timetable.c
View File

@ -1175,7 +1175,7 @@ static void Tmt_TimeTableDrawAdjustRow (void)
static void Tmt_TimeTableDrawDaysCells (void) static void Tmt_TimeTableDrawDaysCells (void)
{ {
extern const char *Txt_DAYS_CAPS[7]; extern const char *Txt_DAYS[7];
unsigned DayColumn; unsigned DayColumn;
unsigned Weekday; unsigned Weekday;
@ -1190,7 +1190,7 @@ static void Tmt_TimeTableDrawDaysCells (void)
"Tmt_DAY_", // Monday to Saturday "Tmt_DAY_", // Monday to Saturday
The_GetSuffix (), The_GetSuffix (),
Tmt_PERCENT_WIDTH_OF_A_DAY); Tmt_PERCENT_WIDTH_OF_A_DAY);
HTM_Txt (Txt_DAYS_CAPS[Weekday]); HTM_Txt (Txt_DAYS[Weekday]);
HTM_TD_End (); HTM_TD_End ();
} }
} }