From 5fd124eabeacbf9e9bd5ecbcd01649f2d0b45c52 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 21 Sep 2012 18:09:55 -0700 Subject: [PATCH] undo revert of template changes --- view/en/friend_complete_eml.tpl | 14 +++++++------- view/en/intro_complete_eml.tpl | 16 ++++++++-------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/view/en/friend_complete_eml.tpl b/view/en/friend_complete_eml.tpl index ab12fcb6b7..89f5783881 100644 --- a/view/en/friend_complete_eml.tpl +++ b/view/en/friend_complete_eml.tpl @@ -1,22 +1,22 @@ -Dear $username, +Dear $[username], - Great news... '$fn' at '$dfrn_url' has accepted -your connection request at '$sitename'. + Great news... '$[fn]' at '$[dfrn_url]' has accepted +your connection request at '$[sitename]'. You are now mutual friends and may exchange status updates, photos, and email without restriction. -Please visit your 'Contacts' page at $sitename if you wish to make +Please visit your 'Contacts' page at $[sitename] if you wish to make any changes to this relationship. -$siteurl +$[siteurl] [For instance, you may create a separate profile with information that is not -available to the general public - and assign viewing rights to '$fn']. +available to the general public - and assign viewing rights to '$[fn]']. Sincerely, - $sitename Administrator + $[sitename] Administrator diff --git a/view/en/intro_complete_eml.tpl b/view/en/intro_complete_eml.tpl index a60745ec55..cd78b2a150 100644 --- a/view/en/intro_complete_eml.tpl +++ b/view/en/intro_complete_eml.tpl @@ -1,22 +1,22 @@ -Dear $username, +Dear $[username], - '$fn' at '$dfrn_url' has accepted -your connection request at '$sitename'. + '$[fn]' at '$[dfrn_url]' has accepted +your connection request at '$[sitename]'. - '$fn' has chosen to accept you a "fan", which restricts + '$[fn]' has chosen to accept you a "fan", which restricts some forms of communication - such as private messaging and some profile interactions. If this is a celebrity or community page, these settings were applied automatically. - '$fn' may choose to extend this into a two-way or more permissive + '$[fn]' may choose to extend this into a two-way or more permissive relationship in the future. - You will start receiving public status updates from '$fn', + You will start receiving public status updates from '$[fn]', which will appear on your 'Network' page at -$siteurl +$[siteurl] Sincerely, - $sitename Administrator + $[sitename] Administrator