diff options
| -rw-r--r-- | apps/files/lib/helper.php | 2 | ||||
| -rw-r--r-- | settings/ajax/changedisplayname.php | 4 | ||||
| -rw-r--r-- | settings/templates/personal.php | 2 | ||||
| -rw-r--r-- | settings/templates/users.php | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/apps/files/lib/helper.php b/apps/files/lib/helper.php index 7692dd67574..eaff28178ea 100644 --- a/apps/files/lib/helper.php +++ b/apps/files/lib/helper.php @@ -30,7 +30,7 @@ class Helper if ($sid[0] === 'shared') { return \OC_Helper::mimetypeIcon('dir-shared'); } - if ($sid[0] !== 'local') { + if ($sid[0] !== 'local' and $sid[0] !== 'home') { return \OC_Helper::mimetypeIcon('dir-external'); } } diff --git a/settings/ajax/changedisplayname.php b/settings/ajax/changedisplayname.php index 4bb41fa3d3b..ef23826e50b 100644 --- a/settings/ajax/changedisplayname.php +++ b/settings/ajax/changedisplayname.php @@ -28,8 +28,8 @@ if(is_null($userstatus)) { // Return Success story if( OC_User::setDisplayName( $username, $displayName )) { - OC_JSON::success(array("data" => array( "message" => $l->t('Your display name has been changed.'), "username" => $username, 'displayName' => $displayName ))); + OC_JSON::success(array("data" => array( "message" => $l->t('Your full name has been changed.'), "username" => $username, 'displayName' => $displayName ))); } else{ - OC_JSON::error(array("data" => array( "message" => $l->t("Unable to change display name"), 'displayName' => OC_User::getDisplayName($username) ))); + OC_JSON::error(array("data" => array( "message" => $l->t("Unable to change full name"), 'displayName' => OC_User::getDisplayName($username) ))); } diff --git a/settings/templates/personal.php b/settings/templates/personal.php index 6c758e659a8..9d21e18e73c 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -55,7 +55,7 @@ if($_['displayNameChangeSupported']) { ?> <form id="displaynameform"> <fieldset class="personalblock"> - <h2><?php echo $l->t('Display Name');?></h2> + <h2><?php echo $l->t('Full Name');?></h2> <input type="text" id="displayName" name="displayName" value="<?php p($_['displayName'])?>" /> <span class="msg"></span> <input type="hidden" id="oldDisplayName" name="oldDisplayName" value="<?php p($_['displayName'])?>" /> diff --git a/settings/templates/users.php b/settings/templates/users.php index f9d4f6ada5e..aabda0fac2f 100644 --- a/settings/templates/users.php +++ b/settings/templates/users.php @@ -85,7 +85,7 @@ $_['subadmingroups'] = array_flip($items); <th id='headerAvatar'></th> <?php endif; ?> <th id='headerName'><?php p($l->t('Username'))?></th> - <th id="headerDisplayName"><?php p($l->t( 'Display Name' )); ?></th> + <th id="headerDisplayName"><?php p($l->t( 'Full Name' )); ?></th> <th id="headerPassword"><?php p($l->t( 'Password' )); ?></th> <th id="headerGroups"><?php p($l->t( 'Groups' )); ?></th> <?php if(is_array($_['subadmins']) || $_['subadmins']): ?> @@ -105,7 +105,7 @@ $_['subadmingroups'] = array_flip($items); <td class="name"><?php p($user["name"]); ?></td> <td class="displayName"><span><?php p($user["displayName"]); ?></span> <img class="svg action" src="<?php p(image_path('core', 'actions/rename.svg'))?>" - alt="<?php p($l->t("change display name"))?>" title="<?php p($l->t("change display name"))?>"/> + alt="<?php p($l->t("change full name"))?>" title="<?php p($l->t("change full name"))?>"/> </td> <td class="password"><span>●●●●●●●</span> <img class="svg action" src="<?php print_unescaped(image_path('core', 'actions/rename.svg'))?>" |