From 8a844b14402b44d13b14c7b56faf425998a68fb7 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sat, 24 Feb 2018 08:00:11 +0100 Subject: [PATCH 1/4] added some help texts to the Security and Privacy profile settings --- mod/settings.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/mod/settings.php b/mod/settings.php index 9aa2c0b5b..b56f9cc65 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -1106,40 +1106,40 @@ function settings_content(App $a) $profile_in_dir = ''; } else { $profile_in_dir = replace_macros($opt_tpl, [ - '$field' => ['profile_in_directory', L10n::t('Publish your default profile in your local site directory?'), $profile['publish'], L10n::t("Your profile may be visible in public."), [L10n::t('No'), L10n::t('Yes')]] + '$field' => ['profile_in_directory', L10n::t('Publish your default profile in your local site directory?'), $profile['publish'], L10n::t('If you enable this option your profile will be published in the global friendica directories (e.g. %s). Your profile may be visible in public.', Config::get('system', 'directory'), Config::get('system', 'directory')), [L10n::t('No'), L10n::t('Yes')]] ]); } if (strlen(Config::get('system', 'directory'))) { $profile_in_net_dir = replace_macros($opt_tpl, [ - '$field' => ['profile_in_netdirectory', L10n::t('Publish your default profile in the global social directory?'), $profile['net-publish'], '', [L10n::t('No'), L10n::t('Yes')]] + '$field' => ['profile_in_netdirectory', L10n::t('Publish your default profile in the global social directory?'), $profile['net-publish'], L10n::t('If you enable this option your profile will be listed in this nodes local directory.', System::baseUrl().'/directory'), [L10n::t('No'), L10n::t('Yes')]] ]); } else { $profile_in_net_dir = ''; } $hide_friends = replace_macros($opt_tpl, [ - '$field' => ['hide-friends', L10n::t('Hide your contact/friend list from viewers of your default profile?'), $profile['hide-friends'], '', [L10n::t('No'), L10n::t('Yes')]], + '$field' => ['hide-friends', L10n::t('Hide your contact/friend list from viewers of your default profile?'), $profile['hide-friends'], L10n::t('If you enable this option your contacts wont be shown on your profile page. If you add further profiles, you can decide separately for each profile to show your contact list there.'), [L10n::t('No'), L10n::t('Yes')]], ]); $hide_wall = replace_macros($opt_tpl, [ - '$field' => ['hidewall', L10n::t('Hide your profile details from unknown viewers?'), $a->user['hidewall'], L10n::t("If enabled, posting public messages to Diaspora and other networks isn't possible."), [L10n::t('No'), L10n::t('Yes')]], + '$field' => ['hidewall', L10n::t('Hide your profile details from unknown viewers?'), $a->user['hidewall'], L10n::t("If you enable this option unknown visitors of your profile page will only see your profile picture, your display name and the nick name you are using. Please note that if this is enabled posting public messages to Diaspora and other networks isn't possible."), [L10n::t('No'), L10n::t('Yes')]], ]); $blockwall = replace_macros($opt_tpl, [ - '$field' => ['blockwall', L10n::t('Allow friends to post to your profile page?'), (intval($a->user['blockwall']) ? '0' : '1'), '', [L10n::t('No'), L10n::t('Yes')]], + '$field' => ['blockwall', L10n::t('Allow friends to post to your profile page?'), (intval($a->user['blockwall']) ? '0' : '1'), L10n::t('If you enable this option your contacts may write new postings on your profile wall, if they are authentificated. These postings will be distributed to your other contacts.'), [L10n::t('No'), L10n::t('Yes')]], ]); $blocktags = replace_macros($opt_tpl, [ - '$field' => ['blocktags', L10n::t('Allow friends to tag your posts?'), (intval($a->user['blocktags']) ? '0' : '1'), '', [L10n::t('No'), L10n::t('Yes')]], + '$field' => ['blocktags', L10n::t('Allow friends to tag your posts?'), (intval($a->user['blocktags']) ? '0' : '1'), L10n::t('If you enable this option your contacts are allowed to tag your postings with additional tags.'), [L10n::t('No'), L10n::t('Yes')]], ]); $suggestme = replace_macros($opt_tpl, [ - '$field' => ['suggestme', L10n::t('Allow us to suggest you as a potential friend to new members?'), $suggestme, '', [L10n::t('No'), L10n::t('Yes')]], + '$field' => ['suggestme', L10n::t('Allow us to suggest you as a potential friend to new members?'), $suggestme, L10n::t('If you like, Friendica will suggest your profile to new members of the network as potential interesting contact.'), [L10n::t('No'), L10n::t('Yes')]], ]); $unkmail = replace_macros($opt_tpl, [ - '$field' => ['unkmail', L10n::t('Permit unknown people to send you private mail?'), $unkmail, '', [L10n::t('No'), L10n::t('Yes')]], + '$field' => ['unkmail', L10n::t('Permit unknown people to send you private mail?'), $unkmail, L10n::t('If this option is enabled verified user from the Friendica network may send you private messages, even if they are not in your contact list.'), [L10n::t('No'), L10n::t('Yes')]], ]); if (!$profile['publish'] && !$profile['net-publish']) { From 28fa27ea0e3d49953d3296b8979aeb1b61d9be44 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sun, 25 Feb 2018 08:50:50 +0100 Subject: [PATCH 2/4] some wording changes --- mod/settings.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/mod/settings.php b/mod/settings.php index b56f9cc65..c90ebf064 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -1106,20 +1106,20 @@ function settings_content(App $a) $profile_in_dir = ''; } else { $profile_in_dir = replace_macros($opt_tpl, [ - '$field' => ['profile_in_directory', L10n::t('Publish your default profile in your local site directory?'), $profile['publish'], L10n::t('If you enable this option your profile will be published in the global friendica directories (e.g. %s). Your profile may be visible in public.', Config::get('system', 'directory'), Config::get('system', 'directory')), [L10n::t('No'), L10n::t('Yes')]] + '$field' => ['profile_in_directory', L10n::t('Publish your default profile in your local site directory?'), $profile['publish'], L10n::t('Your profile will be published in the global friendica directories (e.g. %s). Your profile will be visible in public.', Config::get('system', 'directory'), Config::get('system', 'directory')), [L10n::t('No'), L10n::t('Yes')]] ]); } if (strlen(Config::get('system', 'directory'))) { $profile_in_net_dir = replace_macros($opt_tpl, [ - '$field' => ['profile_in_netdirectory', L10n::t('Publish your default profile in the global social directory?'), $profile['net-publish'], L10n::t('If you enable this option your profile will be listed in this nodes local directory.', System::baseUrl().'/directory'), [L10n::t('No'), L10n::t('Yes')]] + '$field' => ['profile_in_netdirectory', L10n::t('Publish your default profile in the global social directory?'), $profile['net-publish'], L10n::t('Your profile will be publishedin this node\'s local directory. Your profile details may be publicly visible depending on the system settings.', System::baseUrl().'/directory'), [L10n::t('No'), L10n::t('Yes')]] ]); } else { $profile_in_net_dir = ''; } $hide_friends = replace_macros($opt_tpl, [ - '$field' => ['hide-friends', L10n::t('Hide your contact/friend list from viewers of your default profile?'), $profile['hide-friends'], L10n::t('If you enable this option your contacts wont be shown on your profile page. If you add further profiles, you can decide separately for each profile to show your contact list there.'), [L10n::t('No'), L10n::t('Yes')]], + '$field' => ['hide-friends', L10n::t('Hide your contact/friend list from viewers of your default profile?'), $profile['hide-friends'], L10n::t('Your contact list won\'t be shown in your default profile page. You can decide to show your contact list separately for each additional profile you create'), [L10n::t('No'), L10n::t('Yes')]], ]); $hide_wall = replace_macros($opt_tpl, [ @@ -1127,19 +1127,19 @@ function settings_content(App $a) ]); $blockwall = replace_macros($opt_tpl, [ - '$field' => ['blockwall', L10n::t('Allow friends to post to your profile page?'), (intval($a->user['blockwall']) ? '0' : '1'), L10n::t('If you enable this option your contacts may write new postings on your profile wall, if they are authentificated. These postings will be distributed to your other contacts.'), [L10n::t('No'), L10n::t('Yes')]], + '$field' => ['blockwall', L10n::t('Allow friends to post to your profile page?'), (intval($a->user['blockwall']) ? '0' : '1'), L10n::t('Your contacts may write posts on your profile wall. These posts will be distributed to your other contacts'), [L10n::t('No'), L10n::t('Yes')]], ]); $blocktags = replace_macros($opt_tpl, [ - '$field' => ['blocktags', L10n::t('Allow friends to tag your posts?'), (intval($a->user['blocktags']) ? '0' : '1'), L10n::t('If you enable this option your contacts are allowed to tag your postings with additional tags.'), [L10n::t('No'), L10n::t('Yes')]], + '$field' => ['blocktags', L10n::t('Allow friends to tag your posts?'), (intval($a->user['blocktags']) ? '0' : '1'), L10n::t('Your contacts can add additional tags to your posts.'), [L10n::t('No'), L10n::t('Yes')]], ]); $suggestme = replace_macros($opt_tpl, [ - '$field' => ['suggestme', L10n::t('Allow us to suggest you as a potential friend to new members?'), $suggestme, L10n::t('If you like, Friendica will suggest your profile to new members of the network as potential interesting contact.'), [L10n::t('No'), L10n::t('Yes')]], + '$field' => ['suggestme', L10n::t('Allow us to suggest you as a potential friend to new members?'), $suggestme, L10n::t('If you like, Friendica may suggest new members to add you as a contact.'), [L10n::t('No'), L10n::t('Yes')]], ]); $unkmail = replace_macros($opt_tpl, [ - '$field' => ['unkmail', L10n::t('Permit unknown people to send you private mail?'), $unkmail, L10n::t('If this option is enabled verified user from the Friendica network may send you private messages, even if they are not in your contact list.'), [L10n::t('No'), L10n::t('Yes')]], + '$field' => ['unkmail', L10n::t('Permit unknown people to send you private mail?'), $unkmail, L10n::t('Friendica network users may send you private messages even if they are not in your contact list.'), [L10n::t('No'), L10n::t('Yes')]], ]); if (!$profile['publish'] && !$profile['net-publish']) { From 1b7a307423a5016280092d8c26d3afd65e003eb8 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Mon, 26 Feb 2018 17:21:47 +0100 Subject: [PATCH 3/4] annon it is --- mod/settings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/settings.php b/mod/settings.php index c90ebf064..ef9341f4c 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -1123,7 +1123,7 @@ function settings_content(App $a) ]); $hide_wall = replace_macros($opt_tpl, [ - '$field' => ['hidewall', L10n::t('Hide your profile details from unknown viewers?'), $a->user['hidewall'], L10n::t("If you enable this option unknown visitors of your profile page will only see your profile picture, your display name and the nick name you are using. Please note that if this is enabled posting public messages to Diaspora and other networks isn't possible."), [L10n::t('No'), L10n::t('Yes')]], + '$field' => ['hidewall', L10n::t('Hide your profile details from anonymous viewers?'), $a->user['hidewall'], L10n::t('Anonymous visitors will only see your profile picture, your display name and the nickname you are using on your profile page. Disables posting public messages to Diaspora and other networks.'), [L10n::t('No'), L10n::t('Yes')]], ]); $blockwall = replace_macros($opt_tpl, [ From 56bd9ec148e22be87ae52871e29b6e3e4dcd8b16 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Mon, 26 Feb 2018 17:27:00 +0100 Subject: [PATCH 4/4] not only the others --- mod/settings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/settings.php b/mod/settings.php index ef9341f4c..6fcbe4d11 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -1127,7 +1127,7 @@ function settings_content(App $a) ]); $blockwall = replace_macros($opt_tpl, [ - '$field' => ['blockwall', L10n::t('Allow friends to post to your profile page?'), (intval($a->user['blockwall']) ? '0' : '1'), L10n::t('Your contacts may write posts on your profile wall. These posts will be distributed to your other contacts'), [L10n::t('No'), L10n::t('Yes')]], + '$field' => ['blockwall', L10n::t('Allow friends to post to your profile page?'), (intval($a->user['blockwall']) ? '0' : '1'), L10n::t('Your contacts may write posts on your profile wall. These posts will be distributed to your contacts'), [L10n::t('No'), L10n::t('Yes')]], ]); $blocktags = replace_macros($opt_tpl, [