bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge pull request #12426 from MrPetovan/task/12237-ACL-meta-groups-doc

Browse source 
Add documentation about the ACL autocomplete fields
This commit is contained in:
Tobias Diekershoff 2022-12-15 06:22:14 +01:00 committed by GitHub
commit 0128bbdb08
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Core/ACL.php
View file

@ -35,7 +35,7 @@ class ACL
{ {
/** /**
* Returns the default lock state for the given user id * Returns the default lock state for the given user id
* @param int $uid * @param int $uid
* @return bool "true" if the default settings are non public * @return bool "true" if the default settings are non public
*/ */
public static function getLockstateForUserId(int $uid) public static function getLockstateForUserId(int $uid)
@ -294,7 +294,7 @@ class ACL
!empty($mailacct['pubmail']) !empty($mailacct['pubmail'])
] ]
]; ];
} }
} }
Hook::callAll('jot_networks', $jotnets_fields); Hook::callAll('jot_networks', $jotnets_fields);
@ -320,7 +320,7 @@ class ACL
'$public_title' => DI::l10n()->t('Public'), '$public_title' => DI::l10n()->t('Public'),
'$public_desc' => DI::l10n()->t('This content will be shown to all your followers and can be seen in the community pages and by anyone with its link.'), '$public_desc' => DI::l10n()->t('This content will be shown to all your followers and can be seen in the community pages and by anyone with its link.'),
'$custom_title' => DI::l10n()->t('Limited/Private'), '$custom_title' => DI::l10n()->t('Limited/Private'),
'$custom_desc' => DI::l10n()->t('This content will be shown only to the people in the first box, to the exception of the people mentioned in the second box. It won\'t appear anywhere public.'), '$custom_desc' => DI::l10n()->t('This content will be shown only to the people in the first box, to the exception of the people mentioned in the second box. It won\'t appear anywhere public.') . DI::l10n()->t('Start typing the name of a contact or a group to show a filtered list. You can also mention the special groups "Followers" and "Mutuals".'),
'$allow_label' => DI::l10n()->t('Show to:'), '$allow_label' => DI::l10n()->t('Show to:'),
'$deny_label' => DI::l10n()->t('Except to:'), '$deny_label' => DI::l10n()->t('Except to:'),
'$emailcc' => DI::l10n()->t('CC: email addresses'), '$emailcc' => DI::l10n()->t('CC: email addresses'),

8
view/lang/C/messages.po
View file

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 2022.12-rc\n" "Project-Id-Version: 2022.12-rc\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-12-14 23:18+0100\n" "POT-Creation-Date: 2022-12-14 21:56-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -2203,6 +2203,12 @@ msgid ""
"anywhere public." "anywhere public."
msgstr "" msgstr ""
#: src/Core/ACL.php:323
msgid ""
"Start typing the name of a contact or a group to show a filtered list. You "
"can also mention the special groups \"Followers\" and \"Mutuals\"."
msgstr ""
#: src/Core/ACL.php:324 #: src/Core/ACL.php:324
msgid "Show to:" msgid "Show to:"
msgstr "" msgstr ""