mirror of https://github.com/acanas/swad-core.git
Version18.66.6
This commit is contained in:
parent
85ec81b870
commit
5291756181
|
@ -428,10 +428,11 @@ En OpenSWAD:
|
||||||
ps2pdf source.ps destination.pdf
|
ps2pdf source.ps destination.pdf
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define Log_PLATFORM_VERSION "SWAD 18.66.5 (2019-03-06)"
|
#define Log_PLATFORM_VERSION "SWAD 18.66.6 (2019-03-07)"
|
||||||
#define CSS_FILE "swad18.66.3.css"
|
#define CSS_FILE "swad18.66.3.css"
|
||||||
#define JS_FILE "swad18.64.js"
|
#define JS_FILE "swad18.64.js"
|
||||||
/*
|
/*
|
||||||
|
Version 18.66.6: Mar 07, 2019 Number of days printed as months or years in user's figures. (238846 lines)
|
||||||
Version 18.66.5: Mar 06, 2019 Code refactoring in user's figures. (238739 lines)
|
Version 18.66.5: Mar 06, 2019 Code refactoring in user's figures. (238739 lines)
|
||||||
Version 18.66.4: Mar 06, 2019 Code refactoring in user's figures. (238678 lines)
|
Version 18.66.4: Mar 06, 2019 Code refactoring in user's figures. (238678 lines)
|
||||||
Version 18.66.3: Mar 06, 2019 Changed order of figures in user's profile. (238674 lines)
|
Version 18.66.3: Mar 06, 2019 Changed order of figures in user's profile. (238674 lines)
|
||||||
|
|
|
@ -436,10 +436,16 @@ static void Prf_ShowTimeSinceFirstClick (const struct UsrData *UsrDat,
|
||||||
const struct UsrFigures *UsrFigures)
|
const struct UsrFigures *UsrFigures)
|
||||||
{
|
{
|
||||||
extern const char *Txt_TIME_Since;
|
extern const char *Txt_TIME_Since;
|
||||||
|
extern const char *Txt_year;
|
||||||
|
extern const char *Txt_years;
|
||||||
|
extern const char *Txt_month;
|
||||||
|
extern const char *Txt_months;
|
||||||
extern const char *Txt_day;
|
extern const char *Txt_day;
|
||||||
extern const char *Txt_days;
|
extern const char *Txt_days;
|
||||||
extern const char *Txt_Today;
|
extern const char *Txt_Today;
|
||||||
char IdFirstClickTime[Frm_MAX_BYTES_ID + 1];
|
char IdFirstClickTime[Frm_MAX_BYTES_ID + 1];
|
||||||
|
int NumYears;
|
||||||
|
int NumMonths;
|
||||||
|
|
||||||
/***** Time since first click *****/
|
/***** Time since first click *****/
|
||||||
Prf_StartListItem (Txt_TIME_Since,"clock.svg");
|
Prf_StartListItem (Txt_TIME_Since,"clock.svg");
|
||||||
|
@ -451,10 +457,30 @@ static void Prf_ShowTimeSinceFirstClick (const struct UsrData *UsrDat,
|
||||||
|
|
||||||
fprintf (Gbl.F.Out,"<span id=\"%s\"></span>",IdFirstClickTime);
|
fprintf (Gbl.F.Out,"<span id=\"%s\"></span>",IdFirstClickTime);
|
||||||
if (UsrFigures->NumDays > 0)
|
if (UsrFigures->NumDays > 0)
|
||||||
fprintf (Gbl.F.Out," (%d %s)",
|
{
|
||||||
UsrFigures->NumDays,
|
fprintf (Gbl.F.Out," (");
|
||||||
(UsrFigures->NumDays == 1) ? Txt_day :
|
NumYears = UsrFigures->NumDays / 365;
|
||||||
Txt_days);
|
if (NumYears)
|
||||||
|
fprintf (Gbl.F.Out,"%d %s",
|
||||||
|
NumYears,
|
||||||
|
(NumYears == 1) ? Txt_year :
|
||||||
|
Txt_years);
|
||||||
|
else // Less than one year
|
||||||
|
{
|
||||||
|
NumMonths = UsrFigures->NumDays / 30;
|
||||||
|
if (NumMonths)
|
||||||
|
fprintf (Gbl.F.Out,"%d %s",
|
||||||
|
NumMonths,
|
||||||
|
(NumMonths == 1) ? Txt_month :
|
||||||
|
Txt_months);
|
||||||
|
else // Less than one month
|
||||||
|
fprintf (Gbl.F.Out,"%d %s",
|
||||||
|
UsrFigures->NumDays,
|
||||||
|
(UsrFigures->NumDays == 1) ? Txt_day :
|
||||||
|
Txt_days);
|
||||||
|
}
|
||||||
|
fprintf (Gbl.F.Out,")");
|
||||||
|
}
|
||||||
fprintf (Gbl.F.Out,"<script type=\"text/javascript\">"
|
fprintf (Gbl.F.Out,"<script type=\"text/javascript\">"
|
||||||
"writeLocalDateHMSFromUTC('%s',%ld,"
|
"writeLocalDateHMSFromUTC('%s',%ld,"
|
||||||
"%u,', ','%s',true,false,0x6);"
|
"%u,', ','%s',true,false,0x6);"
|
||||||
|
|
88
swad_text.c
88
swad_text.c
|
@ -22025,7 +22025,7 @@ const char *Txt_Modify_user_in_the_course_X = // Warning: it is very important t
|
||||||
|
|
||||||
const char *Txt_Month =
|
const char *Txt_Month =
|
||||||
#if L==1 // ca
|
#if L==1 // ca
|
||||||
"Mes"; // Necessita traduccio
|
"Mes";
|
||||||
#elif L==2 // de
|
#elif L==2 // de
|
||||||
"Monat";
|
"Monat";
|
||||||
#elif L==3 // en
|
#elif L==3 // en
|
||||||
|
@ -22039,11 +22039,53 @@ const char *Txt_Month =
|
||||||
#elif L==7 // it
|
#elif L==7 // it
|
||||||
"Mese";
|
"Mese";
|
||||||
#elif L==8 // pl
|
#elif L==8 // pl
|
||||||
"Miesiac";
|
"Miesiąc";
|
||||||
#elif L==9 // pt
|
#elif L==9 // pt
|
||||||
"Mês";
|
"Mês";
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
const char *Txt_month =
|
||||||
|
#if L==1 // ca
|
||||||
|
"mes";
|
||||||
|
#elif L==2 // de
|
||||||
|
"Monat";
|
||||||
|
#elif L==3 // en
|
||||||
|
"month";
|
||||||
|
#elif L==4 // es
|
||||||
|
"mes";
|
||||||
|
#elif L==5 // fr
|
||||||
|
"mois";
|
||||||
|
#elif L==6 // gn
|
||||||
|
"jasy";
|
||||||
|
#elif L==7 // it
|
||||||
|
"mese";
|
||||||
|
#elif L==8 // pl
|
||||||
|
"miesiąc";
|
||||||
|
#elif L==9 // pt
|
||||||
|
"mês";
|
||||||
|
#endif
|
||||||
|
|
||||||
|
const char *Txt_months =
|
||||||
|
#if L==1 // ca
|
||||||
|
"mesos";
|
||||||
|
#elif L==2 // de
|
||||||
|
"Monate";
|
||||||
|
#elif L==3 // en
|
||||||
|
"months";
|
||||||
|
#elif L==4 // es
|
||||||
|
"meses";
|
||||||
|
#elif L==5 // fr
|
||||||
|
"mois";
|
||||||
|
#elif L==6 // gn
|
||||||
|
"meses"; // Okoteve traducción
|
||||||
|
#elif L==7 // it
|
||||||
|
"mesi";
|
||||||
|
#elif L==8 // pl
|
||||||
|
"miesiące";
|
||||||
|
#elif L==9 // pt
|
||||||
|
"meses";
|
||||||
|
#endif
|
||||||
|
|
||||||
const char *Txt_MONTHS_SMALL[12] =
|
const char *Txt_MONTHS_SMALL[12] =
|
||||||
{
|
{
|
||||||
#if L==1 // ca
|
#if L==1 // ca
|
||||||
|
@ -52731,6 +52773,27 @@ const char *Txt_Year = // 1984, 2011...
|
||||||
"Ano";
|
"Ano";
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
const char *Txt_year = // 1984, 2011...
|
||||||
|
#if L==1 // ca
|
||||||
|
"any";
|
||||||
|
#elif L==2 // de
|
||||||
|
"Jahr";
|
||||||
|
#elif L==3 // en
|
||||||
|
"year";
|
||||||
|
#elif L==4 // es
|
||||||
|
"año";
|
||||||
|
#elif L==5 // fr
|
||||||
|
"année";
|
||||||
|
#elif L==6 // gn
|
||||||
|
"ary";
|
||||||
|
#elif L==7 // it
|
||||||
|
"anno";
|
||||||
|
#elif L==8 // pl
|
||||||
|
"rok";
|
||||||
|
#elif L==9 // pt
|
||||||
|
"ano";
|
||||||
|
#endif
|
||||||
|
|
||||||
const char *Txt_Year_OF_A_DEGREE = // 1, 2, 3..., not 1984, 2011...
|
const char *Txt_Year_OF_A_DEGREE = // 1, 2, 3..., not 1984, 2011...
|
||||||
#if L==1 // ca
|
#if L==1 // ca
|
||||||
"Any o semestre";
|
"Any o semestre";
|
||||||
|
@ -53015,6 +53078,27 @@ const char *Txt_YEAR_OF_DEGREE[1 + Deg_MAX_YEARS_PER_DEGREE] =
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const char *Txt_years =
|
||||||
|
#if L==1 // ca
|
||||||
|
"anys";
|
||||||
|
#elif L==2 // de
|
||||||
|
"Jahre";
|
||||||
|
#elif L==3 // en
|
||||||
|
"years";
|
||||||
|
#elif L==4 // es
|
||||||
|
"años";
|
||||||
|
#elif L==5 // fr
|
||||||
|
"années";
|
||||||
|
#elif L==6 // gn
|
||||||
|
"ary";
|
||||||
|
#elif L==7 // it
|
||||||
|
"anni";
|
||||||
|
#elif L==8 // pl
|
||||||
|
"lat";
|
||||||
|
#elif L==9 // pt
|
||||||
|
"anos";
|
||||||
|
#endif
|
||||||
|
|
||||||
const char *Txt_YES =
|
const char *Txt_YES =
|
||||||
#if L==1 // ca
|
#if L==1 // ca
|
||||||
"SÍ";
|
"SÍ";
|
||||||
|
|
Loading…
Reference in New Issue