mirror of
https://github.com/acanas/swad-core.git
synced 2024-06-17 05:55:43 +02:00
Version 15.60.5
This commit is contained in:
parent
10d994760d
commit
c9d9f49a24
|
@ -110,12 +110,13 @@
|
||||||
/****************************** Public constants *****************************/
|
/****************************** Public constants *****************************/
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
#define Log_PLATFORM_VERSION "SWAD 15.60.4 (2015/12/08)"
|
#define Log_PLATFORM_VERSION "SWAD 15.60.5 (2015/12/08)"
|
||||||
#define CSS_FILE "swad15.59.4.css"
|
#define CSS_FILE "swad15.59.4.css"
|
||||||
|
|
||||||
// Number of lines (includes comments but not blank lines) has been got with the following command:
|
// 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
|
// nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h sql/swad*.sql | tail -1
|
||||||
/*
|
/*
|
||||||
|
Version 15.60.5: Dec 08, 2015 Changed some messages related to login. (186589 lines)
|
||||||
Version 15.60.4: Dec 08, 2015 Change in text about first / last year of a degree. (186589 lines)
|
Version 15.60.4: Dec 08, 2015 Change in text about first / last year of a degree. (186589 lines)
|
||||||
Version 15.60.3: Dec 08, 2015 Fixed bug in country.
|
Version 15.60.3: Dec 08, 2015 Fixed bug in country.
|
||||||
Code refactoring in menu. (186588 lines)
|
Code refactoring in menu. (186588 lines)
|
||||||
|
|
|
@ -215,10 +215,10 @@ void Pwd_ActChgMyPwd2 (void)
|
||||||
|
|
||||||
void Pwd_PutLinkToSendNewPasswd (void)
|
void Pwd_PutLinkToSendNewPasswd (void)
|
||||||
{
|
{
|
||||||
extern const char *Txt_I_forgot_my_password;
|
extern const char *Txt_Forgotten_password;
|
||||||
|
|
||||||
Act_PutContextualLink (ActReqSndNewPwd,Pwd_PutLinkToSendNewPasswdParams,
|
Act_PutContextualLink (ActReqSndNewPwd,Pwd_PutLinkToSendNewPasswdParams,
|
||||||
"key16x16.gif",Txt_I_forgot_my_password);
|
"key16x16.gif",Txt_Forgotten_password);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void Pwd_PutLinkToSendNewPasswdParams (void)
|
static void Pwd_PutLinkToSendNewPasswdParams (void)
|
||||||
|
@ -234,15 +234,15 @@ void Pwd_ShowFormSendNewPwd (void)
|
||||||
{
|
{
|
||||||
extern const char *The_ClassForm[The_NUM_THEMES];
|
extern const char *The_ClassForm[The_NUM_THEMES];
|
||||||
extern const char *Txt_If_you_have_forgotten_your_password_;
|
extern const char *Txt_If_you_have_forgotten_your_password_;
|
||||||
extern const char *Txt_Password;
|
extern const char *Txt_Forgotten_password;
|
||||||
extern const char *Txt_nick_email_or_ID;
|
extern const char *Txt_nick_email_or_ID;
|
||||||
extern const char *Txt_Email_new_password;
|
extern const char *Txt_Get_a_new_password;
|
||||||
|
|
||||||
/***** Start of form *****/
|
/***** Start of form *****/
|
||||||
Act_FormStart (ActSndNewPwd);
|
Act_FormStart (ActSndNewPwd);
|
||||||
|
|
||||||
/***** Start frame *****/
|
/***** Start frame *****/
|
||||||
Lay_StartRoundFrame (NULL,Txt_Password);
|
Lay_StartRoundFrame (NULL,Txt_Forgotten_password);
|
||||||
|
|
||||||
/***** Help text *****/
|
/***** Help text *****/
|
||||||
Lay_ShowAlert (Lay_INFO,Txt_If_you_have_forgotten_your_password_);
|
Lay_ShowAlert (Lay_INFO,Txt_If_you_have_forgotten_your_password_);
|
||||||
|
@ -257,7 +257,7 @@ void Pwd_ShowFormSendNewPwd (void)
|
||||||
Usr_MAX_LENGTH_USR_LOGIN,Gbl.Usrs.Me.UsrIdLogin);
|
Usr_MAX_LENGTH_USR_LOGIN,Gbl.Usrs.Me.UsrIdLogin);
|
||||||
|
|
||||||
/***** Send button and end table *****/
|
/***** Send button and end table *****/
|
||||||
Lay_EndRoundFrameWithButton (Lay_CONFIRM_BUTTON,Txt_Email_new_password);
|
Lay_EndRoundFrameWithButton (Lay_CONFIRM_BUTTON,Txt_Get_a_new_password);
|
||||||
|
|
||||||
/***** End form *****/
|
/***** End form *****/
|
||||||
Act_FormEnd ();
|
Act_FormEnd ();
|
||||||
|
|
84
swad_text.c
84
swad_text.c
|
@ -9884,27 +9884,6 @@ const char *Txt_Email_X_has_already_been_confirmed_before = // Warning: it is ve
|
||||||
" has already been confirmed before."; // Necessita de tradução
|
" has already been confirmed before."; // Necessita de tradução
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
const char *Txt_Email_new_password =
|
|
||||||
#if L==1
|
|
||||||
"Enviarme una nueva contraseña"; // Necessita traduccio
|
|
||||||
#elif L==2
|
|
||||||
"Neues Passwort beantragen";
|
|
||||||
#elif L==3
|
|
||||||
"E-mail new password";
|
|
||||||
#elif L==4
|
|
||||||
"Enviarme una nueva contraseña";
|
|
||||||
#elif L==5
|
|
||||||
"Envoyez-moi un nouveau mot de passe";
|
|
||||||
#elif L==6
|
|
||||||
"Enviarme una nueva contraseña"; // Okoteve traducción
|
|
||||||
#elif L==7
|
|
||||||
"Invia una nuova password";
|
|
||||||
#elif L==8
|
|
||||||
"E-mail nowe hasło";
|
|
||||||
#elif L==9
|
|
||||||
"Enviar uma nova senha";
|
|
||||||
#endif
|
|
||||||
|
|
||||||
const char *Txt_Email_X_removed = // Warning: it is very important to include %s in the following sentences
|
const char *Txt_Email_X_removed = // Warning: it is very important to include %s in the following sentences
|
||||||
#if L==1
|
#if L==1
|
||||||
"Correu <strong>%s</strong> eliminat.";
|
"Correu <strong>%s</strong> eliminat.";
|
||||||
|
@ -12026,6 +12005,27 @@ const char *Txt_Force_students_to_read_this_information =
|
||||||
"Forçar os estudantes a ler esta informação";
|
"Forçar os estudantes a ler esta informação";
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
const char *Txt_Forgotten_password =
|
||||||
|
#if L==1
|
||||||
|
"Contrasenya oblidada?";
|
||||||
|
#elif L==2
|
||||||
|
"Passwort vergessen?";
|
||||||
|
#elif L==3
|
||||||
|
"Forgotten password?";
|
||||||
|
#elif L==4
|
||||||
|
"¿Contraseña olvidada?";
|
||||||
|
#elif L==5
|
||||||
|
"Mot de passe oublié?";
|
||||||
|
#elif L==6
|
||||||
|
"¿Contraseña olvidada?"; // Okoteve traducción
|
||||||
|
#elif L==7
|
||||||
|
"Password dimenticata?";
|
||||||
|
#elif L==8
|
||||||
|
"Zapomniane hasło?";
|
||||||
|
#elif L==9
|
||||||
|
"Senha esquecida?";
|
||||||
|
#endif
|
||||||
|
|
||||||
const char *Txt_Forum =
|
const char *Txt_Forum =
|
||||||
#if L==1
|
#if L==1
|
||||||
"Foro"; // Necessita traduccio
|
"Foro"; // Necessita traduccio
|
||||||
|
@ -12575,6 +12575,27 @@ const char *Txt_Generate_exam =
|
||||||
"Gerar teste";
|
"Gerar teste";
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
const char *Txt_Get_a_new_password =
|
||||||
|
#if L==1
|
||||||
|
"Rebre una nova contrasenya";
|
||||||
|
#elif L==2
|
||||||
|
"Neues Passwort beantragen";
|
||||||
|
#elif L==3
|
||||||
|
"Get a new password";
|
||||||
|
#elif L==4
|
||||||
|
"Recibir una nueva contraseña";
|
||||||
|
#elif L==5
|
||||||
|
"Recevoir un nouveau mot de passe";
|
||||||
|
#elif L==6
|
||||||
|
"Recibir una nueva contraseña"; // Okoteve traducción
|
||||||
|
#elif L==7
|
||||||
|
"Ottenere una nuova password";
|
||||||
|
#elif L==8
|
||||||
|
"Uzyskaj nowe hasło";
|
||||||
|
#elif L==9
|
||||||
|
"Obter uma nova senha";
|
||||||
|
#endif
|
||||||
|
|
||||||
const char *Txt_Go_back =
|
const char *Txt_Go_back =
|
||||||
#if L==1
|
#if L==1
|
||||||
"Tornar enrere";
|
"Tornar enrere";
|
||||||
|
@ -13439,27 +13460,6 @@ const char *Txt_hours_ABBREVIATION = // Abbreviation of "hours"
|
||||||
"h";
|
"h";
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
const char *Txt_I_forgot_my_password =
|
|
||||||
#if L==1
|
|
||||||
"He oblidat la meva contrasenya";
|
|
||||||
#elif L==2
|
|
||||||
"Ich habe mein Passwort vergessen";
|
|
||||||
#elif L==3
|
|
||||||
"I forgot my password";
|
|
||||||
#elif L==4
|
|
||||||
"He olvidado mi contraseña";
|
|
||||||
#elif L==5
|
|
||||||
"J'ai oublié mon mot de passe";
|
|
||||||
#elif L==6
|
|
||||||
"He olvidado mi contraseña"; // Okoteve traducción
|
|
||||||
#elif L==7
|
|
||||||
"Ho dimenticato la mia password";
|
|
||||||
#elif L==8
|
|
||||||
"Nie pamiętam hasła";
|
|
||||||
#elif L==9
|
|
||||||
"Esqueci minha senha";
|
|
||||||
#endif
|
|
||||||
|
|
||||||
const char *Txt_I_have_read_this_information =
|
const char *Txt_I_have_read_this_information =
|
||||||
#if L==1
|
#if L==1
|
||||||
"He leído esta información"; // Necessita traduccio
|
"He leído esta información"; // Necessita traduccio
|
||||||
|
|
|
@ -1414,7 +1414,7 @@ void Usr_Logout (void)
|
||||||
void Usr_WriteFormLogin (void)
|
void Usr_WriteFormLogin (void)
|
||||||
{
|
{
|
||||||
extern const char *The_ClassFormBold[The_NUM_THEMES];
|
extern const char *The_ClassFormBold[The_NUM_THEMES];
|
||||||
extern const char *Txt_New_on_PLATFORM_Sign_up;
|
extern const char *Txt_Create_account;
|
||||||
extern const char *Txt_Enter_from_X;
|
extern const char *Txt_Enter_from_X;
|
||||||
extern const char *Txt_Log_in;
|
extern const char *Txt_Log_in;
|
||||||
extern const char *Txt_User;
|
extern const char *Txt_User;
|
||||||
|
@ -1426,8 +1426,7 @@ void Usr_WriteFormLogin (void)
|
||||||
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
|
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
|
||||||
|
|
||||||
/* Link to create a new account */
|
/* Link to create a new account */
|
||||||
sprintf (Gbl.Title,Txt_New_on_PLATFORM_Sign_up,Cfg_PLATFORM_SHORT_NAME);
|
Act_PutContextualLink (ActFrmUsrAcc,NULL,"arroba16x16.gif",Txt_Create_account);
|
||||||
Act_PutContextualLink (ActFrmUsrAcc,NULL,"arroba16x16.gif",Gbl.Title);
|
|
||||||
|
|
||||||
/* Link to enter from external site */
|
/* Link to enter from external site */
|
||||||
if (Cfg_EXTERNAL_LOGIN_URL[0] &&
|
if (Cfg_EXTERNAL_LOGIN_URL[0] &&
|
||||||
|
|
Loading…
Reference in New Issue
Block a user