diff --git a/swad_changelog.h b/swad_changelog.h index 0a5f13742..f5ddf7298 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -111,18 +111,19 @@ // TODO: Fix bug at the end of ranking (number too low) when a course is selected // TODO: Reply to all // TODO: Reply icons should appear without text -// TODO: Link to remove messages is too wide. For example: "Remove these X messages". /*****************************************************************************/ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.74.4 (2015-12-26)" +#define Log_PLATFORM_VERSION "SWAD 15.74.5 (2015-12-26)" #define CSS_FILE "swad15.74.3.css" // 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.74.5: Dec 26, 2015 Text in link to remove messages is now shorter. + Fixed bug in messages. (187563 lines) Version 15.74.4: Dec 26, 2015 Change in text when no course is selected. (187757 lines) Version 15.74.3: Dec 26, 2015 Changes in layout of breadcrumb. (187770 lines) Version 15.74.2: Dec 26, 2015 Changes in list of countries. (187761 lines) diff --git a/swad_message.c b/swad_message.c index 9b4675ce7..1b6f42aeb 100644 --- a/swad_message.c +++ b/swad_message.c @@ -941,13 +941,13 @@ void Msg_ReqDelAllSntMsgs (void) /***** Request confirmation to remove messages *****/ if (Gbl.Msg.FilterContent[0]) sprintf (Gbl.Message,Txt_Do_you_really_want_to_delete_all_messages_sent_to_USER_X_from_COURSE_Y_related_to_CONTENT_Z, - Gbl.Msg.FilterFromTo[0] ? Gbl.Msg.FilterFromTo : - Txt_any_user, - Gbl.Msg.FilterCrsShortName); + Gbl.Msg.FilterFromTo[0] ? Gbl.Msg.FilterFromTo : + Txt_any_user, + Gbl.Msg.FilterCrsShortName,Gbl.Msg.FilterContent); else sprintf (Gbl.Message,Txt_Do_you_really_want_to_delete_all_messages_sent_to_USER_X_from_COURSE_Y, - Gbl.Msg.FilterFromTo[0] ? Gbl.Msg.FilterFromTo : - Txt_any_user, + Gbl.Msg.FilterFromTo[0] ? Gbl.Msg.FilterFromTo : + Txt_any_user, Gbl.Msg.FilterCrsShortName); Lay_ShowAlert (Lay_WARNING,Gbl.Message); @@ -2298,50 +2298,15 @@ void Msg_WriteNumMsgs (unsigned NumMsgs,unsigned NumUnreadMsgs) void Msg_ShowFormDelSentOrRecMsgs (Msg_TypeOfMessages_t TypeOfMessages,unsigned NumMsgs) { - extern const char *Txt_MSG_containing_the_text; - extern const char *Txt_MSGS_containing_the_text; - extern const char *Txt_Remove_the_MESSAGE; - extern const char *Txt_message_received_from_A_USER; - extern const char *Txt_message_sent_to; - extern const char *Txt_any_user; - extern const char *Txt_Remove_the_X_MESSAGES; - extern const char *Txt_unread_messages_received_from; - extern const char *Txt_messages_received_from_A_USER; - extern const char *Txt_messages_sent_to_A_USER; - extern const char *Txt_from_A_COURSE; - char StrFilterContent[256+Msg_MAX_LENGTH_FILTER_CONTENT+1]; + extern const char *Txt_Remove_this_message; + extern const char *Txt_Remove_these_X_messages; /***** Put link to request deletion of all sent or received messages *****/ fprintf (Gbl.F.Out,"