--- account_reminder.module	2007-11-04 22:41:11.000000000 -0600
+++ account_reminder.new	2007-11-04 22:40:54.000000000 -0600
@@ -80,35 +80,35 @@
                                             
   $form['mail']['account_reminder_subject']=array('#type' => 'textfield', 
                                             '#title' => 'Email subject',
-                                            '#default_value' => variable_get('account_reminder_subject', 'Account details for %username at %site'), 
-                                            '#description' => 'The subject of the message with variables %site, %username',
+                                            '#default_value' => variable_get('account_reminder_subject', 'Account details for !username at !site'), 
+                                            '#description' => 'The subject of the message with variables !site, !username',
                                             '#weight'=>-10
                                             
                                             );
   $form['mail']['account_reminder_msg']=array('#type' => 'textarea', 
                                             '#title' => 'Email body',
-                                            '#default_value' => variable_get('account_reminder_msg', '%username,
+                                            '#default_value' => variable_get('account_reminder_msg', '!username,
 
-This is a reminder from %site. You have registered for a user account but have not yet validated your email address.  To fully activate your account at %login_uri login using the following username and password:
+This is a reminder from !site. You have registered for a user account but have not yet validated your email address.  To fully activate your account at !login_uri login using the following username and password:
 
-username: %username
-password: %password
+username: !username
+password: !password
 
 You may also log in by clicking on this link or copying and pasting it in your browser:
 
-%login_url
+!login_url
 
 This is a one-time login, so it can be used only once.
 
 
---  %site team
+--  !site team
 
 
 You can stop receiving these reminder emails by either activating your account, or using the unsubscribe link below:
 
-%unsubscribe_url'
+!unsubscribe_url'
 ), 
-                                            '#description' => 'Customise the body of the email. Valid variables are %site, %username, %login_uri, %login_url (the one time login link),%unsubscribe_url (A URL allowing users to opt out of recieving the reminder emails) and %password.',
+                                            '#description' => 'Customise the body of the email. Valid variables are !site, !username, !login_uri, !login_url (the one time login link),!unsubscribe_url (A URL allowing users to opt out of recieving the reminder emails) and !password.',
                                             '#weight'=>-8
                                             );
                                            
@@ -184,13 +184,13 @@
 
   $user->pass=md5($pass);
   
-  $variables = array('%site' => variable_get('site_name',""),
-                     '%username' => $user->name,
-                     '%password'=>$pass,
-                     '%user_mail' => $user->mail,
-                     '%login_uri'=>url('user',null,null,true),
-                     '%login_url' => user_pass_reset_url($user),
-                     '%unsubscribe_url'=>account_reminder_unsubscribe_url($user)
+  $variables = array('!site' => variable_get('site_name',""),
+                     '!username' => $user->name,
+                     '!password'=>$pass,
+                     '!user_mail' => $user->mail,
+                     '!login_uri'=>url('user',null,null,true),
+                     '!login_url' => user_pass_reset_url($user),
+                     '!unsubscribe_url'=>account_reminder_unsubscribe_url($user)
                     );
                        
   $from=variable_get('site_mail', 'admin@example.com');
@@ -207,34 +207,34 @@
     $body=strtr($non_translatable_string,$variables);
   }
   else{
-    $body = t("%username,
+    $body = t("!username,
 
-This is a reminder from %site. You have registered for a user account but have not yet validated your email address.  To fully activate your account at %login_uri login using the following username and password:
+This is a reminder from !site. You have registered for a user account but have not yet validated your email address.  To fully activate your account at !login_uri login using the following username and password:
 
-username: %username
-password: %password
+username: !username
+password: !password
 
 You may also log in by clicking on this link or copying and pasting it in your browser:
 
-%login_url
+!login_url
 
 This is a one-time login, so it can be used only once.
 
---  %site team
+--  !site team
 
 
 You can stop receiving these reminder emails by either activating your account, or using the unsubscribe link below:
 
-%unsubscribe_url", $variables);
+!unsubscribe_url", $variables);
   }
   
 
   $email = str_replace(array("\r\n", "\n", "\r", ";", ","), '', $user->mail);
-  
+ 
   if(valid_email_address($email)){
     module_invoke_all('account_reminder_email', $email, $subject, $body, $from);
     drupal_mail('acount_reminder_email',$email, $subject, $body, $from);
-    watchdog("account_reminder", t("Reminder email send to %user at %email.", array('%user' => $user->name, '%email' => $user->mail ) ));
+    watchdog("account_reminder", t("Reminder email send to !user at !email.", array('!user' => $user->name, '!email' => $user->mail ) ));
   }
 }