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

bisitz bisitz@source.lon-capa.org
Thu, 03 Mar 2011 17:29:32 -0000


bisitz		Thu Mar  3 17:29:32 2011 EDT

  Modified files:              
    /loncom/interface	lonsupportreq.pm 
    /loncom/localize/localize	de.pm 
  Log:
  - Corrected closing tag for display of attachment filename
  - Standard style/confirmwrapper for confirmation
  - Enhanced code readability - reverse code order of confirmation: first standard case, then error case
  - Optimized mt calls: don't concatenate; exclude styles from translation phrase
  - Updated and added related phrases in de.pm
  
  
Index: loncom/interface/lonsupportreq.pm
diff -u loncom/interface/lonsupportreq.pm:1.65 loncom/interface/lonsupportreq.pm:1.66
--- loncom/interface/lonsupportreq.pm:1.65	Thu Mar  3 00:33:38 2011
+++ loncom/interface/lonsupportreq.pm	Thu Mar  3 17:29:29 2011
@@ -1,5 +1,5 @@
 #
-# $Id: lonsupportreq.pm,v 1.65 2011/03/03 00:33:38 raeburn Exp $
+# $Id: lonsupportreq.pm,v 1.66 2011/03/03 17:29:29 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -558,7 +558,6 @@
                  sourceurl   => 'URL',
                  date        => 'Date/Time',
                  secn        => 'Section',
-                 asup        => 'A support request has been sent to',
                  warn        => 'Warning: Problem with support e-mail address',
                  your        => 'Your support request contained the following information',
                  sect        => 'section',
@@ -689,14 +688,20 @@
             $bad_email = 1;
         }
     }
