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

This commit is contained in:
Antonio Cañas Vargas 2015-12-16 00:16:32 +01:00
parent 1cebec4de5
commit 3a7a4d17b5
4 changed files with 111 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -120,12 +120,13 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.67 (2015/12/15)"
#define Log_PLATFORM_VERSION "SWAD 15.67.1 (2015/12/15)"
#define CSS_FILE "swad15.65.1.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.67.1: Dec 15, 2015 Changed some messages. (187141 lines)
Version 15.67: Dec 15, 2015 Fixed bugs in queries of enrollment requests. (187140 lines)
Version 15.66.3: Dec 15, 2015 Changes in some small icons.
Fixed bug in record card. (187004 lines)

36
swad_enrollment.c
View File

@ -855,18 +855,18 @@ bool Enr_PutActionsRegRemOneUsr (bool ItsMe)
extern const char *Txt_Modify_me_in_the_course_X;
extern const char *Txt_Modify_user_in_the_course_X;
extern const char *Txt_Register_me_in_the_course_X;
extern const char *Txt_Register_user_in_the_course_X;
extern const char *Txt_Register_user_as_an_administrator_of_the_degree_X;
extern const char *Txt_Register_user_as_an_administrator_of_the_centre_X;
extern const char *Txt_Register_user_as_an_administrator_of_the_institution_X;
extern const char *Txt_Register_USER_in_the_course_X;
extern const char *Txt_Register_USER_as_an_administrator_of_the_degree_X;
extern const char *Txt_Register_USER_as_an_administrator_of_the_centre_X;
extern const char *Txt_Register_USER_as_an_administrator_of_the_institution_X;
extern const char *Txt_Remove_me_from_the_course_X;
extern const char *Txt_Remove_user_from_the_course_X;
extern const char *Txt_Remove_USER_from_the_course_X;
extern const char *Txt_Remove_me_as_an_administrator_of_the_degree_X;
extern const char *Txt_Remove_user_as_an_administrator_of_the_degree_X;
extern const char *Txt_Remove_USER_as_an_administrator_of_the_degree_X;
extern const char *Txt_Remove_me_as_an_administrator_of_the_centre_X;
extern const char *Txt_Remove_user_as_an_administrator_of_the_centre_X;
extern const char *Txt_Remove_USER_as_an_administrator_of_the_centre_X;
extern const char *Txt_Remove_me_as_an_administrator_of_the_institution_X;
extern const char *Txt_Remove_user_as_an_administrator_of_the_institution_X;
extern const char *Txt_Remove_USER_as_an_administrator_of_the_institution_X;
extern const char *Txt_Eliminate_my_user_account;
extern const char *Txt_Eliminate_user_account;
unsigned NumOptionsShown = 0;
@ -917,7 +917,7 @@ bool Enr_PutActionsRegRemOneUsr (bool ItsMe)
sprintf (Gbl.Message,UsrBelongsToCrs ? (ItsMe ? Txt_Modify_me_in_the_course_X :
Txt_Modify_user_in_the_course_X) :
(ItsMe ? Txt_Register_me_in_the_course_X :
Txt_Register_user_in_the_course_X),
Txt_Register_USER_in_the_course_X),
Gbl.CurrentCrs.Crs.ShortName);
fprintf (Gbl.F.Out,"<li>"
"<input type=\"radio\" name=\"RegRemAction\" value=\"%u\"",
@ -941,7 +941,7 @@ bool Enr_PutActionsRegRemOneUsr (bool ItsMe)
if (!UsrIsDegAdmin &&
Gbl.Usrs.Me.LoggedRole >= Rol_CTR_ADM)
{
sprintf (Gbl.Message,Txt_Register_user_as_an_administrator_of_the_degree_X,
sprintf (Gbl.Message,Txt_Register_USER_as_an_administrator_of_the_degree_X,
Gbl.CurrentDeg.Deg.ShortName);
fprintf (Gbl.F.Out,"<li>"
"<input type=\"radio\" name=\"RegRemAction\" value=\"%u\"",
@ -960,7 +960,7 @@ bool Enr_PutActionsRegRemOneUsr (bool ItsMe)
if (!UsrIsCtrAdmin &&
Gbl.Usrs.Me.LoggedRole >= Rol_INS_ADM)
{
sprintf (Gbl.Message,Txt_Register_user_as_an_administrator_of_the_centre_X,
sprintf (Gbl.Message,Txt_Register_USER_as_an_administrator_of_the_centre_X,
Gbl.CurrentCtr.Ctr.ShortName);
fprintf (Gbl.F.Out,"<li>"
"<input type=\"radio\" name=\"RegRemAction\" value=\"%u\"",
@ -980,7 +980,7 @@ bool Enr_PutActionsRegRemOneUsr (bool ItsMe)
if (!UsrIsInsAdmin &&
Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM)
{
sprintf (Gbl.Message,Txt_Register_user_as_an_administrator_of_the_institution_X,
sprintf (Gbl.Message,Txt_Register_USER_as_an_administrator_of_the_institution_X,
Gbl.CurrentIns.Ins.ShortName);
fprintf (Gbl.F.Out,"<li>"
"<input type=\"radio\" name=\"RegRemAction\" value=\"%u\"",
@ -1001,7 +1001,7 @@ bool Enr_PutActionsRegRemOneUsr (bool ItsMe)
{
sprintf (Gbl.Message,
ItsMe ? Txt_Remove_me_from_the_course_X :
Txt_Remove_user_from_the_course_X,
Txt_Remove_USER_from_the_course_X,
Gbl.CurrentCrs.Crs.ShortName);
fprintf (Gbl.F.Out,"<li>"
"<input type=\"radio\" name=\"RegRemAction\" value=\"%u\"",
@ -1027,7 +1027,7 @@ bool Enr_PutActionsRegRemOneUsr (bool ItsMe)
{
sprintf (Gbl.Message,
ItsMe ? Txt_Remove_me_as_an_administrator_of_the_degree_X :
Txt_Remove_user_as_an_administrator_of_the_degree_X,
Txt_Remove_USER_as_an_administrator_of_the_degree_X,
Gbl.CurrentDeg.Deg.ShortName);
fprintf (Gbl.F.Out,"<li>"
"<input type=\"radio\" name=\"RegRemAction\" value=\"%u\"",
@ -1048,7 +1048,7 @@ bool Enr_PutActionsRegRemOneUsr (bool ItsMe)
{
sprintf (Gbl.Message,
ItsMe ? Txt_Remove_me_as_an_administrator_of_the_centre_X :
Txt_Remove_user_as_an_administrator_of_the_centre_X,
Txt_Remove_USER_as_an_administrator_of_the_centre_X,
Gbl.CurrentCtr.Ctr.ShortName);
fprintf (Gbl.F.Out,"<li>"
"<input type=\"radio\" name=\"RegRemAction\" value=\"%u\"",
@ -1070,7 +1070,7 @@ bool Enr_PutActionsRegRemOneUsr (bool ItsMe)
{
sprintf (Gbl.Message,
ItsMe ? Txt_Remove_me_as_an_administrator_of_the_institution_X :
Txt_Remove_user_as_an_administrator_of_the_institution_X,
Txt_Remove_USER_as_an_administrator_of_the_institution_X,
Gbl.CurrentIns.Ins.ShortName);
fprintf (Gbl.F.Out,"<li>"
"<input type=\"radio\" name=\"RegRemAction\" value=\"%u\"",
@ -3843,7 +3843,7 @@ static void Enr_AskIfRemAdm (bool ItsMe,Sco_Scope_t Scope,const char *InsCtrDegN
extern const char *Txt_Do_you_really_want_to_be_removed_as_an_administrator_of_X;
extern const char *Txt_Do_you_really_want_to_remove_the_following_user_as_an_administrator_of_X;
extern const char *Txt_Remove_me_as_an_administrator;
extern const char *Txt_Remove_user_as_an_administrator;
extern const char *Txt_Remove_USER_as_an_administrator;
static const Act_Action_t Enr_ActRemAdm[Sco_NUM_SCOPES] =
{
ActUnk, // Sco_SCOPE_UNK
@ -3868,7 +3868,7 @@ static void Enr_AskIfRemAdm (bool ItsMe,Sco_Scope_t Scope,const char *InsCtrDegN
Act_FormStart (Enr_ActRemAdm[Scope]);
Usr_PutParamOtherUsrCodEncrypted ();
Lay_PutRemoveButton (ItsMe ? Txt_Remove_me_as_an_administrator :
Txt_Remove_user_as_an_administrator);
Txt_Remove_USER_as_an_administrator);
Act_FormEnd ();
}
else

2
swad_record.c
View File

@ -1979,7 +1979,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
extern const char *Txt_Register;
extern const char *Txt_Confirm;
char StrRecordWidth[10+1];
const char *ClassForm;
const char *ClassForm = "REC_DAT";
char Name[Usr_MAX_BYTES_NAME+1]; // To shorten length of FirstName, Surname1, Surname2
char PhotoURL[PATH_MAX+1];
bool ItsMe = (Gbl.Usrs.Me.UsrDat.UsrCod == UsrDat->UsrCod);

180
swad_text.c
View File

@ -28452,114 +28452,114 @@ const char *Txt_Register_me_in_the_course_X = // Warning: it is very important t
"Registrar me na disciplina <strong>%s</strong>";
#endif
const char *Txt_Register_user_in_the_course_X = // Warning: it is very important to include %s in the following sentences
const char *Txt_Register_USER_in_the_course_X = // Warning: it is very important to include %s in the following sentences
#if L==1
"Inscriure usuari en l'assignatura <strong>%s</strong>";
"Inscriure en l'assignatura <strong>%s</strong>";
#elif L==2
"Anmeldung Benutzer im Kurs <strong>%s</strong>";
"Anmeldung im Kurs <strong>%s</strong>";
#elif L==3
"Register user in the course <strong>%s</strong>";
"Register in the course <strong>%s</strong>";
#elif L==4
"Inscribir usuario en la asignatura <strong>%s</strong>";
"Inscribir en la asignatura <strong>%s</strong>";
#elif L==5
"Inscrire utilisateur dans la mati&egrave;re <strong>%s</strong>";
"Inscrire dans la mati&egrave;re <strong>%s</strong>";
#elif L==6
"Inscribir usuario en la asignatura <strong>%s</strong>"; // Okoteve traducción
"Inscribir en la asignatura <strong>%s</strong>"; // Okoteve traducción
#elif L==7
"Registrare utente nel corso <strong>%s</strong>";
"Registrare nel corso <strong>%s</strong>";
#elif L==8
"Rejestracja u&zdot;ytkownika w kurs <strong>%s</strong>";
"Rejestracja w kurs <strong>%s</strong>";
#elif L==9
"Registrar utilizador na disciplina <strong>%s</strong>";
"Registrar na disciplina <strong>%s</strong>";
#endif
const char *Txt_Register_user_as_an_administrator_of_the_centre_X = // Warning: it is very important to include %s in the following sentences
const char *Txt_Register_USER_as_an_administrator_of_the_centre_X = // Warning: it is very important to include %s in the following sentences
#if L==1
"Inscriure usuari com a administrador"
"Inscriure com a administrador"
" del centre <strong>%s</strong>";
#elif L==2
"Anmeldung Benutzer als Administrator"
"Anmeldung als Administrator"
" des Lehrinstitut <strong>%s</strong>";
#elif L==3
"Register user as an administrator"
"Register as an administrator"
" of the centre <strong>%s</strong>";
#elif L==4
"Inscribir usuario como administrador"
"Inscribir como administrador"
" del centro <strong>%s</strong>";
#elif L==5
"Inscrire utilisateur en tant qu'administrateur"
"Inscrire en tant qu'administrateur"
" du centre <strong>%s</strong>";
#elif L==6
"Inscribir usuario como administrador"
"Inscribir como administrador"
" del centro <strong>%s</strong>"; // Okoteve traducción
#elif L==7
"Registrare utente come amministratore"
"Registrare come amministratore"
" del centro <strong>%s</strong>";
#elif L==8
"Rejestracja u&zdot;ytkownika jako administrator"
"Rejestracja jako administrator"
" centrum <strong>%s</strong>";
#elif L==9
"Registrar utilizador como administrador"
"Registrar como administrador"
" do centro <strong>%s</strong>";
#endif
const char *Txt_Register_user_as_an_administrator_of_the_degree_X = // Warning: it is very important to include %s in the following sentences
const char *Txt_Register_USER_as_an_administrator_of_the_degree_X = // Warning: it is very important to include %s in the following sentences
#if L==1
"Inscriure usuari com a administrador"
"Inscriure com a administrador"
" de la titulaci&oacute; <strong>%s</strong>";
#elif L==2
"Anmeldung Benutzer als Administrator"
"Anmeldung als Administrator"
" des Studiengang <strong>%s</strong>";
#elif L==3
"Register user as an administrator"
"Register as an administrator"
" of the degree <strong>%s</strong>";
#elif L==4
"Inscribir usuario como administrador"
"Inscribir como administrador"
" de la titulaci&oacute;n <strong>%s</strong>";
#elif L==5
"Inscrire utilisateur en tant qu'administrateur"
"Inscrire en tant qu'administrateur"
" du &eacute;tude <strong>%s</strong>";
#elif L==6
"Inscribir usuario como administrador"
"Inscribir como administrador"
" de la titulaci&oacute;n <strong>%s</strong>"; // Okoteve traducción
#elif L==7
"Registrare utente come amministratore"
"Registrare come amministratore"
" della laurea <strong>%s</strong>";
#elif L==8
"Rejestracja u&zdot;ytkownika jako administrator"
"Rejestracja jako administrator"
" stopnia <strong>%s</strong>";
#elif L==9
"Registrar utilizador como administrador"
"Registrar como administrador"
" da titula&ccedil;&atilde;o <strong>%s</strong>";
#endif
const char *Txt_Register_user_as_an_administrator_of_the_institution_X = // Warning: it is very important to include %s in the following sentences
const char *Txt_Register_USER_as_an_administrator_of_the_institution_X = // Warning: it is very important to include %s in the following sentences
#if L==1
"Inscriure usuari com a administrador"
"Inscriure com a administrador"
" de la instituci&oacute; <strong>%s</strong>";
#elif L==2
"Anmeldung Benutzer als Administrator"
"Anmeldung als Administrator"
" des Hochschule <strong>%s</strong>";
#elif L==3
"Register user as an administrator"
"Register as an administrator"
" of the institution <strong>%s</strong>";
#elif L==4
"Inscribir usuario como administrador"
"Inscribir como administrador"
" de la instituci&oacute;n <strong>%s</strong>";
#elif L==5
"Inscrire utilisateur en tant qu'administrateur"
"Inscrire en tant qu'administrateur"
" du &eacute;tablissement <strong>%s</strong>";
#elif L==6
"Inscribir usuario como administrador"
"Inscribir como administrador"
" de la instituci&oacute;n <strong>%s</strong>"; // Okoteve traducción
#elif L==7
"Registrare utente come amministratore"
"Registrare come amministratore"
" della istituzione <strong>%s</strong>";
#elif L==8
"Rejestracja u&zdot;ytkownika jako administrator"
"Rejestracja jako administrator"
" instytucje <strong>%s</strong>";
#elif L==9
"Registrar utilizador como administrador"
"Registrar como administrador"
" da institui&ccedil;&atilde;o <strong>%s</strong>";
#endif
@ -29262,136 +29262,136 @@ const char *Txt_Remove_user_from_this_course =
"Tirar utilizador desta disciplina";
#endif
const char *Txt_Remove_user_as_an_administrator =
const char *Txt_Remove_USER_as_an_administrator =
#if L==1
"Eliminar usuari com a administrador";
"Eliminar com a administrador";
#elif L==2
"Entfernen Benutzer als Administrator";
"Entfernen als Administrator";
#elif L==3
"Remove user as an administrator";
"Remove as an administrator";
#elif L==4
"Eliminar usuario como administrador";
"Eliminar como administrador";
#elif L==5
"Enlever utilisateur en tant qu'administrateur";
"Enlever en tant qu'administrateur";
#elif L==6
"Eliminar usuario como administrador"; // Okoteve traducción
"Eliminar como administrador"; // Okoteve traducción
#elif L==7
"Rimuovi utente come amministratore";
"Rimuovi come amministratore";
#elif L==8
"Usu&nacute; u&zdot;ytkownika jako administrator";
"Usu&nacute; jako administrator";
#elif L==9
"Tirar utilizador como administrador";
"Tirar como administrador";
#endif
const char *Txt_Remove_user_as_an_administrator_of_the_centre_X = // Warning: it is very important to include %s in the following sentences
const char *Txt_Remove_USER_as_an_administrator_of_the_centre_X = // Warning: it is very important to include %s in the following sentences
#if L==1
"Eliminar usuari com a administrador"
"Eliminar com a administrador"
" del centre <strong>%s</strong>";
#elif L==2
"Entfernen Benutzer als Administrator"
"Entfernen als Administrator"
" des Lehrinstitute <strong>%s</strong>";
#elif L==3
"Remove user as an administrator"
"Remove as an administrator"
" of the centre <strong>%s</strong>";
#elif L==4
"Eliminar usuario como administrador"
"Eliminar como administrador"
" del centro <strong>%s</strong>";
#elif L==5
"Enlever utilisateur en tant qu'administrateur"
"Enlever en tant qu'administrateur"
" du centre <strong>%s</strong>";
#elif L==6
"Eliminar usuario como administrador"
"Eliminar como administrador"
" del centro <strong>%s</strong>"; // Okoteve traducción
#elif L==7
"Rimuovi utente come amministratore"
"Rimuovi come amministratore"
" del centro <strong>%s</strong>";
#elif L==8
"Usu&nacute; u&zdot;ytkownika jako administrator"
"Usu&nacute; jako administrator"
" centrum <strong>%s</strong>";
#elif L==9
"Tirar utilizador como administrador"
"Tirar como administrador"
" do centro <strong>%s</strong>";
#endif
const char *Txt_Remove_user_as_an_administrator_of_the_degree_X = // Warning: it is very important to include %s in the following sentences
const char *Txt_Remove_USER_as_an_administrator_of_the_degree_X = // Warning: it is very important to include %s in the following sentences
#if L==1
"Eliminar usuari com a administrador"
"Eliminar com a administrador"
" de la titulaci&oacute; <strong>%s</strong>";
#elif L==2
"Entfernen Benutzer als Administrator"
"Entfernen als Administrator"
" des Studiengang <strong>%s</strong>";
#elif L==3
"Remove user as an administrator"
"Remove as an administrator"
" of the degree <strong>%s</strong>";
#elif L==4
"Eliminar usuario como administrador"
"Eliminar como administrador"
" de la titulaci&oacute;n <strong>%s</strong>";
#elif L==5
"Enlever utilisateur en tant qu'administrateur"
"Enlever en tant qu'administrateur"
" du &eacute;tude <strong>%s</strong>";
#elif L==6
"Eliminar usuario como administrador"
"Eliminar como administrador"
" de la titulaci&oacute;n <strong>%s</strong>"; // Okoteve traducción
#elif L==7
"Rimuovi utente come amministratore"
"Rimuovi come amministratore"
" della laurea <strong>%s</strong>";
#elif L==8
"Usu&nacute; u&zdot;ytkownika jako administrator"
"Usu&nacute; jako administrator"
" stopnia <strong>%s</strong>";
#elif L==9
"Tirar utilizador como administrador"
"Tirar como administrador"
" da titula&ccedil;&atilde;o <strong>%s</strong>";
#endif
const char *Txt_Remove_user_as_an_administrator_of_the_institution_X = // Warning: it is very important to include %s in the following sentences
const char *Txt_Remove_USER_as_an_administrator_of_the_institution_X = // Warning: it is very important to include %s in the following sentences
#if L==1
"Eliminar usuari com a administrador"
"Eliminar com a administrador"
" de la instituci&oacute; <strong>%s</strong>";
#elif L==2
"Entfernen Benutzer als Administrator"
"Entfernen als Administrator"
" des Hochschule <strong>%s</strong>";
#elif L==3
"Remove user as an administrator"
"Remove as an administrator"
" of the institution <strong>%s</strong>";
#elif L==4
"Eliminar usuario como administrador"
"Eliminar como administrador"
" de la instituci&oacute;n <strong>%s</strong>";
#elif L==5
"Enlever utilisateur en tant qu'administrateur"
"Enlever en tant qu'administrateur"
" du &eacute;tablissement <strong>%s</strong>";
#elif L==6
"Eliminar usuario como administrador"
"Eliminar como administrador"
" de la instituci&oacute;n <strong>%s</strong>"; // Okoteve traducción
#elif L==7
"Rimuovi utente come amministratore"
"Rimuovi come amministratore"
" della istituzione <strong>%s</strong>";
#elif L==8
"Usu&nacute; u&zdot;ytkownika jako administrator"
"Usu&nacute; jako administrator"
" instytucji <strong>%s</strong>";
#elif L==9
"Tirar utilizador como administrador"
"Tirar como administrador"
" da institu&ccedil;&atilde;o <strong>%s</strong>";
#endif
const char *Txt_Remove_user_from_the_course_X = // Warning: it is very important to include %s in the following sentences
const char *Txt_Remove_USER_from_the_course_X = // Warning: it is very important to include %s in the following sentences
#if L==1
"Eliminar usuari de l'assignatura <strong>%s</strong>";
"Eliminar de l'assignatura <strong>%s</strong>";
#elif L==2
"Entfernen Benutzer aus dem Kurs <strong>%s</strong>";
"Entfernen aus dem Kurs <strong>%s</strong>";
#elif L==3
"Remove user from the course <strong>%s</strong>";
"Remove from the course <strong>%s</strong>";
#elif L==4
"Eliminar usuario de la asignatura <strong>%s</strong>";
"Eliminar de la asignatura <strong>%s</strong>";
#elif L==5
"Enlever utilisateur de la mati&egrave;re <strong>%s</strong>";
"Enlever de la mati&egrave;re <strong>%s</strong>";
#elif L==6
"Eliminar usuario de la asignatura <strong>%s</strong>"; // Okoteve traducción
"Eliminar de la asignatura <strong>%s</strong>"; // Okoteve traducción
#elif L==7
"Rimuovi utente dal corso <strong>%s</strong>";
"Rimuovi dal corso <strong>%s</strong>";
#elif L==8
"Usu&nacute; u&zdot;ytkownika w kurs <strong>%s</strong>";
"Usu&nacute; w kurs <strong>%s</strong>";
#elif L==9
"Tirar utilizador da disciplina <strong>%s</strong>";
"Tirar da disciplina <strong>%s</strong>";
#endif
const char *Txt_Reply =