Version 22.101.1: Apr 20, 2023 Changes in edition of holidays.

swad_changelog.h

@@ -629,10 +629,11 @@ TODO: Emilce Barrera Mesa: Podr
 TODO: Emilce Barrera Mesa: Mis estudiantes presentan muchas dificultades a la hora de poner la foto porque la plataforma es muy exigente respecto al fondo de la imagen.
 
 */
-#define Log_PLATFORM_VERSION	"SWAD 22.101 (2023-04-20)"
+#define Log_PLATFORM_VERSION	"SWAD 22.101.1 (2023-04-20)"
 #define CSS_FILE		"swad22.95.css"
 #define JS_FILE			"swad22.49.js"
 /*
+	Version 22.101.1: Apr 20, 2023  Changes in edition of holidays. (337338 lines)
 	Version 22.101:   Apr 20, 2023  Removed buttons to create new elements: a new place, new holiday, new link, new banner, new plugin, new building, new room, new program item, new assignment, new project, new call for exam, new question, new exam, new set of questions, new exam session, new game, new match, new rubric, new criterion, new group, new type of group, new attendance event, new record field, new announcement, new notice, new message, new forum thread, new forum post, new survey, new survey question, new agenda event, new email domain. (337332 lines)
 	Version 22.100.4: Apr 19, 2023  Removed buttons to create a new institution, new center, new degree and new course. (338756 lines)
 	Version 22.100.3: Apr 19, 2023  Institution admins can edit places. (338891 lines)

swad_holiday.c

@@ -295,11 +295,7 @@ static void Hld_EditHolidaysInternal (void)
    /***** Get list of holidays *****/
    Hld_GetListHolidays (&Holidays);
 
-   /***** Put a form to create a new holiday *****/
-   Hld_PutFormToCreateHoliday (&Places);
-
    /***** Forms to edit current holidays *****/
-   if (Holidays.Num)
    Hld_ListHolidaysForEdition (&Holidays,&Places);
 
    /***** Free list of holidays *****/
@@ -490,10 +486,18 @@ static void Hld_ListHolidaysForEdition (const struct Hld_Holidays *Holidays,
    unsigned HolidayTypeUnsigned;
    unsigned CurrentYear = Dat_GetCurrentYear ();
 
-   /***** Begin box and table *****/
-   Box_BoxTableBegin (NULL,Txt_Holidays,
+   /***** Begin box *****/
+   Box_BoxBegin (NULL,Txt_Holidays,
                       Cal_PutIconToSeeCalendar,NULL,
-                      Hlp_INSTITUTION_Holidays_edit,Box_NOT_CLOSABLE,2);
+                      Hlp_INSTITUTION_Holidays_edit,Box_NOT_CLOSABLE);
+
+      /***** Put a form to create a new holiday *****/
+      Hld_PutFormToCreateHoliday (Places);
+
+      if (Places->Num)
+	{
+	 /***** Begin table *****/
+	 HTM_TABLE_BeginWidePadding (2);
 
 	    /***** Write heading *****/
 	    Hld_PutHeadHolidays ();
@@ -604,8 +608,12 @@ static void Hld_ListHolidaysForEdition (const struct Hld_Holidays *Holidays,
 	       HTM_TR_End ();
 	      }
 
-   /***** End table and box *****/
-   Box_BoxTableEnd ();
+	 /***** End table *****/
+	 HTM_TABLE_End ();
+	}
+
+   /***** End box *****/
+   Box_BoxEnd ();
   }
 
 /*****************************************************************************/
@@ -864,7 +872,6 @@ void Hld_ContEditAfterChgHld (void)
 
 static void Hld_PutFormToCreateHoliday (const struct Plc_Places *Places)
   {
-   extern const char *Hlp_INSTITUTION_Holidays_edit;
    extern const char *Txt_All_places;
    extern const char *Txt_Holiday;
    extern const char *Txt_Place;
@@ -885,7 +892,7 @@ static void Hld_PutFormToCreateHoliday (const struct Plc_Places *Places)
       /***** Begin box and table *****/
       Box_BoxTableBegin (NULL,Txt_Holiday,
 			 NULL,NULL,
-			 Hlp_INSTITUTION_Holidays_edit,Box_NOT_CLOSABLE,2);
+			 NULL,Box_NOT_CLOSABLE,2);
 
 	 /***** Write heading *****/
 	 HTM_TR_Begin (NULL);

