[LON-CAPA-cvs] cvs: loncom /auth lonroles.pm /interface loncommon.pm loncreateuser.pm slotrequest.pm /localize/localize de.pm zh.pm

bisitz bisitz@source.lon-capa.org
Wed, 05 Aug 2009 13:40:25 -0000


This is a MIME encoded message

--bisitz1249479625
Content-Type: text/plain

bisitz		Wed Aug  5 13:40:25 2009 EDT

  Modified files:              
    /loncom/auth	lonroles.pm 
    /loncom/interface	loncommon.pm loncreateuser.pm slotrequest.pm 
    /loncom/localize/localize	de.pm zh.pm 
  Log:
  loncreateuser.pm:
  - Removed double data_table start (-> rev. 1.301)
  - Removed unneeded <br> between header and page content
  - Separate row for "Update Display" Button
  
  loncreateuser.pm, lonslotrequest.pm:
  - Corrected server version &mt() calls
  - Replaced special note style for version note by standard info style
  
  loncreateuser.pm, lonslotrequest.pm, lonroles.pm:
  - Consistent and optimized wording (server version)
  
  de.pm, zh.pm:
  - Corresponding wording updates
  - Additions of missing phrases
  
  
--bisitz1249479625
Content-Type: text/plain
Content-Disposition: attachment; filename="bisitz-20090805134025.txt"

Index: loncom/auth/lonroles.pm
diff -u loncom/auth/lonroles.pm:1.230 loncom/auth/lonroles.pm:1.231
--- loncom/auth/lonroles.pm:1.230	Fri Jul 24 02:00:28 2009
+++ loncom/auth/lonroles.pm	Wed Aug  5 13:39:56 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.230 2009/07/24 02:00:28 raeburn Exp $
+# $Id: lonroles.pm,v 1.231 2009/08/05 13:39:56 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -843,10 +843,10 @@
     $r->print(&Apache::lonnet::getannounce());
     if ($advanced) {
         my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&');
-	$r->print('<p><small><i>'
-                 .&mt('This is LON-CAPA [_1]',$r->dir_config('lonVersion'))
-		 .'</i><br />'
-		 .'<a href="/adm/logout">'.&mt('Logout').'</a>&nbsp;&nbsp;'
+        $r->print('<p><small><i>'
+                 .&mt('This LON-CAPA server is version [_1]',$r->dir_config('lonVersion'))
+                 .'</i><br />'
+                 .'<a href="/adm/logout">'.&mt('Logout').'</a>&nbsp;&nbsp;'
                  .'<a href="/adm/coursecatalog?showdom='.$esc_dom.'">'
                  .&mt('Course Catalog')
                  .'</a></small></p>');
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.877 loncom/interface/loncommon.pm:1.878
--- loncom/interface/loncommon.pm:1.877	Wed Aug  5 11:01:38 2009
+++ loncom/interface/loncommon.pm	Wed Aug  5 13:40:10 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.877 2009/08/05 11:01:38 bisitz Exp $
+# $Id: loncommon.pm,v 1.878 2009/08/05 13:40:10 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4912,10 +4912,6 @@
   font-weight: bold;
 }
 
-.LC_roleslog_note {
-  font-size: small;
-}
-
 table.LC_data_table,
 table.LC_mail_list {
   border: 1px solid #000000;
Index: loncom/interface/loncreateuser.pm
diff -u loncom/interface/loncreateuser.pm:1.302 loncom/interface/loncreateuser.pm:1.303
--- loncom/interface/loncreateuser.pm:1.302	Tue Aug  4 19:59:19 2009
+++ loncom/interface/loncreateuser.pm	Wed Aug  5 13:40:10 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.302 2009/08/04 19:59:19 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.303 2009/08/05 13:40:10 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -5134,8 +5134,7 @@
 
     # Table Header
     my $tableheader =
-        &Apache::loncommon::start_data_table()
-       .&Apache::loncommon::start_data_table_header_row()
+        &Apache::loncommon::start_data_table_header_row()
        .'<th>&nbsp;</th>'
        .'<th>'.&mt('When').'</th>'
        .'<th>'.&mt('Who made the change').'</th>'
@@ -5220,15 +5219,22 @@
         }
         $output .= '<option value="'.$chgtype.'"'.$selstr.'>'.$lt{$chgtype}.'</option>'."\n";
     }
-    $output .= '</select></td>'.
-               '<td>&nbsp;&nbsp;</td>'.
-               '<td valign="middle"><input type="submit" value="'.
-               &mt('Update Display').'" /></td></tr></table>'.
-               '<span class="LC_roleslog_note">'.
-               &mt('[_1]Note:[_2] Only changes made from servers running LON-CAPA 2.6.99.0 or later are displayed.');
+    $output .= '</select></td>'
+              .'</tr></table>';
+
+    # Update Display button
+    $output .= '<p>'
+              .'<input type="submit" value="'.&mt('Update Display').'" />'
+              .'</p>';
+
+    # Server version info
+    $output .= '<p class="LC_info">'
+              .&mt('Only changes made from servers running LON-CAPA [_1] or later are displayed.'
+                  ,'2.6.99.0');
     if ($version) {
-        $output .= ' '.&mt('This server is version [_3].','<b>','</b>',$version);    }
-    $output .= '</span><hr /><br />';
+        $output .= ' '.&mt('This LON-CAPA server is version [_1]',$version);
+    }
+    $output .= '</p><hr />';
     return $output;
 }
 
