mirror of
https://github.com/acanas/swad-core.git
synced 2024-06-02 14:55:23 +02:00
Version 16.120.2
This commit is contained in:
parent
b0a9ad9582
commit
796c3c8039
|
@ -193,13 +193,14 @@
|
||||||
/****************************** Public constants *****************************/
|
/****************************** Public constants *****************************/
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
#define Log_PLATFORM_VERSION "SWAD 16.120.1 (2017-01-19)"
|
#define Log_PLATFORM_VERSION "SWAD 16.120.2 (2017-01-19)"
|
||||||
#define CSS_FILE "swad16.119.4.css"
|
#define CSS_FILE "swad16.119.4.css"
|
||||||
#define JS_FILE "swad16.119.3.js"
|
#define JS_FILE "swad16.119.3.js"
|
||||||
|
|
||||||
// Number of lines (includes comments but not blank lines) has been got with the following command:
|
// 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
|
// nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*?.h sql/swad*.sql | tail -1
|
||||||
/*
|
/*
|
||||||
|
Version 16.120.2: Jan 19, 2017 Changed the question to confirm user's enrollment. (211954 lines)
|
||||||
Version 16.120.1: Jan 19, 2017 From now on, a teacher A can enroll another user B as a teacher in their courses, although user B is not yet a teacher in any course. (? lines)
|
Version 16.120.1: Jan 19, 2017 From now on, a teacher A can enroll another user B as a teacher in their courses, although user B is not yet a teacher in any course. (? lines)
|
||||||
Version 16.120: Jan 19, 2017 Fixed bug when limiting length of links. (211934 lines)
|
Version 16.120: Jan 19, 2017 Fixed bug when limiting length of links. (211934 lines)
|
||||||
Version 16.119.4: Jan 18, 2017 Changes in layout of current data and time. (211882 lines)
|
Version 16.119.4: Jan 18, 2017 Changes in layout of current data and time. (211882 lines)
|
||||||
|
|
|
@ -320,7 +320,8 @@ void Enr_WriteFormToReqAnotherUsrID (Act_Action_t NextAction)
|
||||||
void Enr_ReqAcceptRegisterInCrs (void)
|
void Enr_ReqAcceptRegisterInCrs (void)
|
||||||
{
|
{
|
||||||
extern const char *Txt_Enrollment;
|
extern const char *Txt_Enrollment;
|
||||||
extern const char *Txt_A_teacher_or_administrator_has_enrolled_you_into_the_course_;
|
extern const char *Txt_A_teacher_or_administrator_has_enrolled_you_as_X_into_the_course_Y;
|
||||||
|
extern const char *Txt_ROLES_SINGUL_abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
|
||||||
extern const char *Txt_Confirm_my_enrollment;
|
extern const char *Txt_Confirm_my_enrollment;
|
||||||
extern const char *Txt_Remove_me_from_this_course;
|
extern const char *Txt_Remove_me_from_this_course;
|
||||||
|
|
||||||
|
@ -328,7 +329,8 @@ void Enr_ReqAcceptRegisterInCrs (void)
|
||||||
Lay_StartRoundFrame (NULL,Txt_Enrollment,NULL,NULL);
|
Lay_StartRoundFrame (NULL,Txt_Enrollment,NULL,NULL);
|
||||||
|
|
||||||
/***** Show message *****/
|
/***** Show message *****/
|
||||||
sprintf (Gbl.Message,Txt_A_teacher_or_administrator_has_enrolled_you_into_the_course_,
|
sprintf (Gbl.Message,Txt_A_teacher_or_administrator_has_enrolled_you_as_X_into_the_course_Y,
|
||||||
|
Txt_ROLES_SINGUL_abc[Gbl.Usrs.Me.UsrDat.RoleInCurrentCrsDB][Gbl.Usrs.Me.UsrDat.Sex],
|
||||||
Gbl.CurrentCrs.Crs.FullName);
|
Gbl.CurrentCrs.Crs.FullName);
|
||||||
Lay_ShowAlert (Lay_INFO,Gbl.Message);
|
Lay_ShowAlert (Lay_INFO,Gbl.Message);
|
||||||
|
|
||||||
|
|
54
swad_text.c
54
swad_text.c
|
@ -1496,52 +1496,62 @@ const char *Txt_A_student_can_only_belong_to_one_group =
|
||||||
"Um aluno pode pertencer a um grupo";
|
"Um aluno pode pertencer a um grupo";
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
const char *Txt_A_teacher_or_administrator_has_enrolled_you_into_the_course_ = // Warning: it is very important to include %s in the following sentences
|
const char *Txt_A_teacher_or_administrator_has_enrolled_you_as_X_into_the_course_Y = // Warning: it is very important to include two %s in the following sentences
|
||||||
#if L==1
|
#if L==1
|
||||||
"Un profesor/a o un administrador/a le ha inscrito"
|
"Un professor/a o un administrador/a l'ha inscrit"
|
||||||
" en la asignatura <strong>%s</strong>."
|
" com a <strong>%s</strong>"
|
||||||
" ¿Confirma la inscripción"
|
" en l'assignatura <strong>%s</strong>."
|
||||||
" o prefiere ser eliminado de la asignatura?"; // Necessita traduccio
|
" ¿Confirma la inscripció"
|
||||||
|
" o prefereix ser eliminat de l'assignatura?";
|
||||||
#elif L==2
|
#elif L==2
|
||||||
"Ein Lehrer oder Administrator hat Sie"
|
"Ein Lehrer oder ein Administrator hat Sie"
|
||||||
" im Kurs <strong>%s</strong> eingeschrieben."
|
" als <strong>%s</strong>"
|
||||||
" Möchten Sie, dass die Registrierung"
|
" in den Kurs <strong>%s</strong> eingeschrieben."
|
||||||
" oder bevorzugen Sie, um aus dem Kurs?";
|
" Möchten Sie die Anmeldung bestätigen"
|
||||||
|
" oder ziehen Sie es vor,"
|
||||||
|
" aus dem Kurs entfernt zu werden?";
|
||||||
#elif L==3
|
#elif L==3
|
||||||
"A teacher or administrator has enrolled you"
|
"A teacher or an administrator has enrolled you"
|
||||||
" into the course <strong>%s</strong>."
|
" as a <strong>%s</strong>"
|
||||||
|
"into the course <strong>%s</strong>."
|
||||||
" Do you want to confirm the enrollment"
|
" Do you want to confirm the enrollment"
|
||||||
" or do you prefer to be removed from the course?";
|
" or do you prefer to be removed from the course?";
|
||||||
#elif L==4
|
#elif L==4
|
||||||
"Un profesor/a o un administrador/a le ha inscrito"
|
"Un profesor/a o un administrador/a le ha inscrito"
|
||||||
|
" como <strong>%s</strong>"
|
||||||
" en la asignatura <strong>%s</strong>."
|
" en la asignatura <strong>%s</strong>."
|
||||||
" ¿Confirma la inscripción"
|
" ¿Confirma la inscripción"
|
||||||
" o prefiere ser eliminado de la asignatura?";
|
" o prefiere ser eliminado/a de la asignatura?";
|
||||||
#elif L==5
|
#elif L==5
|
||||||
"Un professeur ou un administrateur vous a enregistré"
|
"Un professeur ou un administrateur vous a enregistré"
|
||||||
|
" en tant que <strong>%s</strong>"
|
||||||
" dans la matière <strong>%s</strong>."
|
" dans la matière <strong>%s</strong>."
|
||||||
" Voulez-vous confirmer l'enregistrement"
|
" Voulez-vous confirmer l'inscription"
|
||||||
" ou préférez-vous être enlevé de la matière?";
|
" ou préférez-vous être retiré de la matière?";
|
||||||
#elif L==6
|
#elif L==6
|
||||||
"Un profesor/a o un administrador/a le ha inscrito "
|
"Un profesor/a o un administrador/a le ha inscrito"
|
||||||
|
" como <strong>%s</strong>"
|
||||||
" en la asignatura <strong>%s</strong>."
|
" en la asignatura <strong>%s</strong>."
|
||||||
" ¿Confirma la inscripción"
|
" ¿Confirma la inscripción"
|
||||||
" o prefiere ser eliminado de la asignatura?"; // Okoteve traducción
|
" o prefiere ser eliminado/a de la asignatura?"; // Okoteve traducción
|
||||||
#elif L==7
|
#elif L==7
|
||||||
"Un insegnante o amministratore ti a registrato"
|
"Un insegnante o amministratore ti a registrato"
|
||||||
|
" come <strong>%s</strong>"
|
||||||
" nel corso <strong>%s</strong>."
|
" nel corso <strong>%s</strong>."
|
||||||
" Vuoi confermare la registrazione"
|
" Vuoi confermare la registrazione"
|
||||||
" o preferisci essere rimosso da questo corso?";
|
" o preferisci essere rimosso da questo corso?";
|
||||||
#elif L==8
|
#elif L==8
|
||||||
"A teacher or administrator has enrolled you"
|
"Nauczyciel lub administrator zapisał cię"
|
||||||
" into the course <strong>%s</strong>."
|
" jako <strong>%s</strong>"
|
||||||
" Do you want to confirm the enrollment"
|
" do kursu <strong>%s</strong>."
|
||||||
" or do you prefer to be removed from the course?"; // Potrzebujesz tlumaczenie
|
" Czy chcesz, aby potwierdzić rejestrację"
|
||||||
|
" czy wolisz zostać usunięte z kursu?";
|
||||||
#elif L==9
|
#elif L==9
|
||||||
"Um professor ou administrador tem registrado você"
|
"Um professor/a ou administrador/a tem registrado você"
|
||||||
|
" como <strong>%s</strong>"
|
||||||
" na disciplina <strong>%s</strong>."
|
" na disciplina <strong>%s</strong>."
|
||||||
" Você quer para confirmar a inscrição"
|
" Você quer para confirmar a inscrição"
|
||||||
" ou você prefere para ser removido da disciplina?";
|
" ou você prefere para ser removido/a da disciplina?";
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
const char *Txt_A_user_can_not_have_more_than_X_IDs =
|
const char *Txt_A_user_can_not_have_more_than_X_IDs =
|
||||||
|
|
Loading…
Reference in New Issue
Block a user