[LON-CAPA-cvs] cvs: loncom /interface/statistics lonproblemanalysis.pm /localize/localize de.pm

bisitz bisitz at source.lon-capa.org
Tue Oct 1 10:52:54 EDT 2013


bisitz		Tue Oct  1 14:52:54 2013 EDT

  Modified files:              
    /loncom/interface/statistics	lonproblemanalysis.pm 
    /loncom/localize/localize	de.pm 
  Log:
  - Internationalization and localization of labels in statistical graphs
  - Improved quantity in result phrases about correct and incorrect submissions
  - Added missing phrases and translations to de.pm
  
  
  
-------------- next part --------------
Index: loncom/interface/statistics/lonproblemanalysis.pm
diff -u loncom/interface/statistics/lonproblemanalysis.pm:1.143 loncom/interface/statistics/lonproblemanalysis.pm:1.144
--- loncom/interface/statistics/lonproblemanalysis.pm:1.143	Mon Dec 17 03:51:02 2012
+++ loncom/interface/statistics/lonproblemanalysis.pm	Tue Oct  1 14:52:47 2013
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonproblemanalysis.pm,v 1.143 2012/12/17 03:51:02 raeburn Exp $
+# $Id: lonproblemanalysis.pm,v 1.144 2013/10/01 14:52:47 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -400,10 +400,13 @@
         if ($max <$_) { $max = $_; last; }
     }
     #
-    my $title = &mt('Percent Difference');
+    my %lt = &Apache::lonlocal::texthash(
+                 'title'  => 'Percent Difference',
+                 'xlabel' => 'Percent Difference from Correct',
+                 'ylabel' => 'Percent of Answers');
     my @labels = (1..scalar(@bins)-1);
     my $graph = &Apache::loncommon::DrawBarGraph
-        ($title,'Percent Difference from Correct','Percent of Answers',
+        ($lt{'title'},$lt{'xlabel'},$lt{'ylabel'},
          $max,['#33FF00','#FF3300'],\@labels,\@plot_correct,\@plot_incorrect,
          {xskip=>1});
     #
@@ -473,10 +476,13 @@
         if ($max <$_) { $max = $_; last; }
     }
     #
-    my $title = &mt('Difference between submission and correct');
+    my %lt = &Apache::lonlocal::texthash(
+                 'title'  => 'Difference between submission and correct',
+                 'xlabel' => 'Difference from Correct',
+                 'ylabel' => 'Percent of Answers');
     my @labels = (1..scalar(@bins)-1);
     my $graph = &Apache::loncommon::DrawBarGraph
-        ($title,'Difference from Correct','Percent of Answers',
+        ($lt{'title'},$lt{'xlabel'},$lt{'ylabel'},
          $max,['#33FF00','#FF3300'],\@labels,\@plot_correct,\@plot_incorrect,
          {xskip=>1});
     #
@@ -858,8 +864,8 @@
             $no_data_text, at extra_data);
         if ($env{'form.AnalyzeOver'} eq 'tries') {
             $restriction_function = sub {($_[0]->{'tries'} == $plot_num?1:0)};
-            $correct_foil_title = 'Attempt '.$plot_num;
-            $incorrect_foil_title = 'Attempt '.$plot_num;
+            $correct_foil_title = &mt('Attempt [_1]',$plot_num);
+            $incorrect_foil_title = &mt('Attempt [_1]',$plot_num);
             $pre_graph_text = 
                 'Attempt [_1], [_2] submissions, [_3] correct, [_4] incorrect';
             $post_graph_text = '';
@@ -917,8 +923,9 @@
         # Concept Plot
         my $concept_plot = '';
         if (scalar(@$concepts) > 1) {
+            my $title = &mt('Correct Concepts');
             $concept_plot = &RR_concept_plot($concepts,$foil_choice_data,
-                                             'Correct Concepts');
+                                             $title);
         }
         # % Choosing plot
         my $choice_plot = &RR_create_percent_selected_plot
@@ -1033,10 +1040,11 @@
     for (my $i=0;$i<=$#correct;$i++) { 
         $correct[$i] = sprintf('%0f',$correct[$i]/$total*100);
     }
-    my $xlabel = 'concept';
+    my $xlabel = &mt('concept');
+    my $ylabel = &mt('Percent Choosing');
     my $plot=  &Apache::loncommon::DrawBarGraph($title,
                                                 $xlabel,
-                                                'Percent Choosing',
+                                                $ylabel,
                                                 100,
                                                 ['#33ff00','#ff3300'],
                                                 undef,
@@ -1102,10 +1110,11 @@
         @labels = (1 .. scalar(@correct));
     }
     #
-    my $xlabel = 'foil chosen';
+    my $xlabel = &mt('foil chosen');
+    my $ylabel = &mt('Percent Choosing');
     my $plot=  &Apache::loncommon::DrawBarGraph($title,
                                                 $xlabel,
-                                                'Percent Choosing',
+                                                $ylabel,
                                                 100,
                                                 ['#33ff00','#ff3300'],
                                                 \@labels,
@@ -1166,8 +1175,10 @@
         push(@empty_row,0);
     }
     #
