[LON-CAPA-cvs] cvs: loncom /interface loncoursequeueadmin.pm /localize/localize de.pm es.pm pt.pm
raeburn
raeburn at source.lon-capa.org
Fri Aug 26 11:58:05 EDT 2011
raeburn Fri Aug 26 15:58:05 2011 EDT
Modified files:
/loncom/interface loncoursequeueadmin.pm
/loncom/localize/localize de.pm es.pm pt.pm
Log:
- Remove unnecessary punctuation from message sent when course enrollment and/or
creation request is approved.
- For course requests approved by DC, include appropriate portal URL for
course.
Index: loncom/interface/loncoursequeueadmin.pm
diff -u loncom/interface/loncoursequeueadmin.pm:1.27 loncom/interface/loncoursequeueadmin.pm:1.28
--- loncom/interface/loncoursequeueadmin.pm:1.27 Mon Mar 7 02:13:02 2011
+++ loncom/interface/loncoursequeueadmin.pm Fri Aug 26 15:57:56 2011
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Utilities to administer domain course requests and course self-enroll requests
#
-# $Id: loncoursequeueadmin.pm,v 1.27 2011/03/07 02:13:02 raeburn Exp $
+# $Id: loncoursequeueadmin.pm,v 1.28 2011/08/26 15:57:56 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -482,7 +482,7 @@
mt => 'Your request for enrollment has been approved.',
},
{
- mt => 'Visit [_1], to log-in and access the course',
+ mt => 'Visit [_1] to log-in and access the course',
args => [$firsturl],
}];
$rejectedmsg = [{
@@ -497,7 +497,6 @@
$queue = 'pending';
}
%requesthash = &Apache::lonnet::dump_dom($namespace,$cdom,'_'.$queue);
- $firsturl= &course_portal_url($cnum,$cdom);
my %domconfig = &Apache::lonnet::get_dom('configuration',['requestcourses'],$cdom);
if (ref($domconfig{'requestcourses'}) eq 'HASH') {
if (ref($domconfig{'requestcourses'}{'notify'}) eq 'HASH') {
@@ -509,8 +508,8 @@
mt => 'Your course request has been approved.',
},
{
- mt => 'Visit [_1], to log-in and access the course',
- args => [$firsturl],
+ mt => 'Visit [_1] to log-in and access the course',
+ args => [],
}];
$rejectionmsg{'course'} =
[{
@@ -522,8 +521,8 @@
mt => 'Your community request has been approved.',
},
{
- mt => 'Visit [_1], to log-in and access the community',
- args => [$firsturl],
+ mt => 'Visit [_1] to log-in and access the community',
+ args => [],
}];
$rejectionmsg{'community'} =
@@ -645,6 +644,12 @@
} else {
$approvedmsg = $approvalmsg{'course'};
}
+ my $firsturl = &course_portal_url($cnum,$cdom);
+ if (ref($approvedmsg) eq 'ARRAY') {
+ if (ref($approvedmsg->[1]) eq 'HASH') {
+ $approvedmsg->[1]->{'args'} = [$firsturl];
+ }
+ }
push(@completed,$cnum);
unless (&Apache::lonnet::del_dom($namespace,[$cnum.'_'.$queue],$cdom) eq 'ok') {
@@ -1432,7 +1437,7 @@
args => [$cdescr],
},
{
- mt => 'Visit [_1], to log-in and access the course.',
+ mt => 'Visit [_1] to log-in and access the course.',
args => [$firsturl],
},
{
Index: loncom/localize/localize/de.pm
diff -u loncom/localize/localize/de.pm:1.426 loncom/localize/localize/de.pm:1.427
--- loncom/localize/localize/de.pm:1.426 Tue Aug 9 14:28:40 2011
+++ loncom/localize/localize/de.pm Fri Aug 26 15:58:04 2011
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# German Localization Lexicon
#
-# $Id: de.pm,v 1.426 2011/08/09 14:28:40 bisitz Exp $
+# $Id: de.pm,v 1.427 2011/08/26 15:58:04 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -17573,8 +17573,8 @@
'As Course Coordinator, use [_1]Main Menu -> Manage Course Users -> "Enrollment Requests"[_1] to display a list of pending enrollment requests, which you can either approve or reject.'
=> 'Um eine Liste aller noch offenen Belegungswünsche anzuzeigen, wählen Sie als Kurs-Koordinator: [_1]Hauptmenü -> Kursteilnehmer verwalten -> "Belegungswünsche".[_1]Diese können dort bestätigt bzw. abgelehnt werden.',
- 'Visit [_1], to log-in and access the course'
-=> 'Gehen Sie nach [_1], um sich anzumelden und Zugriff auf den Kurs zu erhalten.',
+ 'Visit [_1] to log-in and access the course'
+=> 'Gehen Sie nach [_1] um sich anzumelden und Zugriff auf den Kurs zu erhalten.',
'Your request for enrollment has not been approved.'
=> 'Ihr Belegungswunsch wurde nicht bestätigt.',
Index: loncom/localize/localize/es.pm
diff -u loncom/localize/localize/es.pm:1.65 loncom/localize/localize/es.pm:1.66
--- loncom/localize/localize/es.pm:1.65 Sun Jul 31 01:19:42 2011
+++ loncom/localize/localize/es.pm Fri Aug 26 15:58:04 2011
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Spanish Localization Lexicon
#
-# $Id: es.pm,v 1.65 2011/07/31 01:19:42 raeburn Exp $
+# $Id: es.pm,v 1.66 2011/08/26 15:58:04 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -16675,8 +16675,8 @@
'As Course Coordinator, use [_1]Main Menu -> Manage Course Users -> "Enrollment Requests"[_1] to display a list of pending enrollment requests which you can either approve or reject.'
=> 'Como Coordinador de Curso, usar [_1]Menú Principal -> Control de Usuarios del Curso -> "Solicitud de Inscripción"[_1] para mostrar una lista de solicitud de inscraripción pendiente que puede ser aprobada o rechazada.',
- 'Visit [_1], to log-in and access the course'
-=> 'Visitar [_1], para conectarse y accesar el curso.',
+ 'Visit [_1] to log-in and access the course'
+=> 'Visitar [_1] para conectarse y accesar el curso.',
'Your request for enrollment has not been approved.'
=> 'Su solicitud de inscripción no fue aprobada.',
Index: loncom/localize/localize/pt.pm
diff -u loncom/localize/localize/pt.pm:1.56 loncom/localize/localize/pt.pm:1.57
--- loncom/localize/localize/pt.pm:1.56 Sun Jul 31 01:17:37 2011
+++ loncom/localize/localize/pt.pm Fri Aug 26 15:58:04 2011
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Portuguese Localization Lexicon
#
-# $Id: pt.pm,v 1.56 2011/07/31 01:17:37 raeburn Exp $
+# $Id: pt.pm,v 1.57 2011/08/26 15:58:04 raeburn Exp $
#
# Copyright UNICAMP, Sao Paulo
# Supported in part by Partnership in Global Learning
@@ -19951,8 +19951,8 @@
'Visible input'
=> 'Visible input',
- 'Visit [_1], to log-in and access the course'
-=> 'Visit [_1], to log-in and access the course',
+ 'Visit [_1] to log-in and access the course'
+=> 'Visit [_1] to log-in and access the course',
'Visited Link Color'
=> 'Visited Link Color',
More information about the LON-CAPA-cvs
mailing list