diff --git a/swad_changelog.h b/swad_changelog.h index 9480c25c0..21ad0979d 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -128,13 +128,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.225.4 (2016-06-15)" +#define Log_PLATFORM_VERSION "SWAD 15.225.5 (2016-06-15)" #define CSS_FILE "swad15.224.3.css" #define JS_FILE "swad15.216.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.225.5: Jun 15, 2016 Simplification in texts (links) to view guests and admins. (202586 lines) Version 15.225.4: Jun 15, 2016 Listing possible duplicate users. Not finished. (202623 lines) 1 change necessary in database: INSERT INTO actions (ActCod,Language,Obsolete,Txt) VALUES ('1578','es','N','Listar usuarios duplicados'); diff --git a/swad_text.c b/swad_text.c index d4f4c00f3..9d597d9af 100644 --- a/swad_text.c +++ b/swad_text.c @@ -33229,7 +33229,7 @@ const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS] = #endif }, { -#if L==1 // Rol_ROLE_CTR_ADM - Usr_SEX_UNKNOWN +#if L==1 // Rol_DEG_ADM - Usr_SEX_UNKNOWN "Administradors" #elif L==2 "Administratoren" @@ -33249,7 +33249,7 @@ const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS] = "Administradores" #endif , -#if L==1 // Rol_ROLE_CTR_ADM - Usr_SEX_FEMALE +#if L==1 // Rol_DEG_ADM - Usr_SEX_FEMALE "Administradoras" // Necessita traduccio #elif L==2 "Administratoren" @@ -33269,7 +33269,7 @@ const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS] = "Administradoras" #endif , -#if L==1 // Rol_ROLE_CTR_ADM - Usr_SEX_MALE +#if L==1 // Rol_DEG_ADM - Usr_SEX_MALE "Administradors" #elif L==2 "Administratoren" @@ -33289,7 +33289,7 @@ const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS] = "Administradores" #endif , -#if L==1 // Rol_ROLE_CTR_ADM - Usr_SEX_ALL +#if L==1 // Rol_DEG_ADM - Usr_SEX_ALL "Administradors" #elif L==2 "Administratoren" @@ -33310,7 +33310,7 @@ const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS] = #endif }, { -#if L==1 // Rol_ROLE_INS_ADM - Usr_SEX_UNKNOWN +#if L==1 // Rol_CTR_ADM - Usr_SEX_UNKNOWN "Administradors" #elif L==2 "Administratoren" @@ -33330,7 +33330,7 @@ const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS] = "Administradores" #endif , -#if L==1 // Rol_ROLE_INS_ADM - Usr_SEX_FEMALE +#if L==1 // Rol_CTR_ADM - Usr_SEX_FEMALE "Administradoras" // Necessita traduccio #elif L==2 "Administratoren" @@ -33350,7 +33350,7 @@ const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS] = "Administradoras" #endif , -#if L==1 // Rol_ROLE_INS_ADM - Usr_SEX_MALE +#if L==1 // Rol_CTR_ADM - Usr_SEX_MALE "Administradors" #elif L==2 "Administratoren" @@ -33370,7 +33370,7 @@ const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS] = "Administradores" #endif , -#if L==1 // Rol_ROLE_INS_ADM - Usr_SEX_ALL +#if L==1 // Rol_CTR_ADM - Usr_SEX_ALL "Administradors" #elif L==2 "Administratoren" @@ -33391,7 +33391,7 @@ const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS] = #endif }, { -#if L==1 // Rol_ROLE_DEG_ADM - Usr_SEX_UNKNOWN +#if L==1 // Rol_INS_ADM - Usr_SEX_UNKNOWN "Administradors" #elif L==2 "Administratoren" @@ -33411,7 +33411,7 @@ const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS] = "Administradores" #endif , -#if L==1 // Rol_ROLE_DEG_ADM - Usr_SEX_FEMALE +#if L==1 // Rol_INS_ADM - Usr_SEX_FEMALE "Administradoras" // Necessita traduccio #elif L==2 "Administratoren" @@ -33431,7 +33431,7 @@ const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS] = "Administradoras" #endif , -#if L==1 // Rol_ROLE_DEG_ADM - Usr_SEX_MALE +#if L==1 // Rol_INS_ADM - Usr_SEX_MALE "Administradors" #elif L==2 "Administratoren" @@ -33451,7 +33451,7 @@ const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS] = "Administradores" #endif , -#if L==1 // Rol_ROLE_DEG_ADM - Usr_SEX_ALL +#if L==1 // Rol_INS_ADM - Usr_SEX_ALL "Administradors" #elif L==2 "Administratoren" @@ -33472,7 +33472,7 @@ const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS] = #endif }, { -#if L==1 // Rol_ROLE_SYS_ADM - Usr_SEX_UNKNOWN +#if L==1 // Rol_SYS_ADM - Usr_SEX_UNKNOWN "Superusuaris" #elif L==2 "Superuser" @@ -33492,7 +33492,7 @@ const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS] = "Superutilizadores" #endif , -#if L==1 // Rol_ROLE_SYS_ADM - Usr_SEX_FEMALE +#if L==1 // Rol_SYS_ADM - Usr_SEX_FEMALE "Superusuarias" // Necessita traduccio #elif L==2 "Superuser" @@ -33512,7 +33512,7 @@ const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS] = "Superutilizadoras" #endif , -#if L==1 // Rol_ROLE_SYS_ADM - Usr_SEX_MALE +#if L==1 // Rol_SYS_ADM - Usr_SEX_MALE "Superusuaris" #elif L==2 "Superuser" @@ -33532,7 +33532,7 @@ const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS] = "Superutilizadores" #endif , -#if L==1 // Rol_ROLE_SYS_ADM - Usr_SEX_ALL +#if L==1 // Rol_SYS_ADM - Usr_SEX_ALL "Superusuaris" #elif L==2 "Superuser" @@ -35025,27 +35025,6 @@ const char *Txt_Search_courses = "Procurar disciplinas"; #endif -const char *Txt_See_administrators = -#if L==1 - "Veure administradors"; -#elif L==2 - "Siehe Administratoren"; -#elif L==3 - "See administrators"; -#elif L==4 - "Ver administradores"; -#elif L==5 - "Voir administrateurs"; -#elif L==6 - "Ver administradores"; // Okoteve traducción -#elif L==7 - "Vedi amministratori"; -#elif L==8 - "Wiadomości administratorzy"; -#elif L==9 - "Veja administradores"; -#endif - const char *Txt_See_exam = #if L==1 "Veure exàmen"; @@ -35109,27 +35088,6 @@ const char *Txt_See_full_notice = "Veja aviso completo"; #endif -const char *Txt_See_guests = -#if L==1 - "Veure convidats"; -#elif L==2 - "Siehe Eingeladen"; -#elif L==3 - "See guests"; -#elif L==4 - "Ver invitados"; -#elif L==5 - "Voir invités"; -#elif L==6 - "Ver invitados"; // Okoteve traducción -#elif L==7 - "Vedi ospiti"; -#elif L==8 - "Wiadomości zaproszenie"; -#elif L==9 - "Veja convidados"; -#endif - const char *Txt_See_message = #if L==1 "Veure missatge"; diff --git a/swad_user.c b/swad_user.c index e78decb59..f18077387 100644 --- a/swad_user.c +++ b/swad_user.c @@ -6539,11 +6539,12 @@ static void Usr_UpdateMyPrefAboutListWithPhotosPhotoInDB (void) static void Usr_PutLinkToSeeAdmins (void) { - extern const char *Txt_See_administrators; + extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS]; /***** Put form to list admins *****/ Lay_PutContextualLink (ActLstOth,NULL,"adm16x16.gif", - Txt_See_administrators,Txt_See_administrators); + Txt_ROLES_PLURAL_Abc[Rol_DEG_ADM][Usr_SEX_UNKNOWN], + Txt_ROLES_PLURAL_Abc[Rol_DEG_ADM][Usr_SEX_UNKNOWN]); } /*****************************************************************************/ @@ -6552,11 +6553,12 @@ static void Usr_PutLinkToSeeAdmins (void) static void Usr_PutLinkToSeeGuests (void) { - extern const char *Txt_See_guests; + extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS]; /***** Put form to list guests *****/ Lay_PutContextualLink (ActLstGst,NULL,"usrs64x64.gif", - Txt_See_guests,Txt_See_guests); + Txt_ROLES_PLURAL_Abc[Rol__GUEST_][Usr_SEX_UNKNOWN], + Txt_ROLES_PLURAL_Abc[Rol__GUEST_][Usr_SEX_UNKNOWN]); } /*****************************************************************************/