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.3.2

This commit is contained in:
Antonio Cañas Vargas 2016-09-28 13:12:11 +02:00
parent 2592f1ff3d
commit 9e7c3f2ccd
4 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -142,13 +142,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.3.1 (2016-09-28)"
#define Log_PLATFORM_VERSION "SWAD 16.3.2 (2016-09-28)"
#define CSS_FILE "swad15.229.css"
#define JS_FILE "swad15.238.1.js"
// 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 16.3.2: Sep 28, 2016 Changes in behaviour of button to follow user. (205277 lines)
Version 16.3.1: Sep 28, 2016 Two different messagesrelated to new account merged into one.
Changes in form to create new account. (205271 lines)
Version 16.3: Sep 26, 2016 Message translated.

2
swad_follow.c
View File

@ -825,7 +825,7 @@ void Fol_UnfollowUsr (void)
/* 1) I followed a user when I had permission
2) User restricted permission, so now I can not view his/her profile
3) Now I can not view his/her profile ==> show users I follow */
Fol_ListFollowingUsr (&Gbl.Usrs.Me.UsrDat); // List user's I follow
Fol_ListFollowingUsr (&Gbl.Usrs.Me.UsrDat); // List users I follow
}
else
Lay_ShowAlert (Lay_WARNING,Txt_User_not_found_or_you_do_not_have_permission_);

23
swad_record.c
View File

@ -2364,19 +2364,24 @@ static void Rec_PutIconsCommands (void)
NULL);
/***** Button to follow / unfollow *****/
if (Gbl.Record.TypeOfView == Rec_RECORD_PUBLIC &&
!ItsMe)
if (!ItsMe)
{
if (Fol_CheckUsrIsFollowerOf (Gbl.Usrs.Me.UsrDat.UsrCod,Gbl.Record.UsrDat->UsrCod)) // I follow user
if (Fol_CheckUsrIsFollowerOf (Gbl.Usrs.Me.UsrDat.UsrCod,
Gbl.Record.UsrDat->UsrCod))
// I follow user
Lay_PutContextualLink (ActUnfUsr,Rec_PutParamUsrCodEncrypted,
"following64x64.png",
Txt_Following_unfollow,NULL,
NULL);
else // I do not follow user
Lay_PutContextualLink (ActFolUsr,Rec_PutParamUsrCodEncrypted,
"follow64x64.png",
Txt_Follow,NULL,
NULL);
NULL); // Put button to unfollow, even if I can not view user's profile
else
// I do not follow user
if (Pri_ShowIsAllowed (Gbl.Record.UsrDat->ProfileVisibility,
Gbl.Record.UsrDat->UsrCod))
// I can view user's profile
Lay_PutContextualLink (ActFolUsr,Rec_PutParamUsrCodEncrypted,
"follow64x64.png",
Txt_Follow,NULL,
NULL); // Put button to follow
}
fprintf (Gbl.F.Out,"</div>");

4
swad_text.c
View File

@ -3575,13 +3575,13 @@ const char *Txt_Before_creating_a_new_account_check_if_you_have_been_already_reg
"Before creating a new account,"
" check if you have been already registered with your ID";
#elif L==4
"Antes de crear una cuenta nueva,"
"Antes de crear una nueva cuenta,"
" compruebe si ya le han inscrito con su ID";
#elif L==5
"Avant de cr&eacute;er un nouveau compte,"
" v&eacute;rifiez si vous avez d&eacute;j&agrave; enregistr&eacute; avec votre ID";
#elif L==6
"Antes de crear una cuenta nueva,"
"Antes de crear una nueva cuenta,"
" compruebe si ya le han inscrito con su ID"; // Okoteve traducción
#elif L==7
"Prima di creare un nuovo account,"