From 803854738b9bf514d11f6e8c7c0ac84aad874ae6 Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Sun, 7 Sep 2014 11:48:23 +0200 Subject: [PATCH] another massacre of templates --- mod/admin.php | 53 ++++++++++++++++------- view/cs/smarty3/register_adminadd_eml.tpl | 32 -------------- view/de/smarty3/register_adminadd_eml.tpl | 32 -------------- view/en/register_adminadd_eml.tpl | 32 -------------- view/en/smarty3/register_adminadd_eml.tpl | 32 -------------- view/fr/smarty3/register_adminadd_eml.tpl | 32 -------------- view/it/smarty3/register_adminadd_eml.tpl | 32 -------------- view/ro/smarty3/register_adminadd_eml.tpl | 32 -------------- 8 files changed, 37 insertions(+), 240 deletions(-) delete mode 100644 view/cs/smarty3/register_adminadd_eml.tpl delete mode 100644 view/de/smarty3/register_adminadd_eml.tpl delete mode 100644 view/en/register_adminadd_eml.tpl delete mode 100644 view/en/smarty3/register_adminadd_eml.tpl delete mode 100644 view/fr/smarty3/register_adminadd_eml.tpl delete mode 100644 view/it/smarty3/register_adminadd_eml.tpl delete mode 100644 view/ro/smarty3/register_adminadd_eml.tpl diff --git a/mod/admin.php b/mod/admin.php index 5da07b33e..db3c8b189 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -759,24 +759,45 @@ function admin_page_users_post(&$a){ return; } $nu = $result['user']; + $preamble = deindent(t(' + Dear %1$s, + the administrator of %2$s has set up an account for you.'); + $body = deindent(t(' + The login details are as follows: - $email_tpl = get_intltext_template("register_adminadd_eml.tpl"); - $email_tpl = replace_macros($email_tpl, array( - '$sitename' => $a->config['sitename'], - '$siteurl' => $a->get_baseurl(), - '$username' => $nu['username'], - '$email' => $nu['email'], - '$password' => $result['password'], - '$uid' => $nu['uid'] )); + Site Location: %1$s + Login Name: %2$s + Password: %3$s + + You may change your password from your account "Settings" page after logging + in. + + Please take a few moments to review the other account settings on that page. + + You may also wish to add some basic information to your default profile + (on the "Profiles" page) so that other people can easily find you. + + We recommend setting your full name, adding a profile photo, + adding some profile "keywords" (very useful in making new friends) - and + perhaps what country you live in; if you do not wish to be more specific + than that. + + We fully respect your right to privacy, and none of these items are necessary. + If you are new and do not know anybody here, they may help + you to make some new and interesting friends. + + Thank you and welcome to %4$s.'); + + $preamble = sprintf($preamble, $nu['username'], $a->config['sitename']); + $body = sprintf($body, $a->get_baseurl(), $nu['email'], $result['password'], $a->config['sitename']); + + notification(array( + 'type' => "SYSTEM_EMAIL", + 'to_email' => $email, + 'subject'=> sprintf( t('Registration details for %s'), $a->config['sitename']), + 'preamble'=> $preamble, + 'body' => $body)); - $res = mail($nu['email'], email_header_encode( sprintf( t('Registration details for %s'), $a->config['sitename']),'UTF-8'), - $email_tpl, - 'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n" - . 'Content-type: text/plain; charset=UTF-8' . "\n" - . 'Content-transfer-encoding: 8bit' ); - if ($res) { - info( t('Registration successful. Email send to user').EOL ); - } } if (x($_POST,'page_users_block')){ diff --git a/view/cs/smarty3/register_adminadd_eml.tpl b/view/cs/smarty3/register_adminadd_eml.tpl deleted file mode 100644 index 63efc7151..000000000 --- a/view/cs/smarty3/register_adminadd_eml.tpl +++ /dev/null @@ -1,32 +0,0 @@ -Drahý {{$username}}, - administrátor webu {{$sitename}} pro Vás vytvořil uživatelský účet. - -Vaše přihlašovací údaje jsou tyto: - - -Adresa webu: {{$siteurl}} -Uživatelské jméno: {{$email}} -Heslo: {{$password}} - -Vaše heslo si můžete po přihlášení změnit na stránce -. - -Prosím věnujte chvíli k revizi ostatních nastavení svého účtu. - -Můžete také přidat některé základní informace do Vašeho defaultního profilu - (na stránce "Profily"), čímž umožníte jiným lidem Vás snadněji nalézt. - -Doporučujeme nastavit celé jméno, přidat profilové foto -, přidat nějaká profilová "klíčová slova" (což je velmi užitečné pro hledání nových přátel) a - zemi, ve které žijete. Nemusíte zadávat víc -informací. - -Plně respektujeme Vaše právo na soukromí a žádná z výše uvedených položek není povinná. -Pokud jste nový a neznáte na tomto webu nikoho jiného, zadáním těchto -položek můžete získat nové a zajímavé přátele. - - -Díky a vítejte na {{$sitename}}. - -S pozdravem, - {{$sitename}} administrátor \ No newline at end of file diff --git a/view/de/smarty3/register_adminadd_eml.tpl b/view/de/smarty3/register_adminadd_eml.tpl deleted file mode 100644 index dbe1412b9..000000000 --- a/view/de/smarty3/register_adminadd_eml.tpl +++ /dev/null @@ -1,32 +0,0 @@ -Hallo {{$username}}, - der Administrator von {{$sitename}} hat einen Account für dich eingerichtet. - -Hier die Login Details: - - -Adresse der Seite: {{$siteurl}} -Login Name: {{$email}} -Passwort: {{$password}} - -Du kannst und solltest das Passwort in den "Einstellungen" zu deinem Account ändern, -nachdem du dich erstmalig eingeloggt hast. - -Bitte nimm dir einige Augenblicke Zeit, um die anderen Einstellungen auf der Seite kennenzulernen und zu überprüfen. - -Eventuell möchtest du außerdem einige grundlegende Informationen in deinem Standardprofil (auf der "Profile" Seite) eintragen, -damit andere Leute dich einfacher finden können. - -Wir empfehlen den kompletten Namen anzugeben, ein eigenes Profilbild hochzuladen, -sowie ein paar "Profil-Schlüsselwörter" einzutragen (um leichter Menschen mit gleichen Interessen zu finden) - und -vielleicht auch in welchen Land du lebst; falls du nicht konkreter -werden möchtest. - -Wir respektieren dein Recht auf Privatsphäre und keine dieser Angaben ist notwendig. -Wenn du ganz neu bei Friendica bist und niemanden kennst, werden sie dir aber helfen -ein paar neue und interessante Freunde zu finden. - - -Danke und willkommen auf {{$sitename}}. - -Beste Grüße, - {{$sitename}} Administrator diff --git a/view/en/register_adminadd_eml.tpl b/view/en/register_adminadd_eml.tpl deleted file mode 100644 index 6d324809c..000000000 --- a/view/en/register_adminadd_eml.tpl +++ /dev/null @@ -1,32 +0,0 @@ -Dear {{$username}}, - the administrator of {{$sitename}} has set up an account for you. - -The login details are as follows: - - -Site Location: {{$siteurl}} -Login Name: {{$email}} -Password: {{$password}} - -You may change your password from your account "Settings" page after logging -in. - -Please take a few moments to review the other account settings on that page. - -You may also wish to add some basic information to your default profile -(on the "Profiles" page) so that other people can easily find you. - -We recommend setting your full name, adding a profile photo, -adding some profile "keywords" (very useful in making new friends) - and -perhaps what country you live in; if you do not wish to be more specific -than that. - -We fully respect your right to privacy, and none of these items are necessary. -If you are new and do not know anybody here, they may help -you to make some new and interesting friends. - - -Thank you and welcome to {{$sitename}}. - -Sincerely, - {{$sitename}} Administrator diff --git a/view/en/smarty3/register_adminadd_eml.tpl b/view/en/smarty3/register_adminadd_eml.tpl deleted file mode 100644 index 6d324809c..000000000 --- a/view/en/smarty3/register_adminadd_eml.tpl +++ /dev/null @@ -1,32 +0,0 @@ -Dear {{$username}}, - the administrator of {{$sitename}} has set up an account for you. - -The login details are as follows: - - -Site Location: {{$siteurl}} -Login Name: {{$email}} -Password: {{$password}} - -You may change your password from your account "Settings" page after logging -in. - -Please take a few moments to review the other account settings on that page. - -You may also wish to add some basic information to your default profile -(on the "Profiles" page) so that other people can easily find you. - -We recommend setting your full name, adding a profile photo, -adding some profile "keywords" (very useful in making new friends) - and -perhaps what country you live in; if you do not wish to be more specific -than that. - -We fully respect your right to privacy, and none of these items are necessary. -If you are new and do not know anybody here, they may help -you to make some new and interesting friends. - - -Thank you and welcome to {{$sitename}}. - -Sincerely, - {{$sitename}} Administrator diff --git a/view/fr/smarty3/register_adminadd_eml.tpl b/view/fr/smarty3/register_adminadd_eml.tpl deleted file mode 100644 index c12264087..000000000 --- a/view/fr/smarty3/register_adminadd_eml.tpl +++ /dev/null @@ -1,32 +0,0 @@ -Chère, Cher {{$username}}, - l'administrateur de {{$sitename}} vous à créé un compte. - -Les détails de connexion sont les suivants : - - -Emplacement du site : {{$siteurl}} -Nom de connexion : {{$email}} -Mot de passe : {{$password}} - -Vous pouvez modifier votre mot de passe à la page des "Paramètres" de votre compte, une fois -connecté. - -Veuillez prendre le temps d'examiner les autres paramètres de votre compte sur cette page. - -Vous pouvez aussi ajouter quelques informatiques de base à votre profil par défaut -(sur la page "Profils") pour que d'autres personnes vous trouvent facilement. - -Nous vous recommandons d'indiquer votre nom complet, d'ajouter une photo pour votre profil, -d'ajouter quelques "mots-clés" (très efficace pour se faire de nouveaux amis) - et -peut-être aussi votre pays de résidence ; sauf si vous souhaitez pas être -aussi spécifique. - -Nous respectons entièrement votre vie privée, et aucun de ces éléments n'est nécessaire. -Si vous êtes nouveau et ne connaissez personne, ils peuvent vous -aider à vous faire de nouveaux et interessants amis. - - -Merci, et bienvenue sur {{$sitename}}. - -Sincèrement votre, - L'administrateur de {{$sitename}} \ No newline at end of file diff --git a/view/it/smarty3/register_adminadd_eml.tpl b/view/it/smarty3/register_adminadd_eml.tpl deleted file mode 100644 index 20a9cb176..000000000 --- a/view/it/smarty3/register_adminadd_eml.tpl +++ /dev/null @@ -1,32 +0,0 @@ -Ciao {{$username}}, - l'amministratore di {{{{$sitename}}}} ha creato un account per te. - -I dettagli di accesso sono i seguenti - - -Sito:»{{$siteurl}} -Soprannome:»{{$email}} -Password:»{{$password}} - -Puoi cambiare la tua password dalla pagina "Impostazioni" del tuo profilo dopo aver effettuato l'accesso - - -Prenditi un momento per dare un'occhiata alle altre impostazioni del tuo profilo nella stessa pagina. - -Potrest voler aggiungere alcune informazioni di base a quelle predefinite del profilo -(nella pagina "Profilo") per rendere più facile trovarti alle altre persone. - -Noi raccomandiamo di impostare il tuo nome completo, di aggiungere una foto, -di aggiungere alcune "parole chiavi" (molto utili per farsi nuovi amici) - e -magari il paese dove vivi; se non vuoi essere più dettagliato -di così. - -Noi rispettiamo il tuo diritto alla privacy e nessuna di queste informazioni è indispensabile. -Se non ancora non conosci nessuno qui, posso essere d'aiuto -per farti nuovi e interessanti amici. - - -Grazie. Siamo contenti di darti il benvenuto su {{$sitename}} - -Saluti, - l'amministratore di {{$sitename}} \ No newline at end of file diff --git a/view/ro/smarty3/register_adminadd_eml.tpl b/view/ro/smarty3/register_adminadd_eml.tpl deleted file mode 100644 index b32f223a0..000000000 --- a/view/ro/smarty3/register_adminadd_eml.tpl +++ /dev/null @@ -1,32 +0,0 @@ -Dragă {{$username}}, - administratorul {{$sitename}} v-a configurat un cont pentru dvs. - -Detaliile de autentificare sunt următoarele: - - -Locație Site: {{$siteurl}} -Nume Autentificare:⇥{{$email}} -Parolă:⇥{{$password}} - -Vă puteți schimba parola din pagina contului dvs. de "Configurări", după autentificare -în. - -Vă rugăm să acordați câteva momente pentru revizuirea altor configurări de cont de pe această pagină. - -Puteți de asemenea să adăugați câteva informații generale profilului dvs. implicit -(pe "Profile" pagina), astfel încât alte persoane să vă găsească uşor. - -Vă recomandăm să vă specificați numele complet, adăugând o fotografie de profil, -adăugând profilului câteva "cuvinte cheie" (foarte utile pentru a vă face noi prieteni) - și -poate în ce țara locuiți; dacă nu doriți să dați mai multe detalii -decât acestea. - -Respectăm pe deplin dreptul la intimitate, și nici unul dintre aceste elemente nu sunt necesar. -Dacă sunteți nou si nu ştiţi pe nimeni pe aici, ele pot ajuta -să vă faceți niște prieteni noi și interesanţi. - - -Vă multumim și vă urăm bun venit la {{$sitename}}. - -Cu stimă, - Administratorul {{$sitename}} \ No newline at end of file