+    my $xlabel = &mt('Correct Foil');
+    my $ylabel = &mt('foils chosen Incorrectly');
     my $graph = &Apache::loncommon::DrawBarGraph
-        ($title,'Correct Foil','foils chosen Incorrectly',
+        ($title,$xlabel,$ylabel,
          100,$plotcolors,\@labels,\@empty_row, at dataset);
     return ($graph,\%count_per_foil);
 }
@@ -1363,8 +1374,12 @@
                 }
             }
             #
+            my %lt = &Apache::lonlocal::texthash(
+                         'title'  => 'Correct Concepts',
+                         'xlabel' => 'Concept Number',
+                         'ylabel' => 'Percent Correct');
             $concept_graph = &Apache::loncommon::DrawBarGraph
-                ('Correct Concepts','Concept Number','Percent Correct',
+                ($lt{'title'},$lt{'xlabel'},$lt{'ylabel'},
                  100,$plotcolors,undef,\@concept_plot_data,{xskip=>1});
         }
         #
@@ -1402,8 +1417,12 @@
             push(@Labels,'');
         }
         #
+       my %lt = &Apache::lonlocal::texthash(
+                    'title'  => 'Correct Statements',
+                    'xlabel' => 'Statement',
+                    'ylabel' => '% Answered Correct');
         my $correct_graph = &Apache::loncommon::DrawBarGraph
-            ('Correct Statements','Statement','% Answered Correct',
+            ($lt{'title'},$lt{'xlabel'},$lt{'ylabel'},
              100,$plotcolors,\@Labels,$Datasets[0],{xskip=>1});
         
         #
@@ -1414,8 +1433,12 @@
         }
         my $count = $response_data{'_total'}->[$try] - 
                                            $response_data{'_correct'}->[$try];
+        %lt = &Apache::lonlocal::texthash(
+                  'title'  => 'Incorrect Statements',
+                  'xlabel' => 'Statement',
+                  'ylabel' => '% Chosen Incorrectly');
         my $incorrect_graph = &Apache::loncommon::DrawBarGraph
