From d591631a0028db603a261124a637965a7329f21e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Fri, 5 May 2017 10:09:59 +0200 Subject: [PATCH] Version 16.206.4 --- swad_changelog.h | 3 ++- swad_preference.c | 26 +++++++++++++++++--------- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index 1fb6e1109..08e0a1094 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -232,13 +232,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.206.3 (2017-05-05)" +#define Log_PLATFORM_VERSION "SWAD 16.206.4 (2017-05-05)" #define CSS_FILE "swad16.205.css" #define JS_FILE "swad16.206.3.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.206.4: May 05, 2017 Changes in question to change language. (218534 lines) Version 16.206.3: May 05, 2017 Fixed bug in Javascript function to write local date and time. (218527 lines) Version 16.206.2: May 05, 2017 Changes in date and time of connected users. (218527 lines) Version 16.206.1: May 05, 2017 Changes in Javascript function to write local date and time. (218524 lines) diff --git a/swad_preference.c b/swad_preference.c index a65a74190..9b63a8932 100644 --- a/swad_preference.c +++ b/swad_preference.c @@ -59,6 +59,8 @@ extern struct Globals Gbl; static void Pre_PutIconsLanguage (void); +static void Pre_PutParamLanguage (void); + static void Pre_PutIconsToSelectSideCols (void); static void Pre_PutIconsSideColumns (void); static void Pre_UpdateSideColsOnUsrDataTable (void); @@ -295,15 +297,12 @@ void Pre_AskChangeLanguage (void) Gbl.Prefs.Language = Pre_GetParamLanguage (); // Change temporarily language to set form action /***** Request confirmation *****/ - Lay_ShowAlert (Lay_INFO, - Gbl.Usrs.Me.Logged ? Txt_Do_you_want_to_change_your_language_to_LANGUAGE[Gbl.Prefs.Language] : - Txt_Do_you_want_to_change_the_language_to_LANGUAGE[Gbl.Prefs.Language]); - - /***** Send button *****/ - Act_FormStart (ActChgLan); - Par_PutHiddenParamUnsigned ("Lan",(unsigned) Gbl.Prefs.Language); - Lay_PutConfirmButton (Txt_Switch_to_LANGUAGE[Gbl.Prefs.Language]); - Act_FormEnd (); + Lay_ShowAlertAndButton1 (Lay_QUESTION, + Gbl.Usrs.Me.Logged ? Txt_Do_you_want_to_change_your_language_to_LANGUAGE[Gbl.Prefs.Language] : + Txt_Do_you_want_to_change_the_language_to_LANGUAGE[Gbl.Prefs.Language]); + Lay_ShowAlertAndButton2 (ActChgLan,NULL,Pre_PutParamLanguage, + Lay_CONFIRM_BUTTON, + Txt_Switch_to_LANGUAGE[Gbl.Prefs.Language]); Gbl.Prefs.Language = CurrentLanguage; // Restore current language @@ -315,6 +314,15 @@ void Pre_AskChangeLanguage (void) /******************************* Change language *****************************/ /*****************************************************************************/ +static void Pre_PutParamLanguage (void) + { + Par_PutHiddenParamUnsigned ("Lan",(unsigned) Gbl.Prefs.Language); + } + +/*****************************************************************************/ +/******************************* Change language *****************************/ +/*****************************************************************************/ + void Pre_ChangeLanguage (void) { /***** Get param language *****/