From 4240a23a8a9024daab45a277d5df311762d07d49 Mon Sep 17 00:00:00 2001 From: Friendika Date: Mon, 15 Nov 2010 23:27:12 -0800 Subject: i18n re-arrange --- view/auto_request.tpl | 29 ------ view/cmnt_received_eml.tpl | 18 ---- view/contact_edit.tpl | 71 ------------- view/contact_self.tpl | 9 -- view/dfrn_req_confirm.tpl | 17 --- view/dfrn_request.tpl | 59 ----------- view/en/auto_request.tpl | 29 ++++++ view/en/cmnt_received_eml.tpl | 18 ++++ view/en/contact_edit.tpl | 71 +++++++++++++ view/en/contact_self.tpl | 9 ++ view/en/dfrn_req_confirm.tpl | 17 +++ view/en/dfrn_request.tpl | 59 +++++++++++ view/en/follow_notify_eml.tpl | 14 +++ view/en/friend_complete_eml.tpl | 22 ++++ view/en/insecure_net.tpl | 6 ++ view/en/install_db.tpl | 40 +++++++ view/en/intro_complete_eml.tpl | 22 ++++ view/en/lostpass.tpl | 18 ++++ view/en/lostpass_eml.tpl | 32 ++++++ view/en/mail_received_eml.tpl | 16 +++ view/en/passchanged_eml.tpl | 20 ++++ view/en/profile_advanced.php | 219 +++++++++++++++++++++++++++++++++++++++ view/en/pwdreset.tpl | 16 +++ view/en/register-link.tpl | 1 + view/en/register_open_eml.tpl | 25 +++++ view/en/register_verify_eml.tpl | 26 +++++ view/en/request_notify_eml.tpl | 17 +++ view/en/settings.tpl | 148 ++++++++++++++++++++++++++ view/en/settings_nick_set.tpl | 9 ++ view/en/settings_nick_subdir.tpl | 6 ++ view/en/settings_nick_unset.tpl | 14 +++ view/en/wall_received_eml.tpl | 18 ++++ view/follow_notify_eml.tpl | 14 --- view/friend_complete_eml.tpl | 22 ---- view/insecure_net.tpl | 6 -- view/install_db.tpl | 40 ------- view/intro_complete_eml.tpl | 22 ---- view/intros.tpl | 4 +- view/lostpass.tpl | 18 ---- view/lostpass_eml.tpl | 32 ------ view/mail_received_eml.tpl | 16 --- view/passchanged_eml.tpl | 20 ---- view/profile_advanced.php | 219 --------------------------------------- view/pwdreset.tpl | 16 --- view/register-link.tpl | 1 - view/register_open_eml.tpl | 25 ----- view/register_verify_eml.tpl | 26 ----- view/request_notify_eml.tpl | 17 --- view/settings.tpl | 148 -------------------------- view/settings_nick_set.tpl | 9 -- view/settings_nick_subdir.tpl | 6 -- view/settings_nick_unset.tpl | 14 --- view/sidenote.tpl | 18 ---- view/wall_received_eml.tpl | 18 ---- 54 files changed, 894 insertions(+), 912 deletions(-) delete mode 100644 view/auto_request.tpl delete mode 100644 view/cmnt_received_eml.tpl delete mode 100644 view/contact_edit.tpl delete mode 100644 view/contact_self.tpl delete mode 100644 view/dfrn_req_confirm.tpl delete mode 100644 view/dfrn_request.tpl create mode 100644 view/en/auto_request.tpl create mode 100644 view/en/cmnt_received_eml.tpl create mode 100644 view/en/contact_edit.tpl create mode 100644 view/en/contact_self.tpl create mode 100644 view/en/dfrn_req_confirm.tpl create mode 100644 view/en/dfrn_request.tpl create mode 100644 view/en/follow_notify_eml.tpl create mode 100644 view/en/friend_complete_eml.tpl create mode 100644 view/en/insecure_net.tpl create mode 100644 view/en/install_db.tpl create mode 100644 view/en/intro_complete_eml.tpl create mode 100644 view/en/lostpass.tpl create mode 100644 view/en/lostpass_eml.tpl create mode 100644 view/en/mail_received_eml.tpl create mode 100644 view/en/passchanged_eml.tpl create mode 100644 view/en/profile_advanced.php create mode 100644 view/en/pwdreset.tpl create mode 100644 view/en/register-link.tpl create mode 100644 view/en/register_open_eml.tpl create mode 100644 view/en/register_verify_eml.tpl create mode 100644 view/en/request_notify_eml.tpl create mode 100644 view/en/settings.tpl create mode 100644 view/en/settings_nick_set.tpl create mode 100644 view/en/settings_nick_subdir.tpl create mode 100644 view/en/settings_nick_unset.tpl create mode 100644 view/en/wall_received_eml.tpl delete mode 100644 view/follow_notify_eml.tpl delete mode 100644 view/friend_complete_eml.tpl delete mode 100644 view/insecure_net.tpl delete mode 100644 view/install_db.tpl delete mode 100644 view/intro_complete_eml.tpl delete mode 100644 view/lostpass.tpl delete mode 100644 view/lostpass_eml.tpl delete mode 100644 view/mail_received_eml.tpl delete mode 100644 view/passchanged_eml.tpl delete mode 100644 view/profile_advanced.php delete mode 100644 view/pwdreset.tpl delete mode 100644 view/register-link.tpl delete mode 100644 view/register_open_eml.tpl delete mode 100644 view/register_verify_eml.tpl delete mode 100644 view/request_notify_eml.tpl delete mode 100644 view/settings.tpl delete mode 100644 view/settings_nick_set.tpl delete mode 100644 view/settings_nick_subdir.tpl delete mode 100644 view/settings_nick_unset.tpl delete mode 100644 view/sidenote.tpl delete mode 100644 view/wall_received_eml.tpl (limited to 'view') diff --git a/view/auto_request.tpl b/view/auto_request.tpl deleted file mode 100644 index 97e750083..000000000 --- a/view/auto_request.tpl +++ /dev/null @@ -1,29 +0,0 @@ - -

