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 23.44.2: Nov 06, 2023 Code refactoring in hierarchy.

This commit is contained in:
acanas 2023-11-06 15:20:34 +01:00
parent 32a043c643
commit 69d1ed4108
19 changed files with 222 additions and 232 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
swad_browser.c
View File

@ -9910,7 +9910,7 @@ void Brw_GetAndShowFileBrowsersStats (void)
static void Brw_WriteStatsFileZonesTableHead1 (void)
{
extern const char *Txt_File_zones;
extern const char *Txt_Courses;
extern const char *Txt_HIERARCHY_PLURAL_Abc[Hie_NUM_LEVELS];
extern const char *Txt_Groups;
extern const char *Txt_Users;
extern const char *Txt_Max_levels;
@ -9919,14 +9919,14 @@ static void Brw_WriteStatsFileZonesTableHead1 (void)
extern const char *Txt_Size;
HTM_TR_Begin (NULL);
HTM_TH (Txt_File_zones,HTM_HEAD_LEFT);
HTM_TH (Txt_Courses ,HTM_HEAD_RIGHT);
HTM_TH (Txt_Groups ,HTM_HEAD_RIGHT);
HTM_TH (Txt_Users ,HTM_HEAD_RIGHT);
HTM_TH (Txt_Max_levels,HTM_HEAD_RIGHT);
HTM_TH (Txt_Folders ,HTM_HEAD_RIGHT);
HTM_TH (Txt_Files ,HTM_HEAD_RIGHT);
HTM_TH (Txt_Size ,HTM_HEAD_RIGHT);
HTM_TH (Txt_File_zones ,HTM_HEAD_LEFT);
HTM_TH (Txt_HIERARCHY_PLURAL_Abc[Hie_CRS],HTM_HEAD_RIGHT);
HTM_TH (Txt_Groups ,HTM_HEAD_RIGHT);
HTM_TH (Txt_Users ,HTM_HEAD_RIGHT);
HTM_TH (Txt_Max_levels ,HTM_HEAD_RIGHT);
HTM_TH (Txt_Folders ,HTM_HEAD_RIGHT);
HTM_TH (Txt_Files ,HTM_HEAD_RIGHT);
HTM_TH (Txt_Size ,HTM_HEAD_RIGHT);
HTM_TR_End ();
}

8
swad_center_config.c
View File

