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 16.206.4

This commit is contained in:
Antonio Cañas Vargas 2017-05-05 10:09:59 +02:00
parent d7367bfcd2
commit d591631a00
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

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

26
swad_preference.c
View File

@ -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 *****/