[LON-CAPA-cvs] cvs: loncom /interface groupboards.pm grouproster.pm lonbulletin.pm loncoursegroups.pm lonmsgdisplay.pm lonsimplepage.pm portfolio.pm
raeburn
raeburn at source.lon-capa.org
Tue Sep 8 19:54:40 EDT 2020
raeburn Tue Sep 8 23:54:40 2020 EDT
Modified files:
/loncom/interface groupboards.pm grouproster.pm lonbulletin.pm
loncoursegroups.pm lonmsgdisplay.pm
lonsimplepage.pm portfolio.pm
Log:
- Prevent localization of group description in breadcrumbs for group tools.
-------------- next part --------------
Index: loncom/interface/groupboards.pm
diff -u loncom/interface/groupboards.pm:1.22 loncom/interface/groupboards.pm:1.23
--- loncom/interface/groupboards.pm:1.22 Fri Feb 26 21:44:39 2016
+++ loncom/interface/groupboards.pm Tue Sep 8 23:54:40 2020
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Group Bulletin Boards Manager
#
-# $Id: groupboards.pm,v 1.22 2016/02/26 21:44:39 raeburn Exp $
+# $Id: groupboards.pm,v 1.23 2020/09/08 23:54:40 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -266,17 +266,20 @@
if ($grouppagelink) {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>$grouppagelink,
- text=>"$ucgpterm: $description",
- title=>"Go to group's home page"});
+ text=>&mt('Group').": $description",
+ title=>&mt("Go to group's home page"),
+ no_mt=>1});
} else {
&Apache::lonhtmlcommon::add_breadcrumb
- ({text=>"$ucgpterm: $description",});
+ ({text=>&mt('Group').": $description",
+ no_mt=>1});
}
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"/adm/groupboards?group=$group&$refarg",
text=>"Discussion Boards",
title=>"Display group discussion boards"},);
- $output .= &Apache::lonhtmlcommon::breadcrumbs(&mt('[_1] discussion boards - [_2]',$gpterm,$description));
+ $output .= &Apache::lonhtmlcommon::breadcrumbs(&mt('Group discussion boards - [_1]',$description),
+ undef,undef,undef,undef,1);
return $output;
}
Index: loncom/interface/grouproster.pm
diff -u loncom/interface/grouproster.pm:1.10 loncom/interface/grouproster.pm:1.11
--- loncom/interface/grouproster.pm:1.10 Fri Feb 26 21:44:39 2016
+++ loncom/interface/grouproster.pm Tue Sep 8 23:54:40 2020
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: grouproster.pm,v 1.10 2016/02/26 21:44:39 raeburn Exp $
+# $Id: grouproster.pm,v 1.11 2020/09/08 23:54:40 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -165,17 +165,20 @@
if ($grouppagelink) {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>$grouppagelink,
- text=>"$ucgpterm: $description",
- title=>"Go to group's home page"},);
+ text=>&mt('Group').": $description",
+ title=>&mt("Go to group's home page"),
+ no_mt=>1},);
} else {
&Apache::lonhtmlcommon::add_breadcrumb
- ({text=>"$ucgpterm: $description",});
+ ({text=>&mt('Group').": $description",
+ no_mt=>1});
}
&Apache::lonhtmlcommon::add_breadcrumb
({href=>'/adm/grouproster?group='.$group.'&'.$refarg,
text=>"Membership Roster",
title=>"Display group membership"},);
- $output .= &Apache::lonhtmlcommon::breadcrumbs(&mt($gpterm.' membership status - [_1]',$description));
+ $output .= &Apache::lonhtmlcommon::breadcrumbs(&mt('Group membership status - [_1]',$description),
+ undef,undef,undef,undef,1);
}
return $output;
}
Index: loncom/interface/lonbulletin.pm
diff -u loncom/interface/lonbulletin.pm:1.68 loncom/interface/lonbulletin.pm:1.69
--- loncom/interface/lonbulletin.pm:1.68 Fri Feb 26 21:44:39 2016
+++ loncom/interface/lonbulletin.pm Tue Sep 8 23:54:40 2020
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Bulletin Board Handler
#
-# $Id: lonbulletin.pm,v 1.68 2016/02/26 21:44:39 raeburn Exp $
+# $Id: lonbulletin.pm,v 1.69 2020/09/08 23:54:40 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -323,12 +323,14 @@
if ($grouppagelink) {
push(@{$brcrum},
{href=>$grouppagelink,
- text=>"$ucgpterm: $description",
- title=>"Go to group's home page"},
+ text=>&mt('Group').": $description",
+ title=>&mt("Go to group's home page"),
+ no_mt=>1,},
);
} else {
push(@{$brcrum},
- {text=>"$ucgpterm: $description",}
+ {text=>&mt('Group').": $description",
+ no_mt=>1,}
);
}
push(@{$brcrum},
@@ -337,7 +339,8 @@
title=>"Display group discussion boards"},
{href=>"$boardurl",
text=>"$boardtitle",
- title=>"$boardtitle"},
+ title=>"$boardtitle",
+ no_mt=>1},
);
return $brcrum;
}
Index: loncom/interface/loncoursegroups.pm
diff -u loncom/interface/loncoursegroups.pm:1.130 loncom/interface/loncoursegroups.pm:1.131
--- loncom/interface/loncoursegroups.pm:1.130 Sun Mar 19 17:56:04 2017
+++ loncom/interface/loncoursegroups.pm Tue Sep 8 23:54:40 2020
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: loncoursegroups.pm,v 1.130 2017/03/19 17:56:04 raeburn Exp $
+# $Id: loncoursegroups.pm,v 1.131 2020/09/08 23:54:40 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -941,7 +941,8 @@
if ($env{'form.refpage'} eq 'grouplist') {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"/adm/$cdom/$cnum/$env{'form.groupname'}/smppg?ref=grouplist",
- text=>"Group: $description",});
+ text=>&mt('Group').": $description",
+ no_mt=>1});
}
}
Index: loncom/interface/lonmsgdisplay.pm
diff -u loncom/interface/lonmsgdisplay.pm:1.191 loncom/interface/lonmsgdisplay.pm:1.192
--- loncom/interface/lonmsgdisplay.pm:1.191 Fri Jan 10 05:08:39 2020
+++ loncom/interface/lonmsgdisplay.pm Tue Sep 8 23:54:40 2020
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines for messaging display
#
-# $Id: lonmsgdisplay.pm,v 1.191 2020/01/10 05:08:39 raeburn Exp $
+# $Id: lonmsgdisplay.pm,v 1.192 2020/09/08 23:54:40 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -782,11 +782,14 @@
if ($grouppagelink) {
&Apache::lonhtmlcommon::add_breadcrumb
({href=>$grouppagelink,
- text=>"Group: $description",
- title=>"Go to group's home page"},);
+ text=>&mt('Group').": $description",
+ title=>&mt("Go to group's home page"),
+ no_mt=>1,
+ },);
} else {
&Apache::lonhtmlcommon::add_breadcrumb
- ({text=>"Group: $description",});
+ ({text=>&mt('Group').": $description",
+ no_mt=>1,});
}
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"/adm/email?compose=group&group=".
@@ -799,8 +802,9 @@
title=>"E-mails sent"},);
}
my $groupheader = &Apache::loncommon::start_page('Group Message');
- $groupheader .= &Apache::lonhtmlcommon::breadcrumbs
- ('Group - '.$env{'form.group'}.' Email');
+ $groupheader .= &Apache::lonhtmlcommon::breadcrumbs(
+ &mt('Group messages - [_1]',$description),
+ undef,undef,undef,undef,1);
return $groupheader;
}
Index: loncom/interface/lonsimplepage.pm
diff -u loncom/interface/lonsimplepage.pm:1.104 loncom/interface/lonsimplepage.pm:1.105
--- loncom/interface/lonsimplepage.pm:1.104 Fri Feb 26 21:44:39 2016
+++ loncom/interface/lonsimplepage.pm Tue Sep 8 23:54:40 2020
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Simple Page Editor
#
-# $Id: lonsimplepage.pm,v 1.104 2016/02/26 21:44:39 raeburn Exp $
+# $Id: lonsimplepage.pm,v 1.105 2020/09/08 23:54:40 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -394,8 +394,9 @@
text=>"Groups",
title=>"Display Groups"},
{href=>"/adm/$cdom/$cnum/$group/smppg?ref=grouplist",
- text=>&mt('Group:')." $description",
- title=>"Go to group's home page"},
+ text=>&mt('Group').": $description",
+ title=>&mt("Go to group's home page"),
+ no_mt=>1}},
];
}
Index: loncom/interface/portfolio.pm
diff -u loncom/interface/portfolio.pm:1.261 loncom/interface/portfolio.pm:1.262
--- loncom/interface/portfolio.pm:1.261 Sun Aug 11 15:15:40 2019
+++ loncom/interface/portfolio.pm Tue Sep 8 23:54:40 2020
@@ -1,7 +1,7 @@
# The LearningOnline Network
# portfolio browser
#
-# $Id: portfolio.pm,v 1.261 2019/08/11 15:15:40 raeburn Exp $
+# $Id: portfolio.pm,v 1.262 2020/09/08 23:54:40 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2549,13 +2549,15 @@
}
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"/adm/$cdom/$cnum/$env{'form.group'}/smppg?ref=$env{'form.ref'}",
- text=>"$ucgpterm: $grp_desc",
- title=>"Go to group's home page"},
+ text=>&mt('Group').": $grp_desc",
+ title=>&mt("Go to group's home page"),
+ no_mt=>1}},
{href=>"/adm/coursegrp_portfolio?".&group_args(),
text=>"Group Portfolio",
title=>"Display group portfolio"});
my $output = &Apache::lonhtmlcommon::breadcrumbs(
- &mt('[_1] portfolio files - [_2]',$gpterm,$grp_desc));
+ &mt('Group portfolio files - [_1]',$grp_desc),
+ undef,undef,undef,undef,1);
return $output;
}
More information about the LON-CAPA-cvs
mailing list