Friend/Connection Request

- -

-Please enter your profile address from one of the following supported social networks:
-

-

- -
- -
- - -
-
- - -
- -
- -
- - -
-
diff --git a/view/cmnt_received_eml.tpl b/view/cmnt_received_eml.tpl deleted file mode 100644 index d60fcd375..000000000 --- a/view/cmnt_received_eml.tpl +++ /dev/null @@ -1,18 +0,0 @@ - -Dear $username, - - '$from' commented on an item/conversation which you have been following. - ------ -$body ------ - -Please login at $siteurl to view the complete conversation: - -$display - -Thank you, - $sitename administrator - - - diff --git a/view/contact_edit.tpl b/view/contact_edit.tpl deleted file mode 100644 index 96abf0028..000000000 --- a/view/contact_edit.tpl +++ /dev/null @@ -1,71 +0,0 @@ - -

Contact Editor

- -
$name
- - -
- -
- $alt_text -
- $name -
-
-
-
- - - -
-
-
Last updated: $last_update -
Update public posts:
- $poll_interval -
-
-
- -$insecure -$blocked -$ignored - -
- - -
-

Profile Visibility

-

Please choose the profile you would like to display to $name when viewing your profile securely. -

-
-$profile_select -
- - - - -
-

Online Reputation

-

-Occasionally your friends may wish to inquire about this person's online legitimacy. You may help them choose whether or not to interact with this person by providing a 'reputation' to guide them. -

-
-$rating -
-
-

-Please take a moment to elaborate on this selection if you feel it could be helpful to others. -

- -
-
-$groups - - -
-
diff --git a/view/contact_self.tpl b/view/contact_self.tpl deleted file mode 100644 index 7f5467b39..000000000 --- a/view/contact_self.tpl +++ /dev/null @@ -1,9 +0,0 @@ - -$name - -

$name

-

-This is you. -

- -
\ No newline at end of file diff --git a/view/dfrn_req_confirm.tpl b/view/dfrn_req_confirm.tpl deleted file mode 100644 index f053f22af..000000000 --- a/view/dfrn_req_confirm.tpl +++ /dev/null @@ -1,17 +0,0 @@ - -

-Welcome home $username. -
-Please confirm your introduction to $dfrn_url. - -

-
- - - -$aes_allow - -
- -
-
\ No newline at end of file diff --git a/view/dfrn_request.tpl b/view/dfrn_request.tpl deleted file mode 100644 index 4dd8c0489..000000000 --- a/view/dfrn_request.tpl +++ /dev/null @@ -1,59 +0,0 @@ - -

Friend/Connection Request

- -

-You may request a connection with this member if you have a valid profile address
-on one of the following social networks:
-

-

- -
- -
- - -
-
- -

-Please answer the following: -

- -
- -

-Does $name know you? -

- -
- - - -
-
-
- - - -
-
- - -

-Add a personal note: -

-
- -
- - -
- -
- - -
-
diff --git a/view/en/auto_request.tpl b/view/en/auto_request.tpl new file mode 100644 index 000000000..97e750083 --- /dev/null +++ b/view/en/auto_request.tpl @@ -0,0 +1,29 @@ + +

Friend/Connection Request

+ +

+Please enter your profile address from one of the following supported social networks:
+

+

+ +
+ +
+ + +
+
+ + +
+ +
+ +
+ + +
+
diff --git a/view/en/cmnt_received_eml.tpl b/view/en/cmnt_received_eml.tpl new file mode 100644 index 000000000..d60fcd375 --- /dev/null +++ b/view/en/cmnt_received_eml.tpl @@ -0,0 +1,18 @@ + +Dear $username, + + '$from' commented on an item/conversation which you have been following. + +----- +$body +----- + +Please login at $siteurl to view the complete conversation: + +$display + +Thank you, + $sitename administrator + + + diff --git a/view/en/contact_edit.tpl b/view/en/contact_edit.tpl new file mode 100644 index 000000000..96abf0028 --- /dev/null +++ b/view/en/contact_edit.tpl @@ -0,0 +1,71 @@ + +

