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 15.74.5

This commit is contained in:
Antonio Cañas Vargas 2015-12-26 20:06:42 +01:00
parent ae5b9d215b
commit 76d9302e13
3 changed files with 53 additions and 255 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
swad_changelog.h
View File

@ -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)

53
swad_message.c
View File

@ -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,"<div class=\"CONTEXT_MENU\">");
if (Gbl.Msg.FilterContent[0])
sprintf (StrFilterContent,", %s <strong>%s</strong>",
NumMsgs == 1 ? Txt_MSG_containing_the_text :
Txt_MSGS_containing_the_text,
Gbl.Msg.FilterContent);
else
StrFilterContent[0] = '\0';
if (NumMsgs == 1)
sprintf (Gbl.Title,"%s %s %s, %s %s%s",
Txt_Remove_the_MESSAGE,
TypeOfMessages == Msg_MESSAGES_RECEIVED ? Txt_message_received_from_A_USER :
Txt_message_sent_to,
Gbl.Msg.FilterFromTo[0] ? Gbl.Msg.FilterFromTo :
Txt_any_user,
Txt_from_A_COURSE,
Gbl.Msg.FilterCrsShortName,
StrFilterContent);
strcpy (Gbl.Title,Txt_Remove_this_message);
else
sprintf (Gbl.Title,"%s %u %s %s, %s %s%s",
Txt_Remove_the_X_MESSAGES,
NumMsgs,
TypeOfMessages == Msg_MESSAGES_RECEIVED ? (Gbl.Msg.ShowOnlyUnreadMsgs ? Txt_unread_messages_received_from :
Txt_messages_received_from_A_USER) :
Txt_messages_sent_to_A_USER,
Gbl.Msg.FilterFromTo[0] ? Gbl.Msg.FilterFromTo :
Txt_any_user,
Txt_from_A_COURSE,
Gbl.Msg.FilterCrsShortName,
StrFilterContent);
sprintf (Gbl.Title,Txt_Remove_these_X_messages,NumMsgs);
Lay_PutContextualLink ((TypeOfMessages == Msg_MESSAGES_RECEIVED) ? ActReqDelAllRcvMsg :
ActReqDelAllSntMsg,
Msg_PutHiddenParamsMsgsFilters,

250
swad_text.c
View File

@ -12404,27 +12404,6 @@ const char *Txt_from =
"de";
#endif
const char *Txt_from_A_COURSE =
#if L==1
"desde"; // Necessita traduccio
#elif L==2
"von";
#elif L==3
"from";
#elif L==4
"desde";
#elif L==5
"de";
#elif L==6
"desde"; // Okoteve traducción
#elif L==7
"da";
#elif L==8
"od";
#elif L==9
"de";
#endif
const char *Txt_From_TIME =
#if L==1
"Des de";
@ -20376,48 +20355,6 @@ const char *Txt_message_not_sent_to_X = // Warning: it is very important to incl
"Mensagem n&atilde;o enviada para %s.";
#endif
const char *Txt_message_received_from_A_USER =
#if L==1
"mensaje recibido de"; // Necessita traduccio
#elif L==2
"empfangene Nachricht aus";
#elif L==3
"message received from";
#elif L==4
"mensaje recibido de";
#elif L==5
"message re&ccedil;u de";
#elif L==6
"mensaje recibido de"; // Okoteve traducción
#elif L==7
"messaggio ricevuto da";
#elif L==8
"wiadomosci otrzymane od";
#elif L==9
"mensagem recebida de";
#endif
const char *Txt_message_sent_to =
#if L==1
"mensaje enviado a"; // Necessita traduccio
#elif L==2
"Nachricht gesendet an";
#elif L==3
"message sent to";
#elif L==4
"mensaje enviado a";
#elif L==5
"message envoy&eacute; &agrave;";
#elif L==6
"mensaje enviado a"; // Okoteve traducción
#elif L==7
"messaggio inviato a";
#elif L==8
"Wiadomo&sacute;&cacute; wyslana do";
#elif L==9
"mensagem enviada para";
#endif
const char *Txt_message_sent_to_X_not_notified_by_e_mail = // Warning: it is very important to include %s in the following sentences
#if L==1
"Mensaje enviado a %s (no notificado por e-mail)."; // Necessita traduccio
@ -20586,27 +20523,6 @@ const char *Txt_Messages_received_from_A_COURSE =
"Mensagens recebidas de";
#endif
const char *Txt_messages_received_from_A_USER =
#if L==1
"mensajes recibidos de"; // Necessita traduccio
#elif L==2
"empfangene Nachrichten aus";
#elif L==3
"messages received from";
#elif L==4
"mensajes recibidos de";
#elif L==5
"messages re&ccedil;us de";
#elif L==6
"mensajes recibidos de"; // Okoteve traducción
#elif L==7
"messaggi ricevuti da";
#elif L==8
"wiadomosci odebrane";
#elif L==9
"mensagens recebidas de";
#endif
const char *Txt_Messages_sent =
#if L==1
"Missatges enviats";
@ -20670,27 +20586,6 @@ const char *Txt_Messages_sent_from_A_COURSE =
"Mensagens enviadas de";
#endif
const char *Txt_messages_sent_to_A_USER =
#if L==1
"mensajes enviados a"; // Necessita traduccio
#elif L==2
"gesendete Nachrichten an";
#elif L==3
"messages sent to";
#elif L==4
"mensajes enviados a";
#elif L==5
"messages envoy&eacute;s &agrave;";
#elif L==6
"mensajes enviados a"; // Okoteve traducción
#elif L==7
"messaggi inviati a";
#elif L==8
"wiadomosci wysylanych do";
#elif L==9
"mensagens enviadas para";
#endif
const char *Txt_minimum =
#if L==1
"m&iacute;nimo"; // Necessita traduccio
@ -21693,27 +21588,6 @@ const char *Txt_Movement_not_allowed =
"Movimento n&atilde;o permitido";
#endif
const char *Txt_MSG_containing_the_text =
#if L==1
"que contenga el texto"; // Necessita traduccio
#elif L==2
"mit dem Text";
#elif L==3
"containing the text";
#elif L==4
"que contenga el texto";
#elif L==5
"contenant le texte";
#elif L==6
"que contenga el texto"; // Okoteve traducción
#elif L==7
"contenente il testo";
#elif L==8
"zawierajacy tekst";
#elif L==9
"contendo o texto";
#endif
const char *Txt_MSG_Deleted_without_opening =
#if L==1
"Eliminado sin abrir"; // Necessita traduccio
@ -22008,27 +21882,6 @@ const char *Txt_MSG_Unopened =
"Fechada";
#endif
const char *Txt_MSGS_containing_the_text =
#if L==1
"que contengan el texto"; // Necessita traduccio
#elif L==2
"mit dem Text";
#elif L==3
"containing the text";
#elif L==4
"que contengan el texto";
#elif L==5
"contenant le texte";
#elif L==6
"que contengan el texto"; // Okoteve traducción
#elif L==7
"contenenti il testo";
#elif L==8
"zawierajacy tekst";
#elif L==9
"contendo o texto";
#endif
const char *Txt_MSGS_Deleted =
#if L==1
"Eliminados"; // Necessita traduccio
@ -29194,25 +29047,25 @@ const char *Txt_Remove_survey =
"Remover inqu&eacute;rito";
#endif
const char *Txt_Remove_the_MESSAGE =
const char *Txt_Remove_this_message =
#if L==1
"Eliminar el"; // Necessita traduccio
"Eliminar aquest missatge";
#elif L==2
"Entfernen Sie die";
"Diese Nachricht entfernen";
#elif L==3
"Remove the";
"Remove this message";
#elif L==4
"Eliminar el";
"Eliminar este mensaje";
#elif L==5
"Supprimer le";
"Supprimer ce message";
#elif L==6
"Eliminar el"; // Okoteve traducción
"Eliminar este mensaje"; // Okoteve traducción
#elif L==7
"Rimuovere il";
"Rimuovere questo messaggio";
#elif L==8
"Usu&nacute;";
"Usu&nacute; t&eogon; wiadomo&sacute;&cacute;";
#elif L==9
"Remover a";
"Remover esta mensagem";
#endif
const char *Txt_Remove_thread =
@ -29236,27 +29089,6 @@ const char *Txt_Remove_thread =
"Remover thread";
#endif
const char *Txt_Remove_type_of_group =
#if L==1
"Eliminar tipo de grupo"; // Necessita traduccio
#elif L==2
"Entfernen Art der Gruppe";
#elif L==3
"Remove type of group";
#elif L==4
"Eliminar tipo de grupo";
#elif L==5
"Supprimer type de groupe";
#elif L==6
"Eliminar tipo de grupo"; // Okoteve traducción
#elif L==7
"Rimuovere tipo di gruppo";
#elif L==8
"Usu&nacute; typ grupy";
#elif L==9
"Remover tipo de grupo";
#endif
const char *Txt_Remove_the_users_not_indicated_in_step_1 =
#if L==1
"Eliminar los usuarios <strong>no</strong> indicados en el paso 1"; // Necessita traduccio
@ -29299,25 +29131,46 @@ const char *Txt_Remove_the_users_indicated_in_step_1 =
"Tirar os utilizadores que est&atilde;o na lista";
#endif
const char *Txt_Remove_the_X_MESSAGES =
const char *Txt_Remove_these_X_messages = // Warning: it is very important to include %u in the following sentences
#if L==1
"Eliminar los"; // Necessita traduccio
"Eliminar aquests %u missatges";
#elif L==2
"Entfernen Sie die";
"Diese %u Nachrichten entfernen";
#elif L==3
"Remove the";
"Remove these %u messages";
#elif L==4
"Eliminar los";
"Eliminar estos %u mensajes";
#elif L==5
"Supprimer les";
"Supprimer ces %u messages";
#elif L==6
"Eliminar los"; // Okoteve traducción
"Eliminar estos %u mensajes"; // Okoteve traducción
#elif L==7
"Rimuovere il";
"Rimuovere questi %u messaggi";
#elif L==8
"Usu&nacute;";
"Usu&nacute; te %u wiadomo&sacute;ci";
#elif L==9
"Remover as";
"Remover estas %u mensagens";
#endif
const char *Txt_Remove_type_of_group =
#if L==1
"Eliminar tipo de grupo"; // Necessita traduccio
#elif L==2
"Entfernen Art der Gruppe";
#elif L==3
"Remove type of group";
#elif L==4
"Eliminar tipo de grupo";
#elif L==5
"Supprimer type de groupe";
#elif L==6
"Eliminar tipo de grupo"; // Okoteve traducción
#elif L==7
"Rimuovere tipo di gruppo";
#elif L==8
"Usu&nacute; typ grupy";
#elif L==9
"Remover tipo de grupo";
#endif
const char *Txt_Remove_user_from_this_course =
@ -46394,27 +46247,6 @@ const char *Txt_Unread_BR_msgs =
"N&atilde;o<br />lidas";
#endif
const char *Txt_unread_messages_received_from =
#if L==1
"mensajes no le&iacute;dos recibidos desde"; // Necessita traduccio
#elif L==2
"ungelesene empfangene Nachrichten aus";
#elif L==3
"unread messages received from";
#elif L==4
"mensajes no le&iacute;dos recibidos desde";
#elif L==5
"messages non lus re&ccedil;us de";
#elif L==6
"mensajes no le&iacute;dos recibidos desde"; // Okoteve traducción
#elif L==7
"messaggi non letti ricevuti da";
#elif L==8
"unread messages received from"; // Potrzebujesz tlumaczenie
#elif L==9
"mensagens n&atilde;o lidas recebidas de";
#endif
const char *Txt_Update =
#if L==1
"Actualitzar";