Index: trunk/CHANGELOG =================================================================== --- trunk/CHANGELOG (revision 920) +++ trunk/CHANGELOG (revision 921) @@ -11,6 +11,8 @@ ! = Update/Change ------------------------------------- 2.8.0 ------------------------------------- +05-Feb-2009 Christian Sommer +! mail text for register, signup and forgot mail now taken from WB language file (ticket #684) 02-Feb-2009 Christian Sommer # removed PHPMailer fix introduced with 2.0.3 to get SMTP working again (line 1041 in class.smtp.php) 02-Feb-2009 Matthias Gallas Index: trunk/wb/admin/login/forgot/index.php =================================================================== --- trunk/wb/admin/login/forgot/index.php (revision 920) +++ trunk/wb/admin/login/forgot/index.php (revision 921) @@ -82,19 +82,14 @@ $message = $database->get_error(); } else { // Setup email to send - $mail_subject = 'Your login details...'; $mail_to = $email; - $mail_message = ''. - 'Hello '.$results_array["display_name"].', - - Your '.$website_title.' administration login details are: - Username: '.$results_array["username"].' - Password: '.$new_pass.' - - Your password has been reset to the one above. - This means that your old password will no longer work. - - If you have received this message in error, please delete it immediately.'; + $mail_subject = $MESSAGE['SIGNUP2']['SUBJECT_LOGIN_INFO']; + + // Replace placeholders from language variable with values + $search = array('{LOGIN_DISPLAY_NAME}', '{LOGIN_WEBSITE_TITLE}', '{LOGIN_NAME}', '{LOGIN_PASSWORD}'); + $replace = array($results_array['display_name'], WEBSITE_TITLE, $results_array['username'], $new_pass); + $mail_message = str_replace($search, $replace, $MESSAGE['SIGNUP2']['BODY_LOGIN_INFO']); + // Try sending the email if($admin->mail(SERVER_EMAIL,$mail_to,$mail_subject,$mail_message)) { $message = $MESSAGE['FORGOT_PASS']['PASSWORD_RESET']; Index: trunk/wb/account/forgot_form.php =================================================================== --- trunk/wb/account/forgot_form.php (revision 920) +++ trunk/wb/account/forgot_form.php (revision 921) @@ -75,19 +75,14 @@ $message = $database->get_error(); } else { // Setup email to send - $mail_subject = 'Your login details...'; $mail_to = $email; - $mail_message = ''. -'Hello '.$results_array["display_name"].', + $mail_subject = $MESSAGE['SIGNUP2']['SUBJECT_LOGIN_INFO']; -Your '.WEBSITE_TITLE.' administration login details are: -Username: '.$results_array["username"].' -Password: '.$new_pass.' + // Replace placeholders from language variable with values + $search = array('{LOGIN_DISPLAY_NAME}', '{LOGIN_WEBSITE_TITLE}', '{LOGIN_NAME}', '{LOGIN_PASSWORD}'); + $replace = array($results_array['display_name'], WEBSITE_TITLE, $results_array['username'], $new_pass); + $mail_message = str_replace($search, $replace, $MESSAGE['SIGNUP2']['BODY_LOGIN_INFO']); -Your password has been reset to the one above. -This means that your old password will no longer work. - -If you have received this message in error, please delete it immediately.'; // Try sending the email if($wb->mail(SERVER_EMAIL,$mail_to,$mail_subject,$mail_message)) { $message = $MESSAGE['FORGOT_PASS']['PASSWORD_RESET']; Index: trunk/wb/account/signup2.php =================================================================== --- trunk/wb/account/signup2.php (revision 920) +++ trunk/wb/account/signup2.php (revision 921) @@ -115,19 +115,14 @@ $message = $database->get_error(); } else { // Setup email to send - $mail_subject = 'Your login details...'; $mail_to = $email; - $mail_message = ''. -'Hello '.$display_name.', + $mail_subject = $MESSAGE['SIGNUP2']['SUBJECT_LOGIN_INFO']; -Your '.WEBSITE_TITLE.' login details are: -Username: '.$username.' -Password: '.$new_pass.' + // Replace placeholders from language variable with values + $search = array('{LOGIN_DISPLAY_NAME}', '{LOGIN_WEBSITE_TITLE}', '{LOGIN_NAME}', '{LOGIN_PASSWORD}'); + $replace = array($display_name, WEBSITE_TITLE, $username, $new_pass); + $mail_message = str_replace($search, $replace, $MESSAGE['SIGNUP2']['BODY_LOGIN_INFO']); -Your password has been set to the one above. - -If you have received this message in error, please delete it immediately.'; - // Try sending the email if($wb->mail(SERVER_EMAIL,$mail_to,$mail_subject,$mail_message)) { $display_form = false; Index: trunk/wb/languages/FI.php =================================================================== --- trunk/wb/languages/FI.php (revision 920) +++ trunk/wb/languages/FI.php (revision 921) @@ -443,7 +443,20 @@ $MESSAGE['LOGIN']['AUTHENTICATION_FAILED'] = 'Käyttäjätunnus/salsana väärä'; $MESSAGE['SIGNUP']['NO_EMAIL'] = 'Anna sähköpostiosoite'; +$MESSAGE['SIGNUP2']['SUBJECT_LOGIN_INFO'] = 'Your login details...'; +$MESSAGE['SIGNUP2']['BODY_LOGIN_INFO'] = <<< EOT +Hello {LOGIN_DISPLAY_NAME}, +Your '{LOGIN_WEBSITE_TITLE}' login details are: +Username: {LOGIN_NAME} +Password: {LOGIN_PASSWORD} + +Your password has been set to the one above. +This means that your old password will no longer work. + +If you have received this message in error, please delete it immediately. +EOT; + $MESSAGE['FORGOT_PASS']['NO_DATA'] = 'Anna sähköpostiosoite'; $MESSAGE['FORGOT_PASS']['EMAIL_NOT_FOUND'] = 'Virheellinen sähköpostiosoite'; $MESSAGE['FORGOT_PASS']['CANNOT_EMAIL'] = 'Salasanan postitus ei onnistu, ota yhteyttä pääkäyttäjään'; Index: trunk/wb/languages/EN.php =================================================================== --- trunk/wb/languages/EN.php (revision 920) +++ trunk/wb/languages/EN.php (revision 921) @@ -443,7 +443,20 @@ $MESSAGE['LOGIN']['AUTHENTICATION_FAILED'] = 'Username or password incorrect'; $MESSAGE['SIGNUP']['NO_EMAIL'] = 'You must enter an email address'; +$MESSAGE['SIGNUP2']['SUBJECT_LOGIN_INFO'] = 'Your login details...'; +$MESSAGE['SIGNUP2']['BODY_LOGIN_INFO'] = <<< EOT +Hello {LOGIN_DISPLAY_NAME}, +Your '{LOGIN_WEBSITE_TITLE}' login details are: +Username: {LOGIN_NAME} +Password: {LOGIN_PASSWORD} + +Your password has been set to the one above. +This means that your old password will no longer work. + +If you have received this message in error, please delete it immediately. +EOT; + $MESSAGE['FORGOT_PASS']['NO_DATA'] = 'Please enter your email address below'; $MESSAGE['FORGOT_PASS']['EMAIL_NOT_FOUND'] = 'The email that you entered cannot be found in the database'; $MESSAGE['FORGOT_PASS']['CANNOT_EMAIL'] = 'Unable to email password, please contact system administrator'; Index: trunk/wb/languages/CS.php =================================================================== --- trunk/wb/languages/CS.php (revision 920) +++ trunk/wb/languages/CS.php (revision 921) @@ -443,7 +443,20 @@ $MESSAGE['LOGIN']['AUTHENTICATION_FAILED'] = 'Jméno nebo heslo není platné'; $MESSAGE['SIGNUP']['NO_EMAIL'] = 'Musíte zadat e-mailovou adresu'; +$MESSAGE['SIGNUP2']['SUBJECT_LOGIN_INFO'] = 'Your login details...'; +$MESSAGE['SIGNUP2']['BODY_LOGIN_INFO'] = <<< EOT +Hello {LOGIN_DISPLAY_NAME}, +Your '{LOGIN_WEBSITE_TITLE}' login details are: +Username: {LOGIN_NAME} +Password: {LOGIN_PASSWORD} + +Your password has been set to the one above. +This means that your old password will no longer work. + +If you have received this message in error, please delete it immediately. +EOT; + $MESSAGE['FORGOT_PASS']['NO_DATA'] = 'Zadejte svoji e-mailovou adresu:'; $MESSAGE['FORGOT_PASS']['EMAIL_NOT_FOUND'] = 'Zadaná e-mailová adresa nebyla nalezena'; $MESSAGE['FORGOT_PASS']['CANNOT_EMAIL'] = 'Nelze odeslat heslo e-mailem, kontaktujte prosím správce systému'; Index: trunk/wb/languages/SE.php =================================================================== --- trunk/wb/languages/SE.php (revision 920) +++ trunk/wb/languages/SE.php (revision 921) @@ -443,7 +443,20 @@ $MESSAGE['LOGIN']['AUTHENTICATION_FAILED'] = 'Felaktigt användarnamn eller lösenord'; $MESSAGE['SIGNUP']['NO_EMAIL'] = 'Du måste skriva en e-postadress'; +$MESSAGE['SIGNUP2']['SUBJECT_LOGIN_INFO'] = 'Your login details...'; +$MESSAGE['SIGNUP2']['BODY_LOGIN_INFO'] = <<< EOT +Hello {LOGIN_DISPLAY_NAME}, +Your '{LOGIN_WEBSITE_TITLE}' login details are: +Username: {LOGIN_NAME} +Password: {LOGIN_PASSWORD} + +Your password has been set to the one above. +This means that your old password will no longer work. + +If you have received this message in error, please delete it immediately. +EOT; + $MESSAGE['FORGOT_PASS']['NO_DATA'] = 'Skriv din e-postadress'; $MESSAGE['FORGOT_PASS']['EMAIL_NOT_FOUND'] = 'E-postadressen som du skrev in kan inte hittas i vår databas'; $MESSAGE['FORGOT_PASS']['CANNOT_EMAIL'] = 'Kunde inte skicka lösenordet, vänligen kontakta administratatören'; Index: trunk/wb/languages/ES.php =================================================================== --- trunk/wb/languages/ES.php (revision 920) +++ trunk/wb/languages/ES.php (revision 921) @@ -443,7 +443,20 @@ $MESSAGE['LOGIN']['AUTHENTICATION_FAILED'] = 'El Nombre de Usuario o Pasword incorrecto'; $MESSAGE['SIGNUP']['NO_EMAIL'] = 'Debe ingresar una direccion de email'; +$MESSAGE['SIGNUP2']['SUBJECT_LOGIN_INFO'] = 'Your login details...'; +$MESSAGE['SIGNUP2']['BODY_LOGIN_INFO'] = <<< EOT +Hello {LOGIN_DISPLAY_NAME}, +Your '{LOGIN_WEBSITE_TITLE}' login details are: +Username: {LOGIN_NAME} +Password: {LOGIN_PASSWORD} + +Your password has been set to the one above. +This means that your old password will no longer work. + +If you have received this message in error, please delete it immediately. +EOT; + $MESSAGE['FORGOT_PASS']['NO_DATA'] = 'Por favor ingrese su direccion de email'; $MESSAGE['FORGOT_PASS']['EMAIL_NOT_FOUND'] = 'Email no encontrado en base de datos'; $MESSAGE['FORGOT_PASS']['CANNOT_EMAIL'] = 'No puedo enviarle la contraseña, contacte a su Administrador'; Index: trunk/wb/languages/FR.php =================================================================== --- trunk/wb/languages/FR.php (revision 920) +++ trunk/wb/languages/FR.php (revision 921) @@ -443,7 +443,20 @@ $MESSAGE['LOGIN']['AUTHENTICATION_FAILED'] = 'Votre nom d\'utilisateur ou votre mot de passe est incorrect'; $MESSAGE['SIGNUP']['NO_EMAIL'] = 'L\'adresse email est obligatoire'; +$MESSAGE['SIGNUP2']['SUBJECT_LOGIN_INFO'] = 'Your login details...'; +$MESSAGE['SIGNUP2']['BODY_LOGIN_INFO'] = <<< EOT +Hello {LOGIN_DISPLAY_NAME}, +Your '{LOGIN_WEBSITE_TITLE}' login details are: +Username: {LOGIN_NAME} +Password: {LOGIN_PASSWORD} + +Your password has been set to the one above. +This means that your old password will no longer work. + +If you have received this message in error, please delete it immediately. +EOT; + $MESSAGE['FORGOT_PASS']['NO_DATA'] = 'Merci de saisir votre adresse email'; $MESSAGE['FORGOT_PASS']['EMAIL_NOT_FOUND'] = 'L\'adresse email que vous avez saisi est introuvable dans la base de données'; $MESSAGE['FORGOT_PASS']['CANNOT_EMAIL'] = 'Impossible de trouver le mot de passe associé ç votre adresse email, merci de contacter l\'administrateur du site'; Index: trunk/wb/languages/ET.php =================================================================== --- trunk/wb/languages/ET.php (revision 920) +++ trunk/wb/languages/ET.php (revision 921) @@ -443,7 +443,20 @@ $MESSAGE['LOGIN']['AUTHENTICATION_FAILED'] = 'Kasutajanimi või parool on vigane'; $MESSAGE['SIGNUP']['NO_EMAIL'] = 'Sa pead sisestama emaili aadressi'; +$MESSAGE['SIGNUP2']['SUBJECT_LOGIN_INFO'] = 'Your login details...'; +$MESSAGE['SIGNUP2']['BODY_LOGIN_INFO'] = <<< EOT +Hello {LOGIN_DISPLAY_NAME}, +Your '{LOGIN_WEBSITE_TITLE}' login details are: +Username: {LOGIN_NAME} +Password: {LOGIN_PASSWORD} + +Your password has been set to the one above. +This means that your old password will no longer work. + +If you have received this message in error, please delete it immediately. +EOT; + $MESSAGE['FORGOT_PASS']['NO_DATA'] = 'Palun sisesta oma emaili aadress allapoole'; $MESSAGE['FORGOT_PASS']['EMAIL_NOT_FOUND'] = 'Sisestatud emaili eileitud andmebaasist'; $MESSAGE['FORGOT_PASS']['CANNOT_EMAIL'] = 'Võimetu emailima parooli, palun kontakteeru süsteemi administraatoriga'; Index: trunk/wb/languages/HR.php =================================================================== --- trunk/wb/languages/HR.php (revision 920) +++ trunk/wb/languages/HR.php (revision 921) @@ -443,7 +443,20 @@ $MESSAGE['LOGIN']['AUTHENTICATION_FAILED'] = 'Krivo korisnièko ime ili lozinka'; $MESSAGE['SIGNUP']['NO_EMAIL'] = 'Unesite email adresu'; +$MESSAGE['SIGNUP2']['SUBJECT_LOGIN_INFO'] = 'Your login details...'; +$MESSAGE['SIGNUP2']['BODY_LOGIN_INFO'] = <<< EOT +Hello {LOGIN_DISPLAY_NAME}, +Your '{LOGIN_WEBSITE_TITLE}' login details are: +Username: {LOGIN_NAME} +Password: {LOGIN_PASSWORD} + +Your password has been set to the one above. +This means that your old password will no longer work. + +If you have received this message in error, please delete it immediately. +EOT; + $MESSAGE['FORGOT_PASS']['NO_DATA'] = 'Unesite svoju email adresu ispod'; $MESSAGE['FORGOT_PASS']['EMAIL_NOT_FOUND'] = 'Email adresu koju ste unjeli nemamo upisanu u bazi'; $MESSAGE['FORGOT_PASS']['CANNOT_EMAIL'] = 'Ne možemo vam emailom poslati lozinku, molimo kontakirajte sistemskog administratora'; Index: trunk/wb/languages/NL.php =================================================================== --- trunk/wb/languages/NL.php (revision 920) +++ trunk/wb/languages/NL.php (revision 921) @@ -443,7 +443,20 @@ $MESSAGE['LOGIN']['AUTHENTICATION_FAILED'] = 'Gebruikersnaam en/of wachtwoord incorrect'; $MESSAGE['SIGNUP']['NO_EMAIL'] = 'U moet een e-mailadres invullen'; +$MESSAGE['SIGNUP2']['SUBJECT_LOGIN_INFO'] = 'Your login details...'; +$MESSAGE['SIGNUP2']['BODY_LOGIN_INFO'] = <<< EOT +Hello {LOGIN_DISPLAY_NAME}, +Your '{LOGIN_WEBSITE_TITLE}' login details are: +Username: {LOGIN_NAME} +Password: {LOGIN_PASSWORD} + +Your password has been set to the one above. +This means that your old password will no longer work. + +If you have received this message in error, please delete it immediately. +EOT; + $MESSAGE['FORGOT_PASS']['NO_DATA'] = 'Vult u alstublieft uw e-mailadres hieronder in'; $MESSAGE['FORGOT_PASS']['EMAIL_NOT_FOUND'] = 'Het door u opgegeven e-mailadres is niet gevonden in onze database'; $MESSAGE['FORGOT_PASS']['CANNOT_EMAIL'] = 'Het is niet mogelijk uw wachtwoord per e-mail te versturen. Neem contact op met de beheerder'; Index: trunk/wb/languages/PL.php =================================================================== --- trunk/wb/languages/PL.php (revision 920) +++ trunk/wb/languages/PL.php (revision 921) @@ -443,7 +443,20 @@ $MESSAGE['LOGIN']['AUTHENTICATION_FAILED'] = 'Nieprawidłowa nazwa użytkownika lub hasło'; $MESSAGE['SIGNUP']['NO_EMAIL'] = 'Należy wprowadzić adres e-mail'; +$MESSAGE['SIGNUP2']['SUBJECT_LOGIN_INFO'] = 'Your login details...'; +$MESSAGE['SIGNUP2']['BODY_LOGIN_INFO'] = <<< EOT +Hello {LOGIN_DISPLAY_NAME}, +Your '{LOGIN_WEBSITE_TITLE}' login details are: +Username: {LOGIN_NAME} +Password: {LOGIN_PASSWORD} + +Your password has been set to the one above. +This means that your old password will no longer work. + +If you have received this message in error, please delete it immediately. +EOT; + $MESSAGE['FORGOT_PASS']['NO_DATA'] = 'Proszę wprowadzić poniżej swój adres e-mail'; $MESSAGE['FORGOT_PASS']['EMAIL_NOT_FOUND'] = 'Wprowadzonego adresu e-mail nie ma w bazie danych'; $MESSAGE['FORGOT_PASS']['CANNOT_EMAIL'] = 'Nie udało się wysłać hasła, proszę się skontaktować z administratorem'; Index: trunk/wb/languages/HU.php =================================================================== --- trunk/wb/languages/HU.php (revision 920) +++ trunk/wb/languages/HU.php (revision 921) @@ -443,7 +443,20 @@ $MESSAGE['LOGIN']['AUTHENTICATION_FAILED'] = 'Felhasználónév vagy a jelszó nem megfelelõ!'; $MESSAGE['SIGNUP']['NO_EMAIL'] = 'E-mail címet meg kell adnia'; +$MESSAGE['SIGNUP2']['SUBJECT_LOGIN_INFO'] = 'Your login details...'; +$MESSAGE['SIGNUP2']['BODY_LOGIN_INFO'] = <<< EOT +Hello {LOGIN_DISPLAY_NAME}, +Your '{LOGIN_WEBSITE_TITLE}' login details are: +Username: {LOGIN_NAME} +Password: {LOGIN_PASSWORD} + +Your password has been set to the one above. +This means that your old password will no longer work. + +If you have received this message in error, please delete it immediately. +EOT; + $MESSAGE['FORGOT_PASS']['NO_DATA'] = 'Kérem írja be az E-mail címét'; $MESSAGE['FORGOT_PASS']['EMAIL_NOT_FOUND'] = 'Az Ön által megadott E-mail cím nem talalható adatbázisunkban'; $MESSAGE['FORGOT_PASS']['CANNOT_EMAIL'] = 'Az E-mail küldés problémába ütközött, kérem vegye fel a kapcsolatot az adminisztrátorral'; Index: trunk/wb/languages/IT.php =================================================================== --- trunk/wb/languages/IT.php (revision 920) +++ trunk/wb/languages/IT.php (revision 921) @@ -443,7 +443,20 @@ $MESSAGE['LOGIN']['AUTHENTICATION_FAILED'] = 'Username o password errati'; $MESSAGE['SIGNUP']['NO_EMAIL'] = 'Deve inserire un indirizzo di email'; +$MESSAGE['SIGNUP2']['SUBJECT_LOGIN_INFO'] = 'Your login details...'; +$MESSAGE['SIGNUP2']['BODY_LOGIN_INFO'] = <<< EOT +Hello {LOGIN_DISPLAY_NAME}, +Your '{LOGIN_WEBSITE_TITLE}' login details are: +Username: {LOGIN_NAME} +Password: {LOGIN_PASSWORD} + +Your password has been set to the one above. +This means that your old password will no longer work. + +If you have received this message in error, please delete it immediately. +EOT; + $MESSAGE['FORGOT_PASS']['NO_DATA'] = 'Prego inserire email'; $MESSAGE['FORGOT_PASS']['EMAIL_NOT_FOUND'] = 'L\'Email inserita non è stata trovata nel database'; $MESSAGE['FORGOT_PASS']['CANNOT_EMAIL'] = 'Impossibile inviare l\'email. Contattare l\'ammnistratore'; Index: trunk/wb/languages/NO.php =================================================================== --- trunk/wb/languages/NO.php (revision 920) +++ trunk/wb/languages/NO.php (revision 921) @@ -443,7 +443,20 @@ $MESSAGE['LOGIN']['AUTHENTICATION_FAILED'] = 'Brukernavn eller passord feil'; $MESSAGE['SIGNUP']['NO_EMAIL'] = 'Du må skrive inn en epost adresse'; +$MESSAGE['SIGNUP2']['SUBJECT_LOGIN_INFO'] = 'Your login details...'; +$MESSAGE['SIGNUP2']['BODY_LOGIN_INFO'] = <<< EOT +Hello {LOGIN_DISPLAY_NAME}, +Your '{LOGIN_WEBSITE_TITLE}' login details are: +Username: {LOGIN_NAME} +Password: {LOGIN_PASSWORD} + +Your password has been set to the one above. +This means that your old password will no longer work. + +If you have received this message in error, please delete it immediately. +EOT; + $MESSAGE['FORGOT_PASS']['NO_DATA'] = 'Vennligst skriv epost adressen nedenfor'; $MESSAGE['FORGOT_PASS']['EMAIL_NOT_FOUND'] = 'Epost adressen ble ikke funnet i databasen'; $MESSAGE['FORGOT_PASS']['CANNOT_EMAIL'] = 'Kunne ikke sende passord. Kontakt system administrator'; Index: trunk/wb/languages/LV.php =================================================================== --- trunk/wb/languages/LV.php (revision 920) +++ trunk/wb/languages/LV.php (revision 921) @@ -443,7 +443,20 @@ $MESSAGE['LOGIN']['AUTHENTICATION_FAILED'] = 'Nepareizs lietotajvards vai parole'; $MESSAGE['SIGNUP']['NO_EMAIL'] = 'Jaievada e-pasta adrese'; +$MESSAGE['SIGNUP2']['SUBJECT_LOGIN_INFO'] = 'Your login details...'; +$MESSAGE['SIGNUP2']['BODY_LOGIN_INFO'] = <<< EOT +Hello {LOGIN_DISPLAY_NAME}, +Your '{LOGIN_WEBSITE_TITLE}' login details are: +Username: {LOGIN_NAME} +Password: {LOGIN_PASSWORD} + +Your password has been set to the one above. +This means that your old password will no longer work. + +If you have received this message in error, please delete it immediately. +EOT; + $MESSAGE['FORGOT_PASS']['NO_DATA'] = 'Ludzu ievadi savu e-pasta adresi zemak redzamaja lauka'; $MESSAGE['FORGOT_PASS']['EMAIL_NOT_FOUND'] = 'Ievadito e-pasta adresi nebija iespejams atrast datu baze'; $MESSAGE['FORGOT_PASS']['CANNOT_EMAIL'] = 'Lietotajvardu un paroli pa e-pastu nebija iespejams nosutit, ludzu sakontakte sistemas administratoru'; Index: trunk/wb/languages/CA.php =================================================================== --- trunk/wb/languages/CA.php (revision 920) +++ trunk/wb/languages/CA.php (revision 921) @@ -443,7 +443,20 @@ $MESSAGE['LOGIN']['AUTHENTICATION_FAILED'] = 'Nom d\'usuari o contrasenya incorrectes'; $MESSAGE['SIGNUP']['NO_EMAIL'] = 'Heu d\'Introduir una adreça de correu'; +$MESSAGE['SIGNUP2']['SUBJECT_LOGIN_INFO'] = 'Your login details...'; +$MESSAGE['SIGNUP2']['BODY_LOGIN_INFO'] = <<< EOT +Hello {LOGIN_DISPLAY_NAME}, +Your '{LOGIN_WEBSITE_TITLE}' login details are: +Username: {LOGIN_NAME} +Password: {LOGIN_PASSWORD} + +Your password has been set to the one above. +This means that your old password will no longer work. + +If you have received this message in error, please delete it immediately. +EOT; + $MESSAGE['FORGOT_PASS']['NO_DATA'] = 'Per favor introduïu la vostra adreça de correu a baix'; $MESSAGE['FORGOT_PASS']['EMAIL_NOT_FOUND'] = 'El correu que heu introduït no s\'ha trobat a la base de dades'; $MESSAGE['FORGOT_PASS']['CANNOT_EMAIL'] = 'No ha estat possible enviar la contrasenya, per favor contacteu amb l\'administrador del sistema'; Index: trunk/wb/languages/PT.php =================================================================== --- trunk/wb/languages/PT.php (revision 920) +++ trunk/wb/languages/PT.php (revision 921) @@ -443,7 +443,20 @@ $MESSAGE['LOGIN']['AUTHENTICATION_FAILED'] = 'Usuário ou senha incorretos'; $MESSAGE['SIGNUP']['NO_EMAIL'] = 'Você precisa informar um endere&ccdil;o de email'; +$MESSAGE['SIGNUP2']['SUBJECT_LOGIN_INFO'] = 'Your login details...'; +$MESSAGE['SIGNUP2']['BODY_LOGIN_INFO'] = <<< EOT +Hello {LOGIN_DISPLAY_NAME}, +Your '{LOGIN_WEBSITE_TITLE}' login details are: +Username: {LOGIN_NAME} +Password: {LOGIN_PASSWORD} + +Your password has been set to the one above. +This means that your old password will no longer work. + +If you have received this message in error, please delete it immediately. +EOT; + $MESSAGE['FORGOT_PASS']['NO_DATA'] = 'Favor inserir seu email abaixo'; $MESSAGE['FORGOT_PASS']['EMAIL_NOT_FOUND'] = 'O email informado não pode ser encontrado no banco de dados'; $MESSAGE['FORGOT_PASS']['CANNOT_EMAIL'] = 'Não foi possível enviar a senha, favor contatar o administrador do sistema'; Index: trunk/wb/languages/DA.php =================================================================== --- trunk/wb/languages/DA.php (revision 920) +++ trunk/wb/languages/DA.php (revision 921) @@ -443,7 +443,20 @@ $MESSAGE['LOGIN']['AUTHENTICATION_FAILED'] = 'Brugernavn og/eller adgangskode er ikke korrekt'; $MESSAGE['SIGNUP']['NO_EMAIL'] = 'Du SKAL indtaste en gyldig email-adresse'; +$MESSAGE['SIGNUP2']['SUBJECT_LOGIN_INFO'] = 'Your login details...'; +$MESSAGE['SIGNUP2']['BODY_LOGIN_INFO'] = <<< EOT +Hello {LOGIN_DISPLAY_NAME}, +Your '{LOGIN_WEBSITE_TITLE}' login details are: +Username: {LOGIN_NAME} +Password: {LOGIN_PASSWORD} + +Your password has been set to the one above. +This means that your old password will no longer work. + +If you have received this message in error, please delete it immediately. +EOT; + $MESSAGE['FORGOT_PASS']['NO_DATA'] = 'Indtast venligst din email-adresse nedenfor'; $MESSAGE['FORGOT_PASS']['EMAIL_NOT_FOUND'] = 'Den email-adresse du indtastede findes ikke i vores database'; $MESSAGE['FORGOT_PASS']['CANNOT_EMAIL'] = 'Kunne ikke sende din adgangskode til din email-adresse - Kontak venligst en administrator !'; Index: trunk/wb/languages/TR.php =================================================================== --- trunk/wb/languages/TR.php (revision 920) +++ trunk/wb/languages/TR.php (revision 921) @@ -443,7 +443,20 @@ $MESSAGE['LOGIN']['AUTHENTICATION_FAILED'] = 'Kullanýcý adý ve þifreniz yanlýþ'; $MESSAGE['SIGNUP']['NO_EMAIL'] = 'Bir email adresi girmelisiniz.'; +$MESSAGE['SIGNUP2']['SUBJECT_LOGIN_INFO'] = 'Your login details...'; +$MESSAGE['SIGNUP2']['BODY_LOGIN_INFO'] = <<< EOT +Hello {LOGIN_DISPLAY_NAME}, +Your '{LOGIN_WEBSITE_TITLE}' login details are: +Username: {LOGIN_NAME} +Password: {LOGIN_PASSWORD} + +Your password has been set to the one above. +This means that your old password will no longer work. + +If you have received this message in error, please delete it immediately. +EOT; + $MESSAGE['FORGOT_PASS']['NO_DATA'] = 'Lütfen email adresini girin'; $MESSAGE['FORGOT_PASS']['EMAIL_NOT_FOUND'] = 'Bu email adresi veritabanýnda bulunamadý'; $MESSAGE['FORGOT_PASS']['CANNOT_EMAIL'] = 'Uygunsuz email þifresi, Lütfen Yönetici ile Kontak kurun'; Index: trunk/wb/languages/RU.php =================================================================== --- trunk/wb/languages/RU.php (revision 920) +++ trunk/wb/languages/RU.php (revision 921) @@ -443,7 +443,20 @@ $MESSAGE['LOGIN']['AUTHENTICATION_FAILED'] = 'Имя пользователя и пароль неверны'; $MESSAGE['SIGNUP']['NO_EMAIL'] = 'Вы должны ввести email адрес'; +$MESSAGE['SIGNUP2']['SUBJECT_LOGIN_INFO'] = 'Your login details...'; +$MESSAGE['SIGNUP2']['BODY_LOGIN_INFO'] = <<< EOT +Hello {LOGIN_DISPLAY_NAME}, +Your '{LOGIN_WEBSITE_TITLE}' login details are: +Username: {LOGIN_NAME} +Password: {LOGIN_PASSWORD} + +Your password has been set to the one above. +This means that your old password will no longer work. + +If you have received this message in error, please delete it immediately. +EOT; + $MESSAGE['FORGOT_PASS']['NO_DATA'] = 'Пожалуйста введите ваш email'; $MESSAGE['FORGOT_PASS']['EMAIL_NOT_FOUND'] = 'Email, который вы ввели, не найден в базе'; $MESSAGE['FORGOT_PASS']['CANNOT_EMAIL'] = 'Невозможно выслать пароль, обратитесь к вашему администратору'; Index: trunk/wb/languages/DE.php =================================================================== --- trunk/wb/languages/DE.php (revision 920) +++ trunk/wb/languages/DE.php (revision 921) @@ -65,7 +65,7 @@ $OVERVIEW['MODULES'] = 'Verwaltung der Website Baker Module...'; $OVERVIEW['TEMPLATES'] = 'Ändern des Designs Ihrer Webseite mit Vorlagen...'; $OVERVIEW['LANGUAGES'] = 'Sprachen verwalten...'; -$OVERVIEW['PREFERENCES'] = 'Ändern persönlicher Einstellungen wie E-Mail-Adresse, Passwort, usw.... '; +$OVERVIEW['PREFERENCES'] = 'Ändern persönlicher Einstellungen wie E-Mail Adresse, Passwort, usw.... '; $OVERVIEW['SETTINGS'] = 'Ändern der Optionen für Website Baker...'; $OVERVIEW['USERS'] = 'Verwaltung von Benutzern, die sich in Website Baker einloggen dürfen...'; $OVERVIEW['GROUPS'] = 'Verwaltung von Gruppen und Ihrer Zugangsberechtigungen...'; @@ -101,7 +101,7 @@ $HEADING['LANGUAGE_DETAILS'] = 'Details zur Sprache'; $HEADING['MY_SETTINGS'] = 'Einstellungen'; -$HEADING['MY_EMAIL'] = 'E-Mail-Adresse'; +$HEADING['MY_EMAIL'] = 'E-Mail Adresse'; $HEADING['MY_PASSWORD'] = 'Passwort'; $HEADING['GENERAL_SETTINGS'] = 'Allgemeine Optionen'; @@ -182,7 +182,7 @@ $TEXT['VERSION'] = 'Version'; $TEXT['DESIGNED_FOR'] = 'Entworfen für'; $TEXT['DESCRIPTION'] = 'Beschreibung'; -$TEXT['EMAIL'] = 'E-Mail-Adresse'; +$TEXT['EMAIL'] = 'E-Mail Adresse'; $TEXT['LANGUAGE'] = 'Sprache'; $TEXT['TIMEZONE'] = 'Zeitzone'; $TEXT['CURRENT_PASSWORD'] = 'Bisheriges Passwort'; @@ -409,10 +409,10 @@ $TEXT['PUBL_END_DATE'] = 'End Datum'; $TEXT['CALENDAR'] = 'Kalender'; $TEXT['DELETE_DATE'] = 'Datum löschen'; -$TEXT['WBMAILER_DEFAULT_SETTINGS_NOTICE'] = 'Bitte geben Sie eine Standard "VON" Adresse und einen Sendernamen an. Als Absender Adresse empfiehlt sich ein Format wie: admin@IhreWebseite.de. Manche E-Mail-Provider (z.B. mail.de) stellen keine E-Mails zu, die nicht über den Provider selbst verschickt wurden, in der Absenderadresse aber den Namen des E-Mail-Providers name@mail.de enthalten. Die Standard Werte werden nur verwendet, wenn keine anderen Werte von Website Baker gesetzt wurden. Wenn Ihr Service Provider SMTP anbietet, sollten Sie diese Option für ausgehende E-Mails verwenden.'; +$TEXT['WBMAILER_DEFAULT_SETTINGS_NOTICE'] = 'Bitte geben Sie eine Standard "VON" Adresse und einen Sendernamen an. Als Absender Adresse empfiehlt sich ein Format wie: admin@IhreWebseite.de. Manche E-Mail Provider (z.B. mail.de) stellen keine E-Mails zu, die nicht über den Provider selbst verschickt wurden, in der Absenderadresse aber den Namen des E-Mail Providers name@mail.de enthalten. Die Standard Werte werden nur verwendet, wenn keine anderen Werte von Website Baker gesetzt wurden. Wenn Ihr Service Provider SMTP anbietet, sollten Sie diese Option für ausgehende E-Mails verwenden.'; $TEXT['WBMAILER_DEFAULT_SENDER_MAIL'] = 'Standard "VON" Adresse'; $TEXT['WBMAILER_DEFAULT_SENDER_NAME'] = 'Standard Absender Name'; -$TEXT['WBMAILER_NOTICE'] = 'SMTP Maileinstellungen:
Die nachfolgenden Einstellungen müssen nur angepasst werden, wenn Sie E-Mail über SMTP verschicken wollen. Wenn Sie Ihren SMTP Server nicht kennen, oder Sie sich unsicher bei den Einstellungen sind, verwenden Sie einfach die Standard E-Mailroutine: PHP MAIL.'; +$TEXT['WBMAILER_NOTICE'] = 'SMTP Maileinstellungen:
Die nachfolgenden Einstellungen müssen nur angepasst werden, wenn Sie E-Mail über SMTP verschicken wollen. Wenn Sie Ihren SMTP Server nicht kennen, oder Sie sich unsicher bei den Einstellungen sind, verwenden Sie einfach die Standard E-Mail Routine: PHP MAIL.'; $TEXT['WBMAILER_FUNCTION'] = 'E-Mail Routine'; $TEXT['WBMAILER_SMTP_HOST'] = 'SMTP Host'; $TEXT['WBMAILER_PHP'] = 'PHP MAIL'; @@ -442,12 +442,25 @@ $MESSAGE['LOGIN']['PASSWORD_TOO_LONG'] = 'Das angegebene Passwort ist zu lang'; $MESSAGE['LOGIN']['AUTHENTICATION_FAILED'] = 'Der Benutzername oder das Passwort ist nicht korrekt'; -$MESSAGE['SIGNUP']['NO_EMAIL'] = 'Bitte geben Sie Ihre E-Mail-Adresse an'; +$MESSAGE['SIGNUP']['NO_EMAIL'] = 'Bitte geben Sie Ihre E-Mail Adresse an'; +$MESSAGE['SIGNUP2']['SUBJECT_LOGIN_INFO'] = 'Deine WB Logindaten ...'; +$MESSAGE['SIGNUP2']['BODY_LOGIN_INFO'] = <<< EOT +Hallo {LOGIN_DISPLAY_NAME}, -$MESSAGE['FORGOT_PASS']['NO_DATA'] = 'Bitte geben Sie nachfolgend Ihre E-Mail-Adresse an'; -$MESSAGE['FORGOT_PASS']['EMAIL_NOT_FOUND'] = 'Die angegebene E-Mail-Adresse wurde nicht in der Datenbank gefunden'; +Deine neuen Logindaten für '{LOGIN_WEBSITE_TITLE}' lauten: +Benutzername: {LOGIN_NAME} +Passwort: {LOGIN_PASSWORD} + +Dein bisheriges Passwort wurde durch das neue Passwort oben ersetzt. +Das bisherige Passwort ist nicht mehr gültig. + +Wenn Du dieses E-Mail versehentlich erhalten hast, bitte einfach löschen. +EOT; + +$MESSAGE['FORGOT_PASS']['NO_DATA'] = 'Bitte geben Sie nachfolgend Ihre E-Mail Adresse an'; +$MESSAGE['FORGOT_PASS']['EMAIL_NOT_FOUND'] = 'Die angegebene E-Mail Adresse wurde nicht in der Datenbank gefunden'; $MESSAGE['FORGOT_PASS']['CANNOT_EMAIL'] = 'Das Passwort konnte nicht versendet werden, bitte kontaktieren Sie den Systemadministrator'; -$MESSAGE['FORGOT_PASS']['PASSWORD_RESET'] = 'Ihr Benutzername und Ihr Passwort wurden an Ihre E-Mail-Adresse gesendet'; +$MESSAGE['FORGOT_PASS']['PASSWORD_RESET'] = 'Ihr Benutzername und Ihr Passwort wurden an Ihre E-Mail Adresse gesendet'; $MESSAGE['FORGOT_PASS']['ALREADY_RESET'] = 'Das Passwort kann nur einmal pro Stunde zurückgesetzt werden'; $MESSAGE['START']['WELCOME_MESSAGE'] = 'Willkommen in der Website Baker Verwaltung'; @@ -467,8 +480,8 @@ $MESSAGE['USERS']['USERNAME_TOO_SHORT'] = 'Der eingegebene Benutzername war zu kurz'; $MESSAGE['USERS']['PASSWORD_TOO_SHORT'] = 'Das eingegebene Passwort war zu kurz'; $MESSAGE['USERS']['PASSWORD_MISMATCH'] = 'Das angegebene Passwort ist ungültig'; -$MESSAGE['USERS']['INVALID_EMAIL'] = 'Die angegebene E-Mail-Adresse ist ungültig'; -$MESSAGE['USERS']['EMAIL_TAKEN'] = 'Die angegebene E-Mail-Adresse wird bereits verwendet'; +$MESSAGE['USERS']['INVALID_EMAIL'] = 'Die angegebene E-Mail Adresse ist ungültig'; +$MESSAGE['USERS']['EMAIL_TAKEN'] = 'Die angegebene E-Mail Adresse wird bereits verwendet'; $MESSAGE['USERS']['USERNAME_TAKEN'] = 'Der angegebene Benutzername wird bereits verwendet'; $MESSAGE['USERS']['CHANGING_PASSWORD'] = 'Bitte beachten Sie: Sie sollten in die obigen Felder nur Werte eingeben, wenn Sie das Passwort dieses Benutzers ändern möchten'; $MESSAGE['USERS']['CONFIRM_DELETE'] = 'Sind Sie sicher, dass Sie den ausgewählten Benutzer löschen möchten?'; @@ -482,7 +495,7 @@ $MESSAGE['GROUPS']['GROUP_NAME_EXISTS'] = 'Der Gruppenname existiert bereits'; $MESSAGE['PREFERENCES']['DETAILS_SAVED'] = 'Persönliche Daten wurden erfolgreich gespeichert'; -$MESSAGE['PREFERENCES']['EMAIL_UPDATED'] = 'E-Mail-Einstellung geändert'; +$MESSAGE['PREFERENCES']['EMAIL_UPDATED'] = 'E-Mail Einstellung geändert'; $MESSAGE['PREFERENCES']['CURRENT_PASSWORD_INCORRECT'] = 'Das alte Passwort, das Sie angegeben haben, ist ungültig'; $MESSAGE['PREFERENCES']['PASSWORD_CHANGED'] = 'Das Passwort wurde erfolgreich geändert'; Index: trunk/wb/languages/BG.php =================================================================== --- trunk/wb/languages/BG.php (revision 920) +++ trunk/wb/languages/BG.php (revision 921) @@ -443,7 +443,20 @@ $MESSAGE['LOGIN']['AUTHENTICATION_FAILED'] = 'Некоректан комбинация потребителско име / парола'; $MESSAGE['SIGNUP']['NO_EMAIL'] = 'Трябва да въведете e-mail адрес'; +$MESSAGE['SIGNUP2']['SUBJECT_LOGIN_INFO'] = 'Your login details...'; +$MESSAGE['SIGNUP2']['BODY_LOGIN_INFO'] = <<< EOT +Hello {LOGIN_DISPLAY_NAME}, +Your '{LOGIN_WEBSITE_TITLE}' login details are: +Username: {LOGIN_NAME} +Password: {LOGIN_PASSWORD} + +Your password has been set to the one above. +This means that your old password will no longer work. + +If you have received this message in error, please delete it immediately. +EOT; + $MESSAGE['FORGOT_PASS']['NO_DATA'] = 'Въведете email адрес'; $MESSAGE['FORGOT_PASS']['EMAIL_NOT_FOUND'] = 'Въведения email не е в базата данни'; $MESSAGE['FORGOT_PASS']['CANNOT_EMAIL'] = 'Проблем с изпращането на паролата по email - контактувайте със системния администратор';