From b9ccb352bba623fdf41af1b729eda5eeafb8a305 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Tue, 27 Dec 2016 13:56:44 +0100 Subject: [PATCH] Version 16.107.9 --- swad_changelog.h | 4 +- swad_message.c | 44 +++++++------- swad_notice.c | 24 +++----- swad_text.c | 152 ++++++++++++++++++++++++++--------------------- 4 files changed, 119 insertions(+), 105 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index 1eeb53bd3..393478b22 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -189,13 +189,15 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.107.7 (2016-12-27)" +#define Log_PLATFORM_VERSION "SWAD 16.107.9 (2016-12-27)" #define CSS_FILE "swad16.106.5.css" #define JS_FILE "swad16.101.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.107.9: Dec 27, 2016 Changes in edition of new notice. (211607 lines) + Version 16.107.8: Dec 27, 2016 Changes in behaviour of labels in forms. (211598 lines) Version 16.107.7: Dec 27, 2016 Code refactoring in forums. (211594 lines) Version 16.107.6: Dec 27, 2016 Changes in behaviour of labels in forms. (211593 lines) Version 16.107.5: Dec 26, 2016 Changes in behaviour of labels in forms. (211540 lines) diff --git a/swad_message.c b/swad_message.c index 73d32f63e..7a736b2f2 100644 --- a/swad_message.c +++ b/swad_message.c @@ -422,38 +422,42 @@ static void Msg_WriteFormUsrsIDsOrNicksOtherRecipients (void) extern const char *Txt_Other_recipients; extern const char *Txt_Recipients; extern const char *Txt_nicks_emails_or_IDs_separated_by_commas; - char Nickname[Nck_MAX_LENGTH_NICKNAME_WITHOUT_ARROBA+1]; // old version because is a nickname retrieved from database. TODO: change in 2013 - bool PutColspan; + char Nickname[Nck_MAX_LENGTH_NICKNAME_WITHOUT_ARROBA+1]; unsigned Colspan; + bool StdsAndTchsWritten = Gbl.CurrentCrs.Crs.CrsCod > 0 && // If there is a course selected + (Gbl.Usrs.Me.IBelongToCurrentCrs || // I belong to it + Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM); - PutColspan = Gbl.CurrentCrs.Crs.CrsCod > 0 && // If there is a course selected - (Gbl.Usrs.Me.IBelongToCurrentCrs || // I belong to it - Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM); - if (PutColspan) + /***** How many columns? *****/ + if (StdsAndTchsWritten) Colspan = Usr_GetColumnsForSelectUsrs (); + else + Colspan = 1; + + /***** Title *****/ + fprintf (Gbl.F.Out,"" + " 1) + fprintf (Gbl.F.Out," colspan=\"%u\"",Colspan); + fprintf (Gbl.F.Out," class=\"LEFT_MIDDLE LIGHT_BLUE\">" + "" + "" + "", + StdsAndTchsWritten ? Txt_Other_recipients : + Txt_Recipients); /***** Textarea with users' @nicknames, emails or IDs *****/ fprintf (Gbl.F.Out,"" - "%s:", - Colspan,Txt_Other_recipients); - else - fprintf (Gbl.F.Out," >%s:", - Txt_Recipients); - fprintf (Gbl.F.Out,"" - "" - "" " 1) fprintf (Gbl.F.Out," colspan=\"%u\"",Colspan); fprintf (Gbl.F.Out," class=\"LEFT_MIDDLE\">" - "" - "" - "", - The_ClassForm[Gbl.Prefs.Theme], - Txt_MSG_Message); + fprintf (Gbl.F.Out,""); /***** Button to create notice and end frame *****/ - Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Create_notice); + Lay_EndRoundFrameWithButton (Lay_CREATE_BUTTON,Txt_Create_notice); /***** End form *****/ Act_FormEnd (); diff --git a/swad_text.c b/swad_text.c index 54aa529d5..395476fc9 100644 --- a/swad_text.c +++ b/swad_text.c @@ -44399,88 +44399,106 @@ const char *Txt_The_nickname_entered_X_is_not_valid_ = // Warning: it is very im " a digit (0-9) or "_"."; // Necessita de tradução #endif -const char *Txt_The_notice_you_enter_here_will_appear_as_a_yellow_note_ = // Warning: it is very important to include %s in the following sentences +const char *Txt_The_notice_will_appear_as_a_yellow_note_ = #if L==1 - "El aviso que escriba aquí aparecerá en forma de nota amarilla" - " a la izquierda de la página y será visible por todo el mundo" - " (no solo por los usuarios de la asignatura %s).
" - "El mensaje debe ser breve." - " Si desea crear un aviso extenso o de acceso exclusivo para sus estudiantes," - " puede usar el foro de la asignatura," - " enviar un mensaje a todos a través del sistema de mensajería interna," - " o incluso crear un archivo con el texto y añadirlo a la zona de documentos."; // Necessita traduccio + "L'avís apareixerà en forma de nota groga" + " a l'esquerra de la pàgina" + " i serà visible per tot el món" + " (no només pels usuaris de l'assignatura).
" + "El missatge ha de ser breu." + " Per crear un avís extens" + " o d'accés exclusiu per a estudiants," + " pot utilitzar el fòrum de l'assignatura," + " enviar un missatge a tots," + " o pujar un arxiu amb el text a la zona de documents."; #elif L==2 - "The notice you enter here will appear as a yellow note" - " in the left of the page and will be visible worldwide" - " (not just by users of the course %s).
" - "The message should be short." - " If you want to create a long notice or a notice with exclusive access to your students," - " you can use the forum of the course," - " or send a message to all through the internal messaging system," - " or even create a file with the text and upload it to the documents area."; // Need Übersetzung + "Die Ankündigung wird als ein gelber Hinweis" + " auf der linken Seite der Seite erscheinen" + " und wird weltweit" + " (nicht nur von den Benutzern des Kurses) sichtbar sein.
" + "Die Nachricht sollte kurz sein." + " Wenn Sie eine lange Ankündigung" + " oder einen Hinweis mit exklusivem Zugang für Studenten erstellen möchten," + " können Sie das Forum des Kurses nutzen," + " eine Nachricht an alle senden" + " oder eine Datei mit dem Text in den Dokumentenbereich hochladen."; #elif L==3 - "The notice you enter here will appear as a yellow note" - " in the left of the page and will be visible worldwide" - " (not just by users of the course %s).
" + "The notice will appear as a yellow note" + " in the left of the page" + " and will be visible worldwide" + " (not just by users of the course).
" "The message should be short." - " If you want to create a long notice or a notice with exclusive access to your students," + " If you want to create a long notice" + " or a notice with exclusive access for students," " you can use the forum of the course," - " or send a message to all through the internal messaging system," - " or even create a file with the text and upload it to the documents area."; + " send a message to all," + " or upload a file with the text to the documents area."; #elif L==4 - "El aviso que escriba aquí aparecerá en forma de nota amarilla" - " a la izquierda de la página y será visible por todo el mundo" - " (no solo por los usuarios de la asignatura %s).
" + "El aviso aparecerá en forma de nota amarilla" + " a la izquierda de la página" + " y será visible por todo el mundo" + " (no solo por los usuarios de la asignatura).
" "El mensaje debe ser breve." - " Si desea crear un aviso extenso o de acceso exclusivo para sus estudiantes," + " Si desea crear un aviso extenso" + " o de acceso exclusivo para estudiantes," " puede usar el foro de la asignatura," - " enviar un mensaje a todos a través del sistema de mensajería interna," - " o incluso crear un archivo con el texto y añadirlo a la zona de documentos."; + " enviar un mensaje a todos," + " o subir un archivo con el texto a la zona de documentos."; #elif L==5 - "The notice you enter here will appear as a yellow note" - " in the left of the page and will be visible worldwide" - " (not just by users of the course %s).
" - "The message should be short." - " If you want to create a long notice or a notice with exclusive access to your students," - " you can use the forum of the course," - " or send a message to all through the internal messaging system," - " or even create a file with the text and upload it to the documents area."; // Besoin de traduction + "L'avis apparaîtra comme une note jaune" + " à gauche de la page" + " et sera visible dans le monde entier" + " (pas seulement par les utilisateurs du cours).
" + "Le message doit être court." + " Si vous souhaitez créer un avis long" + " ou un avis avec un accès exclusif pour les étudiants," + " vous pouvez utiliser le forum du cours," + " envoyer un message à tous" + " ou télécharger un fichier avec le texte dans la zone des documents."; #elif L==6 - "El aviso que escriba aquí aparecerá en forma de nota amarilla" - " a la izquierda de la página y será visible por todo el mundo" - " (no solo por los usuarios de la asignatura %s).
" + "El aviso aparecerá en forma de nota amarilla" + " a la izquierda de la página" + " y será visible por todo el mundo" + " (no solo por los usuarios de la asignatura).
" "El mensaje debe ser breve." - " Si desea crear un aviso extenso o de acceso exclusivo para sus estudiantes," + " Si desea crear un aviso extenso" + " o de acceso exclusivo para estudiantes," " puede usar el foro de la asignatura," - " enviar un mensaje a todos a través del sistema de mensajería interna," - " o incluso crear un archivo con el texto y añadirlo a la zona de documentos."; // Okoteve traducción + " enviar un mensaje a todos," + " o subir un archivo con el texto a la zona de documentos."; // Okoteve traducción #elif L==7 - "L'avviso che hai inserito qui apparirà come una nota in giallo" - " sulla parte sinistra della pagina è sarà visibile a tutti" - " (non solo da utenti del corso %s).
" - "Il messaggio dovrà essere breve." - " Se vuoi creare un avviso lungo o un avviso con accesso esclusivo per i tuoi studenti," - " potrai usare il forum del corso," - " o inviare un messaggio a tutti attraverso il sistema di messaggistica interno," - " o sempre creare un file con il testo e caricarlo nell'area documenti."; + "L'avviso verrà visualizzato come una nota di colore giallo" + " nella parte sinistra della pagina" + " e sarà visibile in tutto il mondo" + " (non solo dagli utenti del corso).
" + "Il messaggio deve essere breve." + " Se si desidera creare un lungo avviso" + " o una comunicazione con accesso esclusivo per gli studenti," + " è possibile utilizzare il forum del corso," + " inviare un messaggio a tutti," + " o caricare un file con il testo all'area documenti."; #elif L==8 - "The notice you enter here will appear as a yellow note" - " in the left of the page and will be visible worldwide" - " (not just by users of the course %s).
" - "The message should be short." - " If you want to create a long notice or a notice with exclusive access to your students," - " you can use the forum of the course," - " or send a message to all through the internal messaging system," - " or even create a file with the text and upload it to the documents area."; // Potrzebujesz tlumaczenie + "Ogłoszenie pojawi się jako żółty notatki" + " w lewej strony" + " i będzie widoczny na całym świecie" + " (nie tylko przez użytkowników oczywiście).
" + "Wiadomość powinna być krótka." + " Jeśli chcesz stworzyć długą zawiadomienie" + " lub zawiadomienie z wyłącznego dostępu dla studentów," + " można korzystać z forum kursu," + " wysłać wiadomość do wszystkich," + " lub przesłać plik z tekstem do obszaru dokumentów."; #elif L==9 - "The notice you enter here will appear as a yellow note" - " in the left of the page and will be visible worldwide" - " (not just by users of the course %s).
" - "The message should be short." - " If you want to create a long notice or a notice with exclusive access to your students," - " you can use the forum of the course," - " or send a message to all through the internal messaging system," - " or even create a file with the text and upload it to the documents area."; // Necessita de tradução + "O aviso aparecerá como uma nota amarela" + " à esquerda da página" + " e será visível em todo o mundo" + " (não apenas pelos usuários do curso).
" + "A mensagem deve ser curta." + " Se você quiser criar um aviso longo" + " ou um aviso com acesso exclusivo para os alunos," + " você pode usar o fórum do curso," + " enviar uma mensagem para todos" + " ou enviar um arquivo com o texto para a área de documentos."; #endif const char *Txt_The_new_web_address_is_X = // Warning: it is very important to include %s in the following sentences