Index: lams_central/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -rd3c9d3f03c16e8f7025d7b2bfe84e68af4fc0746 -rb04831bae6986da3f6ed5dc515f209d98d13e6ed --- lams_central/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision d3c9d3f03c16e8f7025d7b2bfe84e68af4fc0746) +++ lams_central/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision b04831bae6986da3f6ed5dc515f209d98d13e6ed) @@ -218,7 +218,7 @@ index.searchlesson =Learner Search index.searchlesson.tooltip =Search learners across lessons lessonsearch.noresults =No Lessons found -error.multiple.emails =There are multiple users in LAMS with the given email. Email could not be sent. Please try again using your username, or contact your System Administrator. +error.email.internal =An internal error occured. Try again using your username or contact your System Administrator. More information is provided in application logs. label.lamscommunity.message =Login to lamscommunity.org label.lamscommunity.login =lamscommunity.org login: label.lamscommunity.password =lamscommunity.org password: Index: lams_central/conf/language/lams/ApplicationResources_cs_CZ.properties =================================================================== diff -u -rdb46abfd22650e81e900fbbf9f93cee55421a3fd -rb04831bae6986da3f6ed5dc515f209d98d13e6ed --- lams_central/conf/language/lams/ApplicationResources_cs_CZ.properties (.../ApplicationResources_cs_CZ.properties) (revision db46abfd22650e81e900fbbf9f93cee55421a3fd) +++ lams_central/conf/language/lams/ApplicationResources_cs_CZ.properties (.../ApplicationResources_cs_CZ.properties) (revision b04831bae6986da3f6ed5dc515f209d98d13e6ed) @@ -221,7 +221,6 @@ index.searchlesson =Vyhled\u00e1n\u00ed student\u016f index.searchlesson.tooltip =Vyhled\u00e1n\u00ed student\u016f v lekc\u00edch lessonsearch.noresults =\u017d\u00e1dn\u00e9 lekce nebyly nalezeny -error.multiple.emails =Existuje v\u00edce u\u017eivatel\u016f v LAMS s danou e-mailovou adresou. E-mail nelze odeslat. Zkuste to pros\u00edm znovu pomoc\u00ed sv\u00e9ho u\u017eivatelsk\u00e9ho jm\u00e9na, nebo se obra\u0165te na spr\u00e1vce syst\u00e9mu. label.lamscommunity.message =P\u0159ihl\u00e1\u0161en\u00ed do lamscommunity.org label.lamscommunity.login =lamscommunity.org p\u0159ihla\u0161ovac\u00ed jm\u00e9no: label.lamscommunity.password =lamscommunity.org heslo: Index: lams_central/conf/language/lams/ApplicationResources_de_DE.properties =================================================================== diff -u -r542c2cefed9f7ef2c515eff59a06f508330e24f7 -rb04831bae6986da3f6ed5dc515f209d98d13e6ed --- lams_central/conf/language/lams/ApplicationResources_de_DE.properties (.../ApplicationResources_de_DE.properties) (revision 542c2cefed9f7ef2c515eff59a06f508330e24f7) +++ lams_central/conf/language/lams/ApplicationResources_de_DE.properties (.../ApplicationResources_de_DE.properties) (revision b04831bae6986da3f6ed5dc515f209d98d13e6ed) @@ -221,7 +221,6 @@ index.searchlesson =Teilnehmersuche index.searchlesson.tooltip =Suche Teilnehmer quer durch Lektionen lessonsearch.noresults =Es wurden keine Lektionen gefunden -error.multiple.emails =Es gibt innerhalb von LAMS mehrere Benutzer mit dieser E-Mail Adresse. Die E-Mail konnte deswegen nicht gesendet werden. Bitte versuchen Sie es f\u00fcr Ihren Benutzernamen erneut oder kontaktieren Sie Ihren Systemadministrator. label.lamscommunity.message =Login zu lamscommunity.org label.lamscommunity.login =lamscommunity.org Login: label.lamscommunity.password =lamscommunity.org Passwort: Index: lams_central/conf/language/lams/ApplicationResources_el_GR.properties =================================================================== diff -u -r2c3974ea0cd95d07baeffd9d0e07e93da2e76c1a -rb04831bae6986da3f6ed5dc515f209d98d13e6ed --- lams_central/conf/language/lams/ApplicationResources_el_GR.properties (.../ApplicationResources_el_GR.properties) (revision 2c3974ea0cd95d07baeffd9d0e07e93da2e76c1a) +++ lams_central/conf/language/lams/ApplicationResources_el_GR.properties (.../ApplicationResources_el_GR.properties) (revision b04831bae6986da3f6ed5dc515f209d98d13e6ed) @@ -220,7 +220,6 @@ index.searchlesson =\u0391\u03bd\u03b1\u03b6\u03ae\u03c4\u03b7\u03c3\u03b7 index.searchlesson.tooltip =\u0391\u03bd\u03b1\u03b6\u03ae\u03c4\u03b7\u03c3\u03b7 \u03c3\u03c0\u03bf\u03c5\u03b4\u03b1\u03c3\u03c4\u03ce\u03bd \u03c3\u03b5 \u03cc\u03bb\u03b1 \u03c4\u03b1 \u03bc\u03b1\u03b8\u03ae\u03bc\u03b1\u03c4\u03b1 lessonsearch.noresults =\u0394\u03b5\u03bd \u03b2\u03c1\u03ad\u03b8\u03b7\u03ba\u03b1\u03bd \u039c\u03b1\u03b8\u03ae\u03bc\u03b1\u03c4\u03b1 -error.multiple.emails =\u03a5\u03c0\u03ac\u03c1\u03c7\u03bf\u03c5\u03bd \u03ac\u03bb\u03bb\u03bf\u03b9 \u03c7\u03c1\u03ae\u03c3\u03c4\u03b5\u03c2 \u03c3\u03c4\u03bf LAMS \u03bc\u03b5 \u03c4\u03bf\u03bd \u03c3\u03c5\u03b3\u03ba\u03b5\u03ba\u03c1\u03b9\u03bc\u03ad\u03bd\u03bf e-mail. \u03a4\u03bf e-mail \u03b4\u03b5\u03bd \u03bc\u03c0\u03bf\u03c1\u03b5\u03af \u03bd\u03b1 \u03c3\u03c4\u03b1\u03bb\u03b5\u03af. \u0394\u03bf\u03ba\u03b9\u03bc\u03ac\u03c3\u03c4\u03b5 \u03be\u03b1\u03bd\u03ac \u03c7\u03c1\u03b7\u03c3\u03b9\u03bc\u03bf\u03c0\u03bf\u03b9\u03ce\u03bd\u03c4\u03b1\u03c2 \u03c4\u03bf \u03cc\u03bd\u03bf\u03bc\u03b1 \u03c7\u03c1\u03ae\u03c3\u03c4\u03b7 \u03c3\u03b1\u03c2 \u03ae \u03b5\u03c0\u03b9\u03ba\u03bf\u03b9\u03bd\u03c9\u03bd\u03ae\u03c3\u03c4\u03b5 \u03bc\u03b5 \u03c4\u03bf \u0394\u03b9\u03b1\u03c7\u03b5\u03b9\u03c1\u03b9\u03c3\u03c4\u03ae \u03c4\u03bf\u03c5 \u03a3\u03c5\u03c3\u03c4\u03ae\u03bc\u03b1\u03c4\u03cc\u03c2 \u03c3\u03b1\u03c2. label.lamscommunity.message =\u03a3\u03cd\u03bd\u03b4\u03b5\u03c3\u03b7 \u03bc\u03b5 lamscommunity.org label.lamscommunity.login =\u03a3\u03cd\u03bd\u03b4\u03b5\u03c3\u03b7 \u03c3\u03b5 lamscommunity.org \u03bc\u03b5 \u03cc\u03bd\u03bf\u03bc\u03b1 \u03a7\u03c1\u03ae\u03c3\u03c4\u03b7: label.lamscommunity.password =\u03a3\u03cd\u03bd\u03b4\u03b5\u03c3\u03b7 \u03c3\u03c4\u03b7 lamscommunity.org \u03bc\u03b5 \u039a\u03c9\u03b4\u03b9\u03ba\u03cc: Index: lams_central/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -rd3c9d3f03c16e8f7025d7b2bfe84e68af4fc0746 -rb04831bae6986da3f6ed5dc515f209d98d13e6ed --- lams_central/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision d3c9d3f03c16e8f7025d7b2bfe84e68af4fc0746) +++ lams_central/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision b04831bae6986da3f6ed5dc515f209d98d13e6ed) @@ -220,7 +220,6 @@ index.searchlesson =Learner Search index.searchlesson.tooltip =Search learners across lessons lessonsearch.noresults =No Lessons found -error.multiple.emails =There are multiple users in LAMS with the given email. Email could not be sent. Please try again using your username, or contact your System Administrator. label.lamscommunity.message =Login to lamscommunity.org label.lamscommunity.login =lamscommunity.org login: label.lamscommunity.password =lamscommunity.org password: @@ -665,4 +664,4 @@ label.no.comments=No Comments label.newest.first=Newest First label.top.comments=Top Comments -#======= End labels: Exported 439 labels for en AU ===== +#======= End labels: Exported 439 labels for en AU ===== \ No newline at end of file Index: lams_central/conf/language/lams/ApplicationResources_es_ES.properties =================================================================== diff -u -r2c3974ea0cd95d07baeffd9d0e07e93da2e76c1a -rb04831bae6986da3f6ed5dc515f209d98d13e6ed --- lams_central/conf/language/lams/ApplicationResources_es_ES.properties (.../ApplicationResources_es_ES.properties) (revision 2c3974ea0cd95d07baeffd9d0e07e93da2e76c1a) +++ lams_central/conf/language/lams/ApplicationResources_es_ES.properties (.../ApplicationResources_es_ES.properties) (revision b04831bae6986da3f6ed5dc515f209d98d13e6ed) @@ -220,7 +220,6 @@ index.searchlesson =Buscar index.searchlesson.tooltip =Buscar estudiantes en secuencias lessonsearch.noresults =No se han encontrado lecciones -error.multiple.emails =Hay multiples cuentas bajo ese correo electr\u00f3nico, por lo tanto no se puede enviar el mensaje. Pruebe nuevamente con su nombre de usuario o contacte a su administrador de sistema. label.lamscommunity.message =Ingresar a lamscommunity.org label.lamscommunity.login =lamscommunity.org usuario: label.lamscommunity.password =lamscommunity.org contrase\u00f1a: Index: lams_central/conf/language/lams/ApplicationResources_es_MX.properties =================================================================== diff -u -r542c2cefed9f7ef2c515eff59a06f508330e24f7 -rb04831bae6986da3f6ed5dc515f209d98d13e6ed --- lams_central/conf/language/lams/ApplicationResources_es_MX.properties (.../ApplicationResources_es_MX.properties) (revision 542c2cefed9f7ef2c515eff59a06f508330e24f7) +++ lams_central/conf/language/lams/ApplicationResources_es_MX.properties (.../ApplicationResources_es_MX.properties) (revision b04831bae6986da3f6ed5dc515f209d98d13e6ed) @@ -221,7 +221,6 @@ index.searchlesson =Buscar index.searchlesson.tooltip =Buscar estudiantes en secuencias lessonsearch.noresults =No se han encontrado lecciones -error.multiple.emails =Hay multiples cuentas bajo ese correo electr\u00f3nico, por lo tanto no se puede enviar el mensaje. Pruebe nuevamente con su nombre de usuario o contacte a su administrador de sistema. label.lamscommunity.message =Ingresar a lamscommunity.org label.lamscommunity.login =lamscommunity.org usuario: label.lamscommunity.password =lamscommunity.org contrase\u00f1a: Index: lams_central/conf/language/lams/ApplicationResources_fr_FR.properties =================================================================== diff -u -r542c2cefed9f7ef2c515eff59a06f508330e24f7 -rb04831bae6986da3f6ed5dc515f209d98d13e6ed --- lams_central/conf/language/lams/ApplicationResources_fr_FR.properties (.../ApplicationResources_fr_FR.properties) (revision 542c2cefed9f7ef2c515eff59a06f508330e24f7) +++ lams_central/conf/language/lams/ApplicationResources_fr_FR.properties (.../ApplicationResources_fr_FR.properties) (revision b04831bae6986da3f6ed5dc515f209d98d13e6ed) @@ -221,7 +221,6 @@ index.searchlesson =Rercherche index.searchlesson.tooltip =Rechercher des apprenants au travers des le\u00e7ons lessonsearch.noresults =Pas de le\u00e7ons trouv\u00e9es -error.multiple.emails =Plusieurs utilisateurs dans LAMS ont le m\u00eame e-mail. Le courrier \u00e9lectronique n'a pas pu \u00eatre envoy\u00e9. S'il vous pla\u00eet essayez de nouveau en utilisant votre nom d'utilisateur, ou contactez votre administrateur syst\u00e8me. label.lamscommunity.message =Login \u00e0 lamscommunity.org label.lamscommunity.login =Login lamscommunity.org: label.lamscommunity.password =Mot de passe lamscommunity.org: Index: lams_central/conf/language/lams/ApplicationResources_id_ID.properties =================================================================== diff -u -r542c2cefed9f7ef2c515eff59a06f508330e24f7 -rb04831bae6986da3f6ed5dc515f209d98d13e6ed --- lams_central/conf/language/lams/ApplicationResources_id_ID.properties (.../ApplicationResources_id_ID.properties) (revision 542c2cefed9f7ef2c515eff59a06f508330e24f7) +++ lams_central/conf/language/lams/ApplicationResources_id_ID.properties (.../ApplicationResources_id_ID.properties) (revision b04831bae6986da3f6ed5dc515f209d98d13e6ed) @@ -221,7 +221,6 @@ index.searchlesson =Pencarian Siswa index.searchlesson.tooltip =Cari siswa dari seluruh pelajaran lessonsearch.noresults =Tidak ada Pelajaran ditemukan -error.multiple.emails =Ada beberapa pengguna dalam LAMS dengan email tersebut. Email tidak dapat dikirim. Coba lagi menggunakan nama pengguna, atau hubungi Sistem Administrator . label.lamscommunity.message =Login ke lamscommunity.org label.lamscommunity.login =lamscommunity.org login: label.lamscommunity.password =lamscommunity.org password: Index: lams_central/conf/language/lams/ApplicationResources_it_IT.properties =================================================================== diff -u -r542c2cefed9f7ef2c515eff59a06f508330e24f7 -rb04831bae6986da3f6ed5dc515f209d98d13e6ed --- lams_central/conf/language/lams/ApplicationResources_it_IT.properties (.../ApplicationResources_it_IT.properties) (revision 542c2cefed9f7ef2c515eff59a06f508330e24f7) +++ lams_central/conf/language/lams/ApplicationResources_it_IT.properties (.../ApplicationResources_it_IT.properties) (revision b04831bae6986da3f6ed5dc515f209d98d13e6ed) @@ -221,7 +221,6 @@ index.searchlesson =Cerca Studente index.searchlesson.tooltip =Cerca studenti attraverso le lezioni lessonsearch.noresults =Nessuna lezione trovata -error.multiple.emails =Vi sono diversi utenti in LAMS con questo email. L'email non pu\u00f2 essere spedita. Prova ancora usando il tuo username oppure contatta il tuo Amministratore di sistema. label.lamscommunity.message =Login alla lamscommunity.org label.lamscommunity.login =lamscommunity.org login: label.lamscommunity.password =lamscommunity.org password: Index: lams_central/conf/language/lams/ApplicationResources_ja_JP.properties =================================================================== diff -u -rd4760a0139708f8ea404b3038b14a5e890e70e68 -rb04831bae6986da3f6ed5dc515f209d98d13e6ed --- lams_central/conf/language/lams/ApplicationResources_ja_JP.properties (.../ApplicationResources_ja_JP.properties) (revision d4760a0139708f8ea404b3038b14a5e890e70e68) +++ lams_central/conf/language/lams/ApplicationResources_ja_JP.properties (.../ApplicationResources_ja_JP.properties) (revision b04831bae6986da3f6ed5dc515f209d98d13e6ed) @@ -20,7 +20,6 @@ error.support.email.not.set =\u30e1\u30fc\u30eb\u304c\u9001\u4fe1\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002LAMS\u30b5\u30fc\u30d0\u306b\u30e1\u30fc\u30eb\u306e\u8a2d\u5b9a\u304c\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002\u30b7\u30b9\u30c6\u30e0\u7ba1\u7406\u8005\u306b\u76f8\u8ac7\u3057\u3066\u304f\u3060\u3055\u3044\u3002 label.forgot.password.instructions.2 =LAMS\u306e\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u304c\u5206\u304b\u3089\u306a\u3044\u5834\u5408\u306f\u3001\u30b7\u30b9\u30c6\u30e0\u7ba1\u7406\u8005\u306b\u76f8\u8ac7\u3057\u3066\u304f\u3060\u3055\u3044\u3002 label.required =\u5fc5\u9808 -error.multiple.emails =\u30e1\u30fc\u30eb\u30a2\u30c9\u30ec\u30b9\u3092\u6301\u3064\u8907\u6570\u306e\u30e6\u30fc\u30b6\u30fc\u304c\u3044\u307e\u3059\u3002\u30e1\u30fc\u30eb\u3092\u9001\u308c\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u3042\u306a\u305f\u306e\u30e6\u30fc\u30b6\u30fc\u540d\u3092\u4f7f\u3063\u3066\u518d\u8a66\u884c\u3059\u308b\u304b\u3001\u30b7\u30b9\u30c6\u30e0\u7ba1\u7406\u8005\u306b\u9023\u7d61\u3092\u3068\u3063\u3066\u304f\u3060\u3055\u3044\u3002 title.import.lamscommunity =lamscommunity.org \u304b\u3089\u306e\u30a4\u30f3\u30dd\u30fc\u30c8 msg.import.ld.success =\u5b66\u7fd2\u30c7\u30b6\u30a4\u30f3\u306e\u30a4\u30f3\u30dd\u30fc\u30c8\u306b\u6210\u529f\u3057\u307e\u3057\u305f\u3002 label.lamscommunity.notRegistered.1 =\u3042\u306a\u305f\u306e\u30b5\u30fc\u30d0\u306f LAMS \u30b3\u30df\u30e5\u30cb\u30c6\u30a3\u306b\u767b\u9332\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002\u305d\u306e\u305f\u3081\u3001\u30b7\u30fc\u30b1\u30f3\u30b9\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3092\u30b3\u30df\u30e5\u30cb\u30c6\u30a3\u304b\u3089 LAMS \u30b5\u30fc\u30d0\u306b\u30b7\u30fc\u30e0\u30ec\u30b9\u306b\u30a4\u30f3\u30dd\u30fc\u30c8\u3067\u304d\u307e\u305b\u3093\u3002\u3053\u306e\u6a5f\u80fd\u306e\u6709\u52b9\u5316\u306b\u3064\u3044\u3066\u306f\u3001\u30b7\u30b9\u30c6\u30e0\u7ba1\u7406\u8005\u306b\u5c0b\u306d\u3066\u304f\u3060\u3055\u3044\u3002 Index: lams_central/conf/language/lams/ApplicationResources_mi_NZ.properties =================================================================== diff -u -r62c627ddcb227f5a1cb96c2c0a737894812d8125 -rb04831bae6986da3f6ed5dc515f209d98d13e6ed --- lams_central/conf/language/lams/ApplicationResources_mi_NZ.properties (.../ApplicationResources_mi_NZ.properties) (revision 62c627ddcb227f5a1cb96c2c0a737894812d8125) +++ lams_central/conf/language/lams/ApplicationResources_mi_NZ.properties (.../ApplicationResources_mi_NZ.properties) (revision b04831bae6986da3f6ed5dc515f209d98d13e6ed) @@ -221,7 +221,6 @@ index.searchlesson =Rapu \u0100konga index.searchlesson.tooltip =Rapu \u0101konga puta noa ng\u0101 akoranga lessonsearch.noresults =K\u0101ore he Akoranga i kitea mai -error.multiple.emails =He tokomaha ng\u0101 kaimahi i LAMS me t\u0113nei \u012bm\u0113r\u0101. K\u0101ore i taea te tuku \u012bm\u0113r\u0101. Mahia an\u014d me t\u014du ingoa takiuru, whakap\u0101 atu r\u0101nei ki t\u014d Kaiwhakahaere P\u016bnaha. label.lamscommunity.message =Takiuru mai ki lamscommunity.org label.lamscommunity.login =lamscommunity.org ingoa takiuru: label.lamscommunity.password =lamscommunity.org kupuhuna: Index: lams_central/conf/language/lams/ApplicationResources_no_NO.properties =================================================================== diff -u -r2c3974ea0cd95d07baeffd9d0e07e93da2e76c1a -rb04831bae6986da3f6ed5dc515f209d98d13e6ed --- lams_central/conf/language/lams/ApplicationResources_no_NO.properties (.../ApplicationResources_no_NO.properties) (revision 2c3974ea0cd95d07baeffd9d0e07e93da2e76c1a) +++ lams_central/conf/language/lams/ApplicationResources_no_NO.properties (.../ApplicationResources_no_NO.properties) (revision b04831bae6986da3f6ed5dc515f209d98d13e6ed) @@ -220,7 +220,6 @@ index.searchlesson =S\u00f8k etter studenter. index.searchlesson.tooltip =S\u00f8k etter studenter p\u00e5 tvers av flere leksjoner. lessonsearch.noresults =Ingen leksjoner er funnet -error.multiple.emails =Det er flere brukere i LAMS med denne e-post adressen. E-post kunne ikke sendes. Vennligst pr\u00f8v igjen og benytt ditt brukernavn eller kontakt system administrator. label.lamscommunity.message =Logg inn til lamscommunity.org label.lamscommunity.login =lamscommunity.org logg inn: label.lamscommunity.password =lamscommunity.org passord: Index: lams_central/conf/language/lams/ApplicationResources_pt_BR.properties =================================================================== diff -u -red84afe5b317b35b156848df66a1a9332af0f4b1 -rb04831bae6986da3f6ed5dc515f209d98d13e6ed --- lams_central/conf/language/lams/ApplicationResources_pt_BR.properties (.../ApplicationResources_pt_BR.properties) (revision ed84afe5b317b35b156848df66a1a9332af0f4b1) +++ lams_central/conf/language/lams/ApplicationResources_pt_BR.properties (.../ApplicationResources_pt_BR.properties) (revision b04831bae6986da3f6ed5dc515f209d98d13e6ed) @@ -220,7 +220,6 @@ index.searchlesson =Pesquisa de aluno index.searchlesson.tooltip =Pesquisar alunos em todas as li\u00e7\u00f5es lessonsearch.noresults =Nenhuma li\u00e7\u00e3o encontrada -error.multiple.emails =Existem v\u00e1rios usu\u00e1rios em LAMS com o e-mail fornecido. E-mail n\u00e3o p\u00f4de ser enviado. Por favor, tente novamente usando seu nome de usu\u00e1rio ou contate o administrador do sistema. label.lamscommunity.message =Entre para lamscommunity.org label.lamscommunity.login =lamscommunity.org login: label.lamscommunity.password =lamscommunity.org senha: Index: lams_central/conf/language/lams/ApplicationResources_tr_TR.properties =================================================================== diff -u -r7ec0fafa8387cb78866e82e464ffbbc808c4b49f -rb04831bae6986da3f6ed5dc515f209d98d13e6ed --- lams_central/conf/language/lams/ApplicationResources_tr_TR.properties (.../ApplicationResources_tr_TR.properties) (revision 7ec0fafa8387cb78866e82e464ffbbc808c4b49f) +++ lams_central/conf/language/lams/ApplicationResources_tr_TR.properties (.../ApplicationResources_tr_TR.properties) (revision b04831bae6986da3f6ed5dc515f209d98d13e6ed) @@ -160,7 +160,6 @@ title.portrait.change.screen =Resmimi de\u011fi\u015ftir title.change.portrait.window =LAMS: Resmimi de\u011fi\u015ftir error.portrait.not.image =Dosya resim format\u0131nda de\u011fil. (Ge\u00e7erli formatlar: PNG, GIF, JPG, WBMP ve BMP -error.multiple.emails =Verilen e-posta adresinde birden fazla kullan\u0131c\u0131 bulundu. E-posta g\u00f6nderilemedi. Kullan\u0131c\u0131 ad\u0131n\u0131z\u0131 kullanarak tekrar deneyin veya sistem y\u00f6neticinize ba\u015fvurun. label.forgot.password.email =E-posta kontrol et label.forgot.password.username =Kullan\u0131c\u0131 ad\u0131 kontrol et error.forgot.password.fields =T\u00fcm alanlar\u0131n girilmesi gereklidir. Tekrar deneyin Index: lams_central/conf/language/lams/ApplicationResources_zh_CN.properties =================================================================== diff -u -r330a7eaff719ad6823cb0f5993a437007d71b086 -rb04831bae6986da3f6ed5dc515f209d98d13e6ed --- lams_central/conf/language/lams/ApplicationResources_zh_CN.properties (.../ApplicationResources_zh_CN.properties) (revision 330a7eaff719ad6823cb0f5993a437007d71b086) +++ lams_central/conf/language/lams/ApplicationResources_zh_CN.properties (.../ApplicationResources_zh_CN.properties) (revision b04831bae6986da3f6ed5dc515f209d98d13e6ed) @@ -221,7 +221,6 @@ index.searchlesson =\u641c\u7d22 index.searchlesson.tooltip =\u5728\u8bfe\u7a0b\u95f4\u641c\u7d22\u5b66\u4e60\u8005 lessonsearch.noresults =\u6ca1\u6709\u53d1\u73b0\u8bfe\u7a0b -error.multiple.emails =\u5728LAMS\u4e2d\u6709\u591a\u4e2a\u6709\u7279\u5b9a\u90ae\u7bb1\u7684\u7528\u6237\u3002\u90ae\u4ef6\u65e0\u6cd5\u53d1\u9001\u3002\u8bf7\u4f7f\u7528\u60a8\u7684\u7528\u6237\u540d\u518d\u6b21\u5c1d\u8bd5\uff0c\u6216\u4e0e\u60a8\u7684\u7cfb\u7edf\u7ba1\u7406\u5458\u8054\u7cfb\u3002 #======= End labels: Exported 216 labels for zh CN ===== Index: lams_central/src/java/org/lamsfoundation/lams/web/ForgotPasswordServlet.java =================================================================== diff -u -r5b4307e77743c078a26bb2b953b6f5245b697e26 -rb04831bae6986da3f6ed5dc515f209d98d13e6ed --- lams_central/src/java/org/lamsfoundation/lams/web/ForgotPasswordServlet.java (.../ForgotPasswordServlet.java) (revision 5b4307e77743c078a26bb2b953b6f5245b697e26) +++ lams_central/src/java/org/lamsfoundation/lams/web/ForgotPasswordServlet.java (.../ForgotPasswordServlet.java) (revision b04831bae6986da3f6ed5dc515f209d98d13e6ed) @@ -29,302 +29,263 @@ import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.support.WebApplicationContextUtils; - /** * Servlet to handle forgot password requests * - * This servlet handles two type of requests, one to save the request and send an email to the user, - * and one to save the new password + * This servlet handles two type of requests, one to save the request and send an email to the user, and one to save the + * new password + * * @author lfoxton * * @web:servlet name="forgotPasswordServlet" * @web:servlet-mapping url-pattern="/ForgotPasswordRequest" */ -public class ForgotPasswordServlet extends HttpServlet -{ - private static Logger log = Logger.getLogger(ForgotPasswordServlet.class); - - // states - public static String SMTP_SERVER_NOT_SET = "error.support.email.not.set"; - public static String USER_NOT_FOUND = "error.user.not.found"; - public static String PASSWORD_REQUEST_EXPIRED = "error.password.request.expired"; - public static String SUCCESS_REQUEST_EMAIL = "forgot.password.email.sent"; - public static String SUCCESS_CHANGE_PASS = "heading.password.changed.screen"; - public static String EMAIL_NOT_FOUND = "error.email.not.found"; - public static String MULTIPLE_EMAILS = "error.multiple.emails"; - public static String EMAIL_FAILED = "error.email.not.sent"; - public static String REQUEST_KEY_NOT_FOUND = "error.forgot.password.incorrect.key"; - - private static int MILLISECONDS_IN_A_DAY = 86400000; - - private static String STATE = "&state="; - private static String LANGUAGE_KEY = "&languageKey="; - private static String EMAIL_SENT = "&emailSent="; - - public void doGet(HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException - { - String method = request.getParameter("method"); - - if (method.equals("requestEmail")) - { - String selectType = request.getParameter("selectType"); - Boolean findByEmail = false; - String param = ""; - if (selectType.equals("radioEmail")) - { - findByEmail = true; - param = request.getParameter("email"); - } - else - { - param = request.getParameter("login"); - } +public class ForgotPasswordServlet extends HttpServlet { + private static final long serialVersionUID = -4833236166181290760L; + private static Logger log = Logger.getLogger(ForgotPasswordServlet.class); - handleEmailRequest(findByEmail, param.trim(), response); - } - else if (method.equals("requestPasswordChange")) - { - String newPassword = request.getParameter("newPassword"); - String key = request.getParameter("key"); - handlePasswordChange(newPassword, key, response); - } - else - { - response.sendError(HttpServletResponse.SC_BAD_REQUEST); - } - - } - - /** - * Handles the first step of the forgot login process, sending the email to the user. - * An email is sent with a link and key attached to identify the forgot login request - * @param findByEmail true if the forgot login request was for an email, false if it was for a login - * @param param the param for which the user password will be searched - * @param response - * @throws ServletException - * @throws IOException - */ - public void handleEmailRequest(Boolean findByEmail, String param, HttpServletResponse response) - throws ServletException, IOException - { + // states + public static String SMTP_SERVER_NOT_SET = "error.support.email.not.set"; + public static String USER_NOT_FOUND = "error.user.not.found"; + public static String PASSWORD_REQUEST_EXPIRED = "error.password.request.expired"; + public static String SUCCESS_REQUEST_EMAIL = "forgot.password.email.sent"; + public static String SUCCESS_CHANGE_PASS = "heading.password.changed.screen"; + public static String EMAIL_NOT_FOUND = "error.email.not.found"; + public static String INTERNAL_ERROR = "error.email.internal"; + public static String EMAIL_FAILED = "error.email.not.sent"; + public static String REQUEST_KEY_NOT_FOUND = "error.forgot.password.incorrect.key"; - int success=0; - String languageKey = ""; - - boolean err = false; - - if (param==null||param.equals("")) - { - response.sendError(HttpServletResponse.SC_BAD_REQUEST); - return; - } + private static int MILLISECONDS_IN_A_DAY = 86400000; - String SMPTServer = Configuration.get("SMTPServer"); - String supportEmail = Configuration.get("LamsSupportEmail"); - boolean useInternalSMTPServer = Boolean.parseBoolean(Configuration.get(ConfigurationKeys.USE_INTERNAL_SMTP_SERVER)); - User user = null; + private static String STATE = "&state="; + private static String LANGUAGE_KEY = "&languageKey="; + private static String EMAIL_SENT = "&emailSent="; - if (!useInternalSMTPServer && (SMPTServer==null||SMPTServer.equals("")) || supportEmail==null || supportEmail.equals("")) - { - // Validate SMTP not set up - languageKey = this.SMTP_SERVER_NOT_SET; - } - else - { - WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(this.getServletContext()); - IUserManagementService userService = (IUserManagementService) ctx.getBean("userManagementService"); - MessageService messageService = (MessageService)ctx.getBean("centralMessageService"); + @Override + public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + String method = request.getParameter("method"); - // get the user by email or login - if (!findByEmail) - { - if (userService.getUserByLogin(param)!=null) - { - user = userService.getUserByLogin(param); - } - else - { - // validate user is not found - languageKey = this.USER_NOT_FOUND; - err = true; - } - } - else - { - List users = userService.getAllUsersWithEmail(param); - - if (users.size()==1) - { - user = (User)users.get(0); - } - else if (users.size()==0) - { - // validate no user with email found - languageKey = this.EMAIL_NOT_FOUND; - err = true; - } - else - { - // validate multiple users with email found - languageKey = this.MULTIPLE_EMAILS; - err = true; - } - } - + if (method.equals("requestEmail")) { + String selectType = request.getParameter("selectType"); + Boolean findByEmail = false; + String param = ""; + if (selectType.equals("radioEmail")) { + findByEmail = true; + param = request.getParameter("email"); + } else { + param = request.getParameter("login"); + } - if (!err) - { - boolean isHtmlFormat = false; - // generate a key for the request - String key = generateUniqueKey(); - - // all good, save the request in the db - ForgotPasswordRequest fp = new ForgotPasswordRequest(); - fp.setRequestDate(new Date()); - fp.setUserId(user.getUserId()); - fp.setRequestKey(key); - userService.save(fp); - - // Constructing the body of the email - String body = messageService.getMessage("forgot.password.email.body") - + "\n\n" - + Configuration.get("ServerURL") - + "forgotPasswordChange.jsp?key=" - + key; - - // send the email - try{ - Emailer.sendFromSupportEmail( - messageService.getMessage("forgot.password.email.subject"), - user.getEmail(), - body, - isHtmlFormat - ); - languageKey = this.SUCCESS_REQUEST_EMAIL; - success = 1; - } - catch (AddressException e) - { - // failure handling - log.error("Problem sending email to: " +user.getLogin()+ " with email: " + user.getEmail(), e); - //response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); - languageKey = EMAIL_FAILED; - success = 0; - } - catch (MessagingException e) - { - // failure handling - log.error("Problem sending email to: " +user.getLogin()+ " with email: " + user.getEmail(), e); - //response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); - languageKey = EMAIL_FAILED; - success = 0; - } - catch (Exception e) - { - // failure handling - log.error("Problem sending email to: " +user.getLogin()+ " with email: " + user.getEmail(), e); - languageKey = EMAIL_FAILED; - success = 0; - //response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); - } - - - } - - } - - String redirectStr = Configuration.get("ServerURL") + "forgotPasswordProc.jsp?" + - STATE + - success + - LANGUAGE_KEY + - languageKey; - - if (success==1 && user.getEmail()!=null) - { - redirectStr += EMAIL_SENT +java.net.URLEncoder.encode(user.getEmail(), "UTF-8"); - } + handleEmailRequest(findByEmail, param.trim(), response); + } else if (method.equals("requestPasswordChange")) { + String newPassword = request.getParameter("newPassword"); + String key = request.getParameter("key"); + handlePasswordChange(newPassword, key, response); + } else { + response.sendError(HttpServletResponse.SC_BAD_REQUEST); + } - response.sendRedirect(redirectStr); + } + /** + * Handles the first step of the forgot login process, sending the email to the user. An email is sent with a link + * and key attached to identify the forgot login request + * + * @param findByEmail + * true if the forgot login request was for an email, false if it was for a login + * @param param + * the param for which the user password will be searched + * @param response + * @throws ServletException + * @throws IOException + */ + @SuppressWarnings("unchecked") + public void handleEmailRequest(Boolean findByEmail, String param, HttpServletResponse response) + throws ServletException, IOException { + + int success = 0; + String languageKey = ""; + + boolean err = false; + + if ((param == null) || param.equals("")) { + response.sendError(HttpServletResponse.SC_BAD_REQUEST); + return; } - - /** - * Updates the user's password - * @param key the key of the forgot password request - */ - public void handlePasswordChange(String newPassword, String key, HttpServletResponse response) - throws ServletException, IOException - { - int success=0; - String languageKey = ""; - if (key==null||key.equals("")||newPassword==null||newPassword.equals("")) - { - response.sendError(HttpServletResponse.SC_BAD_REQUEST); - return; + String SMPTServer = Configuration.get("SMTPServer"); + String supportEmail = Configuration.get("LamsSupportEmail"); + boolean useInternalSMTPServer = Boolean + .parseBoolean(Configuration.get(ConfigurationKeys.USE_INTERNAL_SMTP_SERVER)); + User user = null; + + if ((!useInternalSMTPServer && ((SMPTServer == null) || SMPTServer.equals(""))) || (supportEmail == null) + || supportEmail.equals("")) { + // Validate SMTP not set up + languageKey = ForgotPasswordServlet.SMTP_SERVER_NOT_SET; + } else { + WebApplicationContext ctx = WebApplicationContextUtils + .getRequiredWebApplicationContext(this.getServletContext()); + IUserManagementService userService = (IUserManagementService) ctx.getBean("userManagementService"); + MessageService messageService = (MessageService) ctx.getBean("centralMessageService"); + + // get the user by email or login + if (!findByEmail) { + if (userService.getUserByLogin(param) != null) { + user = userService.getUserByLogin(param); + } else { + // validate user is not found + languageKey = ForgotPasswordServlet.USER_NOT_FOUND; + err = true; } - - WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(this.getServletContext()); - IUserManagementService userService = (IUserManagementService) ctx.getBean("userManagementService"); - - ForgotPasswordRequest fp = userService.getForgotPasswordRequest(key); - - if (fp == null) - { - response.sendRedirect(Configuration.get("ServerURL") + "forgotPasswordProc.jsp?" + - STATE + - 0 + - LANGUAGE_KEY + - REQUEST_KEY_NOT_FOUND - ); - return; + } else { + try { + List users = userService.getAllUsersWithEmail(param); + if (users.size() == 1) { + user = users.get(0); + } else if (users.size() == 0) { + // validate no user with email found + languageKey = ForgotPasswordServlet.EMAIL_NOT_FOUND; + err = true; + } else { + // validate multiple users with email found + languageKey = ForgotPasswordServlet.INTERNAL_ERROR; + ForgotPasswordServlet.log + .info("Password recovery: The email is assigned to multiple users: " + param); + err = true; + } + } catch (Exception e) { + languageKey = ForgotPasswordServlet.INTERNAL_ERROR; + ForgotPasswordServlet.log.error("Error while recovering password.", e); + err = true; } - - long cutoffTime = fp.getRequestDate().getTime() + MILLISECONDS_IN_A_DAY; - Date now = new Date(); - long nowLong = now.getTime(); + } - if (nowLong < cutoffTime) - { - User user = (User)userService.findById(User.class, fp.getUserId()); - userService.updatePassword(user.getLogin(), newPassword); - userService.auditPasswordChanged(user, CentralConstants.MODULE_NAME); - languageKey = this.SUCCESS_CHANGE_PASS; - success = 1; + if (!err) { + boolean isHtmlFormat = false; + // generate a key for the request + String key = ForgotPasswordServlet.generateUniqueKey(); + + // all good, save the request in the db + ForgotPasswordRequest fp = new ForgotPasswordRequest(); + fp.setRequestDate(new Date()); + fp.setUserId(user.getUserId()); + fp.setRequestKey(key); + userService.save(fp); + + // Constructing the body of the email + String body = messageService.getMessage("forgot.password.email.body") + "\n\n" + + Configuration.get("ServerURL") + "forgotPasswordChange.jsp?key=" + key; + + // send the email + try { + Emailer.sendFromSupportEmail(messageService.getMessage("forgot.password.email.subject"), + user.getEmail(), body, isHtmlFormat); + languageKey = ForgotPasswordServlet.SUCCESS_REQUEST_EMAIL; + success = 1; + } catch (AddressException e) { + // failure handling + ForgotPasswordServlet.log.error( + "Problem sending email to: " + user.getLogin() + " with email: " + user.getEmail(), e); + // response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); + languageKey = ForgotPasswordServlet.EMAIL_FAILED; + success = 0; + } catch (MessagingException e) { + // failure handling + ForgotPasswordServlet.log.error( + "Problem sending email to: " + user.getLogin() + " with email: " + user.getEmail(), e); + // response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); + languageKey = ForgotPasswordServlet.EMAIL_FAILED; + success = 0; + } catch (Exception e) { + // failure handling + ForgotPasswordServlet.log.error( + "Problem sending email to: " + user.getLogin() + " with email: " + user.getEmail(), e); + languageKey = ForgotPasswordServlet.EMAIL_FAILED; + success = 0; + // response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); } - else - { - // validate password request expired - languageKey = this.PASSWORD_REQUEST_EXPIRED; - } - - userService.delete(fp); - - response.sendRedirect(Configuration.get("ServerURL") + "forgotPasswordProc.jsp?" + - STATE + - success + - LANGUAGE_KEY + - languageKey - ); + + } + } - - /** - * Generates the unique key used for the forgot password request - * @return a unique key - * @throws FileUtilException - * @throws IOException - */ - public static String generateUniqueKey() - { - String newUniqueContentFolderID = null; - Properties props = new Properties(); - - IdentifierGenerator uuidGen = new UUIDHexGenerator(); - ( (Configurable) uuidGen).configure(StringType.INSTANCE, props, null); - - return ((String) uuidGen.generate(null, null)).toLowerCase(); + + String redirectStr = Configuration.get("ServerURL") + "forgotPasswordProc.jsp?" + ForgotPasswordServlet.STATE + + success + ForgotPasswordServlet.LANGUAGE_KEY + languageKey; + + if ((success == 1) && (user.getEmail() != null)) { + redirectStr += ForgotPasswordServlet.EMAIL_SENT + java.net.URLEncoder.encode(user.getEmail(), "UTF-8"); } - + + response.sendRedirect(redirectStr); + + } + + /** + * Updates the user's password + * + * @param key + * the key of the forgot password request + */ + public void handlePasswordChange(String newPassword, String key, HttpServletResponse response) + throws ServletException, IOException { + int success = 0; + String languageKey = ""; + + if ((key == null) || key.equals("") || (newPassword == null) || newPassword.equals("")) { + response.sendError(HttpServletResponse.SC_BAD_REQUEST); + return; + } + + WebApplicationContext ctx = WebApplicationContextUtils + .getRequiredWebApplicationContext(this.getServletContext()); + IUserManagementService userService = (IUserManagementService) ctx.getBean("userManagementService"); + + ForgotPasswordRequest fp = userService.getForgotPasswordRequest(key); + + if (fp == null) { + response.sendRedirect( + Configuration.get("ServerURL") + "forgotPasswordProc.jsp?" + ForgotPasswordServlet.STATE + 0 + + ForgotPasswordServlet.LANGUAGE_KEY + ForgotPasswordServlet.REQUEST_KEY_NOT_FOUND); + return; + } + + long cutoffTime = fp.getRequestDate().getTime() + ForgotPasswordServlet.MILLISECONDS_IN_A_DAY; + Date now = new Date(); + long nowLong = now.getTime(); + + if (nowLong < cutoffTime) { + User user = (User) userService.findById(User.class, fp.getUserId()); + userService.updatePassword(user.getLogin(), newPassword); + userService.auditPasswordChanged(user, CentralConstants.MODULE_NAME); + languageKey = ForgotPasswordServlet.SUCCESS_CHANGE_PASS; + success = 1; + } else { + // validate password request expired + languageKey = ForgotPasswordServlet.PASSWORD_REQUEST_EXPIRED; + } + + userService.delete(fp); + + response.sendRedirect(Configuration.get("ServerURL") + "forgotPasswordProc.jsp?" + ForgotPasswordServlet.STATE + + success + ForgotPasswordServlet.LANGUAGE_KEY + languageKey); + } + + /** + * Generates the unique key used for the forgot password request + * + * @return a unique key + * @throws FileUtilException + * @throws IOException + */ + public static String generateUniqueKey() { + Properties props = new Properties(); + + IdentifierGenerator uuidGen = new UUIDHexGenerator(); + ((Configurable) uuidGen).configure(StringType.INSTANCE, props, null); + + return ((String) uuidGen.generate(null, null)).toLowerCase(); + } + } Index: lams_central/web/forgotPasswordProc.jsp =================================================================== diff -u -rabff8dcc2af4d1607d0306af02edb795fe62d13b -rb04831bae6986da3f6ed5dc515f209d98d13e6ed --- lams_central/web/forgotPasswordProc.jsp (.../forgotPasswordProc.jsp) (revision abff8dcc2af4d1607d0306af02edb795fe62d13b) +++ lams_central/web/forgotPasswordProc.jsp (.../forgotPasswordProc.jsp) (revision b04831bae6986da3f6ed5dc515f209d98d13e6ed) @@ -1,17 +1,18 @@ -<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %> -<%@page import="org.apache.struts.action.ActionMessages" %> -<%@page import="org.apache.commons.lang.StringEscapeUtils" %> -<%@page import="org.lamsfoundation.lams.web.ForgotPasswordServlet" %> -<%@page import="org.lamsfoundation.lams.util.MessageService" %> -<%@page import="org.springframework.web.context.WebApplicationContext" %> -<%@page import="org.springframework.web.context.support.WebApplicationContextUtils" %> -<%@ page import="org.lamsfoundation.lams.util.Configuration" %> -<%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys" %> +<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8"%> +<%@page import="org.apache.struts.action.ActionMessages"%> +<%@page import="org.apache.commons.lang.StringEscapeUtils"%> +<%@page import="org.lamsfoundation.lams.web.ForgotPasswordServlet"%> +<%@page import="org.lamsfoundation.lams.util.MessageService"%> +<%@page import="org.springframework.web.context.WebApplicationContext"%> +<%@page import="org.springframework.web.context.support.WebApplicationContextUtils"%> +<%@ page import="org.lamsfoundation.lams.util.Configuration"%> +<%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys"%> -<%@ taglib uri="tags-html" prefix="html" %> -<%@ taglib uri="tags-logic" prefix="logic" %> -<%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="tags-lams" prefix="lams" %> +<%@ taglib uri="tags-html" prefix="html"%> +<%@ taglib uri="tags-logic" prefix="logic"%> +<%@ taglib uri="tags-fmt" prefix="fmt"%> +<%@ taglib uri="tags-lams" prefix="lams"%> +<%@ taglib uri="tags-core" prefix="c"%> <% String languageKey = StringEscapeUtils.escapeHtml(request.getParameter("languageKey")); @@ -23,63 +24,66 @@ - - <fmt:message key="title.forgot.password"/> - - + + <fmt:message key="title.forgot.password" /> + + - -
- -
-
-

- - - <% + +
+ + +
+
+

+ +

+ + + <% if (stateStr.equals("0")) { %> -

- <% +

+ <% } else { %> -

- <% +

+ <% } %> - + - <% + <% if (emailStr!=null && !emailStr.equals("")) { out.print(emailStr); } - %> -

+ %> +

-
- -
- - - +
+ + + +
- + + + +