Contact Editor

+ +
$name
+ + +
+ +
+ $alt_text +
+ $name +
+
+
+
+ + + +
+
+
Last updated: $last_update +
Update public posts:
+ $poll_interval +
+
+
+ +$insecure +$blocked +$ignored + +
+ + +
+

Profile Visibility

+

Please choose the profile you would like to display to $name when viewing your profile securely. +

+
+$profile_select +
+ + + + +
+

Online Reputation

+

+Occasionally your friends may wish to inquire about this person's online legitimacy. You may help them choose whether or not to interact with this person by providing a 'reputation' to guide them. +

+
+$rating +
+
+

+Please take a moment to elaborate on this selection if you feel it could be helpful to others. +

+ +
+
+$groups + + +
+
diff --git a/view/en/contact_self.tpl b/view/en/contact_self.tpl new file mode 100644 index 000000000..7f5467b39 --- /dev/null +++ b/view/en/contact_self.tpl @@ -0,0 +1,9 @@ + +$name + +

$name

+

+This is you. +

+ +
\ No newline at end of file diff --git a/view/en/dfrn_req_confirm.tpl b/view/en/dfrn_req_confirm.tpl new file mode 100644 index 000000000..f053f22af --- /dev/null +++ b/view/en/dfrn_req_confirm.tpl @@ -0,0 +1,17 @@ + +

+Welcome home $username. +
+Please confirm your introduction to $dfrn_url. + +

+
+ + + +$aes_allow + +
+ +
+
\ No newline at end of file diff --git a/view/en/dfrn_request.tpl b/view/en/dfrn_request.tpl new file mode 100644 index 000000000..4dd8c0489 --- /dev/null +++ b/view/en/dfrn_request.tpl @@ -0,0 +1,59 @@ + +

Friend/Connection Request

+ +

+You may request a connection with this member if you have a valid profile address
+on one of the following social networks:
+

+

+ +
+ +
+ + +
+
+ +

+Please answer the following: +

+ +
+ +

+Does $name know you? +

+ +
+ + + +
+
+
+ + + +
+
+ + +

+Add a personal note: +

+
+ +
+ + +
+ +
+ + +
+
diff --git a/view/en/follow_notify_eml.tpl b/view/en/follow_notify_eml.tpl new file mode 100644 index 000000000..ae758c9a8 --- /dev/null +++ b/view/en/follow_notify_eml.tpl @@ -0,0 +1,14 @@ + +Dear $myname, + +You have a new follower at $sitename - '$requestor'. + +You may visit their profile at $url. + +Please login to your site to approve or ignore/cancel the request. + +$siteurl + +Regards, + + $sitename administrator \ No newline at end of file diff --git a/view/en/friend_complete_eml.tpl b/view/en/friend_complete_eml.tpl new file mode 100644 index 000000000..ab12fcb6b --- /dev/null +++ b/view/en/friend_complete_eml.tpl @@ -0,0 +1,22 @@ + +Dear $username, + + 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 +any changes to this relationship. + +$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']. + +Sincerely, + + $sitename Administrator + + diff --git a/view/en/insecure_net.tpl b/view/en/insecure_net.tpl new file mode 100644 index 000000000..5628639cc --- /dev/null +++ b/view/en/insecure_net.tpl @@ -0,0 +1,6 @@ +
+

+The social network that $name belongs to is an open network with limited or non-existent privacy controls. +Please use appropriate discretion. +

+
\ No newline at end of file diff --git a/view/en/install_db.tpl b/view/en/install_db.tpl new file mode 100644 index 000000000..d5f28828e --- /dev/null +++ b/view/en/install_db.tpl @@ -0,0 +1,40 @@ + +

Friendika Social Network

+

Installation

+ +

+In order to install Friendika we need to know how to contact your database. Please contact your hosting provider or site administrator if you have questions about these settings. The database you specify below must already exist. If it does not, please create it before continuing. +

+ +
+ + + + + +
+ + + +
+ + + +
+ + + +
+ +
+Please select a default timezone for your website +
+ +$tzselect + +
+ + +
+
+ diff --git a/view/en/intro_complete_eml.tpl b/view/en/intro_complete_eml.tpl new file mode 100644 index 000000000..a60745ec5 --- /dev/null +++ b/view/en/intro_complete_eml.tpl @@ -0,0 +1,22 @@ + +Dear $username, + + '$fn' at '$dfrn_url' has accepted +your connection request at '$sitename'. + + '$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 +relationship in the future. + + You will start receiving public status updates from '$fn', +which will appear on your 'Network' page at + +$siteurl + +Sincerely, + + $sitename Administrator diff --git a/view/en/lostpass.tpl b/view/en/lostpass.tpl new file mode 100644 index 000000000..a7040c149 --- /dev/null +++ b/view/en/lostpass.tpl @@ -0,0 +1,18 @@ +

Forgot your Password?

