");
Cal_PutIconsToSelectFirstDayOfWeek (); // 2. First day of week
fprintf (Gbl.F.Out,"
"
"
");
- Dat_PutIconsToSelectDateFormat (); // 3. Date format
+ Dat_PutBoxToSelectDateFormat (); // 3. Date format
fprintf (Gbl.F.Out,"
");
Lay_EndRoundFrame ();
@@ -121,17 +113,6 @@ void Pre_EditPrefs (void)
}
}
-/*****************************************************************************/
-/*************** Put contextual icons in language preference *****************/
-/*****************************************************************************/
-
-static void Pre_PutIconsLanguage (void)
- {
- /***** Put icon to show a figure *****/
- Gbl.Stat.FigureType = Sta_LANGUAGES;
- Sta_PutIconToShowFigure ();
- }
-
/*****************************************************************************/
/******************* Get preferences changed from current IP *****************/
/*****************************************************************************/
@@ -243,142 +224,6 @@ void Pre_RemoveOldPrefsFromIP (void)
DB_QueryDELETE (Query,"can not remove old preferences");
}
-/*****************************************************************************/
-/************** Put link to change language (edit preferences) ***************/
-/*****************************************************************************/
-
-void Pre_PutLinkToChangeLanguage (void)
- {
- Lay_PutContextualLink (ActEdiPrf,NULL,NULL,
- "cty64x64.gif",
- "Change language","Change language",
- NULL);
- }
-
-/*****************************************************************************/
-/********************* Put a selector to select language *********************/
-/*****************************************************************************/
-// Width == 0 means don't force width of selector
-
-void Pre_PutSelectorToSelectLanguage (void)
- {
- extern const char *Txt_STR_LANG_NAME[1 + Txt_NUM_LANGUAGES];
- Txt_Language_t Lan;
-
- Act_FormStart (ActReqChgLan);
- fprintf (Gbl.F.Out,"");
- Act_FormEnd ();
- }
-
-/*****************************************************************************/
-/********* Ask user if he/she really wants to change the language ************/
-/*****************************************************************************/
-
-void Pre_AskChangeLanguage (void)
- {
- extern const char *Txt_Do_you_want_to_change_your_language_to_LANGUAGE[1 + Txt_NUM_LANGUAGES];
- extern const char *Txt_Do_you_want_to_change_the_language_to_LANGUAGE[1 + Txt_NUM_LANGUAGES];
- extern const char *Txt_Switch_to_LANGUAGE[1 + Txt_NUM_LANGUAGES];
- Txt_Language_t CurrentLanguage = Gbl.Prefs.Language;
-
- /***** Get param language *****/
- Gbl.Prefs.Language = Pre_GetParamLanguage (); // Change temporarily language to set form action
-
- /***** Request confirmation *****/
- 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
-
- /***** Display preferences *****/
- Pre_EditPrefs ();
- }
-
-/*****************************************************************************/
-/******************************* Change language *****************************/
-/*****************************************************************************/
-
-static void Pre_PutParamLanguage (void)
- {
- Par_PutHiddenParamUnsigned ("Lan",(unsigned) Gbl.Prefs.Language);
- }
-
-/*****************************************************************************/
-/******************************* Change language *****************************/
-/*****************************************************************************/
-
-void Pre_ChangeLanguage (void)
- {
- /***** Get param language *****/
- Gbl.Prefs.Language = Pre_GetParamLanguage ();
-
- /***** Store language in database *****/
- /*
- sprintf (Gbl.Message,"Txt_STR_LANG_ID[Gbl.Prefs.Language] = %s",Txt_STR_LANG_ID[Gbl.Prefs.Language]);
- Lay_ShowAlert (Lay_INFO,Gbl.Message);
- sprintf (Gbl.Message,"Txt_STR_LANG_ID[Gbl.Usrs.Me.UsrDat.Prefs.Language] = %s",Txt_STR_LANG_ID[Gbl.Usrs.Me.UsrDat.Prefs.Language]);
- Lay_ShowAlert (Lay_INFO,Gbl.Message);
- */
-
- if (Gbl.Usrs.Me.Logged &&
- Gbl.Prefs.Language != Gbl.Usrs.Me.UsrDat.Prefs.Language)
- Pre_UpdateMyLanguageToCurrentLanguage ();
-
- /***** Set preferences from current IP *****/
- Pre_SetPrefsFromIP ();
- }
-
-/*****************************************************************************/
-/**************** Update my language to the current language *****************/
-/*****************************************************************************/
-
-void Pre_UpdateMyLanguageToCurrentLanguage (void)
- {
- extern const char *Txt_STR_LANG_ID[1 + Txt_NUM_LANGUAGES];
- char Query[128];
-
- /***** Set my language to the current language *****/
- Gbl.Usrs.Me.UsrDat.Prefs.Language = Gbl.Prefs.Language;
-
- /***** Update my language in database *****/
- sprintf (Query,"UPDATE usr_data SET Language='%s' WHERE UsrCod=%ld",
- Txt_STR_LANG_ID[Gbl.Prefs.Language],
- Gbl.Usrs.Me.UsrDat.UsrCod);
- DB_QueryUPDATE (Query,"can not update your language");
- }
-
-/*****************************************************************************/
-/*************************** Get parameter language **************************/
-/*****************************************************************************/
-
-Txt_Language_t Pre_GetParamLanguage (void)
- {
- extern const unsigned Txt_Current_CGI_SWAD_Language;
-
- return (Txt_Language_t)
- Par_GetParToUnsignedLong ("Lan",
- 1,
- Txt_NUM_LANGUAGES,
- (unsigned long) Txt_Current_CGI_SWAD_Language);
- }
-
/*****************************************************************************/
/************ Put icons to select the layout of the side columns *************/
/*****************************************************************************/
diff --git a/swad_preference.h b/swad_preference.h
index 490de559..c90df5d5 100644
--- a/swad_preference.h
+++ b/swad_preference.h
@@ -45,13 +45,6 @@ void Pre_GetPrefsFromIP (void);
void Pre_SetPrefsFromIP (void);
void Pre_RemoveOldPrefsFromIP (void);
-void Pre_PutLinkToChangeLanguage (void);
-void Pre_PutSelectorToSelectLanguage (void);
-void Pre_AskChangeLanguage (void);
-void Pre_ChangeLanguage (void);
-void Pre_UpdateMyLanguageToCurrentLanguage (void);
-Txt_Language_t Pre_GetParamLanguage (void);
-
void Pre_ChangeSideCols (void);
void Pre_HideLeftCol (void);
void Pre_HideRightCol (void);
diff --git a/swad_user.c b/swad_user.c
index da93607e..876223f1 100644
--- a/swad_user.c
+++ b/swad_user.c
@@ -48,6 +48,7 @@
#include "swad_help.h"
#include "swad_hierarchy.h"
#include "swad_ID.h"
+#include "swad_language.h"
#include "swad_MFU.h"
#include "swad_nickname.h"
#include "swad_notification.h"
@@ -2019,7 +2020,7 @@ void Usr_WriteFormLogin (Act_Action_t NextAction,void (*FuncParams) ())
Acc_PutLinkToCreateAccount ();
Pwd_PutLinkToSendNewPasswd ();
- Pre_PutLinkToChangeLanguage ();
+ Lan_PutLinkToChangeLanguage ();
fprintf (Gbl.F.Out,"
");
@@ -2839,7 +2840,7 @@ static void Usr_SetUsrRoleAndPrefs (void)
/***** Set my language if unknown *****/
if (Gbl.Usrs.Me.UsrDat.Prefs.Language == Txt_LANGUAGE_UNKNOWN) // I have not chosen language
- Pre_UpdateMyLanguageToCurrentLanguage (); // Update my language in database
+ Lan_UpdateMyLanguageToCurrentLanguage (); // Update my language in database
/***** Set preferences from my preferences *****/
Gbl.Prefs.FirstDayOfWeek = Gbl.Usrs.Me.UsrDat.Prefs.FirstDayOfWeek;