@ -771,7 +771,7 @@ static void CtrCfg_NumUsrs (void)
static void CtrCfg_NumDegs (void)
{
extern const char *Txt_Degrees;
extern const char *Txt_HIERARCHY_PLURAL_Abc[Hie_NUM_LEVELS];
extern const char *Txt_Degrees_of_CENTER_X;
char *Title;
@ -779,7 +779,7 @@ static void CtrCfg_NumDegs (void)
HTM_TR_Begin (NULL);
/* Label */
Frm_LabelColumn ("RT",NULL,Txt_Degrees);
Frm_LabelColumn ("RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_DEG]);
/* Data */
HTM_TD_Begin ("class=\"LB DAT_%s\"",The_GetSuffix ());
@ -806,13 +806,13 @@ static void CtrCfg_NumDegs (void)
static void CtrCfg_NumCrss (void)
{
extern const char *Txt_Courses;
extern const char *Txt_HIERARCHY_PLURAL_Abc[Hie_NUM_LEVELS];
/***** Number of courses *****/
HTM_TR_Begin (NULL);
/* Label */
Frm_LabelColumn ("RT",NULL,Txt_Courses);
Frm_LabelColumn ("RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_CRS]);
/* Data */
HTM_TD_Begin ("class=\"LB DAT_%s\"",The_GetSuffix ());

3
swad_changelog.h
View File

@ -633,10 +633,11 @@ Me sale este error, no s
"can npt create received message (duplicated entry '243218-2160773' for key 'UsrCod_MsgCod')
*/
#define Log_PLATFORM_VERSION "SWAD 23.44.1 (2023-11-06)"
#define Log_PLATFORM_VERSION "SWAD 23.44.2 (2023-11-06)"
#define CSS_FILE "swad23.35.1.css"
#define JS_FILE "swad22.49.js"
/*
Version 23.44.2: Nov 06, 2023 Code refactoring in hierarchy. (335532 lines)
Version 23.44.1: Nov 06, 2023 Code refactoring in hierarchy. (335538 lines)
Version 23.44: Nov 06, 2023 Code refactoring in hierarchy. (335571 lines)
Version 23.43.1: Nov 06, 2023 Code refactoring in forms. (335583 lines)

8
swad_country.c
View File

@ -208,7 +208,7 @@ void Cty_ListCountries1 (void)
void Cty_ListCountries2 (void)
{
extern const char *Hlp_SYSTEM_Countries;
extern const char *Txt_Countries;
extern const char *Txt_HIERARCHY_PLURAL_Abc[Hie_NUM_LEVELS];
extern const char *Txt_Other_countries;
extern const char *Txt_Country_unspecified;
unsigned NumCty;
@ -217,7 +217,7 @@ void Cty_ListCountries2 (void)
Hie_WriteMenuHierarchy ();
/***** Begin box and table *****/
Box_BoxTableBegin (NULL,Txt_Countries,
Box_BoxTableBegin (NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_CTY],
Cty_PutIconsListingCountries,NULL,
Hlp_SYSTEM_Countries,Box_NOT_CLOSABLE,2);
@ -660,7 +660,7 @@ void Cty_EditCountries (void)
static void Cty_EditCountriesInternal (void)
{
extern const char *Hlp_SYSTEM_Countries;
extern const char *Txt_Countries;
extern const char *Txt_HIERARCHY_PLURAL_Abc[Hie_NUM_LEVELS];
/***** Get list of countries *****/
Gbl.Hierarchy.List[Hie_SYS].SelectedOrder = Hie_ORDER_BY_NAME;
@ -670,7 +670,7 @@ static void Cty_EditCountriesInternal (void)
Hie_WriteMenuHierarchy ();
/***** Begin box *****/
Box_BoxBegin (NULL,Txt_Countries,
Box_BoxBegin (NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_CTY],
Cty_PutIconsEditingCountries,NULL,
Hlp_SYSTEM_Countries,Box_NOT_CLOSABLE);

12
swad_country_config.c
View File

@ -477,7 +477,7 @@ static void CtyCfg_NumUsrs (void)
static void CtyCfg_NumInss (void)
{
extern const char *Txt_Institutions;
extern const char *Txt_HIERARCHY_PLURAL_Abc[Hie_NUM_LEVELS];
extern const char *Txt_Institutions_of_COUNTRY_X;
char *Title;
@ -485,7 +485,7 @@ static void CtyCfg_NumInss (void)
HTM_TR_Begin (NULL);
/* Label */
Frm_LabelColumn ("RT",NULL,Txt_Institutions);
Frm_LabelColumn ("RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_INS]);
/* Data */
HTM_TD_Begin ("class=\"LT DAT_%s\"",The_GetSuffix ());
@ -512,13 +512,13 @@ static void CtyCfg_NumInss (void)
static void CtyCfg_NumDegs (void)
{
extern const char *Txt_Degrees;
extern const char *Txt_HIERARCHY_PLURAL_Abc[Hie_NUM_LEVELS];
/***** Number of degrees *****/
HTM_TR_Begin (NULL);
/* Label */
Frm_LabelColumn ("RT",NULL,Txt_Degrees);
Frm_LabelColumn ("RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_DEG]);
/* Data */
HTM_TD_Begin ("class=\"LB DAT_%s\"",The_GetSuffix ());
@ -536,13 +536,13 @@ static void CtyCfg_NumDegs (void)
static void CtyCfg_NumCrss (void)
{
extern const char *Txt_Courses;
extern const char *Txt_HIERARCHY_PLURAL_Abc[Hie_NUM_LEVELS];
/***** Number of courses *****/
HTM_TR_Begin (NULL);
/* Label */
Frm_LabelColumn ("RT",NULL,Txt_Courses);
Frm_LabelColumn ("RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_CRS]);
/* Data */
HTM_TD_Begin ("class=\"LB DAT_%s\"",The_GetSuffix ());

4
swad_degree_config.c
View File

@ -323,7 +323,7 @@ static void DegCfg_QR (void)
static void DegCfg_NumCrss (void)
{
extern const char *Txt_Courses;
extern const char *Txt_HIERARCHY_PLURAL_Abc[Hie_NUM_LEVELS];
extern const char *Txt_Courses_of_DEGREE_X;
char *Title;
@ -332,7 +332,7 @@ static void DegCfg_NumCrss (void)
HTM_TR_Begin (NULL);
/* Label */
Frm_LabelColumn ("RT",NULL,Txt_Courses);
Frm_LabelColumn ("RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_CRS]);
/* Data */
HTM_TD_Begin ("class=\"LB DAT_%s\"",The_GetSuffix ());

10
swad_degree_type.c
View File

@ -558,14 +558,14 @@ static void DegTyp_PutHeadDegreeTypesForEdition (void)
{
extern const char *Txt_Code;
extern const char *Txt_Type_of_degree;
extern const char *Txt_Degrees;
extern const char *Txt_HIERARCHY_PLURAL_Abc[Hie_NUM_LEVELS];
HTM_TR_Begin (NULL);
HTM_TH_Span (NULL ,HTM_HEAD_CENTER,1,1,"BT");
HTM_TH (Txt_Code ,HTM_HEAD_CENTER);
HTM_TH (Txt_Type_of_degree,HTM_HEAD_CENTER);
HTM_TH (Txt_Degrees ,HTM_HEAD_RIGHT );
HTM_TH_Span (NULL ,HTM_HEAD_CENTER,1,1,"BT");
HTM_TH (Txt_Code ,HTM_HEAD_CENTER);
HTM_TH (Txt_Type_of_degree ,HTM_HEAD_CENTER);
HTM_TH (Txt_HIERARCHY_PLURAL_Abc[Hie_DEG],HTM_HEAD_RIGHT );
HTM_TR_End ();
}

29
swad_forum.c
View File

@ -3334,10 +3334,7 @@ static void For_ShowStatOfAForumType (For_ForumType_t ForumType,
long HieCod[Hie_NUM_LEVELS],
struct For_FiguresForum *FiguresForum)
{
extern const char *Txt_Courses;
extern const char *Txt_Degrees;
extern const char *Txt_Centers;
extern const char *Txt_Institutions;
extern const char *Txt_HIERARCHY_PLURAL_Abc[Hie_NUM_LEVELS];
extern const char *Txt_General;
extern const char *Txt_only_teachers;
static const char *PlatformShortName = Cfg_PLATFORM_SHORT_NAME;
@ -3349,18 +3346,18 @@ static void For_ShowStatOfAForumType (For_ForumType_t ForumType,
const char **ForumName2;
} Pars[For_NUM_TYPES_FORUM] =
{
[For_FORUM_COURSE_USRS] = {"chalkboard-teacher.svg",&Txt_Courses ,&EmptyName },
[For_FORUM_COURSE_TCHS] = {"chalkboard-teacher.svg",&Txt_Courses ,&Txt_only_teachers},
[For_FORUM_DEGREE_USRS] = {"graduation-cap.svg" ,&Txt_Degrees ,&EmptyName },
[For_FORUM_DEGREE_TCHS] = {"graduation-cap.svg" ,&Txt_Degrees ,&Txt_only_teachers},
[For_FORUM_CENTER_USRS] = {"building.svg" ,&Txt_Centers ,&EmptyName },
[For_FORUM_CENTER_TCHS] = {"building.svg" ,&Txt_Centers ,&Txt_only_teachers},
[For_FORUM_INSTIT_USRS] = {"university.svg" ,&Txt_Institutions ,&EmptyName },
[For_FORUM_INSTIT_TCHS] = {"university.svg" ,&Txt_Institutions ,&Txt_only_teachers},
[For_FORUM_GLOBAL_USRS] = {"comments.svg" ,&Txt_General ,&EmptyName },
[For_FORUM_GLOBAL_TCHS] = {"comments.svg" ,&Txt_General ,&Txt_only_teachers},
[For_FORUM__SWAD__USRS] = {"swad64x64.png" ,&PlatformShortName,&EmptyName },
[For_FORUM__SWAD__TCHS] = {"swad64x64.png" ,&PlatformShortName,&Txt_only_teachers},
[For_FORUM_COURSE_USRS] = {"chalkboard-teacher.svg",&Txt_HIERARCHY_PLURAL_Abc[Hie_CRS],&EmptyName },
[For_FORUM_COURSE_TCHS] = {"chalkboard-teacher.svg",&Txt_HIERARCHY_PLURAL_Abc[Hie_CRS],&Txt_only_teachers},
[For_FORUM_DEGREE_USRS] = {"graduation-cap.svg" ,&Txt_HIERARCHY_PLURAL_Abc[Hie_DEG],&EmptyName },
[For_FORUM_DEGREE_TCHS] = {"graduation-cap.svg" ,&Txt_HIERARCHY_PLURAL_Abc[Hie_DEG],&Txt_only_teachers},
[For_FORUM_CENTER_USRS] = {"building.svg" ,&Txt_HIERARCHY_PLURAL_Abc[Hie_CTR],&EmptyName },
[For_FORUM_CENTER_TCHS] = {"building.svg" ,&Txt_HIERARCHY_PLURAL_Abc[Hie_CTR],&Txt_only_teachers},
[For_FORUM_INSTIT_USRS] = {"university.svg" ,&Txt_HIERARCHY_PLURAL_Abc[Hie_INS],&EmptyName },
[For_FORUM_INSTIT_TCHS] = {"university.svg" ,&Txt_HIERARCHY_PLURAL_Abc[Hie_INS],&Txt_only_teachers},
[For_FORUM_GLOBAL_USRS] = {"comments.svg" ,&Txt_General ,&EmptyName },
[For_FORUM_GLOBAL_TCHS] = {"comments.svg" ,&Txt_General ,&Txt_only_teachers},
[For_FORUM__SWAD__USRS] = {"swad64x64.png" ,&PlatformShortName ,&EmptyName },
[For_FORUM__SWAD__TCHS] = {"swad64x64.png" ,&PlatformShortName ,&Txt_only_teachers},
};
if (Pars[ForumType].Icon)

25
swad_help.c
View File

@ -77,19 +77,15 @@ void Hlp_ShowHelpWhatWouldYouLikeToDo (void)
extern const char *Txt_Register_me_in_X;
extern const char *Txt_Select_create_course_in_X;
extern const char *Txt_Select_or_create_one_course_in_X;
extern const char *Txt_Courses;
extern const char *Txt_HIERARCHY_PLURAL_Abc[Hie_NUM_LEVELS];
extern const char *Txt_Select_or_create_another_degree_in_X;
extern const char *Txt_Select_or_create_one_degree_in_X;
extern const char *Txt_Degrees;
extern const char *Txt_Select_or_create_another_center_in_X;
extern const char *Txt_Select_or_create_one_center_in_X;
extern const char *Txt_Centers;
extern const char *Txt_Select_or_create_another_institution_in_X;
extern const char *Txt_Select_or_create_one_institution_in_X;
extern const char *Txt_Institutions;
extern const char *Txt_Select_another_country;
extern const char *Txt_Select_one_country;
extern const char *Txt_Countries;
extern const char *Txt_Upload_my_picture;
extern const char *Txt_Upload_photo;
extern const char *Txt_Log_in;
@ -181,16 +177,17 @@ void Hlp_ShowHelpWhatWouldYouLikeToDo (void)
Btn_CONFIRM_BUTTON,Txt_My_courses);
}
if (Gbl.Hierarchy.Node[Hie_DEG].HieCod > 0) // Degree selected
if (Gbl.Hierarchy.Node[Hie_DEG].HieCod > 0) // Degree selected
{
/* Select a course */
if (asprintf (&Description,Gbl.Hierarchy.Level == Hie_CRS ? Txt_Select_create_course_in_X :
Txt_Select_or_create_one_course_in_X,
Txt_Select_or_create_one_course_in_X,
Gbl.Hierarchy.Node[Hie_DEG].ShrtName) < 0)
Err_NotEnoughMemoryExit ();
Hlp_ShowRowHelpWhatWouldYouLikeToDo (Description,
ActSeeCrs,
Btn_CONFIRM_BUTTON,Txt_Courses);
Btn_CONFIRM_BUTTON,
Txt_HIERARCHY_PLURAL_Abc[Hie_CRS]);
free (Description);
}
else if (Gbl.Hierarchy.Node[Hie_CTR].HieCod > 0) // Center selected
@ -202,7 +199,8 @@ void Hlp_ShowHelpWhatWouldYouLikeToDo (void)
Err_NotEnoughMemoryExit ();
Hlp_ShowRowHelpWhatWouldYouLikeToDo (Description,
ActSeeDeg,
Btn_CONFIRM_BUTTON,Txt_Degrees);
Btn_CONFIRM_BUTTON,
Txt_HIERARCHY_PLURAL_Abc[Hie_DEG]);
free (Description);
}
else if (Gbl.Hierarchy.Node[Hie_INS].HieCod > 0) // Institution selected
@ -214,7 +212,8 @@ void Hlp_ShowHelpWhatWouldYouLikeToDo (void)
Err_NotEnoughMemoryExit ();
Hlp_ShowRowHelpWhatWouldYouLikeToDo (Description,
ActSeeCtr,
Btn_CONFIRM_BUTTON,Txt_Centers);
Btn_CONFIRM_BUTTON,
Txt_HIERARCHY_PLURAL_Abc[Hie_CTR]);
free (Description);
}
else if (Gbl.Hierarchy.Node[Hie_CTY].HieCod > 0) // Country selected
@ -226,7 +225,8 @@ void Hlp_ShowHelpWhatWouldYouLikeToDo (void)
Err_NotEnoughMemoryExit ();
Hlp_ShowRowHelpWhatWouldYouLikeToDo (Description,
ActSeeIns,
Btn_CONFIRM_BUTTON,Txt_Institutions);
Btn_CONFIRM_BUTTON,
Txt_HIERARCHY_PLURAL_Abc[Hie_INS]);
free (Description);
}
else
@ -234,7 +234,8 @@ void Hlp_ShowHelpWhatWouldYouLikeToDo (void)
Hlp_ShowRowHelpWhatWouldYouLikeToDo (Gbl.Hierarchy.Node[Hie_CTY].HieCod > 0 ? Txt_Select_another_country :
Txt_Select_one_country,
ActSeeCty,
Btn_CONFIRM_BUTTON,Txt_Countries);
Btn_CONFIRM_BUTTON,
Txt_HIERARCHY_PLURAL_Abc[Hie_CTY]);
if (!Gbl.Usrs.Me.MyPhotoExists) // I have no photo
Hlp_ShowRowHelpWhatWouldYouLikeToDo (Txt_Upload_my_picture,

18
swad_hierarchy.c
View File

@ -1106,11 +1106,7 @@ void Hie_GetAndShowHierarchyStats (void)
static void Hie_WriteHeadHierarchy (void)
{
extern const char *Txt_Countries;
extern const char *Txt_Institutions;
extern const char *Txt_Centers;
extern const char *Txt_Degrees;
extern const char *Txt_Courses;
extern const char *Txt_HIERARCHY_PLURAL_Abc[Hie_NUM_LEVELS];
static const char *Icons[Hie_NUM_LEVELS] =
{
[Hie_CTY] = "globe-americas.svg",
@ -1119,14 +1115,6 @@ static void Hie_WriteHeadHierarchy (void)
[Hie_DEG] = "graduation-cap.svg",
[Hie_CRS] = "chalkboard-teacher.svg",
};
static const char **Txt[Hie_NUM_LEVELS] =
{
[Hie_CTY] = &Txt_Countries,
[Hie_INS] = &Txt_Institutions,
[Hie_CTR] = &Txt_Centers,
[Hie_DEG] = &Txt_Degrees,
[Hie_CRS] = &Txt_Courses,
};
Hie_Level_t Level;
HTM_TR_Begin (NULL);
@ -1138,9 +1126,9 @@ static void Hie_WriteHeadHierarchy (void)
Level++)
{
HTM_TH_Begin (HTM_HEAD_RIGHT);
Ico_PutIcon (Icons[Level],Ico_BLACK,*Txt[Level],"ICOx16");
Ico_PutIcon (Icons[Level],Ico_BLACK,Txt_HIERARCHY_PLURAL_Abc[Level],"ICOx16");
HTM_BR ();
HTM_Txt (*Txt[Level]);
HTM_Txt (Txt_HIERARCHY_PLURAL_Abc[Level]);
HTM_TH_End ();
}

4
swad_hierarchy_config.c
View File

@ -251,7 +251,7 @@ void HieCfg_Shortcut (Vie_ViewType_t ViewType,ParCod_Param_t ParCode,long HieCod
void HieCfg_NumCtrs (unsigned NumCtrs,Frm_PutForm_t PutForm)
{
extern const char *Txt_Centers;
extern const char *Txt_HIERARCHY_PLURAL_Abc[Hie_NUM_LEVELS];
extern const char *Txt_Centers_of_INSTITUTION_X;
char *Title;
@ -259,7 +259,7 @@ void HieCfg_NumCtrs (unsigned NumCtrs,Frm_PutForm_t PutForm)
HTM_TR_Begin (NULL);
/* Label */
Frm_LabelColumn ("RT",NULL,Txt_Centers);
Frm_LabelColumn ("RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_CTR]);
/* Data */
HTM_TD_Begin ("class=\"LB DAT_%s\"",The_GetSuffix ());

13
swad_indicator.c
View File

@ -439,7 +439,7 @@ static void Ind_ShowNumCoursesWithIndicators (const struct Ind_Indicators *Indic
Frm_PutForm_t PutForm)
{
extern const char *Txt_Indicators;
extern const char *Txt_Courses;
extern const char *Txt_HIERARCHY_PLURAL_Abc[Hie_NUM_LEVELS];
extern const char *Txt_Total;
char *ClassNormal;
char *ClassHighlight;
@ -459,8 +459,8 @@ static void Ind_ShowNumCoursesWithIndicators (const struct Ind_Indicators *Indic
HTM_TR_Begin (NULL);
if (PutForm == Frm_PUT_FORM)
HTM_TH_Empty (1);
HTM_TH (Txt_Indicators,HTM_HEAD_RIGHT);
HTM_TH_Span (Txt_Courses ,HTM_HEAD_RIGHT,1,2,NULL);
HTM_TH (Txt_Indicators ,HTM_HEAD_RIGHT);
HTM_TH_Span (Txt_HIERARCHY_PLURAL_Abc[Hie_CRS],HTM_HEAD_RIGHT,1,2,NULL);
HTM_TR_End ();
for (Ind = 0;
@ -555,7 +555,6 @@ static void Ind_ShowTableOfCoursesWithIndicators (const struct Ind_Indicators *I
extern const char *Txt_YES;
extern const char *Txt_NO;
extern const char *Txt_INFO_SRC_SHORT_TEXT[Inf_NUM_SOURCES];
extern const char *Txt_Courses;
MYSQL_ROW row;
unsigned NumCrs;
long CrsCod;
@ -575,9 +574,9 @@ static void Ind_ShowTableOfCoursesWithIndicators (const struct Ind_Indicators *I
HTM_TR_Begin (NULL);
HTM_TH_Span (Txt_HIERARCHY_SINGUL_Abc[Hie_DEG],HTM_HEAD_LEFT ,3, 1,NULL);
HTM_TH_Span (Txt_HIERARCHY_SINGUL_Abc[Hie_CRS],HTM_HEAD_LEFT ,3, 1,NULL);
HTM_TH_Span (Txt_Institutional_BR_code ,HTM_HEAD_LEFT ,3, 1,NULL);
HTM_TH_Span (Txt_Web_page_of_the_course,HTM_HEAD_LEFT ,3, 1,NULL);
HTM_TH_Span (Txt_Indicators ,HTM_HEAD_CENTER,1,11,NULL);
HTM_TH_Span (Txt_Institutional_BR_code ,HTM_HEAD_LEFT ,3, 1,NULL);
HTM_TH_Span (Txt_Web_page_of_the_course ,HTM_HEAD_LEFT ,3, 1,NULL);
HTM_TH_Span (Txt_Indicators ,HTM_HEAD_CENTER,1,11,NULL);
HTM_TR_End ();
HTM_TR_Begin (NULL);

16
swad_institution.c
View File

@ -1641,11 +1641,11 @@ void Ins_PutParInsCod (void *InsCod)
void Ins_GetAndShowInstitutionsStats (void)
{
extern const char *Hlp_ANALYTICS_Figures_institutions;
extern const char *Txt_Institutions;
extern const char *Txt_HIERARCHY_PLURAL_Abc[Hie_NUM_LEVELS];
struct Fig_Figures Figures;
/***** Begin box *****/
Box_BoxBegin (NULL,Txt_Institutions,
Box_BoxBegin (NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_INS],
NULL,NULL,
Hlp_ANALYTICS_Figures_institutions,Box_NOT_CLOSABLE);
@ -1681,7 +1681,7 @@ void Ins_GetAndShowInstitutionsStats (void)
static void Ins_GetAndShowInssOrderedByNumCtrs (void)
{
extern const char *Txt_Institutions_by_number_of_centers;
extern const char *Txt_Centers;
extern const char *Txt_HIERARCHY_PLURAL_Abc[Hie_NUM_LEVELS];
MYSQL_RES *mysql_res;
unsigned NumInss;
@ -1694,7 +1694,7 @@ static void Ins_GetAndShowInssOrderedByNumCtrs (void)
NumInss = Ins_DB_GetInssOrderedByNumCtrs (&mysql_res);
/***** Show institutions *****/
Ins_ShowInss (&mysql_res,NumInss,Txt_Centers);
Ins_ShowInss (&mysql_res,NumInss,Txt_HIERARCHY_PLURAL_Abc[Hie_CTR]);
/***** Free structure that stores the query result *****/
DB_FreeMySQLResult (&mysql_res);
@ -1710,7 +1710,7 @@ static void Ins_GetAndShowInssOrderedByNumCtrs (void)
static void Ins_GetAndShowInssOrderedByNumDegs (void)
{
extern const char *Txt_Institutions_by_number_of_degrees;
extern const char *Txt_Degrees;
extern const char *Txt_HIERARCHY_PLURAL_Abc[Hie_NUM_LEVELS];
MYSQL_RES *mysql_res;
unsigned NumInss;
@ -1723,7 +1723,7 @@ static void Ins_GetAndShowInssOrderedByNumDegs (void)
NumInss = Ins_DB_GetInssOrderedByNumDegs (&mysql_res);
/***** Show institutions *****/
Ins_ShowInss (&mysql_res,NumInss,Txt_Degrees);
Ins_ShowInss (&mysql_res,NumInss,Txt_HIERARCHY_PLURAL_Abc[Hie_DEG]);
/***** Free structure that stores the query result *****/
DB_FreeMySQLResult (&mysql_res);
@ -1739,7 +1739,7 @@ static void Ins_GetAndShowInssOrderedByNumDegs (void)
static void Ins_GetAndShowInssOrderedByNumCrss (void)
{
extern const char *Txt_Institutions_by_number_of_courses;
extern const char *Txt_Courses;
extern const char *Txt_HIERARCHY_PLURAL_Abc[Hie_NUM_LEVELS];
MYSQL_RES *mysql_res;
unsigned NumInss;
@ -1752,7 +1752,7 @@ static void Ins_GetAndShowInssOrderedByNumCrss (void)
NumInss = Ins_DB_GetInssOrderedByNumCrss (&mysql_res);
/***** Show institutions *****/
Ins_ShowInss (&mysql_res,NumInss,Txt_Courses);
Ins_ShowInss (&mysql_res,NumInss,Txt_HIERARCHY_PLURAL_Abc[Hie_CRS]);
/***** Free structure that stores the query result *****/
DB_FreeMySQLResult (&mysql_res);

8
swad_institution_config.c
View File

@ -447,13 +447,13 @@ static void InsCfg_NumUsrs (void)
static void InsCfg_NumDegs (void)
{
extern const char *Txt_Degrees;
extern const char *Txt_HIERARCHY_PLURAL_Abc[Hie_NUM_LEVELS];
/***** Number of degrees *****/
HTM_TR_Begin (NULL);
/* Label */
Frm_LabelColumn ("RT",NULL,Txt_Degrees);
Frm_LabelColumn ("RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_DEG]);
/* Data */
HTM_TD_Begin ("class=\"LB DAT_%s\"",The_GetSuffix ());
@ -471,13 +471,13 @@ static void InsCfg_NumDegs (void)
static void InsCfg_NumCrss (void)
{
extern const char *Txt_Courses;
extern const char *Txt_HIERARCHY_PLURAL_Abc[Hie_NUM_LEVELS];
/***** Number of courses *****/
HTM_TR_Begin (NULL);
/* Label */
Frm_LabelColumn ("RT",NULL,Txt_Courses);
Frm_LabelColumn ("RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_CRS]);
/* Data */
HTM_TD_Begin ("class=\"LB DAT_%s\"",The_GetSuffix ());

6
swad_photo.c
View File

@ -1691,7 +1691,7 @@ void Pho_PrintPhotoDegree (void)
static void Pho_ShowOrPrintPhotoDegree (Pho_AvgPhotoSeeOrPrint_t SeeOrPrint)
{
extern const char *Hlp_ANALYTICS_Degrees;
extern const char *Txt_Degrees;
extern const char *Txt_HIERARCHY_PLURAL_Abc[Hie_NUM_LEVELS];
static void (*ShowOrPrintDegrees[Set_NUM_USR_LIST_TYPES]) (struct Pho_DegPhotos *DegPhotos,
Pho_AvgPhotoSeeOrPrint_t SeeOrPrint) =
{
@ -1714,7 +1714,7 @@ static void Pho_ShowOrPrintPhotoDegree (Pho_AvgPhotoSeeOrPrint_t SeeOrPrint)
{
case Pho_DEGREES_SEE:
/***** Begin box *****/
Box_BoxBegin (NULL,Txt_Degrees,
Box_BoxBegin (NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_DEG],
Pho_PutIconToPrintDegreeStats,&DegPhotos,
Hlp_ANALYTICS_Degrees,Box_NOT_CLOSABLE);
@ -1737,7 +1737,7 @@ static void Pho_ShowOrPrintPhotoDegree (Pho_AvgPhotoSeeOrPrint_t SeeOrPrint)
break;
case Pho_DEGREES_PRINT:
/***** Begin box *****/
Box_BoxBegin (NULL,Txt_Degrees,
Box_BoxBegin (NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_DEG],
NULL,NULL,
NULL,Box_NOT_CLOSABLE);
break;

12
swad_place.c
View File

@ -677,14 +677,14 @@ static void Plc_PutHeadPlaces (void)
extern const char *Txt_Code;
extern const char *Txt_Short_name;
extern const char *Txt_Full_name;
extern const char *Txt_Centers;
extern const char *Txt_HIERARCHY_PLURAL_Abc[Hie_NUM_LEVELS];
HTM_TR_Begin (NULL);
HTM_TH_Span (NULL ,HTM_HEAD_CENTER,1,1,"BT");
HTM_TH (Txt_Code ,HTM_HEAD_RIGHT );
HTM_TH (Txt_Short_name,HTM_HEAD_LEFT );
HTM_TH (Txt_Full_name ,HTM_HEAD_LEFT );
HTM_TH (Txt_Centers ,HTM_HEAD_RIGHT );
HTM_TH_Span (NULL ,HTM_HEAD_CENTER,1,1,"BT");
HTM_TH (Txt_Code ,HTM_HEAD_RIGHT );
HTM_TH (Txt_Short_name ,HTM_HEAD_LEFT );
HTM_TH (Txt_Full_name ,HTM_HEAD_LEFT );
HTM_TH (Txt_HIERARCHY_PLURAL_Abc[Hie_CTR],HTM_HEAD_RIGHT );
HTM_TR_End ();
}

8
swad_report.c
View File

@ -793,13 +793,13 @@ static void Rep_WriteSectionHitsPerAction (struct Rep_Report *Report)
static void Rep_WriteSectionCurrentCourses (struct Rep_Report *Report)
{
extern const char *Txt_Courses;
extern const char *Txt_HIERARCHY_PLURAL_Abc[Hie_NUM_LEVELS];
Rol_Role_t Role;
/***** Begin section *****/
fprintf (Rep_File,"<section>"
"<h3>%s",
Txt_Courses);
Txt_HIERARCHY_PLURAL_Abc[Hie_CRS]);
if (Report->CurrentTimeUTC.StrDate[0])
fprintf (Rep_File," (%s)",Report->CurrentTimeUTC.StrDate);
fprintf (Rep_File,"</h3>");
@ -823,7 +823,7 @@ static void Rep_WriteSectionCurrentCourses (struct Rep_Report *Report)
static void Rep_WriteSectionHistoricCourses (struct Rep_Report *Report)
{
extern const char *Txt_Courses;
extern const char *Txt_HIERARCHY_PLURAL_Abc[Hie_NUM_LEVELS];
extern const char *Txt_historical_log;
extern const char *Txt_Only_courses_with_more_than_X_clicks_are_shown;
Rol_Role_t Role;
@ -831,7 +831,7 @@ static void Rep_WriteSectionHistoricCourses (struct Rep_Report *Report)
/***** Begin section *****/
fprintf (Rep_File,"<section>"
"<h3>%s (%s)</h3>",
Txt_Courses,Txt_historical_log);
Txt_HIERARCHY_PLURAL_Abc[Hie_CRS],Txt_historical_log);
fprintf (Rep_File,Txt_Only_courses_with_more_than_X_clicks_are_shown,
Rep_MIN_CLICKS_CRS);
fprintf (Rep_File,"<ul>");

19
swad_system_config.c
View File

@ -308,18 +308,19 @@ static void SysCfg_QR (void)
static void SysCfg_NumCtys (void)
{
extern const char *Txt_Countries;
extern const char *Txt_HIERARCHY_PLURAL_Abc[Hie_NUM_LEVELS];
/***** Number of countries ******/
HTM_TR_Begin (NULL);
/* Label */
Frm_LabelColumn ("RT",NULL,Txt_Countries);
Frm_LabelColumn ("RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_CTY]);
/* Data */
HTM_TD_Begin ("class=\"LB DAT_%s\"",The_GetSuffix ());
Frm_BeginFormGoTo (ActSeeCty);
HTM_BUTTON_Submit_Begin (Txt_Countries,"class=\"LB BT_LINK\"");
HTM_BUTTON_Submit_Begin (Txt_HIERARCHY_PLURAL_Abc[Hie_CTY],
"class=\"LB BT_LINK\"");
HTM_Unsigned (Hie_GetCachedNumNodesInHieLvl (Hie_CTY, // Number of countries...
Hie_SYS, // ...in system
Gbl.Hierarchy.Node[Hie_SYS].HieCod));
@ -336,13 +337,13 @@ static void SysCfg_NumCtys (void)
static void SysCfg_NumInss (void)
{
extern const char *Txt_Institutions;
extern const char *Txt_HIERARCHY_PLURAL_Abc[Hie_NUM_LEVELS];
/***** Number of institutions ******/
HTM_TR_Begin (NULL);
/* Label */
Frm_LabelColumn ("RT",NULL,Txt_Institutions);
Frm_LabelColumn ("RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_INS]);
/* Data */
HTM_TD_Begin ("class=\"LB DAT_%s\"",The_GetSuffix ());
@ -360,13 +361,13 @@ static void SysCfg_NumInss (void)
static void SysCfg_NumDegs (void)
{
extern const char *Txt_Degrees;
extern const char *Txt_HIERARCHY_PLURAL_Abc[Hie_NUM_LEVELS];
/***** Number of degrees *****/
HTM_TR_Begin (NULL);
/* Label */
Frm_LabelColumn ("RT",NULL,Txt_Degrees);
Frm_LabelColumn ("RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_DEG]);
/* Data */
HTM_TD_Begin ("class=\"LB DAT_%s\"",The_GetSuffix ());
@ -384,13 +385,13 @@ static void SysCfg_NumDegs (void)
static void SysCfg_NumCrss (void)
{
extern const char *Txt_Courses;
extern const char *Txt_HIERARCHY_PLURAL_Abc[Hie_NUM_LEVELS];
/***** Number of courses *****/
HTM_TR_Begin (NULL);
/* Label */
Frm_LabelColumn ("RT",NULL,Txt_Courses);
Frm_LabelColumn ("RT",NULL,Txt_HIERARCHY_PLURAL_Abc[Hie_DEG]);
/* Data */
HTM_TD_Begin ("class=\"LB DAT_%s\"",The_GetSuffix ());

233
swad_text.c
View File

@ -4623,29 +4623,6 @@ const char *Txt_CENTER_STATUS[Hie_NUM_STATUS_TXT] =
#endif
};
const char *Txt_Centers =
#if L==1 // ca
"Centers";
#elif L==2 // de
"Lehrinstitute";
#elif L==3 // en
"Centers";
#elif L==4 // es
"Centros";
#elif L==5 // fr
"Centers";
#elif L==6 // gn
"Mbo'ehao";
#elif L==7 // it
"Centri";
#elif L==8 // pl
"Centra";
#elif L==9 // pt
"Centros";
#elif L==10 // tr
"Merkezler";
#endif
const char *Txt_Centers_ABBREVIATION =
#if L==1 // ca
"Cent.";
@ -5921,29 +5898,6 @@ const char *Txt_Countdown =
"Countdown"; // Çeviri lazim!
#endif
const char *Txt_Countries =
#if L==1 // ca
"Pa&iuml;sos";
#elif L==2 // de
"L&auml;nder";
#elif L==3 // en
"Countries";
#elif L==4 // es
"Pa&iacute;ses";
#elif L==5 // fr
"Pays";
#elif L==6 // gn
"Tet&atilde;";
#elif L==7 // it
"Paesi";
#elif L==8 // pl
"Kraje";
#elif L==9 // pt
"Pa&iacute;ses";
#elif L==10 // tr
"Countries"; // Çeviri lazim!
#endif
const char *Txt_COUNTRIES_HELP_ORDER[Hie_NUM_ORDERS] =
{
[Hie_ORDER_BY_NAME] =
@ -6321,29 +6275,6 @@ const char *Txt_Course_X_removed = // Warning: it is very important to include %
"Course <strong>%s</strong> removed."; // Çeviri lazim!
#endif
const char *Txt_Courses =
#if L==1 // ca
"Assignatures";
#elif L==2 // de
"Kursen";
#elif L==3 // en
"Courses";
#elif L==4 // es
"Asignaturas";
#elif L==5 // fr
"Mati&egrave;res";
#elif L==6 // gn
"Mbo'esyry";
#elif L==7 // it
"Corsi";
#elif L==8 // pl
"Kurs&oacute;w";
#elif L==9 // pt
"Disciplinas";
#elif L==10 // tr
"Dersler";
#endif
const char *Txt_Courses_ABBREVIATION =
#if L==1 // ca
"Assig.";
@ -8254,29 +8185,6 @@ const char *Txt_Degree_X_removed = // Warning: it is very important to include %
"Degree <strong>%s</strong> removed."; // Çeviri lazim!
#endif
const char *Txt_Degrees =
#if L==1 // ca
"Titulacions";
#elif L==2 // de
"Studiengang";
#elif L==3 // en
"Degrees";
#elif L==4 // es
"Titulaciones";
#elif L==5 // fr
"&Eacute;tudes";
#elif L==6 // gn
"Arandur&atilde;";
#elif L==7 // it
"Lauree";
#elif L==8 // pl
"Stopnie";
#elif L==9 // pt
"Graus";
#elif L==10 // tr
"Derece";
#endif
const char *Txt_Degrees_ABBREVIATION =
#if L==1 // ca
"Titul.";
@ -15641,6 +15549,124 @@ const char *Txt_Hide_right_column =
"Hide right column"; // Çeviri lazim!
#endif
const char *Txt_HIERARCHY_PLURAL_Abc[Hie_NUM_LEVELS] =
{
[Hie_CTY] =
#if L==1 // ca
"Pa&iuml;sos"
#elif L==2 // de
"L&auml;nder"
#elif L==3 // en
"Countries"
#elif L==4 // es
"Pa&iacute;ses"
#elif L==5 // fr
"Pays"
#elif L==6 // gn
"Tet&atilde;"
#elif L==7 // it
"Paesi"
#elif L==8 // pl
"Kraje"
#elif L==9 // pt
"Pa&iacute;ses"
#elif L==10 // tr
"Countries" // Çeviri lazim!
#endif
,
[Hie_INS] =
#if L==1 // ca
"Institucions"
#elif L==2 // de
"Hochschulen"
#elif L==3 // en
"Institutions"
#elif L==4 // es
"instituciones"
#elif L==5 // fr
"&Eacute;tablissements"
#elif L==6 // gn
"Mbo'ehao"
#elif L==7 // it
"Istituzioni"
#elif L==8 // pl
"Instytucje"
#elif L==9 // pt
"Institu&ccedil;&otilde;es"
#elif L==10 // tr
"Institutions" // Çeviri lazim!
#endif
,
[Hie_CTR] =
#if L==1 // ca
"Centers"
#elif L==2 // de
"Lehrinstitute"
#elif L==3 // en
"Centers"
#elif L==4 // es
"Centros"
#elif L==5 // fr
"Centers"
#elif L==6 // gn
"Mbo'ehao"
#elif L==7 // it
"Centri"
#elif L==8 // pl
"Centra"
#elif L==9 // pt
"Centros"
#elif L==10 // tr
"Merkezler"
#endif
,
[Hie_DEG] =
#if L==1 // ca
"Titulacions"
#elif L==2 // de
"Studiengang"
#elif L==3 // en
"Degrees"
#elif L==4 // es
"Titulaciones"
#elif L==5 // fr
"&Eacute;tudes"
#elif L==6 // gn
"Arandur&atilde;"
#elif L==7 // it
"Lauree"
#elif L==8 // pl
"Stopnie"
#elif L==9 // pt
"Graus"
#elif L==10 // tr
"Derece"
#endif
,
[Hie_CRS] =
#if L==1 // ca
"Assignatures"
#elif L==2 // de
"Kursen"
#elif L==3 // en
"Courses"
#elif L==4 // es
"Asignaturas"
#elif L==5 // fr
"Mati&egrave;res"
#elif L==6 // gn
"Mbo'esyry"
#elif L==7 // it
"Corsi"
#elif L==8 // pl
"Kurs&oacute;w"
#elif L==9 // pt
"Disciplinas"
#elif L==10 // tr
"Dersler"
#endif
};
const char *Txt_HIERARCHY_PLURAL_abc[Hie_NUM_LEVELS] =
{
[Hie_CTY] =
@ -18040,29 +18066,6 @@ const char *Txt_Institutional_BR_code =
"Institut.<br />code"; // Çeviri lazim!
#endif
const char *Txt_Institutions =
#if L==1 // ca
"Institucions";
#elif L==2 // de
"Hochschulen";
#elif L==3 // en
"Institutions";
#elif L==4 // es
"Instituciones";
#elif L==5 // fr
"&Eacute;tablissements";
#elif L==6 // gn
"Mbo'ehao";
#elif L==7 // it
"Istituzioni";
#elif L==8 // pl
"Instytucje";
#elif L==9 // pt
"Institu&ccedil;&otilde;es";
#elif L==10 // tr
"Institutions"; // Çeviri lazim!
#endif
const char *Txt_Institutions_ABBREVIATION =
#if L==1 // ca
"Instit.";