diff --git a/swad_agenda.c b/swad_agenda.c index 966d5286..b24b6a63 100644 --- a/swad_agenda.c +++ b/swad_agenda.c @@ -128,7 +128,7 @@ void Agd_ShowMyAgenda (void) static void Agd_ShowEvents (Agd_AgendaType_t AgendaType) { extern const char *Hlp_PROFILE_Agenda; - extern const char *Txt_Agenda_USER; + extern const char *Txt_Public_agenda_USER; extern const char *Txt_My_agenda; extern const char *Txt_ASG_ATT_OR_SVY_HELP_ORDER[2]; extern const char *Txt_ASG_ATT_OR_SVY_ORDER[2]; @@ -165,7 +165,7 @@ static void Agd_ShowEvents (Agd_AgendaType_t AgendaType) { case Agd_USR_AGENDA: /***** Start frame *****/ - sprintf (Gbl.Title,Txt_Agenda_USER,Gbl.Usrs.Other.UsrDat.FullName); // TODO: Need translation!!!!! + sprintf (Gbl.Title,Txt_Public_agenda_USER,Gbl.Usrs.Other.UsrDat.FullName); // TODO: Need translation!!!!! Lay_StartRoundFrame ("100%",Gbl.Title, NULL, Hlp_PROFILE_Agenda); // TODO: Change diff --git a/swad_changelog.h b/swad_changelog.h index de8274b4..4f91ed92 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -183,13 +183,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.85 (2016-12-03)" +#define Log_PLATFORM_VERSION "SWAD 16.85.1 (2016-12-03)" #define CSS_FILE "swad16.82.2.css" #define JS_FILE "swad16.84.2.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.85.1: Dec 03, 2016 Changed title of public agenda. (209722 lines) Version 16.85: Dec 03, 2016 Form to choice between all events / only public events in agenda. (209721 lines) Version 16.84.2: Dec 03, 2016 Only hours and minutes (seconds = 0) in agenda events. (209606 lines) Version 16.84.1: Dec 03, 2016 Remove user's agenda when removing user's account. (? lines) diff --git a/swad_parameter.c b/swad_parameter.c index 78548796..7df9f5cd 100644 --- a/swad_parameter.c +++ b/swad_parameter.c @@ -618,7 +618,7 @@ static bool Par_CheckIsParamCanBeUsedInGETMethod (const char *ParamName) "ctr", // To enter directly to a centre "deg", // To enter directly to a degree "crs", // To enter directly to a course - "usr", // To enter directly to a user + "usr", // To enter directly to a user's profile "act", // To execute directly an action (allowed only for fully public actions) "ses", // To use an open session when redirecting from one language to another "key", // To verify an email address diff --git a/swad_text.c b/swad_text.c index 0d9a0c18..b58b359f 100644 --- a/swad_text.c +++ b/swad_text.c @@ -2090,27 +2090,6 @@ const char *Txt_Admin_several_teachers = "Gerenciar vários professores"; #endif -const char *Txt_Agenda_USER = // Warning: it is very important to include %s in the following sentences -#if L==1 - "Agenda de %s"; -#elif L==2 - "Organizer von %s"; -#elif L==3 - "%s's agenda"; -#elif L==4 - "Agenda de %s"; -#elif L==5 - "Agenda de %s"; -#elif L==6 - "Aporyrã %s"; -#elif L==7 - "Agenda di %s"; -#elif L==8 - "Pamiętnik %s"; -#elif L==9 - "Agenda de %s"; -#endif - const char *Txt_all = #if L==1 "tot"; @@ -29515,6 +29494,27 @@ const char *Txt_Public_activity_OF_A_USER = // Warning: it is very important to "Atividade pública de %s"; #endif +const char *Txt_Public_agenda_USER = // Warning: it is very important to include %s in the following sentences +#if L==1 + "Agenda pública de %s"; +#elif L==2 + "Öffentliche Organizer von %s"; +#elif L==3 + "%s's public agenda"; +#elif L==4 + "Agenda pública de %s"; +#elif L==5 + "Agenda publique de %s"; +#elif L==6 + "Agenda pública de %s"; // Okoteve traducción +#elif L==7 + "Agenda pubblica di %s"; +#elif L==8 + "Pamiętnik publiczny %s"; +#elif L==9 + "Agenda pública de %s"; +#endif + const char *Txt_public_FILES = #if L==1 "públics";