+ +

+Enter your email address and submit to have your password reset. Then check your email for further instructions. +

+ +
+
+ + +
+
+
+ +
+
+
+ diff --git a/view/en/lostpass_eml.tpl b/view/en/lostpass_eml.tpl new file mode 100644 index 000000000..c350236a4 --- /dev/null +++ b/view/en/lostpass_eml.tpl @@ -0,0 +1,32 @@ + +Dear $username, + A request was recently received at $sitename to reset your account +password. In order to confirm this request, please select the verification link +below or paste it into your web browser address bar. + +If you did NOT request this change, please DO NOT follow the link +provided and ignore and/or delete this email. + +Your password will not be changed unless we can verify that you +issued this request. + +Follow this link to verify your identity: + +$reset_link + +You will then receive a follow-up message containing the new password. + +You may change that password from your account settings page after logging in. + +The login details are as follows: + +Site Location: $siteurl +Login Name: $email + + + + +Sincerely, + $sitename Administrator + + diff --git a/view/en/mail_received_eml.tpl b/view/en/mail_received_eml.tpl new file mode 100644 index 000000000..261aec4be --- /dev/null +++ b/view/en/mail_received_eml.tpl @@ -0,0 +1,16 @@ + +Dear $username, + + You've received a new private message at $sitename from '$from'. +----- +$title +----- +$body +----- +Please login at $siteurl to read and reply to your private messages. + +Thank you, + $sitename administrator + + + diff --git a/view/en/passchanged_eml.tpl b/view/en/passchanged_eml.tpl new file mode 100644 index 000000000..9692159e1 --- /dev/null +++ b/view/en/passchanged_eml.tpl @@ -0,0 +1,20 @@ + +Dear $username, + Your password has been changed as requested. Please retain this +information for your records (or change your password immediately to +something that you will remember). + + +Your login details are as follows: + +Site Location: $siteurl +Login Name: $email +Password: $new_password + +You may change that password from your account settings page after logging in. + + +Sincerely, + $sitename Administrator + + diff --git a/view/en/profile_advanced.php b/view/en/profile_advanced.php new file mode 100644 index 000000000..1f917f663 --- /dev/null +++ b/view/en/profile_advanced.php @@ -0,0 +1,219 @@ +Profile + + +EOT; + +if($a->profile['name']) { +$o .= <<< EOT +
+
Full Name:
+
{$a->profile['name']}
+
+
+EOT; +} + +if($a->profile['gender']) { +$o .= <<< EOT +
+
Gender:
+
{$a->profile['gender']}
+
+
+EOT; +} + +if(($a->profile['dob']) && ($a->profile['dob'] != '0000-00-00')) { +$o .= <<< EOT +
+
Birthday:
+EOT; + +// If no year, add an arbitrary one so just we can parse the month and day. + +$o .= '
' + . ((intval($a->profile['dob'])) + ? datetime_convert('UTC',date_default_timezone_get(),$a->profile['dob'],'j F, Y') + : datetime_convert('UTC',date_default_timezone_get(),'2001-' . substr($a->profile['dob'],6),'j F')) + . "
\r\n
"; + +$o .= '
'; + +} + +if($age = age($a->profile['dob'],$a->profile['timezone'],'')) { +$o .= <<< EOT +
+
Age:
+
$age
+
+
+EOT; +} + +if($a->profile['marital']) { +$o .= <<< EOT +
+
♥ Status:
+
{$a->profile['marital']}
+
+
+EOT; +} + +if($a->profile['sexual']) { +$o .= <<< EOT +
+
Sexual Preference:
+
{$a->profile['sexual']}
+
+
+EOT; +} + +if($a->profile['homepage']) { +$o .= <<< EOT +
+
Homepage:
+
{$a->profile['homepage']}
+
+
+EOT; +} + +if($a->profile['politic']) { +$o .= <<< EOT +
+
Political Views:
+
{$a->profile['politic']}
+
+
+EOT; +} + +if($a->profile['religion']) { +$o .= <<< EOT +
+
Religion:
+
{$a->profile['religion']}
+
+
+EOT; +} + +if($txt = bbcode($a->profile['about'])) { +$o .= <<< EOT +
+
About:
+
+
$txt
+
+
+EOT; +} + +if($txt = bbcode($a->profile['interest'])) { +$o .= <<< EOT +
+
Hobbies/Interests:
+
+
$txt
+
+
+EOT; +} + +if($txt = bbcode($a->profile['contact'])) { +$o .= <<< EOT +
+
Contact information and Social Networks:
+
+
$txt
+
+
+EOT; +} + +if($txt = bbcode($a->profile['music'])) { +$o .= <<< EOT +
+
Musical interests:
+
+
$txt
+
+
+EOT; +} + +if($txt = bbcode($a->profile['book'])) { +$o .= <<< EOT +
+
Books, literature:
+
+
$txt
+
+
+EOT; +} + +if($txt = bbcode($a->profile['tv'])) { +$o .= <<< EOT +
+
Television:
+
+
$txt
+
+
+EOT; +} + +if($txt = bbcode($a->profile['film'])) { +$o .= <<< EOT +
+
Film/dance/culture/entertainment:
+
+
$txt
+
+
+EOT; +} + +if($txt = bbcode($a->profile['romance'])) { +$o .= <<< EOT +
+
Love/romance:
+
+
$txt
+
+
+EOT; +} + +if($txt = bbcode($a->profile['work'])) { +$o .= <<< EOT +
+
Work/employment:
+
+
$txt
+
+
+EOT; +} + +if($txt = bbcode($a->profile['education'])) { +$o .= <<< EOT +
+
School/education:
+
+
$txt
+
+
+EOT; +} + diff --git a/view/en/pwdreset.tpl b/view/en/pwdreset.tpl new file mode 100644 index 000000000..dd609f061 --- /dev/null +++ b/view/en/pwdreset.tpl @@ -0,0 +1,16 @@ +

