diff --git a/admin_customers.php b/admin_customers.php index 92163354..4930181f 100644 --- a/admin_customers.php +++ b/admin_customers.php @@ -671,7 +671,6 @@ if($page == 'customers' $replace_arr = array( 'FIRSTNAME' => $firstname, 'NAME' => $name, - 'TITLE' => $title, 'COMPANY' => $company, 'SALUTATION' => getCorrectUserSalutation(array('firstname' => $firstname, 'name' => $name, 'company' => $company)), 'USERNAME' => $loginname, diff --git a/lng/english.lng.php b/lng/english.lng.php index 9dd6abc9..af1b60e3 100644 --- a/lng/english.lng.php +++ b/lng/english.lng.php @@ -320,8 +320,10 @@ $lng['admin']['templates']['mailbody'] = 'Mail body'; $lng['admin']['templates']['createcustomer'] = 'Welcome mail for new customers'; $lng['admin']['templates']['pop_success'] = 'Welcome mail for new email accounts'; $lng['admin']['templates']['template_replace_vars'] = 'Variables to be replaced in the template:'; +$lng['admin']['templates']['SALUTATION'] = 'Replaced with a correct salutation'; $lng['admin']['templates']['FIRSTNAME'] = 'Replaced with the customers firstname.'; $lng['admin']['templates']['NAME'] = 'Replaced with the customers name.'; +$lng['admin']['templates']['COMPANY'] = 'Replaces with the customers company name'; $lng['admin']['templates']['USERNAME'] = 'Replaced with the customers account username.'; $lng['admin']['templates']['PASSWORD'] = 'Replaced with the customers account password.'; $lng['admin']['templates']['EMAIL'] = 'Replaced with the address of the POP3/IMAP account.'; diff --git a/lng/german.lng.php b/lng/german.lng.php index 20bac866..5bce2f81 100644 --- a/lng/german.lng.php +++ b/lng/german.lng.php @@ -321,8 +321,10 @@ $lng['admin']['templates']['createcustomer'] = 'Willkommensmail für neue Ku $lng['admin']['templates']['pop_success'] = 'Willkommensmail für neue E-Mail Konten'; $lng['admin']['wwwserveralias'] = 'www. ServerAlias hinzufügen'; $lng['admin']['templates']['template_replace_vars'] = 'Variablen, die in den Vorlagen ersetzt werden:'; +$lng['admin']['templates']['SALUTATION'] = 'Wird mit einer korrekten Anrede des Kunden ersetzt'; $lng['admin']['templates']['FIRSTNAME'] = 'Wird mit dem Vornamen des Kunden ersetzt.'; $lng['admin']['templates']['NAME'] = 'Wird mit dem Namen des Kunden ersetzt.'; +$lng['admin']['templates']['COMPANY'] = 'Wird mit dem Firmennamen des Kunden ersetzt.'; $lng['admin']['templates']['USERNAME'] = 'Wird mit dem Benutzernamen des neuen Kundenkontos ersetzt.'; $lng['admin']['templates']['PASSWORD'] = 'Wird mit dem Passwort des neuen Kundenkontos ersetzt.'; $lng['admin']['templates']['EMAIL'] = 'Wird mit der Adresse des neuen POP3/IMAP Kontos ersetzt.'; diff --git a/templates/admin/templates/templates_add_2.tpl b/templates/admin/templates/templates_add_2.tpl index 0256b870..a55bad44 100644 --- a/templates/admin/templates/templates_add_2.tpl +++ b/templates/admin/templates/templates_add_2.tpl @@ -36,6 +36,10 @@ $header {$lng['admin']['templates']['createcustomer']} + + {SALUTATION}: + {$lng['admin']['templates']['SALUTATION']} + {FIRSTNAME}: {$lng['admin']['templates']['FIRSTNAME']} @@ -44,6 +48,10 @@ $header {NAME}: {$lng['admin']['templates']['NAME']} + + {COMPANY}: + {$lng['admin']['templates']['COMPANY']} + {USERNAME}: {$lng['admin']['templates']['USERNAME']} diff --git a/templates/admin/templates/templates_edit.tpl b/templates/admin/templates/templates_edit.tpl index 38ddd531..cb694945 100644 --- a/templates/admin/templates/templates_edit.tpl +++ b/templates/admin/templates/templates_edit.tpl @@ -38,6 +38,10 @@ $header {$lng['admin']['templates']['createcustomer']} + + {SALUTATION}: + {$lng['admin']['templates']['SALUTATION']} + {FIRSTNAME}: {$lng['admin']['templates']['FIRSTNAME']} @@ -46,6 +50,10 @@ $header {NAME}: {$lng['admin']['templates']['NAME']} + + {COMPANY}: + {$lng['admin']['templates']['COMPANY']} + {USERNAME}: {$lng['admin']['templates']['USERNAME']}