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

This commit is contained in:
Antonio Cañas Vargas 2016-06-17 23:53:14 +02:00
parent c38e98b461
commit 289890ccd0
3 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -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:

11
swad_duplicate.c
View File

@ -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,"</td>"
"</tr>");
/* Buttons to make actions on this user */
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\" class=\"COLOR%u\"></td>"
"<td colspan=\"%u\" class=\"LEFT_TOP COLOR%u\""
@ -335,7 +336,7 @@ static void Dup_ListSimilarUsrsInternal (void)
Act_FormStart (ActUpdOth);
Usr_PutParamUsrCodEncrypted (UsrDat.EncryptedUsrCod);
Par_PutHiddenParamUnsigned ("RegRemAction",(unsigned) Enr_ELIMINATE_ONE_USR_FROM_PLATFORM);
Lay_PutRemoveButtonInline ("Eliminar usuario"); // TODO: Need translation!!!
Lay_PutRemoveButtonInline (Txt_Eliminate_user_account);
Act_FormEnd ();
}
@ -344,7 +345,7 @@ static void Dup_ListSimilarUsrsInternal (void)
{
Act_FormStart (ActRemDupUsr);
Usr_PutParamUsrCodEncrypted (UsrDat.EncryptedUsrCod);
Lay_PutConfirmButtonInline ("No es duplicado"); // TODO: Need translation!!!
Lay_PutConfirmButtonInline (Txt_Not_duplicated);
Act_FormEnd ();
}

21
swad_text.c
View File

@ -25266,6 +25266,27 @@ const char *Txt_not_available =
"n&atilde;o dispon&iacute;vel";
#endif
const char *Txt_Not_duplicated =
#if L==1
"No &eacute;s duplicat";
#elif L==2
"Nicht dupliziert";
#elif L==3
"Not duplicated";
#elif L==4
"No es duplicado";
#elif L==5
"Pas dupliqu&eacute;";
#elif L==6
"No es duplicado"; // Okoteve traducción
#elif L==7
"Non duplicato";
#elif L==8
"Nie powiela&cacute;";
#elif L==9
"N&atilde;o duplicado";
#endif
const char *Txt_Nothing_has_been_pasted_because_the_clipboard_is_empty_ =
#if L==1
"No se pegado nada porque el portapapeles est&aacute; vac&iacute;o."