[LON-CAPA-cvs] cvs: loncom /homework grades.pm /localize/localize de.pm

bisitz bisitz@source.lon-capa.org
Thu, 28 May 2009 14:30:10 -0000


This is a MIME encoded message

--bisitz1243521010
Content-Type: text/plain

bisitz		Thu May 28 14:30:10 2009 EDT

  Modified files:              
    /loncom/homework	grades.pm 
    /loncom/localize/localize	de.pm 
  Log:
  Localization:
  - Resolved translation issues with ID: Now use "Part ID" instead of just "ID"
  - Optimized &mt usage for "Part", "Part ID" and other
    (Note: Values are also displayed in bold now. Redesign expected anyway.)
  - Added missing &mt calls
  - Added missing translations (more to do)
  
  - Optimized nowrap
  - de.pm: some other little updates/corrections
  
  
--bisitz1243521010
Content-Type: text/plain
Content-Disposition: attachment; filename="bisitz-20090528143010.txt"

Index: loncom/homework/grades.pm
diff -u loncom/homework/grades.pm:1.576 loncom/homework/grades.pm:1.577
--- loncom/homework/grades.pm:1.576	Mon May 25 11:12:13 2009
+++ loncom/homework/grades.pm	Thu May 28 14:30:04 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.576 2009/05/25 11:12:13 www Exp $
+# $Id: grades.pm,v 1.577 2009/05/28 14:30:04 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -183,7 +183,8 @@
     my ($partID,$symb)=@_;
     my $display=&Apache::lonnet::EXT('resource.'.$partID.'.display',$symb);
     if (defined($display) and $display ne '') {
-	$display.= " (<span class=\"LC_internal_info\">id $partID</span>)";
+        $display.= ' (<span class="LC_internal_info">'
+                  .&mt('Part ID: [_1]',$partID).'</span>)';
     } else {
 	$display=$partID;
     }
@@ -217,9 +218,9 @@
 		$partsseen{$partID}=1;
 	    }
 	    my $display_part=&get_display_part($partID,$symb);
-	    $result.='<td><b>'.&mt('Part').': </b>'.$display_part.
+            $result.='<td><b>'.&mt('Part: [_1]',$display_part).'</b>'.
                 ' <span class="LC_internal_info">'.$resID.'</span></td>'.
-		'<td><b>'.&mt('Type').': </b>'.$responsetype.'</td></tr>';
+                '<td><b>'.&mt('Type: [_1]',$responsetype).'</b></td></tr>';
 #	    '<td>'.&mt('<b>Handgrade: </b>[_1]',$handgrade).'</td></tr>';
 	}
     }
@@ -1734,7 +1735,7 @@
 
 	#&mt('<td><b>Part:</b></td><td>[_1]</td><td><b>Points:</b></td><td>[_2]</td><td>or</td><td>[_3]</td>',$display_part,$radio,$line);
     $result .= 
-	    '<td><b>'.&mt('Part').':</b></td><td>'.$display_part.'</td><td><b>'.&mt('Points').':</b></td><td>'.$radio.'</td><td>'.&mt('or').'</td><td>'.$line.'</td>'.
+	    '<td><b>'.&mt('Part:').'</b></td><td>'.$display_part.'</td><td><b>'.&mt('Points:').'</b></td><td>'.$radio.'</td><td>'.&mt('or').'</td><td>'.$line.'</td>'.
     
     $result.='</tr></table>'."\n";
     $result.='<input type="hidden" name="stores'.$counter.'_'.$partid.'" value="" />'."\n".
