From 83da8d38e27ce75302a4936d305cef3821b53d90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Wed, 23 Nov 2016 22:43:27 +0100 Subject: [PATCH] Version 16.68.10 --- swad_changelog.h | 3 ++- swad_message.c | 8 ++++---- swad_profile.c | 4 ++-- swad_text.c | 44 ++++++++++++++++++++++---------------------- 4 files changed, 30 insertions(+), 29 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index 709d997c0..6d29ea28f 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -172,13 +172,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.68.9 (2016-11-23)" +#define Log_PLATFORM_VERSION "SWAD 16.68.10 (2016-11-23)" #define CSS_FILE "swad16.68.css" #define JS_FILE "swad16.46.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.68.10: Nov 23, 2016 Changes in layout of messages received / sent. (207459 lines) Version 16.68.9: Nov 23, 2016 Changes in layout of messages received / sent. (207458 lines) Version 16.68.8: Nov 23, 2016 Changes in layout of messages received / sent. (207462 lines) Version 16.68.7: Nov 23, 2016 Changes in layout of messages received / sent. (207463 lines) diff --git a/swad_message.c b/swad_message.c index c0e0c7a78..84f4e42b8 100644 --- a/swad_message.c +++ b/swad_message.c @@ -1650,6 +1650,7 @@ static void Msg_ShowSentOrReceivedMessages (void) extern const char *Hlp_MESSAGES_Received; extern const char *Hlp_MESSAGES_Sent; extern const char *The_ClassFormBold[The_NUM_THEMES]; + extern const char *Txt_Filter; extern const char *Txt_Update_messages; char FilterFromToSubquery[Msg_MAX_LENGTH_MESSAGES_QUERY+1]; char Query[Msg_MAX_LENGTH_MESSAGES_QUERY+1]; @@ -1712,8 +1713,7 @@ static void Msg_ShowSentOrReceivedMessages (void) /***** Filter messages *****/ /* Start frame with filter */ - Lay_StartRoundFrame (NULL,"Filter", // TODO: Need translation!!!! - NULL,NULL); + Lay_StartRoundFrame (NULL,Txt_Filter,NULL,NULL); /* Form to see messages again */ Act_FormStart (ActionSee[Gbl.Msg.TypeOfMessages]); @@ -2557,7 +2557,7 @@ void Msg_ShowFormToFilterMsgs (void) "%s: " "" "" + " size=\"20\" maxlength=\"%u\" value=\"%s\" />" "", The_ClassForm[Gbl.Prefs.Theme], TxtFromTo[Gbl.Msg.TypeOfMessages], @@ -2569,7 +2569,7 @@ void Msg_ShowFormToFilterMsgs (void) "%s: " "" "" + " size=\"20\" maxlength=\"%u\" value=\"%s\" />" "", The_ClassForm[Gbl.Prefs.Theme], Txt_MSG_Message, diff --git a/swad_profile.c b/swad_profile.c index 526ac72d2..c8492e3bd 100644 --- a/swad_profile.c +++ b/swad_profile.c @@ -351,7 +351,7 @@ void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat) extern const char *Txt_file; extern const char *Txt_files; extern const char *Txt_public_FILES; - extern const char *Txt_From_TIME; + extern const char *Txt_TIME_Since; extern const char *Txt_day; extern const char *Txt_days; extern const char *Txt_Today; @@ -434,7 +434,7 @@ void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat) /* Time since first click */ fprintf (Gbl.F.Out,"
  • ", - Txt_From_TIME, + Txt_TIME_Since, Gbl.Prefs.IconsURL); if (UsrFigures.FirstClickTimeUTC) { diff --git a/swad_text.c b/swad_text.c index 44cb8585a..32feb7954 100644 --- a/swad_text.c +++ b/swad_text.c @@ -12351,6 +12351,27 @@ const char *Txt_Files_works = "Arquivos trabalhos"; #endif +const char *Txt_Filter = // As a noun +#if L==1 + "Filtre"; +#elif L==2 + "Filter"; +#elif L==3 + "Filter"; +#elif L==4 + "Filtro"; +#elif L==5 + "Filtre"; +#elif L==6 + "Ayga"; +#elif L==7 + "Filtro"; +#elif L==8 + "Filtr"; +#elif L==9 + "Filtro"; +#endif + const char *Txt_First_day_of_the_week = #if L==1 "Primer dia de la setmana"; @@ -13153,27 +13174,6 @@ const char *Txt_from = "de"; #endif -const char *Txt_From_TIME = -#if L==1 - "Des de"; -#elif L==2 - "Vom"; -#elif L==3 - "From"; -#elif L==4 - "Desde"; -#elif L==5 - "Depuis"; -#elif L==6 - "Desde"; // Okoteve traducción -#elif L==7 - "Da"; -#elif L==8 - "Od"; -#elif L==9 - "Desde"; -#endif - const char *Txt_From_now_on_the_number_of_editing_lines_of_the_field_X_is_Y = // Warning: it is very important to include %s and %u (in this order) in the following sentences #if L==1 "A partir de ahora el nº de líneas de edición del campo %s es %u."; // Necessita traduccio @@ -35784,7 +35784,7 @@ const char *Txt_Send = #elif L==5 "Envoyer"; #elif L==6 - "Enviar"; // Okoteve traducción + "Mondo"; #elif L==7 "Invia"; #elif L==8