Password Reset

+ +

+Your password has been reset as requested. +

+

+Your new password is +

+

+$newpass +

+

+Save or copy your new password - and then click here to login. +

+

+Your password may be changed from the 'Settings' page after successful login. \ No newline at end of file diff --git a/view/en/register-link.tpl b/view/en/register-link.tpl new file mode 100644 index 000000000..7f3fca4d6 --- /dev/null +++ b/view/en/register-link.tpl @@ -0,0 +1 @@ + Register diff --git a/view/en/register_open_eml.tpl b/view/en/register_open_eml.tpl new file mode 100644 index 000000000..600b49d13 --- /dev/null +++ b/view/en/register_open_eml.tpl @@ -0,0 +1,25 @@ + +Dear $username, + Thank you for registering at $sitename. Your account has been created. +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. +By default your account is private and hidden (invisible to other people). +You might wish to change this. Then please "introduce" yourself to others in +the network that you desire to communicate with. This gives them permission +to talk to you. + + +Thank you and welcome to $sitename. + +Sincerely, + $sitename Administrator + + diff --git a/view/en/register_verify_eml.tpl b/view/en/register_verify_eml.tpl new file mode 100644 index 000000000..60c38d800 --- /dev/null +++ b/view/en/register_verify_eml.tpl @@ -0,0 +1,26 @@ + +A new user registration request was received at $sitename which requires +your approval. + + +The login details are as follows: + +Full Name: $username +Site Location: $siteurl +Login Name: $email + + +To approve this request please visit the following link: + + +$siteurl/regmod/allow/$hash + + +To deny the request and remove the account, please visit: + + +$siteurl/regmod/deny/$hash + + +Thank you. + diff --git a/view/en/request_notify_eml.tpl b/view/en/request_notify_eml.tpl new file mode 100644 index 000000000..9eef7a61e --- /dev/null +++ b/view/en/request_notify_eml.tpl @@ -0,0 +1,17 @@ + +Dear $myname, + +You have just received a connection request at $sitename + +from '$requestor'. + +You may visit their profile at $url. + +Please login to your site to view the complete introduction +and approve or ignore/cancel the request. + +$siteurl + +Regards, + + $sitename administrator \ No newline at end of file diff --git a/view/en/settings.tpl b/view/en/settings.tpl new file mode 100644 index 000000000..bf54a54c6 --- /dev/null +++ b/view/en/settings.tpl @@ -0,0 +1,148 @@ +

Account Settings

+ +$nickname_block + + +
+ + +

Basic Settings

+ +
+ + +
+
+ +
+ + +
+
+ + + +
+ +$zoneselect +
+
+ +
+ + +
+
+ +
+ + +
+
+ + + + +
+ +$theme +
+
+ +
+ +
+ + +

Privacy Settings

+ + + + +$profile_in_dir + +$profile_in_net_dir + +
+ +
+ + +
+
+ +
+ +
+ + + +

Notification Settings

+ + +
+
Send a notification email when:
+ + +
+ + +
+ + +
+ + +
+ + +
+
+
+ +
+ +
+ + +

Password Settings

+ + +
+

+Leave password fields blank unless changing +

+ + +
+
+ +
+ + +
+
+ + +
+ +
+ + +

Advanced Page Settings

+ +$pagetype + +
+ +
+ + +
+ + + diff --git a/view/en/settings_nick_set.tpl b/view/en/settings_nick_set.tpl new file mode 100644 index 000000000..a36b3b9a2 --- /dev/null +++ b/view/en/settings_nick_set.tpl @@ -0,0 +1,9 @@ + +
+

+Your profile address is '$nickname@$basepath' +

+$subdir + +
+
diff --git a/view/en/settings_nick_subdir.tpl b/view/en/settings_nick_subdir.tpl new file mode 100644 index 000000000..303c24df7 --- /dev/null +++ b/view/en/settings_nick_subdir.tpl @@ -0,0 +1,6 @@ +

+It appears that your website is located in a subdirectory of the
+$hostname website, so this setting may not work reliably.
+

+

If you have any issues, you may have better results using the profile
address '$baseurl/profile/$nickname'. +

