diff --git a/swad_account.c b/swad_account.c index 19adaa436..def525908 100644 --- a/swad_account.c +++ b/swad_account.c @@ -106,9 +106,12 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith extern const char *The_ClassFormul[The_NUM_THEMES]; extern const char *Txt_Log_in; extern const char *Txt_Nickname; + extern const char *Txt_HELP_nickname; + extern const char *Txt_HELP_email; extern const char *Txt_Email; extern const char *Txt_New_on_PLATFORM_Sign_up; extern const char *Txt_Create_account; + char NewNicknameWithArroba[Nck_MAX_BYTES_NICKNAME_WITH_ARROBA+1]; /***** Link to log in *****/ fprintf (Gbl.F.Out,"
"); @@ -125,19 +128,25 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith Lay_StartRoundFrameTable10 (NULL,2,Gbl.Title); /***** Nickname *****/ + if (NewNicknameWithoutArroba[0]) + sprintf (NewNicknameWithArroba,"@%s",NewNicknameWithoutArroba); + else + NewNicknameWithArroba[0] = '\0'; fprintf (Gbl.F.Out,"" "" "%s: " "" "" "" + " size=\"25\" maxlength=\"%u\"" + " placeholder=\"%s\" value=\"%s\" />" "" "", The_ClassFormul[Gbl.Prefs.Theme], Txt_Nickname, 1+Nck_MAX_LENGTH_NICKNAME_WITHOUT_ARROBA, - NewNicknameWithoutArroba); + Txt_HELP_nickname, + NewNicknameWithArroba); /***** E-mail *****/ fprintf (Gbl.F.Out,"" @@ -146,12 +155,14 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith "" "" "" + " size=\"25\" maxlength=\"%u\"" + " placeholder=\"%s\" value=\"%s\" />" "" "", The_ClassFormul[Gbl.Prefs.Theme], Txt_Email, Cns_MAX_BYTES_STRING, + Txt_HELP_email, NewEmail); /***** Password *****/ diff --git a/swad_changelog.h b/swad_changelog.h index 12ddb7a5a..e249c5596 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -103,11 +103,12 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 14.102.5 (2015/03/27)" +#define Log_PLATFORM_VERSION "SWAD 14.102.6 (2015/03/27)" // 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 14.102.6: Mar 27, 2015 Changes in layout of sign up. (183987 lines) Version 14.102.5: Mar 27, 2015 Changes in layout of log in. (183909 lines) Version 14.102.4: Mar 25, 2015 Fixed bug in ranking. (183883 lines) Version 14.102.3: Mar 25, 2015 Fixed bug in record. (183882 lines) diff --git a/swad_password.c b/swad_password.c index c412b9b69..50932a2ee 100644 --- a/swad_password.c +++ b/swad_password.c @@ -666,12 +666,13 @@ void Pwd_ShowFormChgPwd (void) "%s: " "" "" - "" + "" "" "", The_ClassFormul[Gbl.Prefs.Theme], Txt_Current_password, - Pwd_INPUT_LENGTH_PLAIN_PASSWORD,Pwd_MAX_LENGTH_PLAIN_PASSWORD); + Pwd_MAX_LENGTH_PLAIN_PASSWORD); Pwd_PutFormToGetNewPasswordTwice (); /***** Send button and end form *****/ @@ -693,15 +694,18 @@ void Pwd_PutFormToGetNewPasswordTwice (void) extern const char *The_ClassFormul[The_NUM_THEMES]; extern const char *Txt_New_password; extern const char *Txt_Password; + extern const char *Txt_HELP_password; extern const char *Txt_Retype_new_password; extern const char *Txt_Retype_password; + sprintf (Gbl.Message,Txt_HELP_password,Pwd_MIN_LENGTH_PLAIN_PASSWORD); fprintf (Gbl.F.Out,"" "" "%s: " "" "" - "" + "" "" "" "" @@ -709,17 +713,20 @@ void Pwd_PutFormToGetNewPasswordTwice (void) "%s: " "" "" - "" + "" "" "", The_ClassFormul[Gbl.Prefs.Theme], Gbl.Usrs.Me.Logged? Txt_New_password : // Changing my password Txt_Password, // Creating new account - Pwd_INPUT_LENGTH_PLAIN_PASSWORD,Pwd_MAX_LENGTH_PLAIN_PASSWORD, + Pwd_MAX_LENGTH_PLAIN_PASSWORD, + Gbl.Message, The_ClassFormul[Gbl.Prefs.Theme], Gbl.Usrs.Me.Logged ? Txt_Retype_new_password : // Changing my password Txt_Retype_password, // Creating new account - Pwd_INPUT_LENGTH_PLAIN_PASSWORD,Pwd_MAX_LENGTH_PLAIN_PASSWORD); + Pwd_MAX_LENGTH_PLAIN_PASSWORD, + Gbl.Message); } /*****************************************************************************/ diff --git a/swad_password.h b/swad_password.h index af1a7eb37..20c6c1c28 100644 --- a/swad_password.h +++ b/swad_password.h @@ -32,7 +32,6 @@ /*****************************************************************************/ #define Pwd_MIN_LENGTH_PLAIN_PASSWORD 8 -#define Pwd_INPUT_LENGTH_PLAIN_PASSWORD 16 #define Pwd_MAX_LENGTH_PLAIN_PASSWORD 256 /*****************************************************************************/ diff --git a/swad_text.c b/swad_text.c index 1cced810c..926643702 100644 --- a/swad_text.c +++ b/swad_text.c @@ -12840,6 +12840,69 @@ const char *Txt_Guided_academic_assignments = "Atividades académicas guided"; #endif +const char *Txt_HELP_email = +#if L==0 + "Exemple: garcia@exemplemail.com"; +#elif L==1 + "Beispiel: muller@beispielmail.com"; +#elif L==2 + "Example: smith@examplemail.com"; +#elif L==3 + "Ejemplo: gonzalez@ejemplomail.com"; +#elif L==4 + "Exemple: dubois@exemplemail.com"; +#elif L==5 + "Ejemplo: gonzalez@ejemplomail.com"; // Okoteve traducción +#elif L==6 + "Esempio: rossi@esempiomail.com"; +#elif L==7 + "Przykład: nowak@przykladmail.com"; +#elif L==8 + "Exemplo: silva@exemplomail.com"; +#endif + +const char *Txt_HELP_nickname = +#if L==0 + "Exemple: @garcia"; +#elif L==1 + "Beispiel: @muller"; +#elif L==2 + "Example: @smith"; +#elif L==3 + "Ejemplo: @gonzalez"; +#elif L==4 + "Exemple: @dubois"; +#elif L==5 + "Ejemplo: @gonzalez"; // Okoteve traducción +#elif L==6 + "Esempio: @rossi"; +#elif L==7 + "Przykład: @nowak"; +#elif L==8 + "Exemplo: @silva"; +#endif + +const char *Txt_HELP_password = // Warning: it is very important to include %u in the following sentences +#if L==0 + "%u o més caràcters"; +#elif L==1 + "%u oder mehr Zeichen"; +#elif L==2 + "%u or more characters"; +#elif L==3 + "%u o más caracteres"; +#elif L==4 + "%u ou plusieurs caractères"; +#elif L==5 + "%u o más caracteres"; // Okoteve traducción +#elif L==6 + "%u o più caratteri"; +#elif L==7 + "%u lub więcej znaków"; +#elif L==8 + "%u ou mais caracteres"; +#endif + const char *Txt_Hidden_MALE_PLURAL = #if L==0 "Ocultos"; // Necessita traduccio diff --git a/swad_user.c b/swad_user.c index 7ece1ae8c..e69e37070 100644 --- a/swad_user.c +++ b/swad_user.c @@ -1358,7 +1358,7 @@ void Usr_WriteFormLogin (void) if (Cfg_EXTERNAL_LOGIN_URL[0] && Cfg_EXTERNAL_LOGIN_SERVICE_SHORT_NAME[0]) { - fprintf (Gbl.F.Out,"", + fprintf (Gbl.F.Out,"", Cfg_EXTERNAL_LOGIN_URL, The_ClassFormul[Gbl.Prefs.Theme]); sprintf (Gbl.Title,Txt_Enter_from_X,