diff --git a/swad_announcement.c b/swad_announcement.c
index 70e0b2abd..5bad175e7 100644
--- a/swad_announcement.c
+++ b/swad_announcement.c
@@ -406,7 +406,7 @@ void Ann_ShowFormAnnouncement (void)
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_New_announcement;
extern const char *Txt_MSG_Subject;
- extern const char *Txt_MSG_Message;
+ extern const char *Txt_MSG_Content;
extern const char *Txt_Users;
extern const char *Txt_Create_announcement;
@@ -419,7 +419,7 @@ void Ann_ShowFormAnnouncement (void)
/***** Announcement subject and body *****/
Ann_PutSubjectMessage ("Subject",Txt_MSG_Subject, 2);
- Ann_PutSubjectMessage ("Content",Txt_MSG_Message,20);
+ Ann_PutSubjectMessage ("Content",Txt_MSG_Content,20);
/***** Users' roles who can view the announcement *****/
fprintf (Gbl.F.Out,"
"
diff --git a/swad_changelog.h b/swad_changelog.h
index 5c992fe44..552bba305 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -214,13 +214,15 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
-#define Log_PLATFORM_VERSION "SWAD 16.185 (2017-04-19)"
+#define Log_PLATFORM_VERSION "SWAD 16.185.1 (2017-04-19)"
#define CSS_FILE "swad16.184.css"
#define JS_FILE "swad16.181.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.185.1: Apr 19, 2017 Changes in forums.
+ New help URLs for forums. (217793 lines)
Version 16.185: Apr 19, 2017 Code refactoring in forums. (217708 lines)
Version 16.184: Apr 18, 2017 Changes in layout of page numbers. (217724 lines)
Version 16.183.1: Apr 18, 2017 Changes in layout of forums. (217719 lines)
diff --git a/swad_forum.c b/swad_forum.c
index 2dd86f912..3bc779cbb 100644
--- a/swad_forum.c
+++ b/swad_forum.c
@@ -967,7 +967,7 @@ void For_RemoveUsrFromReadThrs (long UsrCod)
static void For_ShowPostsOfAThread (Lay_AlertType_t AlertType,const char *Message)
{
- extern const char *Hlp_SOCIAL_Forums;
+ extern const char *Hlp_SOCIAL_Forums_posts;
extern const char *Txt_Thread;
struct ForumThread Thr;
char LastSubject[Cns_MAX_BYTES_SUBJECT + 1];
@@ -1006,7 +1006,7 @@ static void For_ShowPostsOfAThread (Lay_AlertType_t AlertType,const char *Messag
/***** Start frame *****/
sprintf (FrameTitle,"%s: %s",Txt_Thread,Thr.Subject);
Lay_StartRoundFrame (NULL,FrameTitle,For_PutIconNewPost,
- Hlp_SOCIAL_Forums);
+ Hlp_SOCIAL_Forums_posts);
/***** Get posts of a thread from database *****/
sprintf (Query,"SELECT PstCod,UNIX_TIMESTAMP(CreatTime)"
@@ -2467,7 +2467,7 @@ void For_ShowForumTheads (void)
static void For_ShowForumThreadsHighlightingOneThread (long ThrCodHighlighted,
Lay_AlertType_t AlertType,const char *Message)
{
- extern const char *Hlp_SOCIAL_Forums;
+ extern const char *Hlp_SOCIAL_Forums_threads;
extern const char *Txt_Forum;
extern const char *Txt_MSG_Subject;
extern const char *Txt_FORUM_THREAD_HELP_ORDER[2];
@@ -2552,7 +2552,7 @@ static void For_ShowForumThreadsHighlightingOneThread (long ThrCodHighlighted,
/***** Start frame for threads of this forum *****/
sprintf (FrameTitle,"%s: %s",Txt_Forum,ForumName);
Lay_StartRoundFrame (NULL,FrameTitle,For_PutIconNewThread,
- Hlp_SOCIAL_Forums);
+ Hlp_SOCIAL_Forums_threads);
/***** List the threads *****/
if (NumThrs)
@@ -3795,19 +3795,22 @@ static void For_RestrictAccess (void)
static void For_WriteFormForumPst (bool IsReply,const char *Subject)
{
- extern const char *Hlp_SOCIAL_Forums;
+ extern const char *Hlp_SOCIAL_Forums_new_post;
+ extern const char *Hlp_SOCIAL_Forums_new_thread;
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_New_post;
extern const char *Txt_New_thread;
extern const char *Txt_MSG_Subject;
- extern const char *Txt_MSG_Message;
+ extern const char *Txt_MSG_Content;
extern const char *Txt_Send;
/***** Start frame *****/
Lay_StartRoundFrame (NULL,
IsReply ? Txt_New_post :
Txt_New_thread,
- NULL,Hlp_SOCIAL_Forums);
+ NULL,
+ IsReply ? Hlp_SOCIAL_Forums_new_post :
+ Hlp_SOCIAL_Forums_new_thread);
/***** Start form *****/
if (IsReply) // Form to write a reply to a message of an existing thread
@@ -3868,7 +3871,7 @@ static void For_WriteFormForumPst (bool IsReply,const char *Subject)
""
""
"
",
- The_ClassForm[Gbl.Prefs.Theme],Txt_MSG_Message);
+ The_ClassForm[Gbl.Prefs.Theme],Txt_MSG_Content);
fprintf (Gbl.F.Out,"");
diff --git a/swad_help_URL.c b/swad_help_URL.c
index 2f0df7be9..f7044879a 100644
--- a/swad_help_URL.c
+++ b/swad_help_URL.c
@@ -1792,6 +1792,90 @@ const char *Hlp_SOCIAL_Forums =
"SOCIAL.Forums.en";
#endif
+const char *Hlp_SOCIAL_Forums_threads =
+#if L==1
+ "SOCIAL.Forums.es#discusiones";
+#elif L==2
+ "SOCIAL.Forums.en#threads";
+#elif L==3
+ "SOCIAL.Forums.en#threads";
+#elif L==4
+ "SOCIAL.Forums.es#discusiones";
+#elif L==5
+ "SOCIAL.Forums.en#threads";
+#elif L==6
+ "SOCIAL.Forums.es#discusiones";
+#elif L==7
+ "SOCIAL.Forums.en#threads";
+#elif L==8
+ "SOCIAL.Forums.en#threads";
+#elif L==9
+ "SOCIAL.Forums.en#threads";
+#endif
+
+const char *Hlp_SOCIAL_Forums_new_thread =
+#if L==1
+ "SOCIAL.Forums.es#nueva-discusi%C3%B3n";
+#elif L==2
+ "SOCIAL.Forums.en#new-thread";
+#elif L==3
+ "SOCIAL.Forums.en#new-thread";
+#elif L==4
+ "SOCIAL.Forums.es#nueva-discusi%C3%B3n";
+#elif L==5
+ "SOCIAL.Forums.en#new-thread";
+#elif L==6
+ "SOCIAL.Forums.es#nueva-discusi%C3%B3n";
+#elif L==7
+ "SOCIAL.Forums.en#new-thread";
+#elif L==8
+ "SOCIAL.Forums.en#new-thread";
+#elif L==9
+ "SOCIAL.Forums.en#new-thread";
+#endif
+
+const char *Hlp_SOCIAL_Forums_posts =
+#if L==1
+ "SOCIAL.Forums.es#comentarios";
+#elif L==2
+ "SOCIAL.Forums.en#posts";
+#elif L==3
+ "SOCIAL.Forums.en#posts";
+#elif L==4
+ "SOCIAL.Forums.es#comentarios";
+#elif L==5
+ "SOCIAL.Forums.en#posts";
+#elif L==6
+ "SOCIAL.Forums.es#comentarios";
+#elif L==7
+ "SOCIAL.Forums.en#posts";
+#elif L==8
+ "SOCIAL.Forums.en#posts";
+#elif L==9
+ "SOCIAL.Forums.en#posts";
+#endif
+
+const char *Hlp_SOCIAL_Forums_new_post =
+#if L==1
+ "SOCIAL.Forums.es#nuevo-comentario";
+#elif L==2
+ "SOCIAL.Forums.en#new-post";
+#elif L==3
+ "SOCIAL.Forums.en#new-post";
+#elif L==4
+ "SOCIAL.Forums.es#nuevo-comentario";
+#elif L==5
+ "SOCIAL.Forums.en#new-post";
+#elif L==6
+ "SOCIAL.Forums.es#nuevo-comentario";
+#elif L==7
+ "SOCIAL.Forums.en#new-post";
+#elif L==8
+ "SOCIAL.Forums.en#new-post";
+#elif L==9
+ "SOCIAL.Forums.en#new-post";
+#endif
+
/***** MESSAGES tab *****/
const char *Hlp_MESSAGES_Notifications =
diff --git a/swad_message.c b/swad_message.c
index 90496baa5..1015b9b57 100644
--- a/swad_message.c
+++ b/swad_message.c
@@ -481,7 +481,7 @@ static void Msg_WriteFormSubjectAndContentMsgToUsrs (char Content[Cns_MAX_BYTES_
{
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_MSG_Subject;
- extern const char *Txt_MSG_Message;
+ extern const char *Txt_MSG_Content;
extern const char *Txt_Original_message;
char Query[512];
MYSQL_RES *mysql_res;
@@ -553,7 +553,7 @@ static void Msg_WriteFormSubjectAndContentMsgToUsrs (char Content[Cns_MAX_BYTES_
""
" | ",
The_ClassForm[Gbl.Prefs.Theme],
- Txt_MSG_Message,
+ Txt_MSG_Content,
Msg_MAX_CHARS_FILTER_CONTENT,Gbl.Msg.FilterContent);
/***** End table *****/
@@ -2856,7 +2856,7 @@ static void Msg_ShowASentOrReceivedMessage (long MsgNum,long MsgCod)
extern const char *Txt_MSG_Sent;
extern const char *Txt_MSG_From;
extern const char *Txt_MSG_To;
- extern const char *Txt_MSG_Message;
+ extern const char *Txt_MSG_Content;
struct UsrData UsrDat;
const char *Title = NULL; // Initialized to avoid warning
bool FromThisCrs = false; // Initialized to avoid warning
@@ -2984,12 +2984,12 @@ static void Msg_ShowASentOrReceivedMessage (long MsgNum,long MsgCod)
fprintf (Gbl.F.Out,""
"");
- /***** Write "Message:" *****/
+ /***** Write "Content:" *****/
fprintf (Gbl.F.Out,""
""
"%s: "
" | ",
- Txt_MSG_Message);
+ Txt_MSG_Content);
/***** Initialize image *****/
Img_ImageConstructor (&Image);
diff --git a/swad_text.c b/swad_text.c
index c96c134ce..d8bd7a126 100644
--- a/swad_text.c
+++ b/swad_text.c
@@ -13360,43 +13360,43 @@ const char *Txt_FORUM_THREAD_HELP_ORDER[For_NUM_ORDERS] =
const char *Txt_FORUM_THREAD_ORDER[For_NUM_ORDERS] =
{
#if L==1
- "Primer mensaje" // Necessita traduccio
+ "Primer comentari"
#elif L==2
- "Erste Nachricht"
+ "Erste Post"
#elif L==3
- "First message"
+ "First post"
#elif L==4
- "Primer mensaje"
+ "Primer comentario"
#elif L==5
- "Premier message"
+ "Premier post"
#elif L==6
- "Primer mensaje" // Okoteve traducción
+ "Primer comentario" // Okoteve traducción
#elif L==7
- "Primo messaggio"
+ "Primo post"
#elif L==8
- "Pierwsza wiadomosc"
+ "Pierwsza post"
#elif L==9
- "Primeira mensagem"
+ "Primeira post"
#endif
,
#if L==1
- "Último mensaje" // Necessita traduccio
+ "Últim comentari"
#elif L==2
- "Letzte Nachricht"
+ "Letzte Post"
#elif L==3
- "Last message"
+ "Last post"
#elif L==4
- "Último mensaje"
+ "Último comentario"
#elif L==5
- "Dernier message"
+ "Dernier post"
#elif L==6
- "Último mensaje" // Okoteve traducción
+ "Último comentario" // Okoteve traducción
#elif L==7
- "Ultimo messaggio"
+ "Ultimo post"
#elif L==8
- "Ostatnia wiadomosc"
+ "Ostatnia post"
#elif L==9
- "Última mensagem"
+ "Última post"
#endif
};
@@ -23214,6 +23214,27 @@ const char *Txt_Movement_not_allowed =
"Movimento não permitido";
#endif
+const char *Txt_MSG_Content = // of a post or message
+#if L==1
+ "Contingut";
+#elif L==2
+ "Inhalt";
+#elif L==3
+ "Content";
+#elif L==4
+ "Contenido";
+#elif L==5
+ "Contenu";
+#elif L==6
+ "Contenido"; // Okoteve traducción
+#elif L==7
+ "Contenuto";
+#elif L==8
+ "Treść";
+#elif L==9
+ "Conteúdo";
+#endif
+
const char *Txt_MSG_Deleted_without_opening =
#if L==1
"Eliminado sin abrir"; // Necessita traduccio
@@ -23277,27 +23298,6 @@ const char *Txt_MSG_from =
"de";
#endif
-const char *Txt_MSG_Message =
-#if L==1
- "Missatge";
-#elif L==2
- "Nachricht";
-#elif L==3
- "Message";
-#elif L==4
- "Mensaje";
-#elif L==5
- "Message";
-#elif L==6
- "Marandu";
-#elif L==7
- "Messaggio";
-#elif L==8
- "Wiadomość";
-#elif L==9
- "Mensagem";
-#endif
-
const char *Txt_MSG_New =
#if L==1
"Nuevo"; // Necessita traduccio
@@ -29955,7 +29955,7 @@ const char *Txt_post =
#if L==1
"comentari";
#elif L==2
- "Nachricht";
+ "Post";
#elif L==3
"post";
#elif L==4