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

bisitz bisitz@source.lon-capa.org
Tue, 21 Apr 2009 13:28:27 -0000


bisitz		Tue Apr 21 13:28:27 2009 EDT

  Modified files:              
    /loncom/interface/statistics	lonproblemanalysis.pm 
                                	lonstudentsubmissions.pm 
    /loncom/localize/localize	de.pm zh.pm 
  Log:
  Moved output options checkboxes from translation phrases to script code.
  This ensures that
  - the checkboxes are always properly displayed, independent from the translation phrases
  - the place of the checkboxes is given by the script code to have a consistent screen layout, independent from the translation of the corresponding text
  
  
Index: loncom/interface/statistics/lonproblemanalysis.pm
diff -u loncom/interface/statistics/lonproblemanalysis.pm:1.136 loncom/interface/statistics/lonproblemanalysis.pm:1.137
--- loncom/interface/statistics/lonproblemanalysis.pm:1.136	Wed Feb  4 13:21:54 2009
+++ loncom/interface/statistics/lonproblemanalysis.pm	Tue Apr 21 13:28:23 2009
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonproblemanalysis.pm,v 1.136 2009/02/04 13:21:54 hauer Exp $
+# $Id: lonproblemanalysis.pm,v 1.137 2009/04/21 13:28:23 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1910,7 +1910,7 @@
     }
     $showprob_checkbox.= ' />';
     $Str.= '<span class="LC_nobreak"><label>'.
-        &mt('Show problem [_1]',$showprob_checkbox).
+        &mt('Show problem').' '.$showprob_checkbox.
         '</label></span><br />';
     ##
     my $analyze_selector = '<select name="AnalyzeOver" >';
Index: loncom/interface/statistics/lonstudentsubmissions.pm
diff -u loncom/interface/statistics/lonstudentsubmissions.pm:1.53 loncom/interface/statistics/lonstudentsubmissions.pm:1.54
--- loncom/interface/statistics/lonstudentsubmissions.pm:1.53	Fri Dec 12 10:01:30 2008
+++ loncom/interface/statistics/lonstudentsubmissions.pm	Tue Apr 21 13:28:23 2009
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonstudentsubmissions.pm,v 1.53 2008/12/12 10:01:30 bisitz Exp $
+# $Id: lonstudentsubmissions.pm,v 1.54 2009/04/21 13:28:23 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1096,7 +1096,6 @@
     $Str .= '<th>'.&mt('Sections').'</th>';
     $Str .= '<th>'.&mt('Groups').'</th>';
     $Str .= '<th>'.&mt('Access Status').'</th>';
-#    $Str .= '<th>'.&mt('Output as [_1]',$output_selector).'</th>';
     $Str .= '<th>'.&mt('Options').'</th>';
     $Str .= '<th>'.&mt('Output Format').'</th>';
     $Str .= &Apache::loncommon::end_data_table_header_row();
@@ -1146,14 +1145,14 @@
     #
     $Str .= '<td align="right" valign="top">'.
         '<label><b>'.
-        &mt('Show problem [_1]',$prob_checkbox).'</b></label><br />'.
+        &mt('Show problem').' '.$prob_checkbox.'</b></label><br />'.
         '<label><b>'.
-        &mt('Show correct answers [_1]',$ans_checkbox).'</b></label><br />'.
+        &mt('Show correct answers').' '.$ans_checkbox.'</b></label><br />'.
         '<label><b>'.
-        &mt('Show all submissions [_1]',$all_sub_checkbox).
+        &mt('Show all submissions').' '.$all_sub_checkbox.
         '</b></label><br />'.
         '<label><b>'.
-        &mt('Show problem grading [_1]',$prob_status_checkbox).
+        &mt('Show problem grading').' '.$prob_status_checkbox.
         '</b></label><br />'.
         '</td>';
     #
Index: loncom/localize/localize/de.pm
diff -u loncom/localize/localize/de.pm:1.281 loncom/localize/localize/de.pm:1.282
--- loncom/localize/localize/de.pm:1.281	Tue Apr 21 10:57:37 2009
+++ loncom/localize/localize/de.pm	Tue Apr 21 13:28:26 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # German Localization Lexicon
 #
-# $Id: de.pm,v 1.281 2009/04/21 10:57:37 bisitz Exp $
+# $Id: de.pm,v 1.282 2009/04/21 13:28:26 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -8463,23 +8463,20 @@
    'none'
 => 'nichts',
 
-   'Output as [_1]' # _1: checkbox
-=> 'Ausgabeformat [_1]',
-
    'Prepare Report'
 => 'Bericht erstellen',
 
-   'Show problem [_1]' # _1: checkbox
-=> 'Aufgabe anzeigen [_1]',
+   'Show problem'
+=> 'Aufgabe anzeigen',
 
-   'Show correct answers [_1]' # _1: checkbox
-=> 'Korrekte Antworten anzeigen [_1]',
+   'Show correct answers'
+=> 'Korrekte Antworten anzeigen',
 
-   'Show all submissions [_1]' # _1: checkbox
-=> 'Alle Einreichungen anzeigen [_1]',
+   'Show all submissions' 
+=> 'Alle Einreichungen anzeigen',
 
-   'Show problem grading [_1]' # _1: checkbox
-=> 'Aufgabenbewertung anzeigen [_1]',
+   'Show problem grading'
+=> 'Aufgabenbewertung anzeigen',
 
    'Computing correct answers greatly increasese the amount of time required to prepare a report.'
 => 'Die Berechnung korrekter Antworten erhöht die benötigte Zeit erheblich, um den Bericht zu erstellen.',
Index: loncom/localize/localize/zh.pm
diff -u loncom/localize/localize/zh.pm:1.47 loncom/localize/localize/zh.pm:1.48
--- loncom/localize/localize/zh.pm:1.47	Tue Apr 21 10:57:37 2009
+++ loncom/localize/localize/zh.pm	Tue Apr 21 13:28:26 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Chinese Simplified Localization Lexicon
 #
-# $Id: zh.pm,v 1.47 2009/04/21 10:57:37 bisitz Exp $
+# $Id: zh.pm,v 1.48 2009/04/21 13:28:26 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -8568,23 +8568,20 @@
    'none'
 => 'nichts',
 
-   'Output as [_1]' # _1: checkbox
-=> 'Ausgabeformat [_1]',
-
    'Prepare Report'
 => 'Bericht erstellen',
 
-   'Show problem [_1]' # _1: checkbox
-=> '提示显示 [_1]',
+   'Show problem'
+=> '提示显示',
 
-   'Show correct answers [_1]' # _1: checkbox
-=> 'Korrekte Antworten anzeigen [_1]',
+   'Show correct answers'
+=> 'Korrekte Antworten anzeigen',
 
-   'Show all submissions [_1]' # _1: checkbox
-=> 'Alle Einreichungen anzeigen [_1]',
+   'Show all submissions'
+=> 'Alle Einreichungen anzeigen',
 
-   'Show problem grading [_1]' # _1: checkbox
-=> 'Aufgabenbewertung anzeigen [_1]',
+   'Show problem grading'
+=> 'Aufgabenbewertung anzeigen',
 
    'Computing correct answers greatly increasese the amount of time required to prepare a report.'
 => 'Die Berechnung korrekter Antworten erhöht die benötigte Zeit erheblich, um den Bericht zu erstellen.',