Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-24 11:10:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into refactoring-of-app-class

Browse source
This commit is contained in:
Art4 2024-11-16 19:29:56 +00:00
commit a24a65de2f
561 changed files with 64963 additions and 61342 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Module/Moderation/Blocklist/Server/Add.php
View file

@ -99,7 +99,7 @@ class Add extends BaseModeration
array_walk($gservers, function (array &$gserver) {
$gserver['domain'] = (new Uri($gserver['url']))->getHost();
$gserver['network_icon'] = ContactSelector::networkToIcon($gserver['network']);
$gserver['network_svg'] = ContactSelector::networkToSVG($gserver['network']);
$gserver['network_name'] = ContactSelector::networkToName($gserver['network']);
});

2
src/Module/Moderation/Item/Source.php
View file

@ -79,7 +79,7 @@ class Source extends BaseModeration
'urllbl' => $this->t('URL'),
'mentionlbl' => $this->t('Mention'),
'implicitlbl' => $this->t('Implicit Mention'),
'error' => $this->t('Error'),
'error' => $this->tt('Error','Errors', 1),
'notfound' => $this->t('Item not found'),
'nosource' => $this->t('No source recorded'),
'noconfig' => !$this->config->get('debug', 'store_source') ? $this->t('Please make sure the <code>debug.store_source</code> config key is set in <code>config/local.config.php</code> for future items to have sources.') : '',