diff options
Diffstat (limited to 'view/en')
| -rw-r--r-- | view/en/follow_notify_eml.tpl | 10 | ||||
| -rw-r--r-- | view/en/friend_complete_eml.tpl | 14 | ||||
| -rw-r--r-- | view/en/htconfig.tpl | 71 | ||||
| -rw-r--r-- | view/en/intro_complete_eml.tpl | 18 | ||||
| -rw-r--r-- | view/en/lostpass_eml.tpl | 12 | ||||
| -rw-r--r-- | view/en/passchanged_eml.tpl | 10 | ||||
| -rw-r--r-- | view/en/register_open_eml.tpl | 17 | ||||
| -rw-r--r-- | view/en/register_verify_eml.tpl | 13 | ||||
| -rw-r--r-- | view/en/request_notify_eml.tpl | 12 | ||||
| -rw-r--r-- | view/en/update_fail_eml.tpl | 16 |
10 files changed, 117 insertions, 76 deletions
diff --git a/view/en/follow_notify_eml.tpl b/view/en/follow_notify_eml.tpl index 917024b84..ba07b19da 100644 --- a/view/en/follow_notify_eml.tpl +++ b/view/en/follow_notify_eml.tpl @@ -1,14 +1,14 @@ -Dear $[myname], +Dear {{$myname}}, -You have a new follower at $[sitename] - '$[requestor]'. +You have a new follower at {{$sitename}} - '{{$requestor}}'. -You may visit their profile at $[url]. +You may visit their profile at {{$url}}. Please login to your site to approve or ignore/cancel the request. -$[siteurl] +{{$siteurl}} Regards, - $[sitename] administrator + {{$sitename}} administrator diff --git a/view/en/friend_complete_eml.tpl b/view/en/friend_complete_eml.tpl index 89f578388..1c647b994 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 'Connnections' 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/htconfig.tpl b/view/en/htconfig.tpl index f35d3292d..9377472bd 100644 --- a/view/en/htconfig.tpl +++ b/view/en/htconfig.tpl @@ -3,21 +3,36 @@ // Set the following for your MySQL installation // Copy or rename this file to .htconfig.php -$db_host = '$dbhost'; -$db_user = '$dbuser'; -$db_pass = '$dbpass'; -$db_data = '$dbdata'; +$db_host = '{{$dbhost}}'; +$db_port = '{{$dbport}}'; +$db_user = '{{$dbuser}}'; +$db_pass = '{{$dbpass}}'; +$db_data = '{{$dbdata}}'; + +/* + * Notice: Many of the following settings will be available in the admin panel + * after a successful site install. Once they are set in the admin panel, they + * are stored in the DB - and the DB setting will over-ride any corresponding + * setting in this file + * + * The command-line tool util/config is able to query and set the DB items + * directly if for some reason the admin panel is not available and a system + * setting requires modification. + * + */ + // Choose a legal default timezone. If you are unsure, use "America/Los_Angeles". // It can be changed later and only applies to timestamps for anonymous viewers. -$default_timezone = '$timezone'; +$default_timezone = '{{$timezone}}'; // What is your site name? -$a->config['system']['baseurl'] = '$siteurl'; -$a->config['system']['sitename'] = "My Friend Network"; -$a->config['system']['location_hash'] = '$site_id'; +$a->config['system']['baseurl'] = '{{$siteurl}}'; +$a->config['system']['sitename'] = "Red Matrix"; +$a->config['system']['location_hash'] = '{{$site_id}}'; + // Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED. // Be certain to create your own personal account before setting @@ -28,19 +43,35 @@ $a->config['system']['location_hash'] = '$site_id'; $a->config['system']['register_policy'] = REGISTER_OPEN; $a->config['system']['register_text'] = ''; -$a->config['system']['admin_email'] = '$adminmail'; +$a->config['system']['admin_email'] = '{{$adminmail}}'; -// Maximum size of an imported message, 0 is unlimited -$a->config['system']['max_import_size'] = 200000; +// Site access restrictions. By default we will create private sites. +// Your choices are ACCESS_PRIVATE, ACCESS_PAID, ACCESS_TIERED, and ACCESS_FREE. +// If you leave REGISTER_OPEN above, anybody may register on your +// site, however your site will not be listed anywhere as an open +// registration hub. We will use the system access policy (below) +// to determine whether or not to list your site in the directory +// as an open hub where anybody may create accounts. Your choice of +// paid, tiered, or free determines how these listings will be presented. + + +$a->config['system']['access_policy'] = ACCESS_PRIVATE; -// maximum size of uploaded photos +// If you operate a public site, you might wish that people are directed +// to a "sellpage" where you can describe for features or policies or service plans in depth. +// This must be an absolute URL beginning with http:// or https:// . -$a->config['system']['maximagesize'] = 800000; +$a->config['system']['sellpage'] = ''; + +// Maximum size of an imported message, 0 is unlimited +// FIXME - NOT currently implemented. + +$a->config['system']['max_import_size'] = 200000; // Location of PHP command line processor -$a->config['system']['php_path'] = '$phpath'; +$a->config['system']['php_path'] = '{{$phpath}}'; // Configure how we communicate with directory servers. // DIRECTORY_MODE_NORMAL = directory client, we will find a directory @@ -54,6 +85,14 @@ $a->config['system']['directory_mode'] = DIRECTORY_MODE_NORMAL; $a->config['system']['theme'] = 'redbasic'; -// By default allow pseudonyms -$a->config['system']['no_regfullname'] = true; +// PHP error logging setup +// Before doing this ensure that the webserver has permission +// to create and write to php.out in the top level Red directory, +// or change the name (below) to a file/path where this is allowed. + +// Uncomment the following 4 lines to turn on PHP error logging. +//error_reporting(E_ERROR | E_WARNING | E_PARSE ); +//ini_set('error_log','php.out'); +//ini_set('log_errors','1'); +//ini_set('display_errors', '0'); diff --git a/view/en/intro_complete_eml.tpl b/view/en/intro_complete_eml.tpl index cd78b2a15..2c2428d68 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]', -which will appear on your 'Network' page at + You will start receiving public status updates from '{{$fn}}', +which will appear on your 'Matrix' page at -$[siteurl] +{{$siteurl}} Sincerely, - $[sitename] Administrator + {{$sitename}} Administrator diff --git a/view/en/lostpass_eml.tpl b/view/en/lostpass_eml.tpl index 1330caa12..3b79d2791 100644 --- a/view/en/lostpass_eml.tpl +++ b/view/en/lostpass_eml.tpl @@ -1,6 +1,6 @@ -Dear $[username], - A request was recently received at $[sitename] to reset your account +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. @@ -12,7 +12,7 @@ issued this request. Follow this link to verify your identity: -$[reset_link] +{{$reset_link}} You will then receive a follow-up message containing the new password. @@ -20,13 +20,13 @@ 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] +Site Location: {{$siteurl}} +Login Name: {{$email}} Sincerely, - $[sitename] Administrator + {{$sitename}} Administrator diff --git a/view/en/passchanged_eml.tpl b/view/en/passchanged_eml.tpl index e7cc0e2dc..0d94be3c2 100644 --- a/view/en/passchanged_eml.tpl +++ b/view/en/passchanged_eml.tpl @@ -1,5 +1,5 @@ -Dear $[username], +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). @@ -7,14 +7,14 @@ something that you will remember). Your login details are as follows: -Site Location: $[siteurl] -Login Name: $[email] -Password: $[new_password] +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 + {{$sitename}} Administrator diff --git a/view/en/register_open_eml.tpl b/view/en/register_open_eml.tpl index 68c4a722b..4b397201c 100644 --- a/view/en/register_open_eml.tpl +++ b/view/en/register_open_eml.tpl @@ -1,18 +1,19 @@ -An account has been created at $[sitename] for this email address. +An account has been created at {{$sitename}} for this email address. The login details are as follows: -Site Location: $[siteurl] -Login: $[email] -Password: $[password] +Site Location: {{$siteurl}} +Login: {{$email}} +Password: (the password which was provided during registration) -If this account was created without your knowledge and is not desired, please -login and remove the account from the links on the Settings page, and we +If this account was created without your knowledge and is not desired, you may +visit this site and reset the password. This will allow you to remove the +account from the links on the Settings page, and we apologise for any inconvenience. -Thank you and welcome. +Thank you and welcome to {{$sitename}}. Sincerely, - $[sitename] Administrator + {{$sitename}} Administrator diff --git a/view/en/register_verify_eml.tpl b/view/en/register_verify_eml.tpl index 73980bb5c..85d9a12d3 100644 --- a/view/en/register_verify_eml.tpl +++ b/view/en/register_verify_eml.tpl @@ -1,25 +1,24 @@ -A new user registration request was received at $[sitename] which requires +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] - +Site Location: {{$siteurl}} +Login Name: {{$email}} +IP Address: {{$details}} To approve this request please visit the following link: -$[siteurl]/regmod/allow/$[hash] +{{$siteurl}}/regmod/allow/{{$hash}} To deny the request and remove the account, please visit: -$[siteurl]/regmod/deny/$[hash] +{{$siteurl}}/regmod/deny/{{$hash}} Thank you. diff --git a/view/en/request_notify_eml.tpl b/view/en/request_notify_eml.tpl index ad118a673..d01b8ff27 100644 --- a/view/en/request_notify_eml.tpl +++ b/view/en/request_notify_eml.tpl @@ -1,17 +1,17 @@ -Dear $[myname], +Dear {{$myname}}, -You have just received a connection request at $[sitename] +You have just received a connection request at {{$sitename}} -from '$[requestor]'. +from '{{$requestor}}'. -You may visit their profile at $[url]. +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] +{{$siteurl}} Regards, - $[sitename] administrator + {{$sitename}} administrator diff --git a/view/en/update_fail_eml.tpl b/view/en/update_fail_eml.tpl index 548e1a0df..a7df8fc2f 100644 --- a/view/en/update_fail_eml.tpl +++ b/view/en/update_fail_eml.tpl @@ -1,11 +1,13 @@ Hey,
-I'm $sitename;
-The friendica developers released update $update recently,
+I'm the web server at {{$sitename}};
+
+The Red Matrix developers released update {{$update}} recently,
but when I tried to install it, something went terribly wrong.
-This needs to be fixed soon and I can't do it alone. Please contact a
-friendica developer if you can not help me on your own. My database might be invalid.
+This needs to be fixed soon and it requires human intervention.
+Please contact a Red developer if you can not figure out how to
+fix it on your own. My database might be invalid.
-The error message is '$error'.
+The error message is '{{$error}}'.
-I'm sorry,
-your friendica server at $siteurl
\ No newline at end of file +Apologies for the inconvenience,
+ your web server at {{$siteurl}}
\ No newline at end of file |