Merge remote-tracking branch 'upstream/develop' into hide-sharer

This commit is contained in:
Michael 2020-09-26 18:05:15 +00:00
commit 4a40a40ed1
4 changed files with 571 additions and 538 deletions

View file

@ -117,11 +117,11 @@ class Community extends BaseModule
'$title' => DI::l10n()->t('Accounts'),
'$content' => self::$content,
'$accounttype' => $parameters['accounttype'],
'$all' => DI::l10n()->t('All Accounts'),
'$person' => DI::l10n()->t('Personal Accounts'),
'$organisation' => DI::l10n()->t('Organisation Accounts'),
'$news' => DI::l10n()->t('News Accounts'),
'$community' => DI::l10n()->t('Communities'),
'$all' => DI::l10n()->t('All'),
'$person' => DI::l10n()->t('Persons'),
'$organisation' => DI::l10n()->t('Organisations'),
'$news' => DI::l10n()->t('News'),
'$community' => DI::l10n()->t('Forums'),
]);
if (local_user() && DI::config()->get('system', 'community_no_sharer')) {