[prev in list] [next in list] [prev in thread] [next in thread] 

List:       lon-capa-cvs
Subject:    [LON-CAPA-cvs] cvs: loncom /interface coursecatalog.pm
From:       bisitz <lon-capa-cvs-allow () mail ! lon-capa ! org>
Date:       2008-09-23 13:14:32
Message-ID: cvsbisitz1222175672 () cvsserver
[Download RAW message or body]

bisitz		Tue Sep 23 09:14:32 2008 EDT

  Modified files:              
    /loncom/interface	coursecatalog.pm 
  Log:
  Localization - Optimized &mt() calls:
    - Excluded HTML tags and white spaces with separator function from &mt() calls
    - Included parameters
    - Re-use already existing translations
  
  
Index: loncom/interface/coursecatalog.pm
diff -u loncom/interface/coursecatalog.pm:1.41 loncom/interface/coursecatalog.pm:1.42
--- loncom/interface/coursecatalog.pm:1.41	Thu Jul 17 08:00:28 2008
+++ loncom/interface/coursecatalog.pm	Tue Sep 23 09:14:32 2008
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler for displaying the course catalog interface
 #
-# $Id: coursecatalog.pm,v 1.41 2008/07/17 12:00:28 raeburn Exp $
+# $Id: coursecatalog.pm,v 1.42 2008/09/23 13:14:32 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -810,7 +810,7 @@
             $output .=
               '<th>'.&mt('Default Access Dates for Students').'</th>'.
               '<th>'.&mt('Student Counts').'</th>'.
-              '<th>'.&mt('Auto-enrollment of <br />registered students').'</th>';
+              '<th>'.&mt('Auto-enrollment of[_1]registered students','<br \
/>').'</th>';  } else {
             $output .= '<th>'.&mt('Details').'</th>';
         }
@@ -957,10 +957,10 @@
                 }
             }
             if ($startaccess) {
-                $accessdates .= &mt('<i>From:</i> ').$startaccess.'<br />';
+                $accessdates .= '<i>'.&mt('From:[_1]','</i> '.$startaccess).'<br \
/>';  }
             if ($endaccess) {
-                $accessdates .= &mt('<i>To:</i> ').$endaccess.'<br />';
+                $accessdates .= '<i>'.&mt('To:[_1]','</i> '.$endaccess).'<br />';
             }
             if (($selfenroll_types ne '') && 
                 ($selfenroll_end > 0 && $selfenroll_end > $now)) {
@@ -981,10 +981,10 @@
                     if ($selfenroll_start_access || $selfenroll_end_access) {
                         $accessdates .= '<br/><br \
/><i>'.&mt('Self-enrollers:').'</i><br />';  if ($selfenroll_start_access) {
-                            $accessdates .= &mt('<i>From:</i> \
').$selfenroll_start_access.'<br />'; +                            $accessdates .= \
'<i>'.&mt('From:[_1]','</i> '.$selfenroll_start_access).'<br />';  }
                         if ($selfenroll_end_access) {
-                            $accessdates .= &mt('<i>To:</i> \
').$selfenroll_end_access.'<br />'; +                            $accessdates .= \
'<i>'.&mt('To:[_1]','</i> '.$selfenroll_end_access).'<br />';  }
                     }
                 }
@@ -1162,11 +1162,11 @@
     }
     if ($totalitems > 0) {
         if (@{$validations{'sections'}}) {
-            $response = &mt('Sections: ').
+            $response = &mt('Sections:').' '.
                         join(', ',@{$validations{'sections'}}).'<br />';
         }
         if (@{$validations{'xlists'}}) {
-            $response .= &mt('Courses: ').
+            $response .= &mt('Courses:').' '.
                         join(', ',@{$validations{'xlists'}});
         }
     }
@@ -1331,17 +1331,20 @@
                    &get_valid_classes($seclist,$xlist_items,$code,
                                       $owners,$cdom,$cnum);
                 if ($valid_classes ne '') {
-                    $autoenrolldates = &mt('Not enabled<br />Starts: ').
-                                       $autostart.'<br />'.$valid_classes;           \
} +                    $autoenrolldates = &mt('Not enabled').'<br />'
+                                      .&mt('Starts: [_1]',$autostart)
+                                      .'<br />'.$valid_classes;
+                }
             }
         } else {
             if ($coursehash->{'internal.autoend'} && \
                $coursehash->{'internal.autoend'} < $now) {
-                $autoenrolldates = &mt('Not enabled<br />Ended: ').$autoend;
+                $autoenrolldates = &mt('Not enabled').'<br />'
+                                  .&mt('Ended: [_1]',$autoend);
             } else {
                 my $valid_classes = &get_valid_classes($seclist,$xlist_items,
                                                        $code,$owners,$cdom,$cnum);
                 if ($valid_classes ne '') {
-                    $autoenrolldates = &mt('Currently enabled<br />').
+                    $autoenrolldates = &mt('Currently enabled').'<br />'.
                                        $valid_classes;
                 }
             }


_______________________________________________
LON-CAPA-cvs mailing list
LON-CAPA-cvs@mail.lon-capa.org
http://mail.lon-capa.org/mailman/listinfo/lon-capa-cvs


[prev in list] [next in list] [prev in thread] [next in thread]