@@ -2113,9 +2114,11 @@
 		}
 		my $responsetype = $responseType->{$partid}->{$respid};
 		if (!exists($record{"resource.$partid.$respid.submission"})) {
-		    $lastsubonly.="\n".'<div class="LC_grade_submission_part"><b>Part:</b> '.
-			$display_part.' <span class="LC_internal_info">( ID '.$respid.
-			' )</span>&nbsp; &nbsp;'.
+                    $lastsubonly.="\n".'<div class="LC_grade_submission_part">'.
+                        '<b>'.&mt('Part: [_1]',$display_part).'</b>'.
+                        ' <span class="LC_internal_info">'.
+                        '('.&mt('Part ID: [_1]',$respid).')</b>'.
+                        '</span>&nbsp; &nbsp;'.
 			'<span class="LC_warning">'.&mt('Nothing submitted - no attempts.').'</span><br /><br /></div>';
 		    next;
 		}
@@ -2151,9 +2154,11 @@
 			($env{'form.lastSub'} eq 'hdgrade' && 
 			 $$handgrade{$$part[0].'_'.$$part[1]} eq 'yes')) {
 			my $display_part=&get_display_part($partid,$symb);
-			$lastsubonly.='<div class="LC_grade_submission_part"><b>Part:</b> '.
-			    $display_part.' <span class="LC_internal_info">( ID '.$respid.
-			    ' )</span>&nbsp; &nbsp;';
+                        $lastsubonly.='<div class="LC_grade_submission_part">'.
+                            '<b>'.&mt('Part: [_1]',$display_part).'</b>'.
+                            ' <span class="LC_internal_info">'.
+                            '('.&mt('Part ID: [_1]',$respid).')'.
+                            '</b></span>&nbsp; &nbsp;';
 			my $files=&get_submitted_files($udom,$uname,$partid,$respid,\%record);
 			if (@$files) {
 			    $lastsubonly.='<br /><span class="LC_warning">'.&mt('Like all files provided by users, this file may contain viruses').'</span><br />';
@@ -3294,7 +3299,7 @@
 
 	$result.=
 	    &Apache::loncommon::start_data_table_row()."\n".
-	    '<td><b>'.&mt('Part').':</b></td><td>'.$display_part.'</td><td><b>'.&mt('Points').':</b></td><td>'.$radio.'</td><td>'.&mt('or').'</td><td>'.$line.'</td>'.
+	    '<td><b>'.&mt('Part:').'</b></td><td>'.$display_part.'</td><td><b>'.&mt('Points:').'</b></td><td>'.$radio.'</td><td>'.&mt('or').'</td><td>'.$line.'</td>'.
 	    &Apache::loncommon::end_data_table_row()."\n";
 	$ctsparts++;
     }
@@ -4466,13 +4471,16 @@
 
 		    my ($responseId)= ($isTask ? ($matchKey=~ /^resource\.(.*?)\.\Q$partid\E\.award$/)
 				               : ($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/));
-		    $displaySub[0].='<b>'.&mt('Part:').'</b>&nbsp;'.$display_part.'&nbsp;';
-		    $displaySub[0].='<span class="LC_internal_info">('.&mt('ID').'&nbsp;'.
-			$responseId.')</span>&nbsp;<b>';
+                    $displaySub[0].='<span class="LC_nobreak"';
+                    $displaySub[0].='<b>'.&mt('Part: [_1]',$display_part).'</b>'
+                                   .' <span class="LC_internal_info">'
+                                   .'('.&mt('Part ID: [_1]',$responseId).')'
+                                   .'</span>'
+                                   .' <b>';
 		    if ($$record{"$where.$partid.tries"} eq '') {
-			$displaySub[0].=&mt('Trial&nbsp;not&nbsp;counted');
+			$displaySub[0].=&mt('Trial not counted');
 		    } else {
-			$displaySub[0].=&mt('Trial&nbsp;[_1]',
+			$displaySub[0].=&mt('Trial: [_1]',
 					    $$record{"$where.$partid.tries"});
 		    }
 		    my $responseType=($isTask ? 'Task'
@@ -4483,7 +4491,8 @@
 			    &get_order($partid,$responseId,$symb,$uname,$udom,
                                        $no_increment);
 		    }
-		    $displaySub[0].='</b>&nbsp; '.
+		    $displaySub[0].='</b></span>'; # /nobreak
+		    $displaySub[0].='&nbsp; '.
 			&cleanRecord($$record{$version.':'.$matchKey},$responseType,$symb,$partid,$responseId,$record,$orders{$partid}->{$responseId},"$version:",$uname,$udom).'<br />';
 		}
 	    }
