Version 14.73.5

This commit is contained in:
Antonio Cañas Vargas 2015-02-05 00:55:47 +01:00
parent 53cf1c3097
commit 53aaa52bb3
4 changed files with 80 additions and 11 deletions

View File

@ -41,11 +41,12 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 14.73.4 (2015/02/04)"
#define Log_PLATFORM_VERSION "SWAD 14.73.4 (2015/02/05)"
// 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 | tail -1
/*
Version 14.73.5: Feb 05, 2015 New message when user does not belong to any course. (177170 lines)
Version 14.73.4: Feb 04, 2015 Changes in institution configuration. (177103 lines)
Version 14.73.3: Feb 04, 2015 Changes in degree configuration. (177080 lines)
Version 14.73.2: Feb 04, 2015 Changes in centre configuration. (177057 lines)

View File

@ -546,7 +546,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_My_courses;
extern const char *Txt_TABS_FULL_TXT[Tab_NUM_TABS];
extern const char *Txt_System;
extern const char *Txt_Go_to_X;
struct Country Cty;
struct Institution Ins;
@ -587,18 +587,18 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
fprintf (Gbl.F.Out,"<li style=\"height:20px;\">");
Act_FormGoToStart (ActMnu);
Par_PutHiddenParamUnsigned ("NxtTab",(unsigned) TabSys);
Act_LinkFormSubmit (Txt_TABS_FULL_TXT[TabSys],
Act_LinkFormSubmit (Txt_System,
The_ClassFormul[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<img src=\"%s/sys16x16.gif\" alt=\"%s\" title=\"%s\""
" style=\"width:16px; height:16px;"
" vertical-align:middle;\" />",
Gbl.Prefs.IconsURL,
Txt_TABS_FULL_TXT[TabSys],
Txt_TABS_FULL_TXT[TabSys]);
Txt_System,
Txt_System);
Highlight = (Gbl.CurrentCty.Cty.CtyCod <= 0);
if (Highlight)
fprintf (Gbl.F.Out,"<strong>");
fprintf (Gbl.F.Out,"&nbsp;%s",Txt_TABS_FULL_TXT[TabSys]);
fprintf (Gbl.F.Out,"&nbsp;%s",Txt_System);
if (Highlight)
fprintf (Gbl.F.Out,"</strong>");
fprintf (Gbl.F.Out,"</a>"
@ -2964,6 +2964,8 @@ static void Crs_PutLinkToGoToCrs (struct Course *Crs)
void Crs_ReqSelectOneOfMyCourses (void)
{
extern const char *Txt_You_are_not_enrolled_in_any_course[Usr_NUM_SEXS];
extern const char *Txt_You_can_search_for_courses_select_them_and_request_your_enrollment_in_them;
extern const char *Txt_If_you_can_not_find_your_institution_your_centre_your_degree_or_your_courses_you_can_create_them;
/***** Search / select more courses *****/
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
@ -2977,7 +2979,13 @@ void Crs_ReqSelectOneOfMyCourses (void)
if (Gbl.Usrs.Me.MyCourses.Num)
Crs_WriteListMyCoursesToSelectOne ();
else
Lay_ShowAlert (Lay_INFO,Txt_You_are_not_enrolled_in_any_course[Gbl.Usrs.Me.UsrDat.Sex]);
{
sprintf (Gbl.Message,"%s<br />%s<br />%s",
Txt_You_are_not_enrolled_in_any_course[Gbl.Usrs.Me.UsrDat.Sex],
Txt_You_can_search_for_courses_select_them_and_request_your_enrollment_in_them,
Txt_If_you_can_not_find_your_institution_your_centre_your_degree_or_your_courses_you_can_create_them);
Lay_ShowAlert (Lay_INFO,Gbl.Message);
}
}
/*****************************************************************************/

View File