swad_text.c

@@ -6951,7 +6951,7 @@ const char *Txt_Create_holiday =
 #elif L==5	// fr
 	"Créer fête";
 #elif L==6	// gn
-	"Crear festividad";	// Okoteve traducción
+	"Omoheñói arete";
 #elif L==7	// it
 	"Crea festività";
 #elif L==8	// pl
@@ -6959,7 +6959,7 @@ const char *Txt_Create_holiday =
 #elif L==9	// pt
 	"Criar féria";
 #elif L==10	// tr
-	"Create holiday";	// Çeviri lazim!
+	"Tatil oluştur";
 #endif
 
 const char *Txt_Create_institution =
@@ -16886,7 +16886,7 @@ const char *Txt_Holiday =
 #elif L==5	// fr
 	"Fête";
 #elif L==6	// gn
-	"Festividad";
+	"Arete";
 #elif L==7	// it
 	"Festività";
 #elif L==8	// pl
@@ -16894,7 +16894,7 @@ const char *Txt_Holiday =
 #elif L==9	// pt
 	"Féria";
 #elif L==10	// tr
-	"Holiday";	// Çeviri lazim!
+	"Tatil";
 #endif
 
 const char *Txt_Holiday_X_removed =	// Warning: it is very important to include %s in the following sentences
@@ -16942,7 +16942,7 @@ const char *Txt_HOLIDAY_TYPES[Hld_NUM_TYPES_HOLIDAY] =
 #elif L==9	// pt
 	"Feriado"
 #elif L==10	// tr
-	"Holiday"	// Çeviri lazim!
+	"Tatil"
 #endif
 	,
 	[Hld_NON_SCHOOL_PERIOD] =
@@ -16971,15 +16971,15 @@ const char *Txt_HOLIDAY_TYPES[Hld_NUM_TYPES_HOLIDAY] =
 
 const char *Txt_Holidays =
 #if   L==1	// ca
-	"Dies festius";
+	"Festivitats";
 #elif L==2	// de
 	"Feiertage";
 #elif L==3	// en
 	"Holidays";
 #elif L==4	// es
-	"Días festivos";
+	"Festividades";
 #elif L==5	// fr
-	"Jours fériés";
+	"Festivités";
 #elif L==6	// gn
 	"Arete";
 #elif L==7	// it
@@ -16989,7 +16989,7 @@ const char *Txt_Holidays =
 #elif L==9	// pt
 	"Férias";
 #elif L==10	// tr
-	"Bayram";
+	"Tatil";
 #endif
 
 const char *Txt_HOLIDAYS_HELP_ORDER[Hld_NUM_ORDERS] =
@@ -25649,17 +25649,17 @@ const char *Txt_No_groups_have_been_created_in_the_course_X_Therefore_ =	// Warn
 
 const char *Txt_No_holidays =
 #if   L==1	// ca
-	"No hi ha dies festius.";
+	"No hi ha festivitats.";
 #elif L==2	// de
 	"Keine Feiertage.";
 #elif L==3	// en
 	"No holidays.";
 #elif L==4	// es
-	"No hay días festivos.";
+	"No hay festividades.";
 #elif L==5	// fr
-	"Pas de vacances.";
+	"Pas de festivités.";
 #elif L==6	// gn
-	"No hay días festivos.";	// Okoteve traducción
+	"Ndaipóri arete.";
 #elif L==7	// it
 	"Non ci sono festività.";
 #elif L==8	// pl
@@ -25667,7 +25667,7 @@ const char *Txt_No_holidays =
 #elif L==9	// pt
 	"Não há feriados.";
 #elif L==10	// tr
-	"No holidays.";			// Çeviri lazim!
+	"Tatil yok.";
 #endif
 
 const char *Txt_No_image_video =	// Without any image