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.199.8

This commit is contained in:
Antonio Cañas Vargas 2016-04-18 09:46:16 +02:00
parent 67ba5eebfb
commit f847ba2ab6
5 changed files with 147 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -135,13 +135,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.199.7 (2016-04-17)"
#define Log_PLATFORM_VERSION "SWAD 15.199.8 (2016-04-18)"
#define CSS_FILE "swad15.198.css"
#define JS_FILE "swad15.197.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 15.199.8: Apr 18, 2016 Changes in title of results of searching documents. (199723 lines)
Version 15.199.7: Apr 17, 2016 Changes in title of results of searching users. (199639 lines)
Version 15.199.6: Apr 17, 2016 Changes in title of results of searching courses. (199647 lines)
Version 15.199.5: Apr 17, 2016 Changes in title of results of searching degrees. (199652 lines)

20
swad_file_browser.c
View File

@ -11127,10 +11127,9 @@ void Brw_GetSummaryAndContentOrSharedFile (char *SummaryStr,char **ContentStr,
/*****************************************************************************/
// Returns the number of documents found
unsigned Brw_ListDocsFound (const char *Query,const char *Title)
unsigned Brw_ListDocsFound (const char *Query,
const char *TitleSingular,const char *TitlePlural)
{
extern const char *Txt_document;
extern const char *Txt_documents;
extern const char *Txt_Institution;
extern const char *Txt_Centre;
extern const char *Txt_Degree;
@ -11150,18 +11149,11 @@ unsigned Brw_ListDocsFound (const char *Query,const char *Title)
if ((NumDocs = (unsigned) DB_QuerySELECT (Query,&mysql_res,"can not get files")))
{
/***** Write heading *****/
/* Table start */
Lay_StartRoundFrameTable (NULL,2,Title);
/* Write header with number of documents found */
fprintf (Gbl.F.Out,"<tr>"
"<th colspan=\"7\" class=\"CENTER_MIDDLE\">");
if (NumDocs == 1)
fprintf (Gbl.F.Out,"1 %s",Txt_document);
else
fprintf (Gbl.F.Out,"%u %s",NumDocs,Txt_documents);
fprintf (Gbl.F.Out,"</th>"
"</tr>");
sprintf (Gbl.Title,"%u %s",
NumDocs,(NumDocs == 1) ? TitleSingular :
TitlePlural);
Lay_StartRoundFrameTable (NULL,2,Gbl.Title);
/* Heading row */
fprintf (Gbl.F.Out,"<tr>"

3
swad_file_browser.h
View File

@ -229,7 +229,8 @@ void Brw_RemoveUsrWorksInAllCrss (struct UsrData *UsrDat,Cns_QuietOrVerbose_t Qu
void Brw_GetSummaryAndContentOrSharedFile (char *SummaryStr,char **ContentStr,
long FilCod,unsigned MaxChars,bool GetContent);
unsigned Brw_ListDocsFound (const char *Query,const char *Title);
unsigned Brw_ListDocsFound (const char *Query,
const char *TitleSingular,const char *TitlePlural);
void Brw_AskRemoveOldFiles (void);
void Brw_RemoveOldFiles (void);

31
swad_search.c
View File

@ -210,7 +210,7 @@ static void Sch_PutFormToSearchWithWhatToSearchAndScope (Act_Action_t Action,Sco
extern const char *Txt_Courses;
extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
extern const char *Txt_My_documents;
extern const char *Txt_DOCUM_in_my_courses;
extern const char *Txt_Documents_in_my_courses;
extern const char *Txt_Open_documents;
extern const char *Txt_Search;
const char *Titles[Sch_NUM_WHAT_TO_SEARCH] =
@ -220,11 +220,11 @@ static void Sch_PutFormToSearchWithWhatToSearchAndScope (Act_Action_t Action,Sco
Txt_Centres, // Sch_SEARCH_CENTRES
Txt_Degrees, // Sch_SEARCH_DEGREES
Txt_Courses, // Sch_SEARCH_COURSES
Txt_ROLES_PLURAL_Abc[Rol_TEACHER][Usr_SEX_UNKNOWN],// Sch_SEARCH_TEACHERS
Txt_ROLES_PLURAL_Abc[Rol_STUDENT][Usr_SEX_UNKNOWN],// Sch_SEARCH_STUDENTS
Txt_ROLES_PLURAL_Abc[Rol__GUEST_ ][Usr_SEX_UNKNOWN],// Sch_SEARCH_GUESTS
Txt_ROLES_PLURAL_Abc[Rol_TEACHER][Usr_SEX_UNKNOWN], // Sch_SEARCH_TEACHERS
Txt_ROLES_PLURAL_Abc[Rol_STUDENT][Usr_SEX_UNKNOWN], // Sch_SEARCH_STUDENTS
Txt_ROLES_PLURAL_Abc[Rol__GUEST_][Usr_SEX_UNKNOWN], // Sch_SEARCH_GUESTS
Txt_Open_documents, // Sch_SEARCH_OPEN_DOCUMENTS
Txt_DOCUM_in_my_courses, // Sch_SEARCH_DOCUM_IN_MY_COURSES
Txt_Documents_in_my_courses, // Sch_SEARCH_DOCUM_IN_MY_COURSES
Txt_My_documents, // Sch_SEARCH_MY_DOCUMENTS
};
Sch_WhatToSearch_t WhatToSearch;
@ -745,7 +745,8 @@ static unsigned Sch_SearchUsrsInDB (Rol_Role_t Role)
static unsigned Sch_SearchOpenDocumentsInDB (const char *RangeQuery)
{
extern const char *Txt_Open_documents;
extern const char *Txt_open_document;
extern const char *Txt_open_documents;
char SearchQuery[Sch_MAX_LENGTH_SEARCH_QUERY+1];
char Query[(512+Sch_MAX_LENGTH_SEARCH_QUERY)*4];
@ -842,7 +843,9 @@ static unsigned Sch_SearchOpenDocumentsInDB (const char *RangeQuery)
/***** Query database and list documents found *****/
/* if (Gbl.Usrs.Me.LoggedRole == Rol_ROLE_SYS_ADM)
Lay_ShowAlert (Lay_INFO,Query); */
return Brw_ListDocsFound (Query,Txt_Open_documents);
return Brw_ListDocsFound (Query,
Txt_open_document,
Txt_open_documents);
}
return 0;
@ -854,7 +857,8 @@ static unsigned Sch_SearchOpenDocumentsInDB (const char *RangeQuery)
static unsigned Sch_SearchDocumentsInMyCoursesInDB (const char *RangeQuery)
{
extern const char *Txt_DOCUM_in_my_courses;
extern const char *Txt_document_in_my_courses;
extern const char *Txt_documents_in_my_courses;
char SearchQuery[Sch_MAX_LENGTH_SEARCH_QUERY+1];
char Query[(512+Sch_MAX_LENGTH_SEARCH_QUERY)*2];
unsigned NumDocs;
@ -952,7 +956,9 @@ static unsigned Sch_SearchDocumentsInMyCoursesInDB (const char *RangeQuery)
/***** Query database and list documents found *****/
/* if (Gbl.Usrs.Me.LoggedRole == Rol_ROLE_SYS_ADM)
Lay_ShowAlert (Lay_INFO,Query); */
NumDocs = Brw_ListDocsFound (Query,Txt_DOCUM_in_my_courses);
NumDocs = Brw_ListDocsFound (Query,
Txt_document_in_my_courses,
Txt_documents_in_my_courses);
/***** Drop temporary table *****/
sprintf (Query,"DROP TEMPORARY TABLE IF EXISTS my_files_crs,my_files_grp");
@ -971,7 +977,8 @@ static unsigned Sch_SearchDocumentsInMyCoursesInDB (const char *RangeQuery)
static unsigned Sch_SearchMyDocumentsInDB (const char *RangeQuery)
{
extern const char *Txt_My_documents;
extern const char *Txt_document_from_me;
extern const char *Txt_documents_from_me;
char SearchQuery[Sch_MAX_LENGTH_SEARCH_QUERY+1];
char Query[(512+Sch_MAX_LENGTH_SEARCH_QUERY)*5];
@ -1106,7 +1113,9 @@ static unsigned Sch_SearchMyDocumentsInDB (const char *RangeQuery)
/***** Query database and list documents found *****/
/* if (Gbl.Usrs.Me.LoggedRole == Rol_ROLE_SYS_ADM)
Lay_ShowAlert (Lay_INFO,Query); */
return Brw_ListDocsFound (Query,Txt_My_documents);
return Brw_ListDocsFound (Query,
Txt_document_from_me,
Txt_documents_from_me);
}
return 0;

150
swad_text.c
View File

@ -9105,27 +9105,6 @@ const char *Txt_Do_you_really_want_to_reset_the_survey_X = // Warning: it is ver
"Voc&ecirc; realmente deseja reiniciar o inqu&eacute;rito <strong>%s</strong>?";
#endif
const char *Txt_document =
#if L==1
"document";
#elif L==2
"Dokument";
#elif L==3
"document";
#elif L==4
"documento";
#elif L==5
"document";
#elif L==6
"documento"; // Okoteve traducción
#elif L==7
"documento";
#elif L==8
"document"; // Potrzebujesz tlumaczenie
#elif L==9
"documento";
#endif
const char *Txt_Document =
#if L==1
"Document";
@ -9153,7 +9132,7 @@ const char *Txt_document_hidden =
#elif L==2
"Dokument verborgen";
#elif L==3
"documen hidden";
"document hidden";
#elif L==4
"documento oculto";
#elif L==5
@ -9168,6 +9147,27 @@ const char *Txt_document_hidden =
"documento oculto";
#endif
const char *Txt_document_in_my_courses =
#if L==1
"document en les meves assignatures";
#elif L==2
"Dokument in meinen Kursen";
#elif L==3
"document in my courses";
#elif L==4
"documento en mis asignaturas";
#elif L==5
"document &agrave; mes mati&egrave;res";
#elif L==6
"documento en mis asignaturas"; // Okoteve traducción
#elif L==7
"documento in miei corsi";
#elif L==8
"dokument w moich kursach";
#elif L==9
"documento em minha disciplinas";
#endif
const char *Txt_Documents =
#if L==1
"Documents";
@ -9189,28 +9189,49 @@ const char *Txt_Documents =
"Documentos";
#endif
const char *Txt_documents =
const char *Txt_document_from_me =
#if L==1
"documents";
"document meu";
#elif L==2
"Dokumente";
"Dokument von mir";
#elif L==3
"documents";
"document from me";
#elif L==4
"documentos";
"documento m&iacute;o";
#elif L==5
"documents";
"document de moi";
#elif L==6
"documentos"; // Okoteve traducción
"documento m&iacute;o"; // Okoteve traducción
#elif L==7
"documenti";
"documento da me";
#elif L==8
"documents"; // Potrzebujesz tlumaczenie
"dokument ode mnie";
#elif L==9
"documentos";
"documento de mim";
#endif
const char *Txt_DOCUM_in_my_courses =
const char *Txt_documents_from_me =
#if L==1
"documents meus";
#elif L==2
"Dokumente von mir";
#elif L==3
"documents from me";
#elif L==4
"documentos m&iacute;os";
#elif L==5
"documents de moi";
#elif L==6
"documentos m&iacute;os"; // Okoteve traducción
#elif L==7
"documenti da me";
#elif L==8
"dokumenty ode mnie";
#elif L==9
"documentos de mim";
#endif
const char *Txt_Documents_in_my_courses =
#if L==1
"Documents en les meves assignatures";
#elif L==2
@ -9231,6 +9252,27 @@ const char *Txt_DOCUM_in_my_courses =
"Documentos em minha disciplinas";
#endif
const char *Txt_documents_in_my_courses =
#if L==1
"documents en les meves assignatures";
#elif L==2
"Dokumente in meinen Kursen";
#elif L==3
"documents in my courses";
#elif L==4
"documentos en mis asignaturas";
#elif L==5
"documents &agrave; mes mati&egrave;res";
#elif L==6
"documentos en mis asignaturas"; // Okoteve traducción
#elif L==7
"documenti in miei corsi";
#elif L==8
"dokumenty w moich kursach";
#elif L==9
"documentos em minha disciplinas";
#endif
const char *Txt_DOCUM_hidden =
#if L==1
"documents ocults";
@ -26743,6 +26785,27 @@ const char *Txt_only_teachers =
", professores";
#endif
const char *Txt_open_document =
#if L==1
"document obert";
#elif L==2
"ge&ouml;ffnet Dokumente";
#elif L==3
"open document";
#elif L==4
"documento abierto";
#elif L==5
"document ouvert";
#elif L==6
"documento abierto"; // Okoteve traducción
#elif L==7
"documento aperto";
#elif L==8
"otwarty dokument";
#elif L==9
"documento aberto";
#endif
const char *Txt_Open_documents =
#if L==1
"Documents oberts";
@ -26764,6 +26827,27 @@ const char *Txt_Open_documents =
"Documentos abertos";
#endif
const char *Txt_open_documents =
#if L==1
"documents oberts";
#elif L==2
"ge&ouml;ffnete Dokumente";
#elif L==3
"open documents";
#elif L==4
"documentos abiertos";
#elif L==5
"documents ouverts";
#elif L==6
"documentos abiertos"; // Okoteve traducción
#elif L==7
"documenti aperti";
#elif L==8
"otwarte dokumenty";
#elif L==9
"documentos abertos";
#endif
const char *Txt_Open_survey =
#if L==1
"Enquesta oberta";