From 10805e0aeae4b7fd7d78b10d3296684c2680f877 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Sun, 24 Apr 2016 22:01:22 +0200 Subject: [PATCH] Version 15.203.6 --- css/swad15.203.css | 6 ++--- swad_ID.c | 16 +++++++----- swad_action.c | 12 ++++----- swad_changelog.h | 3 ++- swad_text.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 84 insertions(+), 16 deletions(-) diff --git a/css/swad15.203.css b/css/swad15.203.css index 973cb7eca..50ebcf342 100644 --- a/css/swad15.203.css +++ b/css/swad15.203.css @@ -1100,13 +1100,13 @@ a:hover /* Default ==> underlined */ .BT_SUBMIT_INLINE { box-sizing:border-box; - min-width:180px; + min-width:140px; color:white; font-size:15px; font-weight:bold; line-height:normal; - margin:0 5px; - padding:5px 10px; + margin:0 10px; + padding:4px; border-radius:4px; box-shadow:0 1px 0 rgba(255,255,255,0.15) inset; } diff --git a/swad_ID.c b/swad_ID.c index 574bfb9d2..8cfc1a42b 100644 --- a/swad_ID.c +++ b/swad_ID.c @@ -432,7 +432,8 @@ static bool ID_ICanSeeAnotherUsrID (struct UsrData *UsrDat) static void ID_PutButtonToReqConfirmID (struct UsrData *UsrDat,unsigned NumID) { - extern const char *Txt_Confirm; + extern const char *The_ClassFormBold[The_NUM_THEMES]; + extern const char *Txt_Confirm_ID; Act_FormStart ( UsrDat->RoleInCurrentCrsDB == Rol_STUDENT ? ActReqCnfID_Std : (UsrDat->RoleInCurrentCrsDB == Rol_TEACHER ? ActReqCnfID_Tch : @@ -440,7 +441,8 @@ static void ID_PutButtonToReqConfirmID (struct UsrData *UsrDat,unsigned NumID) Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); fprintf (Gbl.F.Out,"", UsrDat->IDs.List[NumID].ID); - Lay_PutCreateButtonInline (Txt_Confirm); + Lay_PutIconLink ("ok_on16x16.gif",Txt_Confirm_ID,Txt_Confirm_ID, + The_ClassFormBold[Gbl.Prefs.Theme]); Act_FormEnd (); } @@ -450,7 +452,7 @@ static void ID_PutButtonToReqConfirmID (struct UsrData *UsrDat,unsigned NumID) static void ID_PutButtonToConfirmID (struct UsrData *UsrDat,unsigned NumID) { - extern const char *Txt_Confirm; + extern const char *Txt_Confirm_ID; Act_FormStart ( UsrDat->RoleInCurrentCrsDB == Rol_STUDENT ? ActCnfID_Std : (UsrDat->RoleInCurrentCrsDB == Rol_TEACHER ? ActCnfID_Tch : @@ -458,7 +460,7 @@ static void ID_PutButtonToConfirmID (struct UsrData *UsrDat,unsigned NumID) Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); fprintf (Gbl.F.Out,"", UsrDat->IDs.List[NumID].ID); - Lay_PutCreateButton (Txt_Confirm); + Lay_PutCreateButton (Txt_Confirm_ID); Act_FormEnd (); } @@ -912,6 +914,8 @@ static void ID_InsertANewUsrIDInDB (long UsrCod,const char *NewID,bool Confirmed void ID_RequestConfirmOtherUsrID (void) { + extern const char *Txt_ID_X_had_already_been_confirmed; + extern const char *Txt_Do_you_want_to_confirm_the_ID_X; extern const char *Txt_User_not_found_or_you_do_not_have_permission_; char UsrID[ID_MAX_LENGTH_USR_ID+1]; bool ICanConfirm = false; @@ -947,14 +951,14 @@ void ID_RequestConfirmOtherUsrID (void) if (Gbl.Usrs.Other.UsrDat.IDs.List[NumIDFound].Confirmed) { /***** ID found and already confirmed *****/ - sprintf (Gbl.Message,"El ID %s ya había sido confirmado.", // TODO: Need translation!!! + sprintf (Gbl.Message,Txt_ID_X_had_already_been_confirmed, Gbl.Usrs.Other.UsrDat.IDs.List[NumIDFound].ID); Lay_ShowAlert (Lay_INFO,Gbl.Message); } else { /***** Ask for confirmation *****/ - sprintf (Gbl.Message,"¿Desea confirmar el ID %s?", // TODO: Need translation!!! + sprintf (Gbl.Message,Txt_Do_you_want_to_confirm_the_ID_X, Gbl.Usrs.Other.UsrDat.IDs.List[NumIDFound].ID); Lay_ShowAlert (Lay_INFO,Gbl.Message); diff --git a/swad_action.c b/swad_action.c index a129aeeb4..3cb946640 100644 --- a/swad_action.c +++ b/swad_action.c @@ -2391,12 +2391,12 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActRcvFrmEnrSevStd*/{1428,-1,TabUsr,ActLstStd ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_ReceiveFormAdminStds ,NULL}, /* ActRcvFrmEnrSevTch*/{1429,-1,TabUsr,ActLstTch ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Enr_ReceiveFormAdminTchs ,NULL}, - /* ActReqCnfID_Oth */{1565,-1,TabUsr,ActLstOth ,0x1E0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,ID_RequestConfirmOtherUsrID ,NULL}, - /* ActReqCnfID_Std */{1566,-1,TabUsr,ActLstStd ,0x1E0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,ID_RequestConfirmOtherUsrID ,NULL}, - /* ActReqCnfID_Tch */{1567,-1,TabUsr,ActLstTch ,0x1E0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,ID_RequestConfirmOtherUsrID ,NULL}, - /* ActCnfID_Oth */{1568,-1,TabUsr,ActLstOth ,0x1E0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,ID_ConfirmOtherUsrID ,NULL}, - /* ActCnfID_Std */{1569,-1,TabUsr,ActLstStd ,0x1E0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,ID_ConfirmOtherUsrID ,NULL}, - /* ActCnfID_Tch */{1570,-1,TabUsr,ActLstTch ,0x1E0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,ID_ConfirmOtherUsrID ,NULL}, + /* ActReqCnfID_Oth */{1565,-1,TabUsr,ActLstOth ,0x1F0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,ID_RequestConfirmOtherUsrID ,NULL}, + /* ActReqCnfID_Std */{1566,-1,TabUsr,ActLstStd ,0x1F0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,ID_RequestConfirmOtherUsrID ,NULL}, + /* ActReqCnfID_Tch */{1567,-1,TabUsr,ActLstTch ,0x1F0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,ID_RequestConfirmOtherUsrID ,NULL}, + /* ActCnfID_Oth */{1568,-1,TabUsr,ActLstOth ,0x1F0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,ID_ConfirmOtherUsrID ,NULL}, + /* ActCnfID_Std */{1569,-1,TabUsr,ActLstStd ,0x1F0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,ID_ConfirmOtherUsrID ,NULL}, + /* ActCnfID_Tch */{1570,-1,TabUsr,ActLstTch ,0x1F0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,ID_ConfirmOtherUsrID ,NULL}, /* ActFrmIDsOth */{1447,-1,TabUsr,ActLstOth ,0x1E0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,ID_ShowFormOthIDs ,NULL}, /* ActFrmIDsStd */{1448,-1,TabUsr,ActLstStd ,0x1E0,0x1E0,0x1E0,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,ID_ShowFormOthIDs ,NULL}, diff --git a/swad_changelog.h b/swad_changelog.h index 09d6cdb35..50b77ae5c 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -134,13 +134,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.203.5 (2016-04-24)" +#define Log_PLATFORM_VERSION "SWAD 15.203.6 (2016-04-24)" #define CSS_FILE "swad15.203.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.203.6: Apr 24, 2016 New form to confirm another user's ID. Not finished. (201295 lines) Version 15.203.5: Apr 24, 2016 New form to confirm another user's ID. Not finished. (201230 lines) Version 15.203.4: Apr 23, 2016 New form to confirm another user's ID. Not finished. (201140 lines) Version 15.203.3: Apr 23, 2016 New form to confirm another user's ID. Not finished. (201113 lines) diff --git a/swad_text.c b/swad_text.c index a09601070..1e03796cf 100644 --- a/swad_text.c +++ b/swad_text.c @@ -4837,6 +4837,27 @@ const char *Txt_Confirm_email = "Confirmar e-mail"; #endif +const char *Txt_Confirm_ID = +#if L==1 + "Confirmar ID"; +#elif L==2 + "ID bestätigen"; +#elif L==3 + "Confirm ID"; +#elif L==4 + "Confirmar ID"; +#elif L==5 + "Confirmer ID"; +#elif L==6 + "Confirmar ID"; // Okoteve traducción +#elif L==7 + "Confermare ID"; +#elif L==8 + "Potwierdzenie ID"; +#elif L==9 + "Confirmar ID"; +#endif + const char *Txt_Confirm_my_enrollment = #if L==1 "Confirmar la meva inscripció"; @@ -9118,6 +9139,27 @@ const char *Txt_Do_you_really_want_to_reset_the_survey_X = // Warning: it is ver "Você realmente deseja reiniciar o inquérito %s?"; #endif +const char *Txt_Do_you_want_to_confirm_the_ID_X = // Warning: it is very important to include %s in the following sentences +#if L==1 + "Voleu confirmar l'ID (DNI/cèdula) %s?"; +#elif L==2 + "Wollen Sie die ID %s zu bestätigen?"; +#elif L==3 + "Do you want to confirm the ID (identity number/passport) %s?"; +#elif L==4 + "¿Desea confirmar el ID (DNI/cédula) %s?"; +#elif L==5 + "Voulez-vous confirmer l'ID %s?"; +#elif L==6 + "¿Desea confirmar el ID (DNI/cédula) %s?"; // Okoteve traducción +#elif L==7 + "Vuoi confermare l'ID %s?"; +#elif L==8 + "Czy chcesz potwierdzić I %s?"; +#elif L==9 + "Você quer confirmar o ID %s?"; +#endif + const char *Txt_Document = #if L==1 "Document"; @@ -14050,6 +14092,27 @@ const char *Txt_ID = "Nº identif."; #endif +const char *Txt_ID_X_had_already_been_confirmed = // Warning: it is very important to include %s in the following sentences +#if L==1 + "El ID (DNI/cédula) %s ja havia estat confirmat."; +#elif L==2 + "ID %s hatte bereits bestätigt worden."; +#elif L==3 + "ID %s had already been confirmed."; +#elif L==4 + "El ID (DNI/cédula) %s ya había sido confirmado."; +#elif L==5 + "L'ID %s avait déjà été confirmée."; +#elif L==6 + "El ID (DNI/cédula) %s ya había sido confirmado."; // Okoteve traducción +#elif L==7 + "L'ID %s era già stato confermato."; +#elif L==8 + "ID %s została już potwierdzona."; +#elif L==9 + "O ID %s já havia sido confirmada."; +#endif + const char *Txt_ID_X_confirmed = // Warning: it is very important to include %s in the following sentences #if L==1 "ID (DNI/cédula) %s confirmat";