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

bisitz bisitz@source.lon-capa.org
Fri, 25 Sep 2009 16:35:42 -0000


This is a MIME encoded message

--bisitz1253896542
Content-Type: text/plain

bisitz		Fri Sep 25 16:35:42 2009 EDT

  Modified files:              
    /loncom/interface	lonmsgdisplay.pm 
    /loncom/localize/localize	de.pm 
  Log:
  Localization - Communication and Messages action feedback:
  - Added paragraphs and appropriate styles to success, warning and error messages
  - Use "quant" to optimize phrases and translations
  - Corresponding updates in de.pm
  
  
  
--bisitz1253896542
Content-Type: text/plain
Content-Disposition: attachment; filename="bisitz-20090925163542.txt"

Index: loncom/interface/lonmsgdisplay.pm
diff -u loncom/interface/lonmsgdisplay.pm:1.134 loncom/interface/lonmsgdisplay.pm:1.135
--- loncom/interface/lonmsgdisplay.pm:1.134	Tue Sep  8 22:08:20 2009
+++ loncom/interface/lonmsgdisplay.pm	Fri Sep 25 16:35:29 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.134 2009/09/08 22:08:20 raeburn Exp $
+# $Id: lonmsgdisplay.pm,v 1.135 2009/09/25 16:35:29 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1268,8 +1268,9 @@
         &printheader($r,'/adm/email?compose=multiforward',
              'Forwarding Multiple Messages');
         if ($multiforward > 1) {
-            $r->print(&mt('Each of the <b>[quant,_1,message]</b> you checked'
-                         .' will be forwarded to the recipient(s) you select below.',$multiforward)
+            $r->print(&mt('Each of the [quant,_1,message] you checked'
+                         .' will be forwarded to the recipient(s) you select below.'
+                         ,'<b>'.$multiforward.'</b>')
                     .'<br />');
         } else {
             $r->print(&mt('The message you checked will be forwarded to the recipient(s) you select below.').'<br />');
@@ -3352,7 +3353,7 @@
             $total ++;
         }
         &printheader($r,'','Marked Messages Read');
-        $r->print(&mt('Marked [_1] message(s) read',$total).'<p>');
+        $r->print(&mt('Marked [quant,_1,message] read',$total).'<p>');
         &Apache::loncommunicate::menu($r);
         &disall($r,($folder?$folder:$dismode),$msgstatus);
     } elsif ($env{'form.markedaction'} eq 'markedunread') {
@@ -3363,7 +3364,7 @@
             $total ++;
         }
         &printheader($r,'','Marked Messages Unread');
-        $r->print(&mt('Marked [_1] message(s) unread',$total).'<p>');
+        $r->print(&mt('Marked [quant,_1,message] unread',$total).'<p>');
         &Apache::loncommunicate::menu($r);
         &disall($r,($folder?$folder:$dismode),$msgstatus);
     } elsif ($env{'form.markedaction'} eq 'markedmove') {
@@ -3387,14 +3388,17 @@
 	        }
 	    }
 	    if ($failed) {
-	        $r->print('<p class="LC_error">
-                          '.&mt('Failed to move [_1] message(s)',$failed).
-		      '</p>');
+                $r->print('<p class="LC_error">'
+                         .&mt('Failed to move [quant,_1,message]',$failed)
+                         .'</p>');
 	        $r->print('<p class="LC_error">'.
 	   	          join("</p>\n<p class=\"LC_error\">",@failed_msg).
 		          "</p>\n");
 	    }
-	    $r->print(&mt('Moved [_1] message(s)',$total).'<p>');
+            $r->print('<p class="LC_success">'
+                     .&mt('Moved [quant,_1,message]',$total)
+                     .'</p>'
+                     .'<p>');
         }
 	&Apache::loncommunicate::menu($r);
 	&disall($r,($folder?$folder:$dismode),$msgstatus);
@@ -3413,14 +3417,17 @@
 	}
 	&printheader($r,'','Deleted Messages');
 	if ($failed) {
-	    $r->print('<p class="LC_error">
-                          '.&mt('Failed to delete [_1] message(s)',$failed).
-		      '</p>');
+            $r->print('<p class="LC_error">'
+                     .&mt('Failed to delete [quant,_1,message]',$failed)
+                     .'</p>');
 	    $r->print('<p class="LC_error">'.
 		      join("</p>\n<p class=\"LC_error\">",@failed_msg).
 		      "</p>\n");
 	}
