Language string cleaned up

[mailer.git] / inc / template-functions.php

diff --git a/inc/template-functions.php b/inc/template-functions.php
index 5e163cb6e4420a83d37488f5d344c9cbe44b0ac0..4805bb0e9998ac10dd110fe750cc571eb5b6b3b6 100644 (file)
--- a/inc/template-functions.php
+++ b/inc/template-functions.php
@@ -1724,12 +1724,12 @@ function sendModeMails ($mod, $modes) {
                                                                break;
 
                                                        case 'password': // Password was changed
-                                                               $content['message'] = '{--MEMBER_CHANGED_PASS--}' . PHP_EOL;
+                                                               $content['message'] = '{--MEMBER_CHANGED_PASSWORD--}' . PHP_EOL;
                                                                break;
 
                                                        default:
-                                                               logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unknown mode %s detected.", $mode));
-                                                               $content['message'] = '{--MEMBER_UNKNOWN_MODE--}' . ': ' . $mode . PHP_EOL . PHP_EOL;
+                                                               logDebugMessage(__FUNCTION__, __LINE__, sprintf('Unknown mode %s detected.', $mode));
+                                                               $content['message'] = '{%message,MEMBER_UNKNOWN_MODE=' .  $mode . '%}' . PHP_EOL . PHP_EOL;
                                                                break;
                                                } // END - switch
                                        } // END - foreach
@@ -1748,23 +1748,23 @@ function sendModeMails ($mod, $modes) {
                                        if (isAdminNotificationEnabled()) {
                                                // The admin needs to be notified about a profile change
                                                $message_admin = 'admin_mydata_notify';
-                                               $sub_adm   = '{--ADMIN_CHANGED_DATA--}';
+                                               $subjectAdmin   = '{--ADMIN_CHANGED_DATA_SUBJECT--}';
                                        } else {
                                                // No mail to admin
                                                $message_admin = '';
-                                               $sub_adm   = '';
+                                               $subjectAdmin  = '';
                                        }
 
                                        // Set subject lines
-                                       $sub_mem = '{--MEMBER_CHANGED_DATA--}';
+                                       $subjectMember = '{--MEMBER_CHANGED_DATA--}';
 
                                        // Output success message
                                        $content['message'] = '<span class="message">{--MEMBER_MYDATA_MAIL_SENT--}</span>';
                                        break;
 
                                default: // Unsupported module!
-                                       logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unsupported module %s detected.", $mod));
-                                       $content['message'] = '<span class="bad">{--UNKNOWN_MODULE--}</span>';
+                                       logDebugMessage(__FUNCTION__, __LINE__, sprintf('Unsupported module %s detected.', $mod));
+                                       $content['message'] = '<span class="bad">{%message,UNKNOWN_MODULE=' . $mod . '%}</span>';
                                        break;
                        } // END - switch
                } else {
@@ -1777,15 +1777,15 @@ function sendModeMails ($mod, $modes) {
        }
 
        // Send email to user if required
-       if ((!empty($sub_mem)) && (!empty($message)) && (!empty($content['userid']))) {
+       if ((!empty($subjectMember)) && (!empty($message)) && (!empty($content['userid']))) {
                // Send member mail
-               sendEmail($content['userid'], $sub_mem, $message);
+               sendEmail($content['userid'], $subjectMember, $message);
        } // END - if
 
        // Send only if no other error has occured
-       if ((!empty($sub_adm)) && (!empty($message_admin)) && (isAdminNotificationEnabled())) {
+       if ((!empty($subjectAdmin)) && (!empty($message_admin)) && (isAdminNotificationEnabled())) {
                // Send admin mail
-               sendAdminNotification($sub_adm, $message_admin, $content, getMemberId());
+               sendAdminNotification($subjectAdmin, $message_admin, $content, getMemberId());
        } elseif (isAdminNotificationEnabled()) {
                // Cannot send mails to admin!
                $content['message'] = '{--CANNOT_SEND_ADMIN_MAILS--}';