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

[raeburn]

raeburn		Mon Feb 23 20:25:49 2009 EDT

  Modified files:              
    /loncom/interface	lonpreferences.pm 
    /loncom/localize/localize	de.pm zh.pm 
  Log:
  - &loncommon::start_page() not wanted if $caller of &verify_and_change_password() is 'reset_by_email'.
  - Missing . added to two &mt()'d phrases.
    - de.pm and zh.pm updated accordingly.
  
  
Index: loncom/interface/lonpreferences.pm
diff -u loncom/interface/lonpreferences.pm:1.143 loncom/interface/lonpreferences.pm:1.144
--- loncom/interface/lonpreferences.pm:1.143	Thu Feb 19 16:12:21 2009
+++ loncom/interface/lonpreferences.pm	Mon Feb 23 20:25:44 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Preferences
 #
-# $Id: lonpreferences.pm,v 1.143 2009/02/19 16:12:21 hauer Exp $
+# $Id: lonpreferences.pm,v 1.144 2009/02/23 20:25:44 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1215,8 +1215,10 @@
     Apache::lonhtmlcommon::add_breadcrumb(
 		{ href => '/adm/preferences?action=changepass',
                   text => 'Change Password'});
-    $r->print(Apache::loncommon::start_page('Change Password'));
-    $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Password'));
+    unless ($caller eq 'reset_by_email') {
+        $r->print(Apache::loncommon::start_page('Change Password'));
+        $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Password'));
+    }
     if ((!defined($caller)) || ($caller eq 'preferences')) {
         $user = $env{'user.name'};
         $domain = $env{'user.domain'};
@@ -1552,14 +1554,20 @@
     # Inform the user the password has (not?) been changed
     my $message;
     if ($result =~ /^ok$/) {
-        $message = &mt('The password for [_1] was successfully changed',$user);
-        print_main_menu($r, $message);
+        $message = &mt('The password for [_1] was successfully changed.',$user);
+        if ($caller eq 'reset_by_email') {
+            $r->print($message.'<br />');
+        } else {
+            &print_main_menu($r, $message);
+        }
 #	$r->print("<h3>".&mt('The password for [_1] was successfully changed',$user)."</h3>");
     } else {
 	# error error: run in circles, scream and shout
-        $message = &mt("The password for [_1] was not changed",$user)
+        $message = &mt("The password for [_1] was not changed.",$user).' '.
 		.&mt('Please make sure your old password was entered correctly.');
-        print_main_menu($r, $message);
+        unless ($caller eq 'reset_by_email') {
+            &print_main_menu($r, $message);
+        }
 #        $r->print("<h3><span class='LC_error'>".&mt("The password for [_1] was not changed",$user)."</span></h3>".
 #                  &mt('Please make sure your old password was entered correctly.'));
         return 1;
Index: loncom/localize/localize/de.pm
diff -u loncom/localize/localize/de.pm:1.232 loncom/localize/localize/de.pm:1.233
--- loncom/localize/localize/de.pm:1.232	Thu Feb 19 22:03:09 2009
+++ loncom/localize/localize/de.pm	Mon Feb 23 20:25:49 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # German Localization Lexicon
 #
-# $Id: de.pm,v 1.232 2009/02/19 22:03:09 schafran Exp $
+# $Id: de.pm,v 1.233 2009/02/23 20:25:49 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -12886,11 +12886,11 @@
    'Valid characters are'
 => 'Gültige Zeichen sind',
 
-   'The password for [_1] was successfully changed'
-=> 'Das Passwort für [_1] wurde erfolgreich geändert',
+   'The password for [_1] was successfully changed.'
+=> 'Das Passwort für [_1] wurde erfolgreich geändert.',
 
-   'The password for [_1] was not changed'
-=> 'Das Passwort für [_1] wurde nicht geändert',
+   'The password for [_1] was not changed.'
+=> 'Das Passwort für [_1] wurde nicht geändert.',
 
    'Please make sure your old password was entered correctly.'
 => 'Bitte stellen Sie sicher, dass das alte Passwort korrekt eingegeben wurde.',
Index: loncom/localize/localize/zh.pm
diff -u loncom/localize/localize/zh.pm:1.20 loncom/localize/localize/zh.pm:1.21
--- loncom/localize/localize/zh.pm:1.20	Thu Feb 19 18:09:21 2009
+++ loncom/localize/localize/zh.pm	Mon Feb 23 20:25:49 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Chinese Simplified Localization Lexicon
 #
-# $Id: zh.pm,v 1.20 2009/02/19 18:09:21 bisitz Exp $
+# $Id: zh.pm,v 1.21 2009/02/23 20:25:49 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -12990,10 +12990,10 @@
    'Valid characters are'
 => 'Gültige Zeichen sind',
 
-   'The password for [_1] was successfully changed'
-=> 'Das Passwort für [_1] wurde erfolgreich geändert',
+   'The password for [_1] was successfully changed.'
+=> 'Das Passwort für [_1] wurde erfolgreich geändert.',
 
-   'The password for [_1] was not changed'
+   'The password for [_1] was not changed.'
 => 'Das Passwort für [_1] wurde nicht geändert',
 
    'Please make sure your old password was entered correctly.'