-	$r->print(&mt('Deleted [_1] message(s)',$total).'<p>');
+        $r->print('<p class="LC_success">'
+                 .&mt('Deleted [quant,_1,message]',$total)
+                 .'</p>'
+                 .'<p>');
 	&Apache::loncommunicate::menu($r);
 	&disall($r,($folder?$folder:$dismode),$msgstatus);
     } elsif ($env{'form.markunread'}) {
@@ -3512,10 +3519,14 @@
         my $showfolder = $env{'form.newfolder'};
 	my ($makeresult,$warning) = &makefolder($env{'form.newfolder'});
         if ($makeresult eq 'ok') {
-            $r->print(&mt('Folder "[_1]" created.',$showfolder).'<br />');
+            $r->print('<p class="LC_success">'
+                     .&mt('Folder "[_1]" created.',$showfolder)
+                     .'</p>');
         } else {
-            $r->print(&mt('Creation failed.').' '.$makeresult.'<br />'.
-                      $warning);
+            $r->print('<p class="LC_warning">'
+                     .&mt('Creation failed.').' '.$makeresult.'<br />'
+                     .$warning
+                     .'</p>');
             $showfolder = $folder;
         }
         &Apache::loncommunicate::menu($r);
@@ -3527,10 +3538,14 @@
         my $showfolder = '';
         my $delresult = &deletefolder($folder);
         if ($delresult eq 'ok') {
-            $r->print(&mt('Folder "[_1]" deleted.',$folder).'<br />');
+            $r->print('<p class="LC_success">'
+                     .&mt('Folder "[_1]" deleted.',$folder)
+                     .'</p>');
             $env{'form.folder'} = '';
         } else {
-            $r->print(&mt('Deletion failed.').' '.$delresult.'<br />');
+            $r->print('<p class="LC_warning">'
+                     .&mt('Deletion failed.').' '.$delresult
+                     .'</p>');
             $showfolder = $folder;
         }
         &Apache::loncommunicate::menu($r);
@@ -3540,9 +3555,13 @@
         my $showfolder = $env{'form.renamed'};
         my $renresult = &renamefolder($folder);
         if ($renresult eq 'ok') {
-            $r->print(&mt('Folder "[_1]" renamed to "[_2]".',$folder,$showfolder).'<br />');
+            $r->print('<p class="LC_success">'
+                     .&mt('Folder "[_1]" renamed to "[_2]".',$folder,$showfolder)
+                     .'</p>');
         } else {
-            $r->print(&mt('Renaming failed.').' '.$renresult.'<br />');
+            $r->print('<p class="LC_warning">'
+                     .&mt('Renaming failed.').' '.$renresult
+                     .'</p>');
             $showfolder = $folder;
         }
         &Apache::loncommunicate::menu($r);
Index: loncom/localize/localize/de.pm
diff -u loncom/localize/localize/de.pm:1.327 loncom/localize/localize/de.pm:1.328
--- loncom/localize/localize/de.pm:1.327	Fri Sep 25 13:52:12 2009
+++ loncom/localize/localize/de.pm	Fri Sep 25 16:35:41 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # German Localization Lexicon
 #
-# $Id: de.pm,v 1.327 2009/09/25 13:52:12 droeschl Exp $
+# $Id: de.pm,v 1.328 2009/09/25 16:35:41 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -14074,8 +14074,8 @@
    '[quant,_1,message is, messages are] not viewable because display of LON-CAPA messages sent to you by other students between [_2] and [_3] is currently being blocked because of online exams.'
 => '[quant,_1,Nachricht ist, Nachrichten sind] nicht sichtbar, da die Anzeige von an Sie von anderen Studierenden gesendeten LON-CAPA-Nachrichten zwischen [_2] und [_3] derzeit aufgrund von Online-Prüfungen gesperrt ist.',
 
-   'Each of the <b>[quant,_1,message]</b> you checked will be forwarded to the recipient(s) you select below.'
-=> 'Jede der <b>[quant,_1,Nachricht,Nachrichten]</b>, die Sie ausgewählt haben, wird an die Empfänger weitergeleitet, die Sie unten auswählen.',
+   'Each of the [quant,_1,message] you checked will be forwarded to the recipient(s) you select below.'
+=> 'Jede der [quant,_1,Nachricht,Nachrichten], die Sie ausgewählt haben, wird an die Empfänger weitergeleitet, die Sie unten auswählen.',
 
    'The message you checked will be forwarded to the recipient(s) you select below.'
 => 'Die Nachricht, die Sie ausgewählt haben, wird an die Empfänger weitergeleitet, die Sie unten auswählen.',
@@ -14179,26 +14179,26 @@
    'Failed to delete the message.'
 => 'Löschen der Nachricht ist fehlgeschlagen.',
 
-   'Marked [_1] message(s) read'
-=> '[_1] Nachricht(en) als gelesen markiert',
+   'Marked [quant,_1,message] read'
+=> '[quant,_1,Nachricht,Nachrichten] als gelesen markiert',
 
-   'Marked [_1] message(s) Unread'
-=> '[_1] Nachricht(en) als ungelesen markiert',
+   'Marked [quant,_1,message] unread'
+=> '[quant,_1,Nachricht,Nachrichten] als ungelesen markiert',
 
    'Destination folder [_1] is not a valid folder'
 => 'Bei dem Zielverzeichnis [_1] handelt es sich um kein gültiges Verzeichnis.',
 
-   'Failed to move [_1] message(s)'
-=> '[_1] Nachricht(en) konnte(n) nicht verschoben werden.',
+   'Failed to move [quant,_1,message]'
+=> '[quant,_1,Nachricht konnte,Nachrichten konnten] nicht verschoben werden.',
 
-   'Moved [_1] message(s)'
-=> '[_1] Nachricht(en) wurde(n) verschoben.',
+   'Moved [quant,_1,message]'
+=> '[quant,_1,Nachricht wurde,Nachrichten wurden] verschoben.',
 
-   'Failed to delete [_1] message(s)'
-=> '[_1] Nachricht(en) konnte(n) nicht gelöscht werden.',
+   'Failed to delete [quant,_1,message]'
+=> '[quant,_1,Nachricht konnte,Nachrichten konnten] nicht gelöscht werden.',
 
-   'Deleted [_1] message(s)'
-=> '[_1] Nachricht(en) wurde(n) gelöscht.',
+   'Deleted [quant,_1,message]'
+=> '[quant,_1,Nachricht wurde,Nachrichten wurden] gelöscht.',
 
    '[quant,_1,message] forwarded.'
 => '[quant,_1,Nachricht,Nachrichten] weitergeleitet.',

--bisitz1253896542--