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 16.172.1

This commit is contained in:
Antonio Cañas Vargas 2017-03-30 15:20:25 +02:00
parent 0d3aae35ed
commit 8efaad6ef5
5 changed files with 40 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
swad_changelog.h
View File

@ -206,20 +206,20 @@
// TODO: Include type of degree in form of degree configuration // TODO: Include type of degree in form of degree configuration
// TODO: Cuando un admin. pulsa en "Inscribir profesor/a" y el usuario es invitado, debería salir en el rol por defecto "profesor" y no "estudiante" // TODO: Cuando un admin. pulsa en "Inscribir profesor/a" y el usuario es invitado, debería salir en el rol por defecto "profesor" y no "estudiante"
// TODO: Tras inscribir a un profesor en una asignatura, nos vamos a otra pestaña, luego regresamos a USUARIOS y la opción por defecto es Otros, cuando debería ser Profesores.
// TODO: Poner interrogación de ayuda en "USUARIOS > Inscripción" (cuando se pide confirmación para aceptar o rechazar)
/*****************************************************************************/ /*****************************************************************************/
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.172 (2017-03-30)" #define Log_PLATFORM_VERSION "SWAD 16.172.1 (2017-03-30)"
#define CSS_FILE "swad16.166.css" #define CSS_FILE "swad16.166.css"
#define JS_FILE "swad16.144.js" #define JS_FILE "swad16.144.js"
// Number of lines (includes comments but not blank lines) has been got with the following command: // 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 // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*?.h sql/swad*.sql | tail -1
/* /*
Version 16.172.1: Mar 30, 2017 Some help URLs translated to spanish. (217554 lines)
Version 16.172: Mar 30, 2017 Some help URLs translated to spanish. Version 16.172: Mar 30, 2017 Some help URLs translated to spanish.
Changed "enroll" and "enrollment" to "enrol" and "enrolment", except in web service API. (217531 lines) Changed "enroll" and "enrollment" to "enrol" and "enrolment", except in web service API. (217531 lines)
Version 16.171.15:Mar 30, 2017 Some help URLs translated to spanish. (217528 lines) Version 16.171.15:Mar 30, 2017 Some help URLs translated to spanish. (217528 lines)

4
swad_enrolment.c
View File

@ -347,6 +347,7 @@ void Enr_WriteFormToReqAnotherUsrID (Act_Action_t NextAction)
void Enr_ReqAcceptRegisterInCrs (void) void Enr_ReqAcceptRegisterInCrs (void)
{ {
extern const char *Hlp_USERS_SignUp_confirm_enrolment;
extern const char *Txt_Enrolment; extern const char *Txt_Enrolment;
extern const char *Txt_A_teacher_or_administrator_has_enroled_you_as_X_into_the_course_Y; extern const char *Txt_A_teacher_or_administrator_has_enroled_you_as_X_into_the_course_Y;
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];
@ -354,7 +355,8 @@ void Enr_ReqAcceptRegisterInCrs (void)
extern const char *Txt_Remove_me_from_this_course; extern const char *Txt_Remove_me_from_this_course;
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Enrolment,NULL,NULL); Lay_StartRoundFrame (NULL,Txt_Enrolment,NULL,
Hlp_USERS_SignUp_confirm_enrolment);
/***** Show message *****/ /***** Show message *****/
sprintf (Gbl.Message,Txt_A_teacher_or_administrator_has_enroled_you_as_X_into_the_course_Y, sprintf (Gbl.Message,Txt_A_teacher_or_administrator_has_enroled_you_as_X_into_the_course_Y,

4
swad_follow.c
View File

@ -108,7 +108,7 @@ void Fol_PutLinkWhoToFollow (void)
void Fol_SuggestUsrsToFollowMainZone (void) void Fol_SuggestUsrsToFollowMainZone (void)
{ {
extern const char *Hlp_SOCIAL_Follow; extern const char *Hlp_SOCIAL_Profiles_who_to_follow;
extern const char *Txt_Who_to_follow; extern const char *Txt_Who_to_follow;
extern const char *Txt_No_user_to_whom_you_can_follow_Try_again_later; extern const char *Txt_No_user_to_whom_you_can_follow_Try_again_later;
MYSQL_RES *mysql_res; MYSQL_RES *mysql_res;
@ -131,7 +131,7 @@ void Fol_SuggestUsrsToFollowMainZone (void)
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrameTable ("560px",Txt_Who_to_follow, Lay_StartRoundFrameTable ("560px",Txt_Who_to_follow,
Fol_PutIconsWhoToFollow, Fol_PutIconsWhoToFollow,
Hlp_SOCIAL_Follow,2); Hlp_SOCIAL_Profiles_who_to_follow,2);
/***** Initialize structure with user's data *****/ /***** Initialize structure with user's data *****/
Usr_UsrDataConstructor (&UsrDat); Usr_UsrDataConstructor (&UsrDat);

41
swad_help_URL.c
View File

@ -1601,6 +1601,27 @@ const char *Hlp_USERS_SignUp =
"USERS.SignUp"; "USERS.SignUp";
#endif #endif
const char *Hlp_USERS_SignUp_confirm_enrolment =
#if L==1
"USERS.SignUp#confirm_enrolment";
#elif L==2
"USERS.SignUp#confirm_enrolment";
#elif L==3
"USERS.SignUp#confirm_enrolment";
#elif L==4
"USERS.SignUp.es#confirmar-inscripci%C3%B3n";
#elif L==5
"USERS.SignUp#confirm_enrolment";
#elif L==6
"USERS.SignUp#confirm_enrolment";
#elif L==7
"USERS.SignUp#confirm_enrolment";
#elif L==8
"USERS.SignUp#confirm_enrolment";
#elif L==9
"USERS.SignUp#confirm_enrolment";
#endif
const char *Hlp_USERS_Requests = const char *Hlp_USERS_Requests =
#if L==1 #if L==1
"USERS.Requests"; "USERS.Requests";
@ -1708,25 +1729,25 @@ const char *Hlp_SOCIAL_Profiles_view_public_profile =
"SOCIAL.Profiles#view-public-profile"; "SOCIAL.Profiles#view-public-profile";
#endif #endif
const char *Hlp_SOCIAL_Follow = const char *Hlp_SOCIAL_Profiles_who_to_follow =
#if L==1 #if L==1
"SOCIAL.Follow"; "SOCIAL.Profiles#who-to-follow";
#elif L==2 #elif L==2
"SOCIAL.Follow"; "SOCIAL.Profiles#who-to-follow";
#elif L==3 #elif L==3
"SOCIAL.Follow"; "SOCIAL.Profiles#who-to-follow";
#elif L==4 #elif L==4
"SOCIAL.Follow.es"; "SOCIAL.Profiles.es#a-qui%C3%A9n-seguir";
#elif L==5 #elif L==5
"SOCIAL.Follow"; "SOCIAL.Profiles#who-to-follow";
#elif L==6 #elif L==6
"SOCIAL.Follow"; "SOCIAL.Profiles#who-to-follow";
#elif L==7 #elif L==7
"SOCIAL.Follow"; "SOCIAL.Profiles#who-to-follow";
#elif L==8 #elif L==8
"SOCIAL.Follow"; "SOCIAL.Profiles#who-to-follow";
#elif L==9 #elif L==9
"SOCIAL.Follow"; "SOCIAL.Profiles#who-to-follow";
#endif #endif
const char *Hlp_SOCIAL_Forums = const char *Hlp_SOCIAL_Forums =

2
swad_text.c
View File

@ -1521,7 +1521,7 @@ const char *Txt_A_teacher_or_administrator_has_enroled_you_as_X_into_the_course_
#elif L==3 #elif L==3
"A teacher or an administrator has enroled you" "A teacher or an administrator has enroled you"
" as a <strong>%s</strong>" " as a <strong>%s</strong>"
"into the course <strong>%s</strong>." " into the course <strong>%s</strong>."
" Do you want to confirm the enrolment" " Do you want to confirm the enrolment"
" or do you prefer to be removed from the course?"; " or do you prefer to be removed from the course?";
#elif L==4 #elif L==4