Index: loncom/localize/localize/de.pm
diff -u loncom/localize/localize/de.pm:1.305 loncom/localize/localize/de.pm:1.306
--- loncom/localize/localize/de.pm:1.305	Tue May 26 18:01:44 2009
+++ loncom/localize/localize/de.pm	Thu May 28 14:30:09 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # German Localization Lexicon
 #
-# $Id: de.pm,v 1.305 2009/05/26 18:01:44 bisitz Exp $
+# $Id: de.pm,v 1.306 2009/05/28 14:30:09 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -690,7 +690,7 @@
    'Found no analyzable parts in this problem, currently only Numerical, Formula and String response styles are supported.'
 => 'Keine analysierbaren Aufgabenteile gefunden.  Derzeit werden nur numerische Ausdrücke, Formeln und Strings als Antworttypen unterstützt.',
 
-   'Response [_1] is not analyzable at this time'
+   'Response [_1] is not analyzable at this time.'
 => 'Antwort [_1] ist derzeit nicht analysierbar.',
 
    'Title'
@@ -2223,6 +2223,9 @@
    'Type'
 => 'Typ',
 
+   'Type: [_1]'
+=> 'Typ: [_1]',
+
    'UNIX authenticated'
 => 'UNIX authentifiziert',
 
@@ -7985,9 +7988,24 @@
    'Problem Part'
 => 'Aufgabenteil', # n.t.
 
+   'Part:'
+=> 'Teil:',
+
    'Part ID:'
 => 'Aufgabenteil-ID:',
 
+   'Part ID: [_1]'
+=> 'Aufgabenteil-ID: [_1]',
+
+   'Points:'
+=> 'Punkte:',
+
+   'Trial not counted'
+=> 'Versuch wird nicht gezählt',
+
+   'Trial: [_1]'
+=> 'Versuch: [_1]',
+
    'Displayed Part Description:'
 => 'Anzuzeigende Aufgabenteil-Beschreibung:',
 
@@ -11402,8 +11420,8 @@
    'ID &quot;[_1]&quot; contains invalid characters, IDs are only allowed to contain letters, numbers, spaces and -'
 => 'ID &quot;[_1]&quot; enthält ungültige Zeichen. Gültige Zeichen für IDs sind nur Buchstaben, Ziffern, Zahlen, Leerzeichen und -',
 
-   'File not found'
-=> 'Datei nicht gefunden',
+   'File not found: [_1]'
+=> 'Datei nicht gefunden: [_1]',
 
    'This file appears to be a rendering of a LON-CAPA resource. If this is correct, this resource will act very oddly and incorrectly.'
 => 'Diese Datei scheint eine Umwandlung einer LON-CAPA-Ressource zu sein. Falls dies zutrifft, wird sich diese Ressource sehr unpassend und inkorrekt verhalten.', # ??? [SB 2007-11-27]
@@ -16198,6 +16216,9 @@
    'Grade Status'
 => 'Bewertungsstatus',
 
+   'Override "Correct"'
+=> '"Korrekt" überschreiben',
+
    'reset status'
 => 'Status zurücksetzen',
 
@@ -16414,12 +16435,6 @@
    'Upload a PDF Form with filled Form Fields'
 => 'Hochladen eines PDF-Formulars mit ausgefüllten Formularfeldern',
 
-   'File'
-=> 'Datei',
-
-   'Upload'
-=> 'Hochladen',
-
    'Please choose a PDF-File.'
 => 'Bitte wählen Sie eine PDF-Datei aus.',
 

--bisitz1243521010--