\ No newline at end of file diff --git a/view/en/settings_nick_unset.tpl b/view/en/settings_nick_unset.tpl new file mode 100644 index 000000000..903768b59 --- /dev/null +++ b/view/en/settings_nick_unset.tpl @@ -0,0 +1,14 @@ + +
+

+Your profile URL is currently '$baseurl/profile/$uid'. +Setting a nickname will allow a friendly profile URL such as +'nickname@$basepath'. +
+Once set, it can never be changed. The nickname must start with a letter; and only letters, numbers, dashes, and underscores are allowed. +

+ + +
+
+ diff --git a/view/en/wall_received_eml.tpl b/view/en/wall_received_eml.tpl new file mode 100644 index 000000000..c296de785 --- /dev/null +++ b/view/en/wall_received_eml.tpl @@ -0,0 +1,18 @@ + +Dear $username, + + '$from' posted something to your profile wall. + +----- +$body +----- + +Please login at $siteurl to view or delete the item: + +$display + +Thank you, + $sitename administrator + + + diff --git a/view/follow_notify_eml.tpl b/view/follow_notify_eml.tpl deleted file mode 100644 index ae758c9a8..000000000 --- a/view/follow_notify_eml.tpl +++ /dev/null @@ -1,14 +0,0 @@ - -Dear $myname, - -You have a new follower at $sitename - '$requestor'. - -You may visit their profile at $url. - -Please login to your site to approve or ignore/cancel the request. - -$siteurl - -Regards, - - $sitename administrator \ No newline at end of file diff --git a/view/friend_complete_eml.tpl b/view/friend_complete_eml.tpl deleted file mode 100644 index ab12fcb6b..000000000 --- a/view/friend_complete_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -Dear $username, - - 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 -any changes to this relationship. - -$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']. - -Sincerely, - - $sitename Administrator - - diff --git a/view/insecure_net.tpl b/view/insecure_net.tpl deleted file mode 100644 index 5628639cc..000000000 --- a/view/insecure_net.tpl +++ /dev/null @@ -1,6 +0,0 @@ -
-

-The social network that $name belongs to is an open network with limited or non-existent privacy controls. -Please use appropriate discretion. -

-
\ No newline at end of file diff --git a/view/install_db.tpl b/view/install_db.tpl deleted file mode 100644 index d5f28828e..000000000 --- a/view/install_db.tpl +++ /dev/null @@ -1,40 +0,0 @@ - -

Friendika Social Network

-

Installation

- -

-In order to install Friendika we need to know how to contact your database. Please contact your hosting provider or site administrator if you have questions about these settings. The database you specify below must already exist. If it does not, please create it before continuing. -

- -
- - - - - -
- - - -
- - - -
- - - -
- -
-Please select a default timezone for your website -
- -$tzselect - -
- - -
-
- diff --git a/view/intro_complete_eml.tpl b/view/intro_complete_eml.tpl deleted file mode 100644 index a60745ec5..000000000 --- a/view/intro_complete_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -Dear $username, - - '$fn' at '$dfrn_url' has accepted -your connection request at '$sitename'. - - '$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 -relationship in the future. - - You will start receiving public status updates from '$fn', -which will appear on your 'Network' page at - -$siteurl - -Sincerely, - - $sitename Administrator diff --git a/view/intros.tpl b/view/intros.tpl index 30198beb8..f903515ca 100644 --- a/view/intros.tpl +++ b/view/intros.tpl @@ -1,7 +1,7 @@
-

Notification type: $notify_type

+

$str_notifytype $notify_type

$fullname
fullname
$knowyou
@@ -20,7 +20,7 @@ $dfrn_text - +
diff --git a/view/lostpass.tpl b/view/lostpass.tpl deleted file mode 100644 index a7040c149..000000000 --- a/view/lostpass.tpl +++ /dev/null @@ -1,18 +0,0 @@ -

Forgot your Password?

- -

-Enter your email address and submit to have your password reset. Then check your email for further instructions. -

