Marown/swad-core
Marown/swad-core
1
0
Fork 0
mirror of https://github.com/acanas/swad-core.git synced 2024-06-01 06:15:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version 15.96.1

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2016-01-04 13:20:47 +01:00
parent 2c4d437fd1
commit a365adb30e
3 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
swad_changelog.h
View File

@ -124,6 +124,7 @@
// 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 15.96.1: Jan 04, 2016 Changes in title of user's timeline. (190641 lines)
Version 15.96: Jan 04, 2016 Display number of times a social note is shared. (190616 lines)
Version 15.95.2: Jan 04, 2016 Unavailable social notes can not be shared. (190556 lines)
Version 15.95.1: Jan 04, 2016 Optimization in writing social note. (190555 lines)

16
swad_social.c
View File

@ -130,7 +130,8 @@ extern struct Globals Gbl;
/***************************** Private prototypes ****************************/
/*****************************************************************************/
static void Soc_ShowTimeline (const char *Query,Act_Action_t UpdateAction);
static void Soc_ShowTimeline (const char *Query,Act_Action_t UpdateAction,
const char *Title);
static void Soc_GetDataOfSocialPublishingFromRow (MYSQL_ROW row,struct SocialPublishing *SocPub);
static void Soc_WriteSocialNote (const struct SocialPublishing *SocPub,
struct SocialNote *SocNot,
@ -179,6 +180,7 @@ static Soc_NoteType_t Soc_GetNoteTypeFromStr (const char *Str);
void Soc_ShowTimelineUsr (void)
{
extern const char *Txt_Public_activity_OF_A_USER;
char Query[512];
/***** Link to write a new social post (public comment) *****/
@ -195,7 +197,8 @@ void Soc_ShowTimelineUsr (void)
Soc_NUM_PUBS_IN_TIMELINE);
/***** Show timeline *****/
Soc_ShowTimeline (Query,ActSeePubPrf);
sprintf (Gbl.Title,Txt_Public_activity_OF_A_USER,Gbl.Usrs.Other.UsrDat.FirstName);
Soc_ShowTimeline (Query,ActSeePubPrf,Gbl.Title);
}
/*****************************************************************************/
@ -204,6 +207,7 @@ void Soc_ShowTimelineUsr (void)
void Soc_ShowTimelineGbl (void)
{
extern const char *Txt_Public_activity;
extern const char *Txt_You_dont_follow_any_user;
char Query[512];
@ -241,7 +245,7 @@ void Soc_ShowTimelineGbl (void)
" ORDER BY PubCod DESC");
/***** Show timeline *****/
Soc_ShowTimeline (Query,ActSeeSocTmlGbl);
Soc_ShowTimeline (Query,ActSeeSocTmlGbl,Txt_Public_activity);
/***** Drop temporary table with publishing codes *****/
sprintf (Query,"DROP TEMPORARY TABLE IF EXISTS pub_cods");
@ -257,10 +261,10 @@ void Soc_ShowTimelineGbl (void)
/*********************** Show social activity (timeline) *********************/
/*****************************************************************************/
static void Soc_ShowTimeline (const char *Query,Act_Action_t UpdateAction)
static void Soc_ShowTimeline (const char *Query,Act_Action_t UpdateAction,
const char *Title)
{
extern const char *The_ClassFormBold[The_NUM_THEMES];
extern const char *Txt_Public_activity;
extern const char *Txt_Update;
extern const char *Txt_No_public_activity;
MYSQL_RES *mysql_res;
@ -277,7 +281,7 @@ static void Soc_ShowTimeline (const char *Query,Act_Action_t UpdateAction)
if (NumPublishings) // Publishings found in timeline
{
/***** Start frame *****/
Lay_StartRoundFrame (Soc_WIDTH_TIMELINE,Txt_Public_activity);
Lay_StartRoundFrame (Soc_WIDTH_TIMELINE,Title);
/***** Form to update timeline *****/
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");

21
swad_text.c
View File

@ -27763,6 +27763,27 @@ const char *Txt_Public_activity =
"Atividade p&uacute;blica";
#endif
const char *Txt_Public_activity_OF_A_USER = // Warning: it is very important to include %s in the following sentences
#if L==1
"Activitat p&uacute;blica de %s";
#elif L==2
"%s &ouml;ffentliche Aktivit&auml;t";
#elif L==3
"%s public activity";
#elif L==4
"Actividad p&uacute;blica de %s";
#elif L==5
"Activit&eacute; public de %s";
#elif L==6
"Actividad p&uacute;blica de %s"; // Okoteve traducción
#elif L==7
"Attivit&agrave; pubblica di %s";
#elif L==8
"Aktywno&sacute;&cacute; publiczna %s";
#elif L==9
"Atividade p&uacute;blica de %s";
#endif
const char *Txt_public_FILES =
#if L==1
"p&uacute;blics";