afuna: Cat under a blanket. Text: "Cats are just little people with Fur and Fangs" (Default)
afuna ([personal profile] afuna) wrote in [site community profile] changelog2009-04-03 03:24 pm

[dw-free] Remove bml from /changepassword.bml.forcechange

[commit: http://hg.dwscoalition.org/dw-free/rev/8a4434de96a2]

http://bugs.dwscoalition.org/show_bug.cgi?id=578

Clean up changepassword.bml translation strings.

Patch by [staff profile] denise.

Files modified:
  • htdocs/changepassword.bml
  • htdocs/changepassword.bml.text
--------------------------------------------------------------------------------
diff -r ca51e7c5a2d3 -r 8a4434de96a2 htdocs/changepassword.bml
--- a/htdocs/changepassword.bml	Fri Apr 03 14:53:09 2009 +0000
+++ b/htdocs/changepassword.bml	Fri Apr 03 15:24:05 2009 +0000
@@ -64,13 +64,13 @@ body<=
      }
 
      if ($remote && $remote->prop('badpassword')) {
-         $ret .= "<?warningbar <?h1 Time to Pick a New Password h1?>";
-         $ret .= $ML{'.forcechange'};
+         $ret .= "<?warningbar <?h1 $ML{'.forcechange.header'} h1?>";
+         $ret .= "<?p $ML{'.forcechange'} p?>";
          $ret .= " warningbar?><br />";
      }
 
      $ret .= "<?standout\n";
-     $ret .= "$ML{'Username'}:<br />\n";
+     $ret .= "$ML{'.header.username'}:<br />\n";
 
      # we make the field for the new password *longer* than the max length
      # for a password - that way we can tell if someone is trying to use an
diff -r ca51e7c5a2d3 -r 8a4434de96a2 htdocs/changepassword.bml.text
--- a/htdocs/changepassword.bml.text	Fri Apr 03 14:53:09 2009 +0000
+++ b/htdocs/changepassword.bml.text	Fri Apr 03 15:24:05 2009 +0000
@@ -50,7 +50,11 @@ Regards,
 
 .error.notvalidated=You cannot change your password if your current email address has not been validated.
 
-.forcechange=<?p Your current password is too easy for an automated program to guess, so your account has been frozen. Before you do anything else, you need to change your password. p?>
+.forcechange.header=Pick a New Password
+
+.forcechange=Your current password is too easy for an automated program to guess, so your account has been frozen. Before you do anything else, you need to change your password.
+
+.header.username=Username
 
 .newpassword=New Password:
 
--------------------------------------------------------------------------------