diff --git a/swad_agenda.c b/swad_agenda.c index 799ad6447..4cc2572c7 100644 --- a/swad_agenda.c +++ b/swad_agenda.c @@ -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" "" "", - 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,"" - "
%s
", - Gbl.RowEvenOdd, - Loc.Hidden ? "ASG_TITLE_LIGHT" : - "ASG_TITLE", - Loc.Location); - fprintf (Gbl.F.Out,""); - /* Event */ fprintf (Gbl.F.Out,"" - "
%s
", + "
%s
" + "", Gbl.RowEvenOdd, Loc.Hidden ? "ASG_TITLE_LIGHT" : "ASG_TITLE", Loc.Event); - fprintf (Gbl.F.Out,"" - ""); + + /* Location */ + fprintf (Gbl.F.Out,"" + "
%s
" + "" + "", + Gbl.RowEvenOdd, + Loc.Hidden ? "ASG_TITLE_LIGHT" : + "ASG_TITLE", + Loc.Location); /***** Write second row of data of this location *****/ fprintf (Gbl.F.Out,"" diff --git a/swad_changelog.h b/swad_changelog.h index 6de078aaf..22d281ae5 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -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'; diff --git a/swad_text.c b/swad_text.c index c5c447321..10ce01a5d 100644 --- a/swad_text.c +++ b/swad_text.c @@ -6337,28 +6337,7 @@ const char *Txt_Create_link = #elif L==9 "Criar ligação"; #endif -/* -const char *Txt_Create_location = -#if L==1 - "Crear ubicació"; -#elif L==2 - "Standort eingeben"; -#elif L==3 - "Create location"; -#elif L==4 - "Crear ubicación"; -#elif L==5 - "Créer emplacement"; -#elif L==6 - "Crear ubicación"; // Okoteve traducción -#elif L==7 - "Crea posizione"; -#elif L==8 - "Tworzenie lokalizację"; -#elif L==9 - "Criar localização"; -#endif -*/ + const char *Txt_Create_notice = #if L==1 "Crear avís"; @@ -17193,50 +17172,7 @@ const char *Txt_Location = #elif L==9 "Localizaçã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ó %s ara està oculta."; -#elif L==2 - "Die Standort %s ist jetzt ausgeblendet."; -#elif L==3 - "Location %s is now hidden."; -#elif L==4 - "La ubicación %s ahora está oculta."; -#elif L==5 - "L'emplacement %s est maintenant cachée."; -#elif L==6 - "La ubicación %s ahora está oculta."; // Okoteve traducción -#elif L==7 - "La posizione %s è ora nascosta."; -#elif L==8 - "Lokacja %s jest ukryte."; -#elif L==9 - "A localização %s é 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ó %s ara està visible."; -#elif L==2 - "Die Standort %s ist jetzt sichtbar."; -#elif L==3 - "Location %s is now visible."; -#elif L==4 - "La ubicación %s ahora está visible."; -#elif L==5 - "L'emplacement %s est maintenant visible."; -#elif L==6 - "La ubicación %s ahora está visible."; // Okoteve traducción -#elif L==7 - "La posizione %s è ora visibile."; -#elif L==8 - "Lokacja %s jest teraz widoczny."; -#elif L==9 - "A localização %s é agora visível."; -#endif -*/ + const char *Txt_Location_X_removed = // Warning: it is very important to include %s in the following sentences #if L==1 "Ubicació %s eliminada."; @@ -23756,28 +23692,7 @@ const char *Txt_New_link = #elif L==9 "Nova ligação"; #endif -/* -const char *Txt_New_location = -#if L==1 - "Nova ubicació"; -#elif L==2 - "Neue Standort"; -#elif L==3 - "New location"; -#elif L==4 - "Nueva ubicación"; -#elif L==5 - "Nouvel emplacement"; -#elif L==6 - "Nueva ubicación"; // Okoteve traducción -#elif L==7 - "Nuova posizione"; -#elif L==8 - "Nowe lokacja"; -#elif L==9 - "Nova localizaçã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ó s'ha modificat."; -#elif L==2 - "Die Standort wurde geändert."; -#elif L==3 - "The location has been modified."; -#elif L==4 - "La ubicación ha sido modificada."; -#elif L==5 - "L'emplacement a été modifié."; -#elif L==6 - "La ubicación ha sido modificada."; // Okoteve traducción -#elif L==7 - "La posizione è stata modificata."; -#elif L==8 - "Lokalizacja została zmodyfikowana."; -#elif L==9 - "A localizaçã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ímite inferior del intervalo de respuestas correctas"