harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup some text where we said "public" or "visible to anybody on the internet" when that isn't necessarily true.

Browse Source
This commit is contained in:
friendica 2014-08-07 18:22:50 -07:00
parent f412f6a654
commit a7d95108d0
5 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/acl_selectors.php
View File

@ -237,7 +237,7 @@ function populate_acl($defaults = null,$show_jotnets = true) {
$tpl = get_markup_template("acl_selector.tpl"); $tpl = get_markup_template("acl_selector.tpl");
$o = replace_macros($tpl, array( $o = replace_macros($tpl, array(
'$showall'=> t("Visible to everybody"), '$showall'=> t("Visible to your default audience"),
'$show' => t("Show"), '$show' => t("Show"),
'$hide' => t("Don't show"), '$hide' => t("Don't show"),
'$allowcid' => json_encode($allow_cid), '$allowcid' => json_encode($allow_cid),

2
include/items.php
View File

@ -951,7 +951,7 @@ function map_scope($scope,$strip = false) {
function translate_scope($scope) { function translate_scope($scope) {
if(! $scope || $scope === 'public') if(! $scope || $scope === 'public')
return t('Visible to anybody on the internet'); return t('Visible to anybody on the internet.');
if(strpos($scope,'self') === 0) if(strpos($scope,'self') === 0)
return t('Visible to you only.'); return t('Visible to you only.');
if(strpos($scope,'network:') === 0) if(strpos($scope,'network:') === 0)

4
mod/profiles.php
View File

@ -518,6 +518,7 @@ function profiles_content(&$a) {
$o = ''; $o = '';
$channel = $a->get_channel();
if(! local_user()) { if(! local_user()) {
notice( t('Permission denied.') . EOL); notice( t('Permission denied.') . EOL);
@ -634,7 +635,8 @@ function profiles_content(&$a) {
'$baseurl' => $a->get_baseurl(true), '$baseurl' => $a->get_baseurl(true),
'$profile_id' => $r[0]['id'], '$profile_id' => $r[0]['id'],
'$profile_name' => $r[0]['profile_name'], '$profile_name' => $r[0]['profile_name'],
'$default' => (($is_default) ? '<p id="profile-edit-default-desc">' . t('This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet.') . '</p>' : ""), '$is_default' => $is_default,
'$default' => t('This is your default profile.') . EOL . translate_scope(map_scope($channel['channel_r_profile'])),
'$advanced' => $advanced, '$advanced' => $advanced,
'$name' => $r[0]['name'], '$name' => $r[0]['name'],
'$pdesc' => $r[0]['pdesc'], '$pdesc' => $r[0]['pdesc'],

8
view/css/mod_profiles.css
View File

@ -1,8 +1,8 @@
#profile-edit-default-desc { #profile-edit-default-desc {
color: #FF0000; background: none repeat scroll 0 0 orange;
border: 1px solid #FF8888; font-weight: bold;
background-color: #FFEEEE; margin: 10px;
padding: 7px; padding: 20px 5px 10px;
} }
#profile-edit-clone-link-wrapper { #profile-edit-clone-link-wrapper {

4
view/tpl/profile_edit.tpl
View File

@ -1,4 +1,6 @@
{{$default}} {{if $is_default}}
<p id="profile-edit-default-desc">{{$default}}</p>
{{/if}}
<h1>{{$banner}}</h1> <h1>{{$banner}}</h1>