diff options
| author | zotlabs <mike@macgirvin.com> | 2018-07-29 18:00:56 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-07-29 18:00:56 -0700 |
| commit | 32614e4074758d6112993d71169664a3c29e90b2 (patch) | |
| tree | 6de47408110062e1c6a3f18dfaf0dc183c459c9a /Zotlabs | |
| parent | 9dc5a3bfc9152f04b9e39d61e90310d660029108 (diff) | |
| parent | e4a1286aae411023210628d3be306420f7844d22 (diff) | |
| download | volse-hubzilla-32614e4074758d6112993d71169664a3c29e90b2.tar.gz volse-hubzilla-32614e4074758d6112993d71169664a3c29e90b2.tar.bz2 volse-hubzilla-32614e4074758d6112993d71169664a3c29e90b2.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Lib/Apps.php | 6 | ||||
| -rw-r--r-- | Zotlabs/Module/Siteinfo.php | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/Zotlabs/Lib/Apps.php b/Zotlabs/Lib/Apps.php index ddaf8c44d..f7aff1722 100644 --- a/Zotlabs/Lib/Apps.php +++ b/Zotlabs/Lib/Apps.php @@ -332,7 +332,11 @@ class Apps { 'Features' => t('Features'), 'Language' => t('Language'), 'Post' => t('Post'), - 'Profile Photo' => t('Profile Photo') + 'Profile Photo' => t('Profile Photo'), + 'Profile' => t('Profile'), + 'Profiles' => t('Profiles'), + 'Privacy Groups' => t('Privacy Groups'), + 'Notifications' => t('Notifications') ); if(array_key_exists('name',$arr)) { diff --git a/Zotlabs/Module/Siteinfo.php b/Zotlabs/Module/Siteinfo.php index 25276815d..79b94662d 100644 --- a/Zotlabs/Module/Siteinfo.php +++ b/Zotlabs/Module/Siteinfo.php @@ -32,7 +32,7 @@ class Siteinfo extends \Zotlabs\Web\Controller { '$transport_link' => '<a href="https://zotlabs.com">https://zotlabs.com</a>', '$additional_text' => t('Additional federated transport protocols:'), - '$additional_fed' => implode(',',$federated), + '$additional_fed' => implode(', ',array_unique($federated)), '$prj_version' => ((get_config('system','hidden_version_siteinfo')) ? '' : sprintf( t('Version %s'), \Zotlabs\Lib\System::get_project_version())), '$prj_linktxt' => t('Project homepage'), '$prj_srctxt' => t('Developer homepage'), |