Version 16.80.1

This commit is contained in:
Antonio Cañas Vargas 2016-11-30 22:59:02 +01:00
parent af3e9c48bf
commit d65891d528
3 changed files with 22 additions and 126 deletions

View File

@ -106,8 +106,8 @@ static void Loc_ShowAllLocations (void)
extern const char *Txt_Agenda;
extern const char *Txt_ASG_ATT_OR_SVY_HELP_ORDER[2];
extern const char *Txt_ASG_ATT_OR_SVY_ORDER[2];
extern const char *Txt_Location;
extern const char *Txt_Event;
extern const char *Txt_Location;
extern const char *Txt_No_locations;
Loc_Order_t Order;
struct Pagination Pagination;
@ -161,8 +161,8 @@ static void Loc_ShowAllLocations (void)
"%s"
"</th>"
"</tr>",
Txt_Location,
Txt_Event);
Txt_Event,
Txt_Location);
/***** Write all the locations *****/
for (NumLoc = Pagination.FirstItemVisible;
@ -299,24 +299,24 @@ static void Loc_ShowOneLocation (long LocCod)
Gbl.RowEvenOdd,
UniqueId,Loc.TimeUTC[Loc_END_TIME],Txt_Today);
/* Location */
fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP COLOR%u\">"
"<div class=\"%s\">%s</div>",
Gbl.RowEvenOdd,
Loc.Hidden ? "ASG_TITLE_LIGHT" :
"ASG_TITLE",
Loc.Location);
fprintf (Gbl.F.Out,"</td>");
/* Event */
fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP COLOR%u\">"
"<div class=\"%s\">%s</div>",
"<div class=\"%s\">%s</div>"
"</td>",
Gbl.RowEvenOdd,
Loc.Hidden ? "ASG_TITLE_LIGHT" :
"ASG_TITLE",
Loc.Event);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/* Location */
fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP COLOR%u\">"
"<div class=\"%s\">%s</div>"
"</td>"
"</tr>",
Gbl.RowEvenOdd,
Loc.Hidden ? "ASG_TITLE_LIGHT" :
"ASG_TITLE",
Loc.Location);
/***** Write second row of data of this location *****/
fprintf (Gbl.F.Out,"<tr>"

View File

@ -183,13 +183,15 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.80 (2016-11-30)"
#define Log_PLATFORM_VERSION "SWAD 16.80.1 (2016-11-30)"
#define CSS_FILE "swad16.69.css"
#define JS_FILE "swad16.46.1.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.80.1: Nov 30, 2016 Changed order of event and location in agenda.
Removed unused texts. (209320 lines)
Version 16.80: Nov 30, 2016 Changed location to agenda. (209428 lines)
1 change necessary in database:
UPDATE actions SET Obsolete='Y' WHERE ActCod='1581';

View File

@ -6337,28 +6337,7 @@ const char *Txt_Create_link =
#elif L==9
"Criar liga&ccedil;&atilde;o";
#endif
/*
const char *Txt_Create_location =
#if L==1
"Crear ubicaci&oacute;";
#elif L==2
"Standort eingeben";
#elif L==3
"Create location";
#elif L==4
"Crear ubicaci&oacute;n";
#elif L==5
"Cr&eacute;er emplacement";
#elif L==6
"Crear ubicaci&oacute;n"; // Okoteve traducción
#elif L==7
"Crea posizione";
#elif L==8
"Tworzenie lokalizacj&eogon;";
#elif L==9
"Criar localiza&ccedil;&atilde;o";
#endif
*/
const char *Txt_Create_notice =
#if L==1
"Crear av&iacute;s";
@ -17193,50 +17172,7 @@ const char *Txt_Location =
#elif L==9
"Localiza&ccedil;&atilde;o";
#endif
/*
const char *Txt_Location_X_is_now_hidden = // Warning: it is very important to include %s in the following sentences
#if L==1
"La ubicaci&oacute; <strong>%s</strong> ara est&agrave; oculta.";
#elif L==2
"Die Standort <strong>%s</strong> ist jetzt ausgeblendet.";
#elif L==3
"Location <strong>%s</strong> is now hidden.";
#elif L==4
"La ubicaci&oacute;n <strong>%s</strong> ahora est&aacute; oculta.";
#elif L==5
"L'emplacement <strong>%s</strong> est maintenant cach&eacute;e.";
#elif L==6
"La ubicaci&oacute;n <strong>%s</strong> ahora est&aacute; oculta."; // Okoteve traducción
#elif L==7
"La posizione <strong>%s</strong> &egrave; ora nascosta.";
#elif L==8
"Lokacja <strong>%s</strong> jest ukryte.";
#elif L==9
"A localiza&ccedil;&atilde;o <strong>%s</strong> &eacute; agora oculta.";
#endif
*/
/*
const char *Txt_Location_X_is_now_visible = // Warning: it is very important to include %s in the following sentences
#if L==1
"La ubicaci&oacute; <strong>%s</strong> ara est&agrave; visible.";
#elif L==2
"Die Standort <strong>%s</strong> ist jetzt sichtbar.";
#elif L==3
"Location <strong>%s</strong> is now visible.";
#elif L==4
"La ubicaci&oacute;n <strong>%s</strong> ahora est&aacute; visible.";
#elif L==5
"L'emplacement <strong>%s</strong> est maintenant visible.";
#elif L==6
"La ubicaci&oacute;n <strong>%s</strong> ahora est&aacute; visible."; // Okoteve traducción
#elif L==7
"La posizione <strong>%s</strong> &egrave; ora visibile.";
#elif L==8
"Lokacja <strong>%s</strong> jest teraz widoczny.";
#elif L==9
"A localiza&ccedil;&atilde;o <strong>%s</strong> &eacute; agora vis&iacute;vel.";
#endif
*/
const char *Txt_Location_X_removed = // Warning: it is very important to include %s in the following sentences
#if L==1
"Ubicaci&oacute; <strong>%s</strong> eliminada.";
@ -23756,28 +23692,7 @@ const char *Txt_New_link =
#elif L==9
"Nova liga&ccedil;&atilde;o";
#endif
/*
const char *Txt_New_location =
#if L==1
"Nova ubicaci&oacute;";
#elif L==2
"Neue Standort";
#elif L==3
"New location";
#elif L==4
"Nueva ubicaci&oacute;n";
#elif L==5
"Nouvel emplacement";
#elif L==6
"Nueva ubicaci&oacute;n"; // Okoteve traducción
#elif L==7
"Nuova posizione";
#elif L==8
"Nowe lokacja";
#elif L==9
"Nova localiza&ccedil;&atilde;o";
#endif
*/
const char *Txt_New_message =
#if L==1
"Nou missatge";
@ -43685,28 +43600,7 @@ const char *Txt_The_list_of_X_users_is_too_large_to_be_displayed = // Warning: i
#elif L==9
"The list of %u users is too large to be displayed."; // Necessita de tradução
#endif
/*
const char *Txt_The_location_has_been_modified =
#if L==1
"La ubicaci&oacute; s'ha modificat.";
#elif L==2
"Die Standort wurde ge&auml;ndert.";
#elif L==3
"The location has been modified.";
#elif L==4
"La ubicaci&oacute;n ha sido modificada.";
#elif L==5
"L'emplacement a &eacute;t&eacute; modifi&eacute;.";
#elif L==6
"La ubicaci&oacute;n ha sido modificada."; // Okoteve traducción
#elif L==7
"La posizione &egrave; stata modificata.";
#elif L==8
"Lokalizacja zosta&lstrok;a zmodyfikowana.";
#elif L==9
"A localiza&ccedil;&atilde;o foi modificada.";
#endif
*/
const char *Txt_The_lower_limit_of_correct_answers_must_be_less_than_or_equal_to_the_upper_limit =
#if L==1
"El l&iacute;mite inferior del intervalo de respuestas correctas"