-            ('Incorrect Statements','Statement','% Chosen Incorrectly',
+            ($lt{'title'},$lt{'xlabel'},$lt{'ylabel'},
              100,$plotcolors,\@Labels, at Datasets,{xskip=>1});
         $analysis_html.= 
             '<tr><td colspan="4" align="center">'.
@@ -1477,10 +1500,11 @@
     if (defined($Concepts)) { $num_concepts = scalar(@$Concepts); }
     #
     if ($num_concepts < 2) {
-        $table = '<h3>'.
-                 &mt('Not enough data for concept analysis.').' '.
-                 &mt('Performing Foil Analysis').
-                 '</h3>'.$table;
+        $table = '<p class="LC_info">'.
+                 &mt('Not enough data for concept analysis.'.
+                     ' Performing Foil Analysis instead.').
+                 '</p>'.
+                 $table;
     }
     #
     my $num_plots = $env{'form.NumPlots'};
@@ -1537,7 +1561,7 @@
         $correct |= 0;
         ##
         $table .= '<tr><td colspan="4" align="center"><font size="+1">'.
-            &mt('[_1] submissions from [_2] students, [_3] correct, [_4] incorrect',
+            &mt('[quant,_1,submission,submissions,No submissions] from [quant,_2,student], [_3] correct, [_4] incorrect',
                 $data_count,$student_count,$correct,$data_count-$correct).
                 '</font></td></tr>'.$/;
         my $concept_correct_plot = '';
@@ -1609,9 +1633,13 @@
     }
     #
     # Create the plot
-    my $correct_plot = &Apache::loncommon::DrawBarGraph('Correct Statements',
-                                                        'Statement Number',
-                                                        'Percent Correct',
+    my %lt = &Apache::lonlocal::texthash(
+                 'title'  => 'Correct Statements',
+                 'xlabel' => 'Statement Number',
+                 'ylabel' => 'Percent Correct');
+    my $correct_plot = &Apache::loncommon::DrawBarGraph($lt{'title'},
+                                                        $lt{'xlabel'},
+                                                        $lt{'ylabel'},
                                                         100,
                                                         $plotcolors,
                                                         undef,
@@ -1620,10 +1648,14 @@
     for (my $j=0; $j< scalar(@{$plotdata[0]});$j++) {
         $plotdata[0]->[$j]=0;
     }
+    %lt = &Apache::lonlocal::texthash(
+              'title'  => 'Incorrect Statements',
+              'xlabel' => 'Statement Number',
+              'ylabel' => 'Incorrect Option Choice');
     my $incorrect_plot = 
-        &Apache::loncommon::DrawBarGraph('Incorrect Statements',
-                                         'Statement Number',
-                                         'Incorrect Option Choice',
+        &Apache::loncommon::DrawBarGraph($lt{'title'},
+                                         $lt{'xlabel'},
+                                         $lt{'ylabel'},
                                          100,
                                          $plotcolors,
                                          undef,
@@ -1652,9 +1684,13 @@
     }
     #
     # Create the plot
-    return &Apache::loncommon::DrawBarGraph('Correct Concepts',
-                                            'Concept Number',
-                                            'Percent Correct',
+    my %lt = &Apache::lonlocal::texthash(
+                 'title'  => 'Correct Concepts',
+                 'xlabel' => 'Concept Number',
+                 'ylabel' => 'Percent Correct');
+    return &Apache::loncommon::DrawBarGraph($lt{'title'},
+                                            $lt{'xlabel'},
+                                            $lt{'ylabel'},
                                             100,
                                             $plotcolors,
                                             undef,
Index: loncom/localize/localize/de.pm
diff -u loncom/localize/localize/de.pm:1.547 loncom/localize/localize/de.pm:1.548
--- loncom/localize/localize/de.pm:1.547	Mon Sep 30 17:42:18 2013
+++ loncom/localize/localize/de.pm	Tue Oct  1 14:52:53 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # German Localization Lexicon
 #
-# $Id: de.pm,v 1.547 2013/09/30 17:42:18 bisitz Exp $
+# $Id: de.pm,v 1.548 2013/10/01 14:52:53 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3003,7 +3003,7 @@
 => 'Analysieren: [_1] [_2]',
 
    'Analyze Problem'
-=> 'Analysiere Aufgabe',
+=> 'Aufgabe analysieren',
 
    'Analyze Problem Again'
 => 'Aufgabe erneut analysieren',
@@ -24747,8 +24747,8 @@
    'Maximum number of coinciding values: [_1]'
 => 'Maximale Anzahl an übereinstimmenden Werten: [_1]',
 
-   'Not enough data for concept analysis.'
-=> 'Nicht genug Daten für Konzeptanalyse vorhanden',
+   'Not enough data for concept analysis. Performing Foil Analysis instead.'
+=> 'Es liegen nicht genügend Daten für eine Konzeptanalyse vor. Stattdessen wird eine Analyse der Auswahlmöglichkeiten ausgeführt.',
 
    'Percent Difference'
 => 'Prozent Unterschied',
@@ -24762,6 +24762,9 @@
    '[_1] submissions from [_2] students, [_3] correct, [_4] incorrect'
 => '[_1] Einreichungen von [_2] Studierenden, [_3] korrekt, [_4] inkorrekt',
 
+   '[quant,_1,submission,submissions,No submissions] from [quant,_2,student], [_3] correct, [_4] incorrect'
+=> '[quant,_1,Einreichung,Einreichungen,Keine Einreichungen] von [quant,_2,Student/in,Studierenden,Studierenden], [_3] korrekt, [_4] inkorrekt',
+
    'correct foil chosen'
 => 'korrekte Auswahlmöglichkeit ausgewählt',
 
@@ -26745,9 +26748,6 @@
    'To complete the transaction you [_1]must confirm[_2] you want to [_3]process the change[_4] to [_5].'
 => 'Um die Transaktion abzuschließen, [_1]müssen Sie bestätigen[_2], dass Sie [_3]die Änderung in [_5] vornehmen[_4] möchten.',
 
-   'Performing Foil Analysis'
-=> 'Analyse der Auswahlmöglichkeiten wird ausgeführt',
-
    'Student Submission Data'
 => 'Studentische Einreichungsdaten',
 
@@ -28068,6 +28068,62 @@
    'IMS import completed'
 => 'IMS-Import abgeschlossen',
 
+
+#SYNC Tue Oct  1 14:39:03 2013
+   'Attempt [_1]'
+=> 'Versuch [_1]',
+
+   '% Answered Correct'
+=> '% korrekte Antworten',
+
+   '% Chosen Incorrectly'
+=> '% falsch gewählt',
+
+   'Correct Concepts'
+=> 'Korrekte Konzepte',
+
+   'Correct Foil'
+=> 'Korrekte Ausw.-mögl.',
+
+   'Statement'
+=> 'Angabe',
+
+   'Statement Number'
+=> 'Nummer der Angabe',
+
+   'Correct Statements'
+=> 'Korrekte Angaben',
+
+   'Incorrect Statements'
+=> 'Inkorrekte Angaben',
+
+   'Difference from Correct'
+=> 'Unterschiede zu korrekt',
+
+   'Incorrect Option Choice'
+=> 'Inkorrekte Optionsauwahl',
+
+   'Percent Choosing'
+=> 'Prozent ausgewählt',
+
+   'Percent Correct'
+=> 'Prozent korrekt',
+
+   'Percent Difference from Correct'
+=> 'Prozent Unterschied zu korrekt',
+
+   'Percent of Answers'
+=> 'Prozent an Antworten',
+
+   'concept'
+=> 'Konzept',
+
+   'foil chosen'
+=> 'gewählte Ausw.-mögl.',
+
+   'foils chosen Incorrectly'
+=> 'inkorrekt gewählte Ausw.-mögl.',
+
 #SYNCMARKER
 );
 1;


More information about the LON-CAPA-cvs mailing list