@ -644,17 +644,17 @@ static void Deg_WriteSelectorOfDegree (Act_Action_t NextAction)
void Deg_WriteCtyInsCtrDeg (void)
{
extern const char *The_ClassDegree[The_NUM_THEMES];
extern const char *Txt_TABS_FULL_TXT[Tab_NUM_TABS];
extern const char *Txt_System;
char DegreeShortName[Deg_MAX_LENGTH_DEGREE_FULL_NAME+1]; // Full name of degree
/***** Form to go to the system *****/
Act_FormGoToStart (ActMnu);
Par_PutHiddenParamUnsigned ("NxtTab",(unsigned) TabSys);
Act_LinkFormSubmit (Txt_TABS_FULL_TXT[TabSys],
Act_LinkFormSubmit (Txt_System,
The_ClassDegree[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s</a>"
"</form>",
Txt_TABS_FULL_TXT[TabSys]);
Txt_System);
if (Gbl.CurrentCty.Cty.CtyCod > 0) // If country selected...
{

View File

@ -13245,6 +13245,36 @@ const char *Txt_If_this_is_a_new_user_in_X_you_should_indicate_her_his_ID = // W
" you should indicate her/his ID."; // Necessita de tradução
#endif
const char *Txt_If_you_can_not_find_your_institution_your_centre_your_degree_or_your_courses_you_can_create_them =
#if L==0
"Si no trobes la seva instituci&oacute;, el seu centre,"
" la seva titulaci&oacute; o les seves assignatures, pot crear-los.";
#elif L==1
"Wenn Sie Ihre Institution, Ihre Zentrum, Ihr Studium"
" oder Ihre Kurse nicht finden k&oacute;nnen, k&oacute;nnen Sie sie erstellen.";
#elif L==2
"If you can not find your institution, your centre,"
" your degree or your courses, you can create them.";
#elif L==3
"Si no encuentra su instituci&oacute;n, su centro,"
" su titulaci&oacute;n o sus asignaturas, puede crearlos.";
#elif L==4
"Si vous ne trouvez pas votre &eacute;tablissement, votre centre,"
" votre &eacute;tude ou de vos mati&egrave;res, vous pouvez les cr&eacute;er.";
#elif L==5
"Si no encuentra su instituci&oacute;n, su centro,"
" su titulaci&oacute;n o sus asignaturas, puede crearlos."; // Okoteve traducción
#elif L==6
"Se non riesci a trovare il vostro istituto, il centro,"
" il vostro grado o vostri corsi, &egrave; possibile creare.";
#elif L==7
"Je&sacute;li nie mo&zdot;esz znale&zacute;&cacute; instytucj&eogo, Centrum,"
" studia lub kursy swoich, mo&zdot;na je tworzy&cacute;.";
#elif L==8
"Se voc&ecirc; n&atilde;o consegue encontrar a sua institui&ccedil;&atilde;o, o seu centro,"
" o seu grau ou seus disciplinas, voc&ecirc; pode cri&aacute;-los.";
#endif
const char *Txt_If_you_have_an_Android_device_try_SWADroid =
#if L==0
"Si teniu un dispositiu Android, provi SWADroid";
@ -36912,7 +36942,7 @@ const char *Txt_Table_not_found_in_the_file_of_marks =
const char *Txt_TABS_FULL_TXT[Tab_NUM_TABS] =
{
// TabUnk
// TabUnk
NULL,
// TabSys
#if L==0
@ -49162,6 +49192,36 @@ const char *Txt_You_can_register_voluntarily_in_one_or_more_groups_of_type_X = /
" in one or more groups of type %s."; // Necessita de tradução
#endif
const char *Txt_You_can_search_for_courses_select_them_and_request_your_enrollment_in_them =
#if L==0
"Podeu cercar assignatures, seleccionar-les"
" i sol·licitar la seva inscripci&oacute; en elles.";
#elif L==1
"Sie k&ouml;nnen f&uuml;r Kurse zu suchen, w&auml;hlen Sie sie aus"
" und fordern Sie Ihre Anmeldung in ihnen.";
#elif L==2
"You can search for courses, select them"
" and request your enrollment in them.";
#elif L==3
"Puede buscar asignaturas, seleccionarlas"
" y solicitar su inscripci&oacute;n en ellas.";
#elif L==4
"Vous pouvez rechercher des cours, s&eacute;lectionnez-les"
" et demander votre inscription en eux.";
#elif L==5
"Puede buscar asignaturas, seleccionarlas"
" y solicitar su inscripci&oacute;n en ellas."; // Okoteve traducción"
#elif L==6
"&Egrave; possibile cercare corsi, selezionarli"
" e richiedere l'iscrizione in loro.";
#elif L==7
"Mo&zdot;esz szuka&cacute; kurs&oacute;w, zaznacz je"
" i poprosi&cacute; o rejestracj&eogon; w nich.";
#elif L==8
"Voc&ecirc; pode procurar por cursos, selecion&aacute;-los"
" e solicitar a sua inscri&ccedil;&atilde;o nos mesmos.";
#endif
const char *Txt_You_can_send_a_file_with_an_image_in_png_format_transparent_background_and_size_X_Y = // Warning: it is very important to include two %u in the following sentences
#if L==0
"Puede enviar un archivo con una imagen en formato <em>png</em>,"