- -
-
- - -
-
-
- -
-
-
- diff --git a/view/lostpass_eml.tpl b/view/lostpass_eml.tpl deleted file mode 100644 index c350236a4..000000000 --- a/view/lostpass_eml.tpl +++ /dev/null @@ -1,32 +0,0 @@ - -Dear $username, - A request was recently received at $sitename to reset your account -password. In order to confirm this request, please select the verification link -below or paste it into your web browser address bar. - -If you did NOT request this change, please DO NOT follow the link -provided and ignore and/or delete this email. - -Your password will not be changed unless we can verify that you -issued this request. - -Follow this link to verify your identity: - -$reset_link - -You will then receive a follow-up message containing the new password. - -You may change that password from your account settings page after logging in. - -The login details are as follows: - -Site Location: $siteurl -Login Name: $email - - - - -Sincerely, - $sitename Administrator - - diff --git a/view/mail_received_eml.tpl b/view/mail_received_eml.tpl deleted file mode 100644 index 261aec4be..000000000 --- a/view/mail_received_eml.tpl +++ /dev/null @@ -1,16 +0,0 @@ - -Dear $username, - - You've received a new private message at $sitename from '$from'. ------ -$title ------ -$body ------ -Please login at $siteurl to read and reply to your private messages. - -Thank you, - $sitename administrator - - - diff --git a/view/passchanged_eml.tpl b/view/passchanged_eml.tpl deleted file mode 100644 index 9692159e1..000000000 --- a/view/passchanged_eml.tpl +++ /dev/null @@ -1,20 +0,0 @@ - -Dear $username, - Your password has been changed as requested. Please retain this -information for your records (or change your password immediately to -something that you will remember). - - -Your login details are as follows: - -Site Location: $siteurl -Login Name: $email -Password: $new_password - -You may change that password from your account settings page after logging in. - - -Sincerely, - $sitename Administrator - - diff --git a/view/profile_advanced.php b/view/profile_advanced.php deleted file mode 100644 index 1f917f663..000000000 --- a/view/profile_advanced.php +++ /dev/null @@ -1,219 +0,0 @@ -Profile - - -EOT; - -if($a->profile['name']) { -$o .= <<< EOT -
-
Full Name:
-
{$a->profile['name']}
-
-
-EOT; -} - -if($a->profile['gender']) { -$o .= <<< EOT -
-
Gender:
-
{$a->profile['gender']}
-
-
-EOT; -} - -if(($a->profile['dob']) && ($a->profile['dob'] != '0000-00-00')) { -$o .= <<< EOT -
-
Birthday:
-EOT; - -// If no year, add an arbitrary one so just we can parse the month and day. - -$o .= '
' - . ((intval($a->profile['dob'])) - ? datetime_convert('UTC',date_default_timezone_get(),$a->profile['dob'],'j F, Y') - : datetime_convert('UTC',date_default_timezone_get(),'2001-' . substr($a->profile['dob'],6),'j F')) - . "
\r\n
"; - -$o .= '
'; - -} - -if($age = age($a->profile['dob'],$a->profile['timezone'],'')) { -$o .= <<< EOT -
-
Age:
-
$age
-
-
-EOT; -} - -if($a->profile['marital']) { -$o .= <<< EOT -
-
♥ Status:
-
{$a->profile['marital']}
-
-
-EOT; -} - -if($a->profile['sexual']) { -$o .= <<< EOT -
-
Sexual Preference:
-
{$a->profile['sexual']}
-
-
-EOT; -} - -if($a->profile['homepage']) { -$o .= <<< EOT -
-
Homepage:
-
{$a->profile['homepage']}
-
-
-EOT; -} - -if($a->profile['politic']) { -$o .= <<< EOT -
-
Political Views:
-
{$a->profile['politic']}
-
-
-EOT; -} - -if($a->profile['religion']) { -$o .= <<< EOT -
-
Religion:
-
{$a->profile['religion']}
-
-
-EOT; -} - -if($txt = bbcode($a->profile['about'])) { -$o .= <<< EOT -
-
About:
-
-
$txt
-
-
-EOT; -} - -if($txt = bbcode($a->profile['interest'])) { -$o .= <<< EOT -
-
Hobbies/Interests:
-
-
$txt
-
-
-EOT; -} - -if($txt = bbcode($a->profile['contact'])) { -$o .= <<< EOT -
-
Contact information and Social Networks:
-
-
$txt
-
-
-EOT; -} - -if($txt = bbcode($a->profile['music'])) { -$o .= <<< EOT -
-
Musical interests:
-
-
$txt
-
-
-EOT; -} - -if($txt = bbcode($a->profile['book'])) { -$o .= <<< EOT -
-
Books, literature:
-
-
$txt
-
-
-EOT; -} - -if($txt = bbcode($a->profile['tv'])) { -$o .= <<< EOT -
-
Television:
-
-
$txt
-
-
-EOT; -} - -if($txt = bbcode($a->profile['film'])) { -$o .= <<< EOT -
-
Film/dance/culture/entertainment:
-
-
$txt
-
-
-EOT; -} - -if($txt = bbcode($a->profile['romance'])) { -$o .= <<< EOT -
-
Love/romance:
-
-
$txt
-
-
-EOT; -} - -if($txt = bbcode($a->profile['work'])) { -$o .= <<< EOT -
-
Work/employment:
-
-
$txt
-
-
-EOT; -} - -if($txt = bbcode($a->profile['education'])) { -$o .= <<< EOT -
-
School/education:
-
-
$txt
-
-
-EOT; -} - diff --git a/view/pwdreset.tpl b/view/pwdreset.tpl deleted file mode 100644 index dd609f061..000000000 --- a/view/pwdreset.tpl +++ /dev/null @@ -1,16 +0,0 @@ -

Password Reset

- -

-Your password has been reset as requested. -

-

-Your new password is -

-

-$newpass -

-

-Save or copy your new password - and then click here to login. -

-

