Index: lams_monitoring/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.34 -r1.35
--- lams_monitoring/conf/language/lams/ApplicationResources.properties 14 Mar 2012 20:41:34 -0000 1.34
+++ lams_monitoring/conf/language/lams/ApplicationResources.properties 19 Mar 2012 17:49:58 -0000 1.35
@@ -2,7 +2,7 @@
#language code: en
#locale code: AU
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Wed Mar 14 14:38:50 CST 2012
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Mon Mar 19 11:47:08 CST 2012
#=================== labels for Monitor (Java) =================#
@@ -156,8 +156,6 @@
email.notifications.notify.sudents.that =Notify students that:
email.notifications.lesson.notifications =Lesson notifications: {0}
email.notifications.course.notifications =Course notifications: {0}
-email.notifications.lesson.email.body =Hello,
[put message here]
Lesson:{0}
{1}
-email.notifications.course.email.body =Hello,
[put message here]
Course:{0}
{1}
email.notifications.user.name =User name [login]
email.notifications.lesson.name =Lesson name
email.notifications.send =Send
@@ -197,6 +195,11 @@
conditions.tab.form.preceding.label =Dependencies
conditions.tab.form.preceding.info.label =Select a lesson that students will need to complete before they can see the lesson you are about to create.
advanced.tab.form.time.limits.info.label =Set the number of days the lesson will be available to students. After this period the lesson will not longer be shown. If the time should count from the moment the learner starts the lesson, select the option for individual time limit.
+email.notifications.lesson.email.body.header =Hello,
+email.notifications.lesson.email.body.msg =[put message here]
+email.notifications.lesson.email.body.footer =Lesson: {0} ({1})
+email.notifications.course.email.body.header =Hello,
+email.notifications.course.email.body.msg =[put message here]
-#======= End labels: Exported 191 labels for en AU =====
+#======= End labels: Exported 194 labels for en AU =====
Index: lams_monitoring/conf/language/lams/ApplicationResources_el_GR.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/conf/language/lams/ApplicationResources_el_GR.properties,v
diff -u -r1.25 -r1.26
--- lams_monitoring/conf/language/lams/ApplicationResources_el_GR.properties 18 Mar 2012 13:56:46 -0000 1.25
+++ lams_monitoring/conf/language/lams/ApplicationResources_el_GR.properties 19 Mar 2012 17:49:58 -0000 1.26
@@ -2,7 +2,7 @@
#language code: el
#locale code: GR
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Sun Mar 18 07:56:03 CST 2012
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Mon Mar 19 11:47:07 CST 2012
#=================== labels for Monitor (Java) =================#
@@ -156,8 +156,6 @@
email.notifications.notify.sudents.that =\u0395\u03b9\u03b4\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u03c4\u03c9\u03bd \u03b5\u03ba\u03c0\u03b1\u03b9\u03b4\u03b5\u03c5\u03bf\u03bc\u03ad\u03bd\u03c9\u03bd/\u03bc\u03b1\u03b8\u03b7\u03c4\u03ce\u03bd \u03cc\u03c4\u03b9:
email.notifications.lesson.notifications =\u0395\u03b9\u03b4\u03bf\u03c0\u03bf\u03b9\u03ae\u03c3\u03b5\u03c2 \u03bc\u03b1\u03b8\u03ae\u03bc\u03b1\u03c4\u03bf\u03c2:{0}
email.notifications.course.notifications =\u0395\u03b9\u03b4\u03bf\u03c0\u03bf\u03b9\u03ae\u03c3\u03b5\u03c2 \u03c0\u03c1\u03bf\u03b3\u03c1\u03ac\u03bc\u03bc\u03b1\u03c4\u03bf\u03c2 \u03c3\u03c0\u03bf\u03c5\u03b4\u03ce\u03bd/\u03c3\u03b5\u03b9\u03c1\u03ac\u03c2 \u03bc\u03b1\u03b8\u03b7\u03bc\u03ac\u03c4\u03c9\u03bd:{0}
-email.notifications.lesson.email.body =\u0393\u03b5\u03b9\u03ac \u03c3\u03bf\u03c5, [\u03b3\u03c1\u03ac\u03c8\u03b5 \u03b5\u03b4\u03ce \u03c4\u03bf \u03bc\u03ae\u03bd\u03c5\u03bc\u03b1 \u03c3\u03bf\u03c5]\u039c\u03ac\u03b8\u03b7\u03bc\u03b1{0}{1}
-email.notifications.course.email.body =\u0393\u03b5\u03b9\u03ac \u03c3\u03bf\u03c5, [\u03b3\u03c1\u03ac\u03c8\u03b5 \u03b5\u03b4\u03ce \u03c4\u03bf \u03bc\u03ae\u03bd\u03c5\u03bc\u03b1 \u03c3\u03bf\u03c5]\u039c\u03ac\u03b8\u03b7\u03bc\u03b1{0}{1}
email.notifications.user.name =\u038c\u03bd\u03bf\u03bc\u03b1 \u03a7\u03c1\u03ae\u03c3\u03c4\u03b7 [\u0395\u03af\u03c3\u03bf\u03b4\u03bf\u03c2]
email.notifications.lesson.name =\u038c\u03bd\u03bf\u03bc\u03b1 \u03bc\u03b1\u03b8\u03ae\u03bc\u03b1\u03c4\u03bf\u03c2
email.notifications.send =\u0391\u03c0\u03bf\u03c3\u03c4\u03bf\u03bb\u03ae
@@ -197,6 +195,11 @@
conditions.tab.form.preceding.label =\u0395\u03be\u03b1\u03c1\u03c4\u03ae\u03c3\u03b5\u03b9\u03c2
conditions.tab.form.preceding.info.label =\u0395\u03c0\u03b9\u03bb\u03ad\u03be\u03c4\u03b5 \u03ad\u03bd\u03b1 \u03bc\u03ac\u03b8\u03b7\u03bc\u03b1 \u03c4\u03bf \u03bf\u03c0\u03bf\u03af\u03bf \u03bf\u03b9 \u03b5\u03ba\u03c0\u03b1\u03b9\u03b4\u03b5\u03c5\u03cc\u03bc\u03b5\u03bd\u03bf\u03b9 \u03b8\u03b1 \u03c0\u03c1\u03ad\u03c0\u03b5\u03b9 \u03bd\u03b1 \u03ad\u03c7\u03bf\u03c5\u03bd \u03bf\u03bb\u03bf\u03ba\u03bb\u03b7\u03c1\u03ce\u03c3\u03bf\u03c5\u03bd \u03b3\u03b9\u03b1 \u03bd\u03b1 \u03bc\u03c0\u03bf\u03c1\u03ad\u03c3\u03bf\u03c5\u03bd \u03bd\u03b1 \u03b4\u03bf\u03c5\u03bd \u03c4\u03bf \u03bc\u03ac\u03b8\u03b7\u03bc\u03b1 \u03c0\u03bf\u03c5 \u03c0\u03c1\u03cc\u03ba\u03b5\u03b9\u03c4\u03b1\u03b9 \u03bd\u03b1 \u03b4\u03b7\u03bc\u03b9\u03bf\u03c5\u03c1\u03b3\u03b7\u03b8\u03b5\u03af.
advanced.tab.form.time.limits.info.label =\u039f\u03c1\u03af\u03c3\u03c4\u03b5 \u03c4\u03bf\u03bd \u03b1\u03c1\u03b9\u03b8\u03bc\u03cc \u03c4\u03c9\u03bd \u03b7\u03bc\u03b5\u03c1\u03ce\u03bd \u03cc\u03c0\u03bf\u03c5 \u03c4\u03bf \u03bc\u03ac\u03b8\u03b7\u03bc\u03b1 \u03b8\u03b1 \u03b5\u03af\u03bd\u03b1\u03b9 \u03b4\u03b9\u03b1\u03b8\u03ad\u03c3\u03b9\u03bc\u03bf \u03c3\u03c4\u03bf\u03c5\u03c2 \u03b5\u03ba\u03c0\u03b1\u03b9\u03b4\u03b5\u03c5\u03cc\u03bc\u03b5\u03bd\u03bf\u03c5\u03c2. \u039c\u03b5\u03c4\u03ac \u03c4\u03b7\u03bd \u03c0\u03b5\u03c1\u03af\u03bf\u03b4\u03bf \u03b1\u03c5\u03c4\u03ae \u03c4\u03bf \u03bc\u03ac\u03b8\u03b7\u03bc\u03b1 \u03b4\u03b5\u03bd \u03b8\u03b1 \u03b5\u03bc\u03c6\u03b1\u03bd\u03af\u03b6\u03b5\u03c4\u03b1\u03b9 \u03c0\u03bb\u03ad\u03bf\u03bd. \u0395\u03ac\u03bd \u03bf \u03c7\u03c1\u03cc\u03bd\u03bf\u03c2 \u03b8\u03b1 \u03bc\u03b5\u03c4\u03c1\u03ac\u03b5\u03b9 \u03b1\u03c0\u03cc \u03c4\u03b7 \u03c3\u03c4\u03b9\u03b3\u03bc\u03ae \u03c0\u03bf\u03c5 \u03bf \u03b5\u03ba\u03c0\u03b1\u03b9\u03b4\u03b5\u03c5\u03cc\u03bc\u03b5\u03bd\u03bf \u03be\u03b5\u03ba\u03b9\u03bd\u03ac \u03c4\u03bf \u03bc\u03ac\u03b8\u03b7\u03bc\u03b1, \u03b5\u03c0\u03b9\u03bb\u03ad\u03be\u03c4\u03b5 \u03c4\u03b7\u03bd \u03b5\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae \u03c7\u03c1\u03bf\u03bd\u03b9\u03ba\u03cc \u03cc\u03c1\u03b9\u03bf \u03b1\u03bd\u03ac \u03b5\u03ba\u03c0\u03b1\u03b9\u03b4\u03b5\u03c5\u03cc\u03bc\u03b5\u03bd\u03bf.
+email.notifications.lesson.email.body.header =\u0393\u03b5\u03b9\u03b1 \u03c3\u03b1\u03c2,
+email.notifications.lesson.email.body.msg =[\u03b3\u03c1\u03ac\u03c8\u03b5 \u03b5\u03b4\u03ce \u03c4\u03bf \u03bc\u03ae\u03bd\u03c5\u03bc\u03b1 \u03c3\u03bf\u03c5]
+email.notifications.lesson.email.body.footer =\u039c\u03ac\u03b8\u03b7\u03bc\u03b1 {0} ({1})
+email.notifications.course.email.body.header =\u0393\u03b5\u03b9\u03b1 \u03c3\u03b1\u03c2,
+email.notifications.course.email.body.msg =[\u03b3\u03c1\u03ac\u03c8\u03b5 \u03b5\u03b4\u03ce \u03c4\u03bf \u03bc\u03ae\u03bd\u03c5\u03bc\u03b1 \u03c3\u03bf\u03c5]
-#======= End labels: Exported 191 labels for el GR =====
+#======= End labels: Exported 194 labels for el GR =====
Index: lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.35 -r1.36
--- lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties 14 Mar 2012 20:41:34 -0000 1.35
+++ lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties 19 Mar 2012 17:49:58 -0000 1.36
@@ -2,7 +2,7 @@
#language code: en
#locale code: AU
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Wed Mar 14 14:38:50 CST 2012
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Mon Mar 19 11:47:08 CST 2012
#=================== labels for Monitor (Java) =================#
@@ -156,8 +156,6 @@
email.notifications.notify.sudents.that =Notify students that:
email.notifications.lesson.notifications =Lesson notifications: {0}
email.notifications.course.notifications =Course notifications: {0}
-email.notifications.lesson.email.body =Hello,
[put message here]
Lesson:{0}
{1}
-email.notifications.course.email.body =Hello,
[put message here]
Course:{0}
{1}
email.notifications.user.name =User name [login]
email.notifications.lesson.name =Lesson name
email.notifications.send =Send
@@ -197,6 +195,11 @@
conditions.tab.form.preceding.label =Dependencies
conditions.tab.form.preceding.info.label =Select a lesson that students will need to complete before they can see the lesson you are about to create.
advanced.tab.form.time.limits.info.label =Set the number of days the lesson will be available to students. After this period the lesson will not longer be shown. If the time should count from the moment the learner starts the lesson, select the option for individual time limit.
+email.notifications.lesson.email.body.header =Hello,
+email.notifications.lesson.email.body.msg =[put message here]
+email.notifications.lesson.email.body.footer =Lesson: {0} ({1})
+email.notifications.course.email.body.header =Hello,
+email.notifications.course.email.body.msg =[put message here]
-#======= End labels: Exported 191 labels for en AU =====
+#======= End labels: Exported 194 labels for en AU =====
Index: lams_monitoring/conf/language/lams/ApplicationResources_es_ES.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/conf/language/lams/ApplicationResources_es_ES.properties,v
diff -u -r1.20 -r1.21
--- lams_monitoring/conf/language/lams/ApplicationResources_es_ES.properties 14 Mar 2012 20:41:35 -0000 1.20
+++ lams_monitoring/conf/language/lams/ApplicationResources_es_ES.properties 19 Mar 2012 17:49:58 -0000 1.21
@@ -2,7 +2,7 @@
#language code: es
#locale code: ES
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Wed Mar 14 14:38:47 CST 2012
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Mon Mar 19 11:47:05 CST 2012
#=================== labels for Monitor (Java) =================#
@@ -156,8 +156,6 @@
email.notifications.notify.sudents.that =Notificar a los estudiantes que:
email.notifications.lesson.notifications =Notificaciones para lecci\u00f3nes
email.notifications.course.notifications =Notificaciones para cursos
-email.notifications.lesson.email.body =Hola, [put message here]Lesson: {0}{1}
-email.notifications.course.email.body =Hola, [put message here]Course :{0}{1}
email.notifications.user.name =Nombre de usuario [login]
email.notifications.lesson.name =Nombre de la lecci\u00f3n
email.notifications.send =Enviar
@@ -197,6 +195,11 @@
conditions.tab.form.preceding.label =Prerequisitos
conditions.tab.form.preceding.info.label =Seleccione una lecci\u00f3n que los estudiantes tendr\u00e1n que completar antes de que puedan ver la lecci\u00f3n que est\u00e1n a punto de crear.
advanced.tab.form.time.limits.info.label =Establecer el n\u00famero de d\u00edas que la lecci\u00f3n estar\u00e1 disponible para los estudiantes. Despu\u00e9s de este per\u00edodo, la lecci\u00f3n ya no ser\u00e1 accessible. Si el tiempo debe contar desde el momento en que el alumno comienza la lecci\u00f3n, seleccione la opci\u00f3n de l\u00edmite de tiempo individual.
+email.notifications.lesson.email.body.header =Hola,
+email.notifications.lesson.email.body.msg =[Poner el mensaje aqu\u00ed]
+email.notifications.lesson.email.body.footer =Lecci\u00f3n: {0} ({1})
+email.notifications.course.email.body.header =Hola,
+email.notifications.course.email.body.msg =[Poner el mensaje aqu\u00ed]
-#======= End labels: Exported 191 labels for es ES =====
+#======= End labels: Exported 194 labels for es ES =====
Index: lams_monitoring/conf/language/lams/ApplicationResources_no_NO.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/conf/language/lams/ApplicationResources_no_NO.properties,v
diff -u -r1.24 -r1.25
--- lams_monitoring/conf/language/lams/ApplicationResources_no_NO.properties 18 Mar 2012 13:56:46 -0000 1.24
+++ lams_monitoring/conf/language/lams/ApplicationResources_no_NO.properties 19 Mar 2012 17:49:58 -0000 1.25
@@ -2,7 +2,7 @@
#language code: no
#locale code: NO
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Sun Mar 18 07:55:58 CST 2012
+ # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Mon Mar 19 11:47:06 CST 2012
#=================== labels for Monitor (Java) =================#
@@ -156,8 +156,6 @@
email.notifications.notify.sudents.that =Varsle studentene at:
email.notifications.lesson.notifications =Leksjons-varsler: {0}
email.notifications.course.notifications =Kurs-varsler: {0}
-email.notifications.lesson.email.body =Hei, [skriv meldingen her]Leksjon: {0} {1}
-email.notifications.course.email.body =Hei, [skriv meldingen her]Kurs: {0} {1}
email.notifications.user.name =Brukernavn [login]
email.notifications.lesson.name =Leksjons-navn
email.notifications.send =Send
@@ -197,6 +195,11 @@
conditions.tab.form.preceding.label =Avhengigheter
conditions.tab.form.preceding.info.label =Velg den leksjonen studentene m\u00e5 gjennomf\u00f8re f\u00f8r de kan se den lekjsonen du n\u00e5 utformer.
advanced.tab.form.time.limits.info.label =Definer det antall dager som leksjonen vil v\u00e6re tilgjengelig for studentene. Etter denne tiden vil leksjonen ikke bli vist fram. Nedtellingen starter idet studenten begynner p\u00e5 leksjonen, velg opsjonen for individuell tidsangivelse.
+email.notifications.lesson.email.body.header =Hei,
+email.notifications.lesson.email.body.msg =[skriv meldingen her]
+email.notifications.lesson.email.body.footer =Leksjon: {0} ({1})
+email.notifications.course.email.body.header =Hei,
+email.notifications.course.email.body.msg =[skriv meldingen her]
-#======= End labels: Exported 191 labels for no NO =====
+#======= End labels: Exported 194 labels for no NO =====
Index: lams_monitoring/web/emailnotifications/courseNotifications.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/emailnotifications/courseNotifications.jsp,v
diff -u -r1.3 -r1.4
--- lams_monitoring/web/emailnotifications/courseNotifications.jsp 1 Mar 2012 18:29:38 -0000 1.3
+++ lams_monitoring/web/emailnotifications/courseNotifications.jsp 19 Mar 2012 17:50:12 -0000 1.4
@@ -226,10 +226,7 @@
-
- ${lesson.lessonName}
- home.do?method=learner&lessonID=${lesson.lessonId}
-
+
@@ -277,4 +274,4 @@
-
\ No newline at end of file
+
Index: lams_monitoring/web/emailnotifications/lessonNotifications.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/emailnotifications/lessonNotifications.jsp,v
diff -u -r1.2 -r1.3
--- lams_monitoring/web/emailnotifications/lessonNotifications.jsp 5 Dec 2011 16:03:30 -0000 1.2
+++ lams_monitoring/web/emailnotifications/lessonNotifications.jsp 19 Mar 2012 17:50:12 -0000 1.3
@@ -195,10 +195,7 @@