[LON-CAPA-cvs] cvs: loncom /homework grades.pm /imspackages imsimport.pm /interface loncreateuser.pm lontrackstudent.pm /localize/localize de.pm zh.pm /publisher loncfile.pm londiff.pm lonupload.pm testbankimport.pm
bisitz
bisitz@source.lon-capa.org
Thu, 14 May 2009 14:24:27 -0000
This is a MIME encoded message
--bisitz1242311067
Content-Type: text/plain
bisitz Thu May 14 14:24:27 2009 EDT
Modified files:
/loncom/localize/localize de.pm zh.pm
/loncom/interface lontrackstudent.pm loncreateuser.pm
/loncom/homework grades.pm
/loncom/publisher londiff.pm testbankimport.pm loncfile.pm
lonupload.pm
/loncom/imspackages imsimport.pm
Log:
Don't translate separator character between and domain.
Advantages: No need to change the translation files, if...
- different separator character should be used
- different output is wanted, e.g. just username, plainname, both, etc.
- different style should be used for output
(work in progress to make this even more flexible by introducing a global function usernamewrapper)
--bisitz1242311067
Content-Type: text/plain
Content-Disposition: attachment; filename="bisitz-20090514142427.txt"
Index: loncom/localize/localize/de.pm
diff -u loncom/localize/localize/de.pm:1.295 loncom/localize/localize/de.pm:1.296
--- loncom/localize/localize/de.pm:1.295 Thu May 14 12:02:24 2009
+++ loncom/localize/localize/de.pm Thu May 14 14:23:46 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# German Localization Lexicon
#
-# $Id: de.pm,v 1.295 2009/05/14 12:02:24 bisitz Exp $
+# $Id: de.pm,v 1.296 2009/05/14 14:23:46 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2721,9 +2721,6 @@
'Error: [_1]'
=> 'Fehler: [_1]',
- 'Error dropping [_1]:[_2]'
-=> 'Fehler beim Ausschließen von [_1]:[_2]',
-
'Field'
=> 'Feld',
@@ -7884,8 +7881,8 @@
'View recent activity by this student'
=> 'Zuletzt stattgefundene Aktivitäten dieses/r Studenten/in',
- 'Recent activity of [_1]:[_2]'
-=> 'Zuletzt stattgefundene Aktivtäten von [_1]:[_2]',
+ 'Recent activity of [_1]'
+=> 'Zuletzt stattgefundene Aktivtäten von [_1]',
'Compiling student activity data can take a long time. Your request continues to be processed while results are displayed.'
=> 'Das Zusammenstellen der Aktivitätsdaten kann eine Weile dauern. Ihre Anfrage wird weiter verarbeitet, während die schon vorhandenen Ergebnisse bereits angezeigt werden.',
@@ -9354,8 +9351,8 @@
'Deleting [_1] in [_2]: [_3]'
=> 'Entferne Rolle [_1] für [_2]: [_3]',
- 'Deleting custom role [_1] by [_2]:[_3] in [_4]'
-=> 'Entferne benutzerdefinierte Rolle [_1] von [_2]:[_3] für [_4]',
+ 'Deleting custom role [_1] by [_2] in [_3]'
+=> 'Entferne benutzerdefinierte Rolle [_1] von [_2] für [_3]',
'Add to classlist'
=> 'Hinzufügen zur Kursteilnehmerliste',
@@ -9364,7 +9361,7 @@
=> 'Reaktivierung der Rolle [_1] für [_2]: [_3]',
'Re-enabling custom role [_1] by [_2]:[_3] in [_4] : [_5]'
-=> 'Reaktivierung der benutzerdefinierten Rolle [_1] von [_2]:[_3] für [_4] : [_5]',
+=> 'Reaktivierung der benutzerdefinierten Rolle [_1] für [_2] in [_3]: [_4]',
'Unknown command'
=> 'Unbekannter Befehl',
@@ -9815,9 +9812,6 @@
'Please try again'
=> 'Bitte versuchen Sie es noch einmal',
- 'Enrolling [_1] : [_2]'
-=> '[_1]:[_2] wird in den Kurs aufgenommen',
-
'in this course'
=> 'in diesem Kurs',
@@ -11199,8 +11193,8 @@
'Download All Submitted Documents'
=> 'Alle eingereichten Dokumente herunterladen',
- 'Essay is [_1]% similar to an essay by [_2] ([_3]:[_4]) in course [_5] (course id [_6]:[_7])'
-=> 'Das Essay stimmt zu [_1]% mit dem Essay von [_2] ([_3]:[_4]) im Kurs [_5] (Kurs-ID [_6]:[_7]) überein',
+ 'Essay is [_1]% similar to an essay by [_2] in course [_3] (course id [_4]:[_5])'
+=> 'Das Essay stimmt zu [_1]% mit dem Essay von [_2] im Kurs [_3] (Kurs-ID [_4]:[_5]) überein',
'Compose message to student'
=> 'Nachricht an Student/in erstellen',
@@ -11217,8 +11211,8 @@
'Grading Feedback'
=> 'Bewertungs-Feedback',
- 'Sending message to [_1]:[_2]'
-=> 'Sende Nachricht an [_1]:[_2]',
+ 'Sending message to [_1]'
+=> 'Sende Nachricht an [_1]',
'Not allowed to modify grades for [_1]'
=> 'Keine Berechtigung zur Änderung der Bewertungen für [_1].',
Index: loncom/localize/localize/zh.pm
diff -u loncom/localize/localize/zh.pm:1.51 loncom/localize/localize/zh.pm:1.52
--- loncom/localize/localize/zh.pm:1.51 Thu May 14 12:02:24 2009
+++ loncom/localize/localize/zh.pm Thu May 14 14:23:46 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Chinese Simplified Localization Lexicon
#
-# $Id: zh.pm,v 1.51 2009/05/14 12:02:24 bisitz Exp $
+# $Id: zh.pm,v 1.52 2009/05/14 14:23:46 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2749,9 +2749,6 @@
'Error: [_1]'
=> 'Fehler: [_1]',
- 'Error dropping [_1]:[_2]'
-=> 'Fehler beim Ausschließen von [_1]:[_2]',
-
'Field'
=> 'Feld',
@@ -7981,8 +7978,8 @@
'View recent activity'
=> '查看最近活动',
- 'Recent activity of [_1]:[_2]'
-=> '最后处于活动状态的 [_1]:[_2]',
+ 'Recent activity of [_1]'
+=> '最后处于活动状态的 [_1]',
'Compiling student activity data can take a long time. Your request continues to be processed while results are displayed.'
@@ -9459,8 +9456,8 @@
'Deleting [_1] in [_2]: [_3]'
=> 'Entferne Rolle [_1] für [_2]: [_3]',
- 'Deleting custom role [_1] by [_2]:[_3] in [_4]'
-=> 'Entferne benutzerdefinierte Rolle [_1] von [_2]:[_3] für [_4]',
+ 'Deleting custom role [_1] by [_2] in [_3]'
+=> 'Entferne benutzerdefinierte Rolle [_1] von [_2] für [_3]',
'Add to classlist'
=> 'Hinzufügen zur Kursteilnehmerliste',
@@ -9468,8 +9465,8 @@
'Re-enabling [_1] in [_2]: [_3]'
=> 'Reaktivierung der Rolle [_1] für [_2]: [_3]',
- 'Re-enabling custom role [_1] by [_2]@[_3] in [_4] : [_5]'
-=> 'Reaktivierung der benutzerdefinierten Rolle [_1] von [_2]@[_3] für [_4] : [_5]',
+ 'Re-enabling custom role [_1] by [_2] in [_3]: [_4]'
+=> 'Reaktivierung der benutzerdefinierten Rolle [_1] für [_2] in [_3]: [_4]',
'Unknown command'
=> 'Unbekannter Befehl',
@@ -9927,9 +9924,6 @@
'Please try again'
=> 'Bitte versuchen Sie es noch einmal',
- 'Enrolling [_1] : [_2]'
-=> '[_1]:[_2] wird in den Kurs aufgenommen',
-
'in this course'
=> 'in diesem Kurs',
@@ -11317,8 +11311,8 @@
'Download All Submitted Documents'
=> 'Alle eingereichten Dokumente herunterladen',
- 'Essay is [_1]% similar to an essay by [_2] ([_3]:[_4]) in course [_5] (course id [_6]:[_7])'
-=> 'Das Essay stimmt zu [_1]% mit dem Essay von [_2] ([_3]:[_4]) im Kurs [_5] (Kurs-ID [_6]:[_7]) überein',
+ 'Essay is [_1]% similar to an essay by [_2] in course [_3] (course id [_4]:[_5])'
+=> 'Das Essay stimmt zu [_1]% mit dem Essay von [_2] im Kurs [_3] (Kurs-ID [_4]:[_5]) überein',
'Compose message to student'
=> 'Nachricht an Studenten erstellen',
@@ -11335,8 +11329,8 @@
'Grading Feedback'
=> '评估反馈',
- 'Sending message to [_1]:[_2]'
-=> '发送邮件至 [_1]：[_2]',
+ 'Sending message to [_1]'
+=> '发送邮件至 [_1]',
'Not allowed to modify grades for [_1]'
=> 'Keine Berechtigung zur Änderung der Bewertungen für [_1].',
Index: loncom/interface/lontrackstudent.pm
diff -u loncom/interface/lontrackstudent.pm:1.28 loncom/interface/lontrackstudent.pm:1.29
--- loncom/interface/lontrackstudent.pm:1.28 Thu Mar 26 17:36:39 2009
+++ loncom/interface/lontrackstudent.pm Thu May 14 14:23:56 2009
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lontrackstudent.pm,v 1.28 2009/03/26 17:36:39 bisitz Exp $
+# $Id: lontrackstudent.pm,v 1.29 2009/05/14 14:23:56 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -600,7 +600,7 @@
if ($sname =~ /^$LONCAPA::username_re$/
&& $sdom =~ /^$LONCAPA::domain_re$/) {
$r->print('<h2>'.
- &mt('Recent activity of [_1]:[_2]',$sname,$sdom).
+ &mt('Recent activity of [_1]',$sname.':'.$sdom).
'</h2>');
$r->print('<p class="LC_info">'
.&mt('Compiling student activity data can take a long time.'
Index: loncom/interface/loncreateuser.pm
diff -u loncom/interface/loncreateuser.pm:1.293 loncom/interface/loncreateuser.pm:1.294
--- loncom/interface/loncreateuser.pm:1.293 Mon May 11 13:07:24 2009
+++ loncom/interface/loncreateuser.pm Thu May 14 14:23:56 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Create a user
#
-# $Id: loncreateuser.pm,v 1.293 2009/05/11 13:07:24 bisitz Exp $
+# $Id: loncreateuser.pm,v 1.294 2009/05/14 14:23:56 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2689,8 +2689,8 @@
if ($key=~m{^form\.del\:([^_]+)_cr\.cr/($match_domain)/($match_username)/(\w+)$}) {
my ($url,$rdom,$rnam,$rolename) = ($1,$2,$3,$4);
# Delete custom role
- $r->print(&mt('Deleting custom role [_1] by [_2]:[_3] in [_4]',
- $rolename,$rnam,$rdom,$url).': <b>'.
+ $r->print(&mt('Deleting custom role [_1] by [_2] in [_3]',
+ $rolename,$rnam.':'.$rdom,$url).': <b>'.
&Apache::lonnet::assigncustomrole($env{'form.ccdomain'},
$env{'form.ccuname'},$url,$rdom,$rnam,$rolename,$now,
0,1,$context).'</b><br />');
@@ -2741,8 +2741,8 @@
my $result = &Apache::lonnet::assigncustomrole(
$env{'form.ccdomain'}, $env{'form.ccuname'},
$url,$rdom,$rnam,$rolename,0,$now,undef,$context);
- $r->print(&mt('Re-enabling custom role [_1] by [_2]:[_3] in [_4] : [_5]',
- $rolename,$rnam,$rdom,$url,'<b>'.$result.'</b>').'<br />');
+ $r->print(&mt('Re-enabling custom role [_1] by [_2] in [_3]: [_4]',
+ $rolename,$rnam.':'.$rdom,$url,'<b>'.$result.'</b>').'<br />');
if (!grep(/^cr$/,@rolechanges)) {
push(@rolechanges,'cr');
}
Index: loncom/homework/grades.pm
diff -u loncom/homework/grades.pm:1.573 loncom/homework/grades.pm:1.574
--- loncom/homework/grades.pm:1.573 Mon May 11 13:07:19 2009
+++ loncom/homework/grades.pm Thu May 14 14:24:07 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# The LON-CAPA Grading handler
#
-# $Id: grades.pm,v 1.573 2009/05/11 13:07:19 bisitz Exp $
+# $Id: grades.pm,v 1.574 2009/05/14 14:24:07 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2135,10 +2135,9 @@
{'one_time' => 1});
$similar="<hr /><h3><span class=\"LC_warning\">".
- &mt('Essay is [_1]% similar to an essay by [_2] ([_3]:[_4]) in course [_5] (course id [_6]:[_7])',
+ &mt('Essay is [_1]% similar to an essay by [_2] in course [_3] (course id [_4]:[_5])',
$osim,
- &Apache::loncommon::plainname($oname,$odom),
- $oname,$odom,
+ &Apache::loncommon::plainname($oname,$odom).' ('.$oname.':'.$odom.')',
$old_course_desc{'description'},
$old_course_desc{'num'},
$old_course_desc{'domain'}).
@@ -2463,7 +2462,7 @@
undef,$feedurl,undef,
undef,undef,$showsymb,
$restitle);
- $request->print('<br />'.&mt('Sending message to [_1]:[_2]',$uname,$udom).': '.
+ $request->print('<br />'.&mt('Sending message to [_1]',$uname.':'.$udom).': '.
$msgstatus);
}
if ($env{'form.collaborator'.$ctr}) {
Index: loncom/publisher/londiff.pm
diff -u loncom/publisher/londiff.pm:1.26 loncom/publisher/londiff.pm:1.27
--- loncom/publisher/londiff.pm:1.26 Thu May 14 12:02:14 2009
+++ loncom/publisher/londiff.pm Thu May 14 14:24:18 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to show differences between file versions
#
-# $Id: londiff.pm,v 1.26 2009/05/14 12:02:14 bisitz Exp $
+# $Id: londiff.pm,v 1.27 2009/05/14 14:24:18 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -115,7 +115,7 @@
if (($cuname ne $env{'user.name'}) || ($cudom ne $env{'user.domain'})) {
$r->print('<p><span class="LC_warning">'
- .&mt('Co-Author: [_1]'
+ .&mt('Co-Author [_1]'
,&Apache::loncommon::plainname($cuname,$cudom)
.' ('.$cuname.':'.$cudom.')')
.'</span></p>'
Index: loncom/publisher/testbankimport.pm
diff -u loncom/publisher/testbankimport.pm:1.23 loncom/publisher/testbankimport.pm:1.24
--- loncom/publisher/testbankimport.pm:1.23 Wed May 6 13:13:00 2009
+++ loncom/publisher/testbankimport.pm Thu May 14 14:24:18 2009
@@ -1,5 +1,5 @@
# Handler for parsing text upload problem descriptions into .problems
-# $Id: testbankimport.pm,v 1.23 2009/05/06 13:13:00 bisitz Exp $
+# $Id: testbankimport.pm,v 1.24 2009/05/14 14:24:18 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1774,7 +1774,7 @@
{'add_entries' => $loadentries});
if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) {
$output .= '<p class="LC_warning">'
- .&mt('Co-Author [_1]:[_2]',$uname,$udom)
+ .&mt('Co-Author [_1]',$uname.':'.$udom)
.'</p>';
}
return $output;
Index: loncom/publisher/loncfile.pm
diff -u loncom/publisher/loncfile.pm:1.97 loncom/publisher/loncfile.pm:1.98
--- loncom/publisher/loncfile.pm:1.97 Mon May 11 16:51:32 2009
+++ loncom/publisher/loncfile.pm Thu May 14 14:24:18 2009
@@ -9,7 +9,7 @@
# and displays a page showing the results of the action.
#
#
-# $Id: loncfile.pm,v 1.97 2009/05/11 16:51:32 bisitz Exp $
+# $Id: loncfile.pm,v 1.98 2009/05/14 14:24:18 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1395,7 +1395,7 @@
if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) {
$r->print('<p class="LC_warning">'
- .&mt('Co-Author [_1]:[_2]',$uname,$udom)
+ .&mt('Co-Author [_1]',$uname.':'.$udom)
.'</p>'
);
}
Index: loncom/publisher/lonupload.pm
diff -u loncom/publisher/lonupload.pm:1.45 loncom/publisher/lonupload.pm:1.46
--- loncom/publisher/lonupload.pm:1.45 Wed May 6 16:19:50 2009
+++ loncom/publisher/lonupload.pm Thu May 14 14:24:18 2009
@@ -2,7 +2,7 @@
# The LearningOnline Network with CAPA
# Handler to upload files into construction space
#
-# $Id: lonupload.pm,v 1.45 2009/05/06 16:19:50 bisitz Exp $
+# $Id: lonupload.pm,v 1.46 2009/05/14 14:24:18 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -445,7 +445,7 @@
if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) {
$r->print('<p class="LC_warning">'
- .&mt('Co-Author [_1]:[_2]',$uname,$udom)
+ .&mt('Co-Author [_1]',$uname.':'.$udom)
.'</p>'
);
}
Index: loncom/imspackages/imsimport.pm
diff -u loncom/imspackages/imsimport.pm:1.30 loncom/imspackages/imsimport.pm:1.31
--- loncom/imspackages/imsimport.pm:1.30 Mon May 4 16:45:51 2009
+++ loncom/imspackages/imsimport.pm Thu May 14 14:24:26 2009
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: imsimport.pm,v 1.30 2009/05/04 16:45:51 bisitz Exp $
+# $Id: imsimport.pm,v 1.31 2009/05/14 14:24:26 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -762,9 +762,9 @@
$r->print(&Apache::loncommon::start_page($title, $javascript));
if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) {
- $r->print('<h3><span class="LC_warning">'
- .&mt('Co-Author [_1]:[_2]',$uname,$udom)
- .'</span></h3>'
+ $r->print('<p><span class="LC_warning">'
+ .&mt('Co-Author [_1]',$uname.':'.$udom)
+ .'</span></p>'
);
}
if ($env{'form.phase'} eq 'two') {
--bisitz1242311067--