From 5b72af936565dfb70967c1a051de9bf8936df7b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Wed, 19 Feb 2020 08:42:10 +0100 Subject: [PATCH] Version19.128.2 --- swad_changelog.h | 3 +- swad_test_visibility.c | 17 ++++---- swad_text.c | 91 ++++++++++++++++++++++-------------------- 3 files changed, 56 insertions(+), 55 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index 78830e43f..dae8b8289 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -497,7 +497,7 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - * En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 19.128.1 (2020-02-19)" +#define Log_PLATFORM_VERSION "SWAD 19.128.2 (2020-02-19)" #define CSS_FILE "swad19.118.css" #define JS_FILE "swad19.91.1.js" /* @@ -522,6 +522,7 @@ Param // TODO: Get visibility IN API function getGames // TODO: Sugerencia de Jesús González Peñalver: añadir un poco más de espacio entre pregunta y pregunta en las opciones de un juego + Version 19.128.2: Feb 18, 2020 Changes in match results. (279119 lines) Version 19.128.1: Feb 18, 2020 Changes in match results. (279117 lines) Version 19.128: Feb 18, 2020 Changes in match results. (279175 lines) Copy the following icons to icon public directory: diff --git a/swad_test_visibility.c b/swad_test_visibility.c index b0f9b7ac3..31ad30385 100644 --- a/swad_test_visibility.c +++ b/swad_test_visibility.c @@ -82,27 +82,24 @@ static const char *TsV_Icons[TsV_NUM_ITEMS_VISIBILITY][2] = void TsV_ShowVisibilityIcons (unsigned SelectedVisibility) { - extern const char *Txt_Visible; - extern const char *Txt_Hidden; extern const char *Txt_TST_STR_VISIBILITY[TsV_NUM_ITEMS_VISIBILITY]; + extern const char *Txt_TST_HIDDEN_VISIBLE[2]; TsV_Visibility_t Visibility; - bool ItemVisible; + unsigned ItemVisible; char *Title; for (Visibility = (TsV_Visibility_t) 0; Visibility <= (TsV_Visibility_t) (TsV_NUM_ITEMS_VISIBILITY - 1); Visibility++) { - ItemVisible = (SelectedVisibility & (1 << Visibility)) != 0; + ItemVisible = (SelectedVisibility & (1 << Visibility)) == 0 ? 0 : + 1; if (asprintf (&Title,"%s: %s", Txt_TST_STR_VISIBILITY[Visibility], - ItemVisible ? Txt_Visible : - Txt_Hidden) < 0) + Txt_TST_HIDDEN_VISIBLE[ItemVisible]) < 0) Lay_NotEnoughMemoryExit (); - Ico_PutIcon (ItemVisible ? TsV_Icons[Visibility][1] : - TsV_Icons[Visibility][0], - Title, - "CONTEXT_OPT CONTEXT_ICO_16x16"); + Ico_PutIconOff (TsV_Icons[Visibility][ItemVisible], + Title); free (Title); } } diff --git a/swad_text.c b/swad_text.c index 05da42430..5bb7562a3 100644 --- a/swad_text.c +++ b/swad_text.c @@ -14600,27 +14600,6 @@ const char *Txt_HELP_password = "8 ou mais caracteres"; #endif -const char *Txt_Hidden = -#if L==1 // ca - "Ocult"; -#elif L==2 // de - "Verborgen"; -#elif L==3 // en - "Hidden"; -#elif L==4 // es - "Oculto"; -#elif L==5 // fr - "Caché"; -#elif L==6 // gn - "Oculto"; // Okoteve traducción -#elif L==7 // it - "Nascosto"; -#elif L==8 // pl - "Ukryty"; -#elif L==9 // pt - "Oculto"; -#endif - const char *Txt_Hidden_MALE_PLURAL = #if L==1 // ca "Ocultos"; // Necessita traduccio @@ -32175,7 +32154,7 @@ const char *Txt_RECORD_FIELD_VISIBILITY_RECORD[Rec_NUM_TYPES_VISIBILITY] = { [Rec_HIDDEN_FIELD] = #if L==1 // ca - "oculto" // Necessita traduccio + "ocult" #elif L==2 // de "versteckt" #elif L==3 // en @@ -32196,7 +32175,7 @@ const char *Txt_RECORD_FIELD_VISIBILITY_RECORD[Rec_NUM_TYPES_VISIBILITY] = , [Rec_VISIBLE_FIELD] = #if L==1 // ca - "visible" // Necessita traduccio + "visible" #elif L==2 // de "sichtbar" #elif L==3 // en @@ -51066,6 +51045,51 @@ const char *Txt_TST_Answer_given_by_the_user = "Resposta dada pelo usuário/a"; #endif +const char *Txt_TST_HIDDEN_VISIBLE[2] = + { + [false] = +#if L==1 // ca + "ocult" +#elif L==2 // de + "versteckt" +#elif L==3 // en + "hidden" +#elif L==4 // es + "oculto" +#elif L==5 // fr + "caché" +#elif L==6 // gn + "oculto" // Okoteve traducción +#elif L==7 // it + "nascosto" +#elif L==8 // pl + "ukryty" +#elif L==9 // pt + "oculto" +#endif + , + [true] = +#if L==1 // ca + "visible" +#elif L==2 // de + "sichtbar" +#elif L==3 // en + "visible" +#elif L==4 // es + "visible" +#elif L==5 // fr + "visible" +#elif L==6 // gn + "visible" // Okoteve traducción +#elif L==7 // it + "visibile" +#elif L==8 // pl + "widoczny" +#elif L==9 // pt + "visível" +#endif + }; + const char *Txt_TST_PLUGGABLE[Tst_NUM_OPTIONS_PLUGGABLE] = { [Tst_PLUGGABLE_UNKNOWN] = @@ -53734,27 +53758,6 @@ const char *Txt_Result_visibility = "Visibilidade dos resultados"; #endif -const char *Txt_Visible = -#if L==1 // ca - "Visible"; -#elif L==2 // de - "Sichtbare"; -#elif L==3 // en - "Visible"; -#elif L==4 // es - "Visible"; -#elif L==5 // fr - "Visible"; -#elif L==6 // gn - "Visible"; // Okoteve traducción -#elif L==7 // it - "Visibile"; -#elif L==8 // pl - "Widoczny"; -#elif L==9 // pt - "Visível"; -#endif - const char *Txt_Visible_by_BR_the_student = #if L==1 // ca "¿Visible por
el estudiante?"; // Necessita traduccio