From 8c903260d1109c1ef6c50417c86dff76666cddb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Mon, 7 Nov 2016 16:26:35 +0100 Subject: [PATCH] Version 16.48.11 --- swad_changelog.h | 3 +- swad_statistic.c | 4 +-- swad_statistic.h | 6 ++-- swad_text.c | 80 ++++++++++++++++++++++++------------------------ 4 files changed, 47 insertions(+), 46 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index 6209dcb1b..7b29152dc 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -156,13 +156,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.48.10 (2016-11-07)" +#define Log_PLATFORM_VERSION "SWAD 16.48.11 (2016-11-07)" #define CSS_FILE "swad16.48.4.css" #define JS_FILE "swad16.46.1.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 16.48.11: Nov 07, 2016 Changes in order of figures (statistics). (206523 lines) Version 16.48.10: Nov 07, 2016 Changes in text related to notifications stats. (206522 lines) Version 16.48.9: Nov 07, 2016 Icon in my notifications to show figure (statistics). (206521 lines) Version 16.48.8: Nov 07, 2016 Icon in preferences-notifications to show figure (statistics). (206518 lines) diff --git a/swad_statistic.c b/swad_statistic.c index 1373851ad..47a6bd198 100644 --- a/swad_statistic.c +++ b/swad_statistic.c @@ -3934,13 +3934,13 @@ void Sta_ShowFigures (void) Sta_GetAndShowNoticesStats, // Sta_NOTICES Sta_GetAndShowMsgsStats, // Sta_MESSAGES Sta_GetAndShowSurveysStats, // Sta_SURVEYS - Sta_GetAndShowNumUsrsPerPrivacy, // Sta_PRIVACY Sta_GetAndShowNumUsrsPerLanguage, // Sta_LANGUAGES Sta_GetAndShowNumUsrsPerFirstDayOfWeek, // Sta_FIRST_DAY_OF_WEEK - Sta_GetAndShowNumUsrsPerTheme, // Sta_THEMES Sta_GetAndShowNumUsrsPerIconSet, // Sta_ICON_SETS + Sta_GetAndShowNumUsrsPerTheme, // Sta_THEMES Sta_GetAndShowNumUsrsPerMenu, // Sta_MENUS Sta_GetAndShowNumUsrsPerSideColumns, // Sta_SIDE_COLUMNS + Sta_GetAndShowNumUsrsPerPrivacy, // Sta_PRIVACY }; char UnsignedStr[10+1]; unsigned UnsignedNum; diff --git a/swad_statistic.h b/swad_statistic.h index 78e531afa..031f2ad22 100644 --- a/swad_statistic.h +++ b/swad_statistic.h @@ -44,7 +44,7 @@ typedef enum Sta_TEACHERS = 5, Sta_STUDENTS = 6, Sta_VISITORS = 7, - Sta_GUESTS = 8, + Sta_GUESTS = 8, Sta_UNKNOWN_USRS = 9, Sta_ME = 10, } Sta_Role_t; @@ -116,13 +116,13 @@ typedef enum Sta_NOTICES, // Number of notices Sta_MESSAGES, // Number of users' (sent and received) messages Sta_SURVEYS, // Number of surveys - Sta_PRIVACY, // Number of users per privacity Sta_LANGUAGES, // Number of users per language Sta_FIRST_DAY_OF_WEEK, // Number of users per first day of week - Sta_THEMES, // Number of users per theme Sta_ICON_SETS, // Number of users per icon set + Sta_THEMES, // Number of users per theme Sta_MENUS, // Number of users per menu Sta_SIDE_COLUMNS, // Number of users per layout of columns + Sta_PRIVACY, // Number of users per privacity } Sta_FigureType_t; #define Sta_NUM_COLOR_TYPES 3 diff --git a/swad_text.c b/swad_text.c index 3defb2415..55cd49686 100644 --- a/swad_text.c +++ b/swad_text.c @@ -39056,26 +39056,6 @@ const char *Txt_STAT_USE_STAT_TYPES[Sta_NUM_FIGURES] = "Inquéritos" #endif , -#if L==1 // Sta_PRIVACY - "Privacitat" -#elif L==2 - "Geheimhaltung" -#elif L==3 - "Privacy" -#elif L==4 - "Privacidad" -#elif L==5 - "Privacité" -#elif L==6 - "Privacidad" // Okoteve traducción -#elif L==7 - "Privatezza" -#elif L==8 - "Prywatność" -#elif L==9 - "Privacidade" -#endif - , #if L==1 // Sta_LANGUAGES "Idioma" #elif L==2 @@ -39116,6 +39096,26 @@ const char *Txt_STAT_USE_STAT_TYPES[Sta_NUM_FIGURES] = "Calendário" #endif , +#if L==1 // Sta_ICON_SETS + "Icones" +#elif L==2 + "Symbole" +#elif L==3 + "Icons" +#elif L==4 + "Iconos" +#elif L==5 + "Icônes" +#elif L==6 + "Iconos" // Okoteve traducción +#elif L==7 + "Icone" +#elif L==8 + "Ikony" +#elif L==9 + "Ícones" +#endif + , #if L==1 // Sta_THEMES "Tema (colors)" #elif L==2 @@ -39136,26 +39136,6 @@ const char *Txt_STAT_USE_STAT_TYPES[Sta_NUM_FIGURES] = "Skin" #endif , -#if L==1 // Sta_ICON_SETS - "Icones" -#elif L==2 - "Symbole" -#elif L==3 - "Icons" -#elif L==4 - "Iconos" -#elif L==5 - "Icônes" -#elif L==6 - "Iconos" // Okoteve traducción -#elif L==7 - "Icone" -#elif L==8 - "Ikony" -#elif L==9 - "Ícones" -#endif - , #if L==1 // Sta_MENUS "Menú" #elif L==2 @@ -39194,6 +39174,26 @@ const char *Txt_STAT_USE_STAT_TYPES[Sta_NUM_FIGURES] = "Kolumny" #elif L==9 "Colunas" +#endif + , +#if L==1 // Sta_PRIVACY + "Privacitat" +#elif L==2 + "Geheimhaltung" +#elif L==3 + "Privacy" +#elif L==4 + "Privacidad" +#elif L==5 + "Privacité" +#elif L==6 + "Privacidad" // Okoteve traducción +#elif L==7 + "Privatezza" +#elif L==8 + "Prywatność" +#elif L==9 + "Privacidade" #endif };