keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #8465 from AlfredSK/AlfredSK-dont_mention_multiprofiles

Browse source 
Remove multi profile mention in settings
This commit is contained in:
Tobias Diekershoff 2020-03-29 14:35:50 +02:00 committed by GitHub
commit 8eaab2cecb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mod/match.php
View file

@ -60,7 +60,7 @@ function match_content(App $a)
return ''; return '';
} }
if (!$profile['pub_keywords'] && (!$profile['prv_keywords'])) { if (!$profile['pub_keywords'] && (!$profile['prv_keywords'])) {
notice(DI::l10n()->t('No keywords to match. Please add keywords to your default profile.') . EOL); notice(DI::l10n()->t('No keywords to match. Please add keywords to your profile.') . EOL);
return ''; return '';
} }

2
mod/settings.php
View file

@ -834,7 +834,7 @@ function settings_content(App $a)
]); ]);
$hide_friends = Renderer::replaceMacros($opt_tpl, [ $hide_friends = Renderer::replaceMacros($opt_tpl, [
'$field' => ['hide-friends', DI::l10n()->t('Hide your contact/friend list from viewers of your default profile?'), $profile['hide-friends'], DI::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')], '$field' => ['hide-friends', DI::l10n()->t('Hide your contact/friend list from viewers of your profile?'), $profile['hide-friends'], DI::l10n()->t('A list of your contacts is displayed on your profile page. Activate this option to disable the display of your contact list.')],
]); ]);
$hide_wall = Renderer::replaceMacros($opt_tpl, [ $hide_wall = Renderer::replaceMacros($opt_tpl, [

2
src/Module/Welcome.php
View file

@ -60,7 +60,7 @@ class Welcome extends BaseModule
'$profiles_link' => DI::l10n()->t('Edit Your Profile'), '$profiles_link' => DI::l10n()->t('Edit Your Profile'),
'$profiles_txt' => DI::l10n()->t('Edit your <strong>default</strong> profile to your liking. Review the settings for hiding your list of friends and hiding the profile from unknown visitors.'), '$profiles_txt' => DI::l10n()->t('Edit your <strong>default</strong> profile to your liking. Review the settings for hiding your list of friends and hiding the profile from unknown visitors.'),
'$profiles_keywords_link' => DI::l10n()->t('Profile Keywords'), '$profiles_keywords_link' => DI::l10n()->t('Profile Keywords'),
'$profiles_keywords_txt' => DI::l10n()->t('Set some public keywords for your default profile which describe your interests. We may be able to find other people with similar interests and suggest friendships.'), '$profiles_keywords_txt' => DI::l10n()->t('Set some public keywords for your profile which describe your interests. We may be able to find other people with similar interests and suggest friendships.'),
'$connecting' => DI::l10n()->t('Connecting'), '$connecting' => DI::l10n()->t('Connecting'),
'$mail_disabled' => $mail_disabled, '$mail_disabled' => $mail_disabled,