-Your password may be changed from the 'Settings' page after successful login. \ No newline at end of file diff --git a/view/register-link.tpl b/view/register-link.tpl deleted file mode 100644 index 7f3fca4d6..000000000 --- a/view/register-link.tpl +++ /dev/null @@ -1 +0,0 @@ - Register diff --git a/view/register_open_eml.tpl b/view/register_open_eml.tpl deleted file mode 100644 index 600b49d13..000000000 --- a/view/register_open_eml.tpl +++ /dev/null @@ -1,25 +0,0 @@ - -Dear $username, - Thank you for registering at $sitename. Your account has been created. -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. -By default your account is private and hidden (invisible to other people). -You might wish to change this. Then please "introduce" yourself to others in -the network that you desire to communicate with. This gives them permission -to talk to you. - - -Thank you and welcome to $sitename. - -Sincerely, - $sitename Administrator - - diff --git a/view/register_verify_eml.tpl b/view/register_verify_eml.tpl deleted file mode 100644 index 60c38d800..000000000 --- a/view/register_verify_eml.tpl +++ /dev/null @@ -1,26 +0,0 @@ - -A new user registration request was received at $sitename which requires -your approval. - - -The login details are as follows: - -Full Name: $username -Site Location: $siteurl -Login Name: $email - - -To approve this request please visit the following link: - - -$siteurl/regmod/allow/$hash - - -To deny the request and remove the account, please visit: - - -$siteurl/regmod/deny/$hash - - -Thank you. - diff --git a/view/request_notify_eml.tpl b/view/request_notify_eml.tpl deleted file mode 100644 index 9eef7a61e..000000000 --- a/view/request_notify_eml.tpl +++ /dev/null @@ -1,17 +0,0 @@ - -Dear $myname, - -You have just received a connection request at $sitename - -from '$requestor'. - -You may visit their profile at $url. - -Please login to your site to view the complete introduction -and approve or ignore/cancel the request. - -$siteurl - -Regards, - - $sitename administrator \ No newline at end of file diff --git a/view/settings.tpl b/view/settings.tpl deleted file mode 100644 index bf54a54c6..000000000 --- a/view/settings.tpl +++ /dev/null @@ -1,148 +0,0 @@ -

Account Settings

- -$nickname_block - - -
- - -

Basic Settings

- -
- - -
-
- -
- - -
-
- - - -
- -$zoneselect -
-
- -
- - -
-
- -
- - -
-
- - - - -
- -$theme -
-
- -
- -
- - -

Privacy Settings

- - - - -$profile_in_dir - -$profile_in_net_dir - -
- -
- - -
-
- -
- -
- - - -

Notification Settings

- - -
-
Send a notification email when:
- - -
- - -
- - -
- - -
- - -
-
-
- -
- -
- - -

Password Settings

- - -
-

-Leave password fields blank unless changing -

- - -
-
- -
- - -
-
- - -
- -
- - -

Advanced Page Settings

- -$pagetype - -
- -
- - -
- - - diff --git a/view/settings_nick_set.tpl b/view/settings_nick_set.tpl deleted file mode 100644 index a36b3b9a2..000000000 --- a/view/settings_nick_set.tpl +++ /dev/null @@ -1,9 +0,0 @@ - -
-

-Your profile address is '$nickname@$basepath' -

-$subdir - -
-
diff --git a/view/settings_nick_subdir.tpl b/view/settings_nick_subdir.tpl deleted file mode 100644 index 303c24df7..000000000 --- a/view/settings_nick_subdir.tpl +++ /dev/null @@ -1,6 +0,0 @@ -

-It appears that your website is located in a subdirectory of the
-$hostname website, so this setting may not work reliably.
-

-

If you have any issues, you may have better results using the profile
address '$baseurl/profile/$nickname'. -

\ No newline at end of file diff --git a/view/settings_nick_unset.tpl b/view/settings_nick_unset.tpl deleted file mode 100644 index 903768b59..000000000 --- a/view/settings_nick_unset.tpl +++ /dev/null @@ -1,14 +0,0 @@ - -
-

-Your profile URL is currently '$baseurl/profile/$uid'. -Setting a nickname will allow a friendly profile URL such as -'nickname@$basepath'. -
-Once set, it can never be changed. The nickname must start with a letter; and only letters, numbers, dashes, and underscores are allowed. -

- - -
-
- diff --git a/view/sidenote.tpl b/view/sidenote.tpl deleted file mode 100644 index 44d34bf2a..000000000 --- a/view/sidenote.tpl +++ /dev/null @@ -1,18 +0,0 @@ - -
-

-Write something -

-
- - - - -
-
- - -
-
- -
diff --git a/view/wall_received_eml.tpl b/view/wall_received_eml.tpl deleted file mode 100644 index c296de785..000000000 --- a/view/wall_received_eml.tpl +++ /dev/null @@ -1,18 +0,0 @@ - -Dear $username, - - '$from' posted something to your profile wall. - ------ -$body ------ - -Please login at $siteurl to view or delete the item: - -$display - -Thank you, - $sitename administrator - - - -- cgit v1.2.3