From 5c8c8c88262e55980d4a0852cd64dfcf66098ee9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Wed, 22 Jul 2015 18:59:44 +0200 Subject: [PATCH] Version 14.117.17 --- swad_changelog.h | 4 +- swad_statistic.c | 91 ++++++++++++++++++++++++++++++++++------------ swad_survey.c | 27 +++++++++----- swad_syllabus.c | 37 ++++++++++++++----- swad_test.c | 27 ++++++++++---- swad_test_import.c | 13 +++++-- swad_text.c | 42 +++++++++++++++++++++ swad_timetable.c | 1 + swad_user.c | 49 ++++++++++++++++++------- swad_zip.c | 16 +++++--- 10 files changed, 234 insertions(+), 73 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index 19ddf767..c505a82e 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -103,11 +103,13 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 14.117.15 (2015/07/22)" +#define Log_PLATFORM_VERSION "SWAD 14.117.17 (2015/07/22)" // 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 14.117.17:Jul 22, 2015 Checking "alt" and "title" in all images. (185437 lines) + Version 14.117.16:Jul 22, 2015 Checking "alt" and "title" in all images. (185368 lines) Version 14.117.15:Jul 22, 2015 Checking "alt" and "title" in all images. (185279 lines) Version 14.117.14:Jul 22, 2015 Checking "alt" and "title" in all images. (185203 lines) Version 14.117.13:Jul 22, 2015 Checking "alt" and "title" in all images. diff --git a/swad_statistic.c b/swad_statistic.c index 4620d07c..a167b1f1 100644 --- a/swad_statistic.c +++ b/swad_statistic.c @@ -1845,7 +1845,8 @@ static void Sta_ShowNumAccessesPerUsr (unsigned long NumRows,MYSQL_RES *mysql_re " vertical-align:top; background-color:%s;\">", Gbl.ColorRows[Gbl.RowEvenOdd]); if (BarWidth) - fprintf (Gbl.F.Out,"\"\""" " ", @@ -2356,7 +2357,8 @@ static void Sta_DrawBarColors (Sta_ColorType_t ColorType,float MaxPagesGenerated Sta_SetColor (ColorType,(float) NumColor,(float) GRAPH_DISTRIBUTION_PER_HOUR_TOTAL_WIDTH,&R,&G,&B); fprintf (Gbl.F.Out,"" - "\"\"" + "\"\"" "", R,G,B,Gbl.Prefs.IconsURL); } @@ -2769,7 +2771,8 @@ static void Sta_WriteAccessHour (unsigned Hour,float NumPagesGenerated,float Max AltoBarra = (unsigned) (((NumPagesGenerated * 400.0) / MaxPagesGenerated) + 0.5); if (AltoBarra == 0) AltoBarra = 1; - fprintf (Gbl.F.Out,"\"\""
", Gbl.Prefs.IconsURL,AltoBarra); } @@ -2862,7 +2865,8 @@ static void Sta_ShowAverageAccessesPerMinute (unsigned long NumRows,MYSQL_RES *m /* First division (left) */ fprintf (Gbl.F.Out,"" "" - "\"\""" "", WIDTH_SEMIDIVISION_GRAPHIC,Gbl.Prefs.IconsURL, @@ -2872,7 +2876,8 @@ static void Sta_ShowAverageAccessesPerMinute (unsigned long NumRows,MYSQL_RES *m i < NUM_DIVISIONS_X*2; i++) fprintf (Gbl.F.Out,"" - "\"\""" "", @@ -2880,7 +2885,8 @@ static void Sta_ShowAverageAccessesPerMinute (unsigned long NumRows,MYSQL_RES *m WIDTH_SEMIDIVISION_GRAPHIC); /* Last division (right) */ fprintf (Gbl.F.Out,"" - "\"\""" "" "", @@ -2971,7 +2977,8 @@ static void Sta_WriteAccessMinute (unsigned Minute,float NumPagesGenerated,float /***** Draw bar with anchura proporcional al number of clicks *****/ if (NumPagesGenerated != 0.0) if ((BarWidth = (unsigned) (((NumPagesGenerated * (float) WIDTH_GRAPHIC / MaxX)) + 0.5)) != 0) - fprintf (Gbl.F.Out,"\"\""", Gbl.Prefs.IconsURL, @@ -3254,7 +3261,8 @@ static void Sta_ShowNumAccessesPerBanner (unsigned long NumRows,MYSQL_RES *mysql "" "" - "\"%s\""" "", @@ -3262,7 +3270,8 @@ static void Sta_ShowNumAccessesPerBanner (unsigned long NumRows,MYSQL_RES *mysql Ban.FullName, Cfg_HTTPS_URL_SWAD_PUBLIC,Cfg_FOLDER_BANNER, Ban.Img, - Ban.ShortName); + Ban.ShortName, + Ban.FullName); /* Draw bar proportional to number of clicks */ NumClicks = Str_GetFloatNumFromStr (row[1]); @@ -3521,7 +3530,8 @@ static void Sta_DrawBarNumClicks (char Color,float NumPagesGenerated,float MaxPa BarWidth = (unsigned) (((NumPagesGenerated * (float) MaxBarWidth) / MaxPagesGenerated) + 0.5); if (BarWidth == 0) BarWidth = 1; - fprintf (Gbl.F.Out,"\"\""" " ", @@ -4030,7 +4040,8 @@ static void Sta_GetAndShowNumCtysInSWAD (void) fprintf (Gbl.F.Out,"" "" "\"%s\"" + " alt=\"%s\" title=\"%s\"" + " class=\"ICON16x16\" />" " %s:" "" "" @@ -4058,6 +4069,7 @@ static void Sta_GetAndShowNumCtysInSWAD (void) Gbl.Prefs.IconsURL, Txt_Countries, Txt_Countries, + Txt_Countries, NumCtysTotal, NumCtysWithInss, NumCtysWithCtrs, @@ -4153,7 +4165,8 @@ static void Sta_GetAndShowNumInssInSWAD (void) fprintf (Gbl.F.Out,"" "" "\"%s\"" + " alt=\"%s\" title=\"%s\"" + " class=\"ICON16x16\" />" " %s:" "" "" @@ -4179,6 +4192,7 @@ static void Sta_GetAndShowNumInssInSWAD (void) Gbl.Prefs.IconsURL, Txt_Institutions, Txt_Institutions, + Txt_Institutions, NumInssTotal, NumInssWithCtrs, NumInssWithDegs, @@ -4266,7 +4280,8 @@ static void Sta_GetAndShowNumCtrsInSWAD (void) fprintf (Gbl.F.Out,"" "" "\"%s\"" + " alt=\"%s\" title=\"%s\"" + " class=\"ICON16x16\" />" " %s:" "" "" @@ -4290,6 +4305,7 @@ static void Sta_GetAndShowNumCtrsInSWAD (void) Gbl.Prefs.IconsURL, Txt_Centres, Txt_Centres, + Txt_Centres, NumCtrsTotal, NumCtrsWithDegs, NumCtrsWithCrss, @@ -4369,7 +4385,8 @@ static void Sta_GetAndShowNumDegsInSWAD (void) fprintf (Gbl.F.Out,"" "" "\"%s\"" + " alt=\"%s\" title=\"%s\"" + " class=\"ICON16x16\" />" " %s:" "" "" @@ -4391,6 +4408,7 @@ static void Sta_GetAndShowNumDegsInSWAD (void) Gbl.Prefs.IconsURL, Txt_Degrees, Txt_Degrees, + Txt_Degrees, NumDegsTotal, NumDegsWithCrss, NumDegsWithTchs, @@ -4462,7 +4480,8 @@ static void Sta_GetAndShowNumCrssInSWAD (void) fprintf (Gbl.F.Out,"" "" "\"%s\"" + " alt=\"%s\" title=\"%s\"" + " class=\"ICON16x16\" />" " %s:" "" "" @@ -4482,6 +4501,7 @@ static void Sta_GetAndShowNumCrssInSWAD (void) Gbl.Prefs.IconsURL, Txt_Courses, Txt_Courses, + Txt_Courses, NumCrssTotal, NumCrssWithTchs, NumCrssWithStds); @@ -6775,6 +6795,7 @@ static void Sta_GetAndShowMsgsStats (void) static void Sta_GetAndShowForumStats (void) { extern const char *Txt_STAT_USE_STAT_TYPES[Sta_NUM_TYPES_USE_STATS]; + extern const char *Txt_Scope; extern const char *Txt_Forums; extern const char *Txt_No_of_forums; extern const char *Txt_No_of_threads; @@ -6799,6 +6820,7 @@ static void Sta_GetAndShowForumStats (void) "" "\"%s\"" "" "" "", Gbl.Prefs.IconsURL, + Txt_Scope, + Txt_Scope, Txt_Forums, Txt_No_of_forums, Txt_No_of_threads, @@ -7030,7 +7054,9 @@ static void Sta_WriteForumTitleAndStats (For_ForumType_t ForumType, fprintf (Gbl.F.Out,"" "" - "\"\"" + "\"%s%s\"" "" "" @@ -7067,6 +7093,8 @@ static void Sta_WriteForumTitleAndStats (For_ForumType_t ForumType, "", Gbl.Prefs.IconsURL,Icon, ForumName1,ForumName2, + ForumName1,ForumName2, + ForumName1,ForumName2, NumForums,NumThreads,NumPosts,NumUsrsToBeNotifiedByEMail, NumThrsPerForum,NumPostsPerThread,NumPostsPerForum); } @@ -7622,7 +7650,9 @@ static void Sta_GetAndShowNumUsrsPerLayout (void) Layout++) fprintf (Gbl.F.Out,"" "" - "\"%s\"" + "\"%s\"" "" "" "%u" @@ -7631,7 +7661,9 @@ static void Sta_GetAndShowNumUsrsPerLayout (void) "%5.2f%%" "" "", - Gbl.Prefs.IconsURL,Lay_LayoutIcons[Layout],Txt_LAYOUT_NAMES[Layout], + Gbl.Prefs.IconsURL,Lay_LayoutIcons[Layout], + Txt_LAYOUT_NAMES[Layout], + Txt_LAYOUT_NAMES[Layout], NumUsrs[Layout], NumUsrsTotal ? (float) NumUsrs[Layout] * 100.0 / (float) NumUsrsTotal : @@ -7754,7 +7786,8 @@ static void Sta_GetAndShowNumUsrsPerTheme (void) Theme++) fprintf (Gbl.F.Out,"" "" - "\"%s\""" "" "" @@ -7764,7 +7797,9 @@ static void Sta_GetAndShowNumUsrsPerTheme (void) "%5.2f%%" "" "", - Gbl.Prefs.IconsURL,Cfg_ICON_FOLDER_THEMES,The_ThemeId[Theme],The_ThemeNames[Theme], + Gbl.Prefs.IconsURL,Cfg_ICON_FOLDER_THEMES,The_ThemeId[Theme], + The_ThemeNames[Theme], + The_ThemeNames[Theme], NumUsrs[Theme], NumUsrsTotal ? (float) NumUsrs[Theme] * 100.0 / (float) NumUsrsTotal : @@ -7886,7 +7921,8 @@ static void Sta_GetAndShowNumUsrsPerIconSet (void) IconSet++) fprintf (Gbl.F.Out,"" "" - "\"%s\""" "" "" @@ -7901,6 +7937,7 @@ static void Sta_GetAndShowNumUsrsPerIconSet (void) Ico_IconSetId[IconSet], Cfg_ICON_ACTION, Ico_IconSetNames[IconSet], + Ico_IconSetNames[IconSet], NumUsrs[IconSet], NumUsrsTotal ? (float) NumUsrs[IconSet] * 100.0 / (float) NumUsrsTotal : @@ -8023,7 +8060,9 @@ static void Sta_GetAndShowNumUsrsPerMenu (void) Menu++) fprintf (Gbl.F.Out,"" "" - "\"%s\"" + "\"%s\"" "" "" "%u" @@ -8032,7 +8071,9 @@ static void Sta_GetAndShowNumUsrsPerMenu (void) "%5.2f%%" "" "", - Gbl.Prefs.IconsURL,Mnu_MenuIcons[Menu],Txt_MENU_NAMES[Menu], + Gbl.Prefs.IconsURL,Mnu_MenuIcons[Menu], + Txt_MENU_NAMES[Menu], + Txt_MENU_NAMES[Menu], NumUsrs[Menu], NumUsrsTotal ? (float) NumUsrs[Menu] * 100.0 / (float) NumUsrsTotal : @@ -8153,7 +8194,8 @@ static void Sta_GetAndShowNumUsrsPerSideColumns (void) SideCols++) fprintf (Gbl.F.Out,"" "" - "\"%s\""" "" "" @@ -8165,6 +8207,7 @@ static void Sta_GetAndShowNumUsrsPerSideColumns (void) "", Gbl.Prefs.IconsURL,SideCols >> 1,SideCols & 1, Txt_LAYOUT_SIDE_COLUMNS[SideCols], + Txt_LAYOUT_SIDE_COLUMNS[SideCols], NumUsrs[SideCols], NumUsrsTotal ? (float) NumUsrs[SideCols] * 100.0 / (float) NumUsrsTotal : diff --git a/swad_survey.c b/swad_survey.c index a397584f..1929bef4 100644 --- a/swad_survey.c +++ b/swad_survey.c @@ -3233,6 +3233,16 @@ static void Svy_DrawBarNumUsrs (unsigned NumUsrs,unsigned MaxUsrs) extern const char *Txt_of_PART_OF_A_TOTAL; unsigned BarWidth = 0; + /***** String with the number of users *****/ + if (MaxUsrs) + sprintf (Gbl.Title,"%u (%u%% %s %u)", + NumUsrs, + (unsigned) ((((float) NumUsrs * 100.0) / (float) MaxUsrs) + 0.5), + Txt_of_PART_OF_A_TOTAL,MaxUsrs); + else + sprintf (Gbl.Title,"0 (0%% %s %u)", + Txt_of_PART_OF_A_TOTAL,MaxUsrs); + /***** Draw bar with a with proportional to the number of clicks *****/ fprintf (Gbl.F.Out,"", @@ -3242,21 +3252,20 @@ static void Svy_DrawBarNumUsrs (unsigned NumUsrs,unsigned MaxUsrs) (float) MaxUsrs) + 0.5); if (BarWidth < 2) BarWidth = 2; - fprintf (Gbl.F.Out,"\"\""" " ", - Gbl.Prefs.IconsURL,BarWidth); + Gbl.Prefs.IconsURL, + Gbl.Title, + Gbl.Title, + BarWidth); /***** Write the number of users *****/ - if (MaxUsrs) - fprintf (Gbl.F.Out,"%u (%u", - NumUsrs,(unsigned) ((((float) NumUsrs * 100.0) / (float) MaxUsrs) + 0.5)); - else - fprintf (Gbl.F.Out,"0 (0"); - fprintf (Gbl.F.Out,"%% %s %u)" + fprintf (Gbl.F.Out,"%s" "", - Txt_of_PART_OF_A_TOTAL,MaxUsrs); + Gbl.Title); } /*****************************************************************************/ diff --git a/swad_syllabus.c b/swad_syllabus.c index f8aabea6..bc5f8e88 100644 --- a/swad_syllabus.c +++ b/swad_syllabus.c @@ -514,9 +514,11 @@ static void Syl_ShowSyllabus (Inf_InfoType_t InfoType) static void Syl_ShowRowSyllabus (Inf_InfoType_t InfoType,unsigned NumItem,int Level,int *CodItem,const char *Text,bool NewItem) { + extern const char *Txt_Removal_not_allowed; extern const char *Txt_Remove; extern const char *Txt_Move_up_X_and_its_subsections; extern const char *Txt_Move_up_X; + extern const char *Txt_Movement_not_allowed; extern const char *Txt_Move_down_X_and_its_subsections; extern const char *Txt_Move_down_X; extern const char *Txt_Increase_level_of_X; @@ -547,8 +549,11 @@ static void Syl_ShowRowSyllabus (Inf_InfoType_t InfoType,unsigned NumItem,int Le fprintf (Gbl.F.Out,"",Gbl.RowEvenOdd); if (LstItemsSyllabus.Lst[NumItem].HasChildren) fprintf (Gbl.F.Out,"\"\"", - Gbl.Prefs.IconsURL); + " alt=\"%s\" title=\"%s\"" + " class=\"ICON16x16\" />", + Gbl.Prefs.IconsURL, + Txt_Removal_not_allowed, + Txt_Removal_not_allowed); else { Act_FormStart (InfoType == Inf_LECTURES ? ActDelItmSylLec : @@ -586,8 +591,11 @@ static void Syl_ShowRowSyllabus (Inf_InfoType_t InfoType,unsigned NumItem,int Le } else fprintf (Gbl.F.Out,"\"\"", - Gbl.Prefs.IconsURL); + " alt=\"%s\" title=\"%s\"" + " class=\"ICON16x16\" />", + Gbl.Prefs.IconsURL, + Txt_Movement_not_allowed, + Txt_Movement_not_allowed); fprintf (Gbl.F.Out,""); /***** Icon to get down item *****/ @@ -612,8 +620,11 @@ static void Syl_ShowRowSyllabus (Inf_InfoType_t InfoType,unsigned NumItem,int Le } else fprintf (Gbl.F.Out,"\"\"", - Gbl.Prefs.IconsURL); + " alt=\"%s\" title=\"%s\"" + " class=\"ICON16x16\" />", + Gbl.Prefs.IconsURL, + Txt_Movement_not_allowed, + Txt_Movement_not_allowed); fprintf (Gbl.F.Out,""); /***** Icon to increase the level of an item *****/ @@ -635,8 +646,11 @@ static void Syl_ShowRowSyllabus (Inf_InfoType_t InfoType,unsigned NumItem,int Le } else fprintf (Gbl.F.Out,"\"\"", - Gbl.Prefs.IconsURL); + " alt=\"%s\" title=\"%s\"" + " class=\"ICON16x16\" />", + Gbl.Prefs.IconsURL, + Txt_Movement_not_allowed, + Txt_Movement_not_allowed); fprintf (Gbl.F.Out,""); /***** Icon to decrease level item *****/ @@ -659,8 +673,11 @@ static void Syl_ShowRowSyllabus (Inf_InfoType_t InfoType,unsigned NumItem,int Le } else fprintf (Gbl.F.Out,"\"\"", - Gbl.Prefs.IconsURL); + " alt=\"%s\" title=\"%s\"" + " class=\"ICON16x16\" />", + Gbl.Prefs.IconsURL, + Txt_Movement_not_allowed, + Txt_Movement_not_allowed); fprintf (Gbl.F.Out,""); LastLevel = Level; diff --git a/swad_test.c b/swad_test.c index 48c635e8..24045253 100644 --- a/swad_test.c +++ b/swad_test.c @@ -1421,10 +1421,14 @@ static void Tst_ShowFormSelTags (unsigned long NumRows,MYSQL_RES *mysql_res,bool "\"%s"," ""); @@ -2781,8 +2785,11 @@ static void Tst_WriteAnswersOfAQstEdit (long QstCod) "",Gbl.RowEvenOdd); if (Str_ConvertToUpperLetter (row[2][0]) == 'Y') fprintf (Gbl.F.Out,"\"%s\"", - Gbl.Prefs.IconsURL,Txt_TEST_Correct_answer); + " alt=\"%s\" title=\"%s\"" + " class=\"ICON16x16\" />", + Gbl.Prefs.IconsURL, + Txt_TEST_Correct_answer, + Txt_TEST_Correct_answer); fprintf (Gbl.F.Out,""); /* Write the number of option */ @@ -3215,14 +3222,16 @@ static void Tst_WriteChoiceAnsAssessExam (unsigned NumQst,MYSQL_RES *mysql_res, " vertical-align:top;\">"); if (AnswersUsr[Indexes[NumOpt]] == true) // This answer has been selected by the user fprintf (Gbl.F.Out,"\"%s\"", + " alt=\"%s\" title=\"%s\"" + " class=\"ICON16x16\" />", Gbl.Prefs.IconsURL, (Gbl.Test.Config.FeedbackType == Tst_FEEDBACK_EACH_GOOD_BAD || Gbl.Test.Config.FeedbackType == Tst_FEEDBACK_FULL_FEEDBACK) ? (Gbl.Test.Answer.Options[Indexes[NumOpt]].Correct ? "ok_green" : "ok_red") : "ok_on", - Txt_TEST_User_answer,Txt_TEST_User_answer); + Txt_TEST_User_answer, + Txt_TEST_User_answer); fprintf (Gbl.F.Out,""); /* Draw icon that indicates whether the answer is correct */ @@ -3233,9 +3242,11 @@ static void Tst_WriteChoiceAnsAssessExam (unsigned NumQst,MYSQL_RES *mysql_res, { if (Gbl.Test.Answer.Options[Indexes[NumOpt]].Correct) fprintf (Gbl.F.Out,"\"%s\"", + " alt=\"%s\" title=\"%s\"" + " class=\"ICON16x16\" />", Gbl.Prefs.IconsURL, - Txt_TEST_Correct_answer,Txt_TEST_Correct_answer); + Txt_TEST_Correct_answer, + Txt_TEST_Correct_answer); } else fprintf (Gbl.F.Out,"?"); diff --git a/swad_test_import.c b/swad_test_import.c index a8b1eb59..6be7a348 100644 --- a/swad_test_import.c +++ b/swad_test_import.c @@ -1025,12 +1025,15 @@ static void TsI_WriteRowImportedQst (struct XMLElement *StemElem, fprintf (Gbl.F.Out,"" "" "\"\"" + " alt=\"%s\" title=\"%s\"" + " class=\"ICON16x16\" />" "", Gbl.RowEvenOdd, Gbl.Prefs.IconsURL, QuestionExists ? "tr" : "ok_green", + QuestionExists ? Txt_Existing_question : + Txt_New_question, QuestionExists ? Txt_Existing_question : Txt_New_question); @@ -1090,10 +1093,12 @@ static void TsI_WriteRowImportedQst (struct XMLElement *StemElem, /* Put an icon that indicates whether shuffle is enabled or not */ if (Gbl.Test.Shuffle) fprintf (Gbl.F.Out,"\"%s\"", + " alt=\"%s\" title=\"%s\"" + " class=\"ICON16x16\" />", Gbl.Prefs.IconsURL, QuestionExists ? "ok_off" : "ok_on", + Txt_TEST_Correct_answer, Txt_TEST_Correct_answer); fprintf (Gbl.F.Out,""); @@ -1157,10 +1162,12 @@ static void TsI_WriteRowImportedQst (struct XMLElement *StemElem, "",Gbl.RowEvenOdd); if (Gbl.Test.Answer.Options[NumOpt].Correct) fprintf (Gbl.F.Out,"\"%s\"", + " alt=\"%s\" title=\"%s\"" + " class=\"ICON16x16\" />", Gbl.Prefs.IconsURL, QuestionExists ? "ok_off" : "ok_on", + Txt_TEST_Correct_answer, Txt_TEST_Correct_answer); fprintf (Gbl.F.Out,""); diff --git a/swad_text.c b/swad_text.c index 1b758502..e08f5228 100644 --- a/swad_text.c +++ b/swad_text.c @@ -12795,6 +12795,27 @@ const char *Txt_Guided_academic_assignments = "Atividades académicas guided"; #endif +const char *Txt_Happy_birthday = +#if L==0 + "Feliç aniversari!"; +#elif L==1 + "Gute zum Geburtstag!"; +#elif L==2 + "Happy birthday!"; +#elif L==3 + "¡Feliz cumpleaños!"; +#elif L==4 + "Joyeux anniversaire!"; +#elif L==5 + "¡Feliz cumpleaños!"; // Okoteve traducción +#elif L==6 + "Buon compleanno!"; +#elif L==7 + "Wszystkiego najlepszego!"; +#elif L==8 + "Feliz aniversário!"; +#endif + const char *Txt_HELP_email = #if L==0 "Exemple: garcia@exemplemail.com"; @@ -21633,6 +21654,27 @@ const char *Txt_Move_thread = "Mover thread"; #endif +const char *Txt_Movement_not_allowed = +#if L==0 + "Moviment no permès"; +#elif L==1 + "Bewegung nicht erlaubt"; +#elif L==2 + "Move up not allowed"; +#elif L==3 + "Movimiento no permitido"; +#elif L==4 + "Mouvement pas autorisé"; +#elif L==5 + "Movimiento no permitido"; // Okoteve traducción +#elif L==6 + "Movimento non consentito"; +#elif L==7 + "Ruch nie jest dozwolone"; +#elif L==8 + "Movimento não permitido"; +#endif + const char *Txt_MSG_containing_the_text = #if L==0 "que contenga el texto"; // Necessita traduccio diff --git a/swad_timetable.c b/swad_timetable.c index bb64066d..9d30b113 100644 --- a/swad_timetable.c +++ b/swad_timetable.c @@ -1101,6 +1101,7 @@ static void TT_TimeTableDrawCell (unsigned Day,unsigned Hour,unsigned Column,uns case TT_TUT_SHOW: if (HourType == TT_FREE_HOUR) // If cell is empty... fprintf (Gbl.F.Out,"\"\"", Gbl.Prefs.IconsURL); else diff --git a/swad_user.c b/swad_user.c index a0ac4817..e62061dd 100644 --- a/swad_user.c +++ b/swad_user.c @@ -1380,7 +1380,8 @@ void Usr_WriteFormLogin (void) /***** User's ID/nickname and password *****/ fprintf (Gbl.F.Out,"" "" - "\"%s\"" "" "" @@ -1391,7 +1392,8 @@ void Usr_WriteFormLogin (void) "" "" "" - "\"%s\"" "" "" @@ -1433,6 +1435,7 @@ void Usr_WriteFormLogin (void) void Usr_WelcomeUsr (void) { extern const unsigned Txt_Current_CGI_SWAD_Language; + extern const char *Txt_Happy_birthday; extern const char *Txt_Welcome[Usr_NUM_SEXS]; extern const char *Txt_Welcome_X[Usr_NUM_SEXS]; extern const char *Txt_Welcome_X_and_happy_birthday[Usr_NUM_SEXS]; @@ -1455,9 +1458,12 @@ void Usr_WelcomeUsr (void) if ((CongratulateMyBirthday = Usr_CheckIfMyBirthdayHasNotBeenCongratulated ())) { Usr_InsertMyBirthday (); - fprintf (Gbl.F.Out,"\"\""", - Gbl.Prefs.PathIconSet,Cfg_ICON_128x128); + Gbl.Prefs.PathIconSet,Cfg_ICON_128x128, + Txt_Happy_birthday, + Txt_Happy_birthday); sprintf (Gbl.Message,Txt_Welcome_X_and_happy_birthday[Gbl.Usrs.Me.UsrDat.Sex], Gbl.Usrs.Me.UsrDat.FirstName); } @@ -1533,9 +1539,13 @@ void Usr_PutFormLogIn (void) Act_FormStart (ActFrmLogIn); Act_LinkFormSubmit (Txt_Log_in,The_ClassHead[Gbl.Prefs.Theme]); fprintf (Gbl.F.Out,"\"%s\"" + " alt=\"%s\" title=\"%s\"" + " class=\"ICON16x16\" />" " %s", - Gbl.Prefs.PathTheme,Txt_Log_in,Txt_Log_in); + Gbl.Prefs.PathTheme, + Txt_Log_in, + Txt_Log_in, + Txt_Log_in); Act_FormEnd (); } @@ -1601,10 +1611,14 @@ void Usr_PutFormLogOut (void) Act_FormStart (ActLogOut); Act_LinkFormSubmit (Txt_Log_out,The_ClassHead[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"\"%s\""" + fprintf (Gbl.F.Out,"\"%s\"" " %s", - Gbl.Prefs.PathTheme,Txt_Log_out,Txt_Log_out); + Gbl.Prefs.PathTheme, + Txt_Log_out, + Txt_Log_out, + Txt_Log_out); Act_FormEnd (); } @@ -2605,7 +2619,8 @@ static void Usr_WriteRowGstMainData (unsigned NumUsr,struct UsrData *UsrDat) /***** Student has accepted enrollment in current course? *****/ fprintf (Gbl.F.Out,"" - "\"\""" "", Gbl.RowEvenOdd, @@ -2701,12 +2716,15 @@ void Usr_WriteRowStdMainData (unsigned NumUsr,struct UsrData *UsrDat,bool PutChe else fprintf (Gbl.F.Out,"BM%d",Gbl.RowEvenOdd); fprintf (Gbl.F.Out,"\">" - "\"\"" "", Gbl.Prefs.IconsURL, UsrDat->Accepted ? "ok_on" : "tr", + UsrDat->Accepted ? Txt_Enrollment_confirmed : + Txt_Enrollment_not_confirmed, UsrDat->Accepted ? Txt_Enrollment_confirmed : Txt_Enrollment_not_confirmed); @@ -3022,11 +3040,14 @@ static void Usr_WriteRowTchMainData (unsigned NumUsr,struct UsrData *UsrDat,bool fprintf (Gbl.F.Out,"BM%d",Gbl.RowEvenOdd); fprintf (Gbl.F.Out,"\">" "\"\"" + " alt=\"%s\" title=\"%s\"" + " class=\"ICON16x16\" />" "", Gbl.Prefs.IconsURL, UsrDat->Accepted ? "ok_on" : "tr", + UsrDat->Accepted ? Txt_Enrollment_confirmed : + Txt_Enrollment_not_confirmed, UsrDat->Accepted ? Txt_Enrollment_confirmed : Txt_Enrollment_not_confirmed); @@ -4778,11 +4799,13 @@ static void Usr_FormToSelectUsrListType (Act_Action_t NextAction,Usr_ShowUsrsTyp Usr_PutExtraParamsUsrList (NextAction); Act_LinkFormSubmit (Txt_USR_LIST_TYPES[ListType],The_ClassFormulNB[Gbl.Prefs.Theme]); fprintf (Gbl.F.Out,"\"%s\"" + " alt=\"%s\" title=\"%s\"" + " class=\"ICON16x16\" />" " %s", Gbl.Prefs.IconsURL, Usr_IconsClassPhotoOrList[ListType], Txt_USR_LIST_TYPES[ListType], + Txt_USR_LIST_TYPES[ListType], Txt_USR_LIST_TYPES[ListType]); Act_FormEnd (); } diff --git a/swad_zip.c b/swad_zip.c index 070e5f24..a86e0f7f 100644 --- a/swad_zip.c +++ b/swad_zip.c @@ -330,10 +330,13 @@ void ZIP_PutButtonToDownloadZIPOfAFolder (const char *PathInTree,const char *Fil } Brw_ParamListFiles (Brw_IS_FOLDER,PathInTree,FileName); Act_LinkFormSubmit (Txt_Create_ZIP_file,The_ClassFormul[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"\"%s\""" + fprintf (Gbl.F.Out,"\"%s\"" "", - Gbl.Prefs.IconsURL,Txt_Create_ZIP_file,Txt_Create_ZIP_file); + Gbl.Prefs.IconsURL, + Txt_Create_ZIP_file, + Txt_Create_ZIP_file); Act_FormEnd (); } @@ -572,7 +575,8 @@ static void ZIP_ShowLinkToDownloadZIP (const char *FileName,const char *URL, "" "" - "\"%s\""" " %s " ""