--- loncom/interface/lonmsgdisplay.pm 2013/07/15 16:13:21 1.163
+++ loncom/interface/lonmsgdisplay.pm 2014/04/25 17:56:42 1.174
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines for messaging display
#
-# $Id: lonmsgdisplay.pm,v 1.163 2013/07/15 16:13:21 bisitz Exp $
+# $Id: lonmsgdisplay.pm,v 1.174 2014/04/25 17:56:42 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -128,11 +128,8 @@ sub folderlist {
go => 'Go',
nnff => 'New Name for Folder',
newn => 'New Name',
- thfm => 'The folder may not be renamed',
- fmnb => 'folder may not be renamed as it is a folder provided by the system.',
- asth => 'as this name is already in use for a system-provided or user-defined folder.',
- the => 'The',
- tnfm => 'The new folder may not be named',
+ fmnb => 'Folder may not be renamed as it is a folder provided by the system.',
+ asth => 'Requested name already in use for a system-provided or user-defined folder.',
);
@@ -182,7 +179,7 @@ function folder_choice(targetform,caller
if (targetform.folderaction.options[targetform.folderaction.selectedIndex].value == 'rename') {
for (var i=0; i
'."\n".
&Apache::loncommon::select_form($msgstatus,'msgstatus',\%statushash).'
- '.$lt{'actn'}.'
'."\n".'
+
+ '.$lt{'actn'}.'
-
-
'."\n".'
'.
&Apache::loncommon::select_form('view','folderaction',\%actions).
'
- '.&mt('New Folder').'
'."\n".'
+
+ '.&mt('New Folder').'
'."\n".'
print(''.(($status eq 'new')?'':'').
''.
- $item.(($status eq 'new')?'':'').' ');
+ $item.''.(($status eq 'new')?'':'').'');
}
# Description and Status
my $showstatus;
@@ -1257,7 +1254,7 @@ ENDDISHEADER
$r->print(' '."\n");
}
if ($msgstatus ne 'read') {
- $r->print(' ."\n"');
+ $r->print(' '."\n");
}
if ($msgstatus ne 'unread') {
$r->print(' '."\n");
@@ -1665,8 +1662,8 @@ ENDREPSCRIPT
$r->print(&additional_rec_row(\%lt));
$r->print(' ');
+ &mt("The subject in each forwarded message will be [_1]'Forwarding:'[_2] followed by the original subject.",'','').''.
&mt('Unless you choose otherwise:').'
-'.&mt('The messages will be assembled from all lines with the respective'."\n".'username:domain, and appended to the general message text.'));
+'.&mt('The messages will be assembled from all lines with the respective [_1][_2]username:domain[_3], and appended to the general message text.','
@@ -1927,8 +1924,7 @@ sub disfacetoface {
} else {
%content=&Apache::lonmsg::unpackagemsg($content{'message'});
$content{'message'} =
- ''.&mt('Subject').': '.$content{'subject'}.' ".&mt('No notes, face-to-face discussion records, critical messages, or broadcast messages in this [_1].',$lctype)." ".&mt('No notes, face-to-face discussion records, critical messages or broadcast messages in this '.$lctype.'.')."
','',''));
$r->print(<
'.&mt('Subject').': '.$content{'subject'}.'
'.
$content{'message'};
}
} else {
@@ -1957,9 +1953,9 @@ $content{'sendername'}.':'.
if ($result eq '') {
my $lctype = &mt(lc(&Apache::loncommon::course_type()));
if ($target ne 'tex') {
- $r->print("