-    if ($bad_email) {
-        $r->print('
- <h3>'.$lt{'warn'}.'</h3>'.
-&mt('As the e-mail address provided for this LON-CAPA server ([_1]) does not appear to be a valid e-mail address, your support request has <b>not</b> been sent to the LON-CAPA support staff or administrator at your institution.',$to).' '.&mt('Instead a copy has been sent to the LON-CAPA support team at Michigan State University.')); 
-            $to = 'helpdesk@lon-capa.org';
-    } else {
-        $r->print('<h3>'.$lt{'asup'}.' '.$to.'</h3>');
+
+    my $message;
+    if (!$bad_email) {
+        $message = &Apache::lonhtmlcommon::confirm_success(
+            &mt('A support request has been sent to [_1]','<tt>'.$to.'</tt>'));
+    } else {
+        $message = &Apache::lonhtmlcommon::confirm_success(
+            $lt{'warn'}.'<br />'
+           .&mt('As the e-mail address provided for this LON-CAPA server ([_1]) does not appear to be a valid e-mail address, your support request has [_2]not[_3] been sent to the LON-CAPA support staff or administrator at your institution.','<tt>'.$to.'</tt>','<b>','</b>')
+           .' '.&mt('Instead a copy has been sent to the LON-CAPA support team at Michigan State University.'),1); 
+        $to = 'helpdesk@lon-capa.org';
     }
+    $r->print(&Apache::loncommon::confirmwrapper($message));
+
     if (defined($env{'form.email'})) {
         $env{'form.email'} =~ s/^\s+//;
         $env{'form.email'} =~ s/\s+$//;
@@ -744,7 +749,7 @@
         $fname = $1;
         $displaymsg .= '<br />'
                       .&mt('An uploaded screenshot file [_1] ([_2] bytes) was included in the request sent by [_3].'
-                          ,'<span class="LC_filename">'.$fname.'<span>'
+                          ,'<span class="LC_filename">'.$fname.'</span>'
                           ,$attachmentsize
                           ,$env{'user.name'}.':'.$env{'user.domain'}
                        );
Index: loncom/localize/localize/de.pm
diff -u loncom/localize/localize/de.pm:1.410 loncom/localize/localize/de.pm:1.411
--- loncom/localize/localize/de.pm:1.410	Thu Feb 24 17:23:30 2011
+++ loncom/localize/localize/de.pm	Thu Mar  3 17:29:31 2011
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # German Localization Lexicon
 #
-# $Id: de.pm,v 1.410 2011/02/24 17:23:30 bisitz Exp $
+# $Id: de.pm,v 1.411 2011/03/03 17:29:31 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -392,6 +392,9 @@
    'Return to Last Location'
 => 'Zurück zum zuletzt verwendeten Kursdokument',
 
+   'Return to last location' # Helpdesk
+=> 'Zurück zum letzten Ort',
+
    'Send and receive messages'
 # => 'Verschicken und Empfangen von Nachrichten',
 # => 'Interne Nachrichten verwalten',
@@ -4285,6 +4288,9 @@
    'Report a Bug'
 => 'Einen Fehler melden',
 
+   'Report a bug'
+=> 'Einen Fehler melden',
+
    'Resource'
 => 'Ressource',
 
@@ -8134,7 +8140,7 @@
 => 'Login-Hilfe',
 
    'Ask helpdesk'
-=> 'Anfrage an Helpdesk abschicken',
+=> 'Helpdesk kontaktieren',
 
    'Back to last location'
 => 'Zurück zum letzten Ort',
@@ -9456,6 +9462,9 @@
    'Username:domain of each co-owner'
 => 'Benutzerkennung:Domäne eines jeden Co-Eigentümers',
 
+   'Username/domain'
+=> 'Benutzerkennung/Domäne',
+
    'Course Access'
 => 'Kurs-Zugriff',
 
@@ -15482,8 +15491,11 @@
    'Optional file upload'
 => 'Optionales Hochladen einer Datei',
 
-   'A support request has been sent to'
-=> 'Eine Support-Anfrage wurde gesendet an',
+   'Warning: Problem with support e-mail address'
+=> 'Achtung, es gibt Probleme mit der Support-E-Mail-Adresse.',
+
+   'A support request has been sent to [_1]'
+=> 'Es wurde eine Support-Anfrage an [_1] gesendet.',
 
    'Your support request contained the following information'
 => 'Ihre Support-Anfrage enthält folgende Daten',
@@ -15494,7 +15506,7 @@
    'The following Cc e-mail addresses are invalid: '
 => 'Die folgende CC-E-Mail-Adressen sind ungültig: ',
 
-   'As the e-mail address provided for this LON-CAPA server ([_1]) does not appear to be a valid e-mail address, your support request has <b>not</b> been sent to the LON-CAPA support staff or administrator at your institution.'
+   'As the e-mail address provided for this LON-CAPA server ([_1]) does not appear to be a valid e-mail address, your support request has [_2]not[_3] been sent to the LON-CAPA support staff or administrator at your institution.'
 => 'Da die für diesen LON-CAPA-Server angegebene E-Mail-Adresse ([_1]) anscheinend ungültig ist, wurde Ihre Support-Anfrage weder an das LON-CAPA-Supportteam Ihrer Institution noch an den Adminstrator geschickt.',
 
    'Instead a copy has been sent to the LON-CAPA support team at Michigan State University.'
@@ -15506,6 +15518,12 @@
    'An uploaded screenshot file [_1] ([_2] bytes) was included in the request sent by [_3].'
 => 'Eine hochgeladene Screenshot-Datei [_1] ([_2] Bytes) wurde der Anfrage beigefügt, die von [_3] gesendet wurde.',
 
+   'Information supplied'
+=> 'Angegebene Daten',
+
+   'Additional information recorded'
+=> 'Zusätzlich mitgeschriebene Daten',
+
    'File does not have [_1] or [_2] starting tag'
 => 'Die Datei hat weder ein [_1]- noch ein [_2]-Start-Tag',
 
@@ -21572,6 +21590,9 @@
    'You must enter a positive integer.'
 => 'Sie müssen eine positive Zahl eingeben.',
 
+   'General Help'
+=> 'Allgemeine Hilfe',
+
    ''
 => '',