From c7241ba15852da00df19d2b4632ee3175ab9d7a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Wed, 15 Apr 2015 19:48:33 +0200 Subject: [PATCH] Version 14.113.3 --- swad_account.c | 7 ++-- swad_changelog.h | 3 +- swad_config.h | 4 +-- swad_file_browser.c | 1 + swad_text.c | 87 ++++++++++++++++++++++++++++++++++----------- 5 files changed, 76 insertions(+), 26 deletions(-) diff --git a/swad_account.c b/swad_account.c index c872ada28..2e5047dd7 100644 --- a/swad_account.c +++ b/swad_account.c @@ -523,12 +523,15 @@ static void Acc_CreateNewEncryptedUsrCod (struct UsrData *UsrDat) void Acc_AfterCreationNewAccount (void) { - extern const char *Txt_New_account_created; + extern const char *Txt_Congratulations_You_have_created_your_account_X_Now_Y_will_request_you_; if (Gbl.Usrs.Me.Logged) // If account has been created without problem, I am logged { /***** Show message of success *****/ - Lay_ShowAlert (Lay_SUCCESS,Txt_New_account_created); + sprintf (Gbl.Message,Txt_Congratulations_You_have_created_your_account_X_Now_Y_will_request_you_, + Gbl.Usrs.Me.UsrDat.Nickname, + Cfg_PLATFORM_SHORT_NAME); + Lay_ShowAlert (Lay_SUCCESS,Gbl.Message); /***** Show form with account data *****/ Acc_ShowFormChangeMyAccount (); diff --git a/swad_changelog.h b/swad_changelog.h index 4b2721f58..ce9024605 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -103,11 +103,12 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 14.113.2 (2015/04/14)" +#define Log_PLATFORM_VERSION "SWAD 14.113.3 (2015/04/15)" // 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 14.113.3: Apr 15, 2015 New welcome message after creating an account. (184536 lines) Version 14.113.2: Apr 14, 2015 Fixed bug when compressing users' works. (184486 lines) Version 14.113.1: Apr 14, 2015 Fixed bug when compressing users' works, reported by José Martínez Aroza. (184484 lines) Version 14.113: Apr 12, 2015 Refactoring code related to frames. (184462 lines) diff --git a/swad_config.h b/swad_config.h index 623d8797a..b8ce77004 100644 --- a/swad_config.h +++ b/swad_config.h @@ -28,9 +28,9 @@ /** Uncomment one of the following installations of SWAD or create your own **/ /*****************************************************************************/ -//#define LOCALHOST_UBUNTU // Comment this line if not applicable +#define LOCALHOST_UBUNTU // Comment this line if not applicable //#define OPENSWAD_ORG // Comment this line if not applicable -#define SWAD_UGR_ES // Comment this line if not applicable +//#define SWAD_UGR_ES // Comment this line if not applicable //#define WWW_CEVUNA_UNA_PY // Comment this line if not applicable /*****************************************************************************/ diff --git a/swad_file_browser.c b/swad_file_browser.c index 9944cc663..0a1bd7fa0 100644 --- a/swad_file_browser.c +++ b/swad_file_browser.c @@ -1201,6 +1201,7 @@ const char *Brw_MIMETypesAllowed[] = "application/x-ms-project", // Microsoft Project mpp "application/x-msword", // PDF? "application/x-mswrite", // PDF + "application/x-octet-stream", // PDF "application/x-rar", // .rar "application/x-shockwave-flash", // Flash "application/x-shockwave-flash2-preview", // Flash diff --git a/swad_text.c b/swad_text.c index 8a17c5eab..d082c4dbe 100644 --- a/swad_text.c +++ b/swad_text.c @@ -4632,6 +4632,72 @@ const char *Txt_Confirm_my_enrollment = "Confirmar o meu registo"; #endif +const char *Txt_Congratulations_You_have_created_your_account_X_Now_Y_will_request_you_ = // Warning: it is very important to include two %s in the following sentences +#if L==0 + "Enhorabona! Ha creat el seu compte @%s." + " Ara %s li demanarà algunes dades per completar el seu perfil" + " i després podrà sol·licitar la seva inscripció en assignatures." + " Si no hi ha una assignatura," + " vostè pot crear abans de sol·licitar la seva inscripció en ella" + " (el mateix és aplicable a institucions, centres i titulacions)."; +#elif L==1 + "Herzlichen Glückwunsch! Du hast Dein Konto @%s erstellt." + " Jetzt %s finden Sie einige Daten in Ihrem Profil" + " vervollständigen anfordern und dann werden Sie in der Lage," + " für die Einschreibung in Kurse an." + " Wenn ein Kurs nicht vorhanden ist," + " können Sie es vor der Anwendung für die Immatrikulation in es zu erstellen" + " (das gleiche gilt für Einrichtungen, Zentren und Grad)."; +#elif L==2 + "Congratulations! You have created your account @%s." + " Now %s will request you some data to complete your profile" + " and then you will be able to apply for enrollment in courses." + " If a course does not exist," + " you can create it before applying for enrollment in it" + " (the same applies to institutions, centres and degrees)."; +#elif L==3 + "¡Enhorabuena! Ha creado su cuenta @%s." + " Ahora %s le solicitará algunos datos para completar su perfil" + " y después podrá solicitar su inscripción en asignaturas." + " Si una asignatura no existe," + " usted puede crearla antes de solicitar su inscripción en ella" + " (lo mismo es aplicable a instituciones, centros y titulaciones)."; +#elif L==4 + "Félicitations! Vous avez créé votre compte @%s." + " Maintenant %s vous demanderá certaines données pour compléter votre profil" + " et vous serez alors en mesure de demander l'inscription à des matières." + " Si une matière ne existe pas," + " vous pouvez le créer avant de demander l'inscription en elle" + " (la même chose se applique aux institutions, centres et degrés)."; +#elif L==5 + "¡Enhorabuena! Ha creado su cuenta @%s." + " Ahora %s le solicitará algunos datos para completar su perfil" + " y después usted podrá solicitar su inscripción en asignaturas." + " Si una asignatura no existe," + " usted puede crearla antes de solicitar su inscripción en ella" + " (lo mismo es aplicable a instituciones, centros y titulaciones)."; // Okoteve traducción +#elif L==6 + "Congratulazioni! Avete creato il vostro account %s." + " Ora %s chiederà alcuni dati per completare il tuo profilo" + " e allora si sarà in grado di applicare per l'iscrizione ai corsi." + " Se un corso non esiste, è possibile crearlo prima di applicare per l'iscrizione in esso" + " (lo stesso vale per le istituzioni, centri e gradi)."; +#elif L==7 + "Gratulujemy! Utworzeniu konta @%s." + " Teraz %s zwróci Ci kilka danych, aby zakończyć swój profil," + " a następnie będzie można ubiegać się o przyjęcie na kursy." + " Jeśli kurs nie istnieje," + " można go utworzyć przed ubieganiem siè o przyjęcie w nim" + " (to samo odnosi się do instytucji, placówek i stopni)."; +#elif L==8 + "Parab&eaacute;ns! Você criou seu ACC conta." + " Agora %s vai pedir-lhe alguns dados para completar o seu perfil" + " e, em seguida, você será capaz de aplicar para a matrícula em cursos." + " Se um curso não existir," + " você pode criá-lo antes de solicitar a inscrição do mesmo" + " (o mesmo se aplica às instituições, centros e graus)."; +#endif + const char *Txt_Connected_PLURAL = #if L==0 "Connectats"; @@ -22050,27 +22116,6 @@ const char *Txt_Name = "Nome"; #endif -const char *Txt_New_account_created = -#if L==0 - "Nou compte creat."; -#elif L==1 - "Neues Konto erstellt."; -#elif L==2 - "New account created."; -#elif L==3 - "Nueva cuenta creada."; -#elif L==4 - "Nouveau compte créé."; -#elif L==5 - "Nueva cuenta creada."; // Okoteve traducción -#elif L==6 - "Nuovo account creato."; -#elif L==7 - "Nowe konto utworzone."; -#elif L==8 - "Nova conta criada."; -#endif - const char *Txt_New_assignment = #if L==0 "Nova activitat";