From 289890ccd0a3010ce7a253c3477425ffb979becf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Fri, 17 Jun 2016 23:53:14 +0200 Subject: [PATCH] Version 15.226.4 --- swad_changelog.h | 3 ++- swad_duplicate.c | 11 ++++++----- swad_text.c | 21 +++++++++++++++++++++ 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index e5bbfebfc..32a2a9400 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -129,13 +129,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.226.3 (2016-06-17)" +#define Log_PLATFORM_VERSION "SWAD 15.226.4 (2016-06-17)" #define CSS_FILE "swad15.226.css" #define JS_FILE "swad15.226.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.226.4: Jun 17, 2016 Translation of buttons in list of similar users. (202934 lines) Version 15.226.3: Jun 17, 2016 Request the removal of a user account from list of similar users. (202912 lines) Version 15.226.2: Jun 17, 2016 New action to remove a user from list of possible duplicate users. (202921 lines) 1 change necessary in database: diff --git a/swad_duplicate.c b/swad_duplicate.c index eb5895ccd..bb39962d4 100644 --- a/swad_duplicate.c +++ b/swad_duplicate.c @@ -168,6 +168,7 @@ void Dup_ListDuplicateUsrs (void) UsrDat.UsrCod = Str_ConvertStrCodToLongCod (row[0]); if (Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat)) { + /* Get if user has accepted all his/her courses */ if (Usr_GetNumCrssOfUsr (UsrDat.UsrCod) != 0) UsrDat.Accepted = (Usr_GetNumCrssOfUsrNotAccepted (UsrDat.UsrCod) == 0); else @@ -248,8 +249,8 @@ void Dup_ListSimilarUsrs (void) static void Dup_ListSimilarUsrsInternal (void) { extern const char *Txt_Possibly_duplicate_users; - extern const char *Txt_Informants; - extern const char *Txt_Similar_users; + extern const char *Txt_Eliminate_user_account; + extern const char *Txt_Not_duplicated; extern const char *Txt_No_users_found[Rol_NUM_ROLES]; struct UsrData UsrDat; char Query[256]; @@ -295,6 +296,7 @@ static void Dup_ListSimilarUsrsInternal (void) UsrDat.UsrCod = Str_ConvertStrCodToLongCod (row[0]); if (Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat)) { + /* Get if user has accepted all his/her courses */ if (Usr_GetNumCrssOfUsr (UsrDat.UsrCod) != 0) UsrDat.Accepted = (Usr_GetNumCrssOfUsrNotAccepted (UsrDat.UsrCod) == 0); else @@ -320,7 +322,6 @@ static void Dup_ListSimilarUsrsInternal (void) fprintf (Gbl.F.Out,"" ""); - /* Buttons to make actions on this user */ fprintf (Gbl.F.Out,"" "" "