diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-05-19 07:04:36 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-05-19 07:04:36 -0400 |
| commit | 062cb7753981f9f2a3e52d1322c81fe03f08747b (patch) | |
| tree | f7d869cf2652c8b4cb8189e9e59bd2291e386ba7 /Zotlabs/Module/Settings.php | |
| parent | b55e2776ccc72be172cdf9a6d29e35716a592708 (diff) | |
| parent | 50d1d06b0324737ca6dc7dab43e42217ee9381b4 (diff) | |
| download | volse-hubzilla-062cb7753981f9f2a3e52d1322c81fe03f08747b.tar.gz volse-hubzilla-062cb7753981f9f2a3e52d1322c81fe03f08747b.tar.bz2 volse-hubzilla-062cb7753981f9f2a3e52d1322c81fe03f08747b.zip | |
Merge remote-tracking branch 'upstream/dev' into plugin-repo-ui
Diffstat (limited to 'Zotlabs/Module/Settings.php')
| -rw-r--r-- | Zotlabs/Module/Settings.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Zotlabs/Module/Settings.php b/Zotlabs/Module/Settings.php index a6293e842..f588e2824 100644 --- a/Zotlabs/Module/Settings.php +++ b/Zotlabs/Module/Settings.php @@ -1062,11 +1062,11 @@ class Settings extends \Zotlabs\Web\Controller { '$lbl_p2macro' => t('Advanced Privacy Settings'), - '$expire' => array('expire',t('Expire other channel content after this many days'),$expire,sprintf( t('0 or blank to use the website limit. The website expires after %d days.'),intval($sys_expire))), + '$expire' => array('expire',t('Expire other channel content after this many days'),$expire, t('0 or blank to use the website limit.') . ' ' . ((intval($sys_expire)) ? sprintf( t('This website expires after %d days.'),intval($sys_expire)) : t('This website does not expire imported content.')) . ' ' . t('The website limit takes precedence if lower than your limit.')), '$maxreq' => array('maxreq', t('Maximum Friend Requests/Day:'), intval($channel['channel_max_friend_req']) , t('May reduce spam activity')), - '$permissions' => t('Default Post Permissions'), + '$permissions' => t('Default Post and Publish Permissions'), '$permdesc' => t("\x28click to open/close\x29"), - '$aclselect' => populate_acl($perm_defaults, false, \PermissionDescription::fromDescription(t('Use my default audience setting for the type of post'))), + '$aclselect' => populate_acl($perm_defaults, false, \PermissionDescription::fromDescription(t('Use my default audience setting for the type of object published'))), '$suggestme' => $suggestme, '$group_select' => $group_select, '$role' => array('permissions_role' , t('Channel permissions category:'), $permissions_role, '', get_roles()), |