Index: loncom/interface/slotrequest.pm
diff -u loncom/interface/slotrequest.pm:1.99 loncom/interface/slotrequest.pm:1.100
--- loncom/interface/slotrequest.pm:1.99	Tue Jun 30 15:03:28 2009
+++ loncom/interface/slotrequest.pm	Wed Aug  5 13:40:10 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler for requesting to have slots added to a students record
 #
-# $Id: slotrequest.pm,v 1.99 2009/06/30 15:03:28 bisitz Exp $
+# $Id: slotrequest.pm,v 1.100 2009/08/05 13:40:10 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1736,7 +1736,7 @@
         }
     } else {
         $r->print('<span class="LC_info">'
-                 .&mt('There are no transactions to display')
+                 .&mt('There are no transactions to display.')
                  .'</span>'
         );
     }
@@ -1933,7 +1933,7 @@
 ENDSCRIPT
         }
     } else {
-        $r->print(&mt('There are no records to display'));
+        $r->print(&mt('There are no records to display.'));
     }
     $r->print('<input type="hidden" name="page" value="'.$curr{'page'}.'" />'.
               '<input type="hidden" name="slotname" value="'.$env{'form.slotname'}.'" />'.
@@ -2052,12 +2052,13 @@
     }
     $output .= '<td>&nbsp;&nbsp;</td><td valign="middle"><input type="submit" value="'.
                &mt('Update Display').'" /></tr></table>'.
-               '<span class="LC_roleslog_note">'.
-               &mt('[_1]Note:[_2] Only changes made from servers running LON-CAPA 2.8.99.0 or later are displayed.');
+               '<p class="LC_info">'.
+               &mt('Only changes made from servers running LON-CAPA [_1] or later are displayed.'
+                  ,'2.6.99.0');
     if ($version) {
-        $output .= ' '.&mt('This server is version [_3].','<b>','</b>',$version);
+        $output .= ' '.&mt('This LON-CAPA server is version [_1]',$version);
     }
-    $output .= '</span><hr /><br />';
+    $output .= '</p><hr /><br />';
     return $output;
 }
 
Index: loncom/localize/localize/de.pm
diff -u loncom/localize/localize/de.pm:1.320 loncom/localize/localize/de.pm:1.321
--- loncom/localize/localize/de.pm:1.320	Mon Aug  3 15:57:34 2009
+++ loncom/localize/localize/de.pm	Wed Aug  5 13:40:24 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # German Localization Lexicon
 #
-# $Id: de.pm,v 1.320 2009/08/03 15:57:34 bisitz Exp $
+# $Id: de.pm,v 1.321 2009/08/05 13:40:24 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -8375,8 +8375,11 @@
    'Posting [_1]'
 => 'Sende an [_1]',
 
-   'This is LON-CAPA [_1]'
-=> 'Hier läuft LON-CAPA [_1]',
+   'This LON-CAPA server is version [_1]'
+=> 'Auf diesem LON-CAPA-Server läuft Version [_1]',
+
+   'Only changes made from servers running LON-CAPA [_1] or later are displayed.'
+=> 'Es werden nur Änderungen angezeigt, die auf Servern mit der LON-CAPA-Version [_1] oder später vorgenommen wurden.',
 
    'Edit Answer'
 => 'Antwort editieren',
@@ -15590,8 +15593,11 @@
    'Next [_1] changes'
 => 'Nächste [_1] Änderungen',
 
-   'There are no records to display'
-=> 'Keine Datensätze zum Anzeigen',
+   'There are no records to display.'
+=> 'Keine Datensätze zum Anzeigen.',
+
+   'There are no transactions to display.'
+=> 'Es gibt keine Transaktionen, die angezeigt werden können.',
 
    'Automated enrollment'
 => 'Automatisierte Kursbelegung',
Index: loncom/localize/localize/zh.pm
diff -u loncom/localize/localize/zh.pm:1.73 loncom/localize/localize/zh.pm:1.74
--- loncom/localize/localize/zh.pm:1.73	Mon Aug  3 15:57:34 2009
+++ loncom/localize/localize/zh.pm	Wed Aug  5 13:40:24 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Chinese Simplified Localization Lexicon
 #
-# $Id: zh.pm,v 1.73 2009/08/03 15:57:34 bisitz Exp $
+# $Id: zh.pm,v 1.74 2009/08/05 13:40:24 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -8421,7 +8421,6 @@
 
    'Calendar'
 => '日历',
-#=> 'Kalender',
 
    'Download your Calendar as iCalendar File'
 => '下载您的日历',
@@ -8432,9 +8431,12 @@
    'Posting [_1]'
 => 'Sende an [_1]',
 
-   'This is LON-CAPA [_1]'
+   'This LON-CAPA server is version [_1]'
 => '这里是 LON-CAPA [_1]',
 
+   'Only changes made from servers running LON-CAPA [_1] or later are displayed.'
+=> 'Es werden nur Änderungen angezeigt, die auf Servern mit der LON-CAPA-Version [_1] oder später vorgenommen wurden.',
+
    'Edit Answer'
 => 'Antwort editieren',
 
@@ -15698,8 +15700,11 @@
    'Next [_1] changes'
 => 'Nächste [_1] Änderungen',
 
-   'There are no records to display'
-=> '没有记录显示',
+   'There are no records to display.'
+=> '没有记录显示。',
+
+   'There are no transactions to display.'
+=> 'Es gibt keine Transaktionen, die angezeigt werden können.',
 
    'Automated enrollment'
 => '自动注册',

--bisitz1249479625--