mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5716 from owncloud/full-name 

change 'Display Name' to more understandable 'Full Name', fix #5612
This commit is contained in:
Vincent Petry 2013-11-06 05:25:13 -08:00
parent 3e5a5567eb d62b683c6a
commit 6e47828b45
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
settings/ajax/changedisplayname.php
View File

@ -28,8 +28,8 @@ if(is_null($userstatus)) {
// Return Success story // Return Success story
if( OC_User::setDisplayName( $username, $displayName )) { 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{ 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) )));
} }

2
settings/templates/personal.php
View File

@ -55,7 +55,7 @@ if($_['displayNameChangeSupported']) {
?> ?>
<form id="displaynameform"> <form id="displaynameform">
<fieldset class="personalblock"> <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'])?>" /> <input type="text" id="displayName" name="displayName" value="<?php p($_['displayName'])?>" />
<span class="msg"></span> <span class="msg"></span>
<input type="hidden" id="oldDisplayName" name="oldDisplayName" value="<?php p($_['displayName'])?>" /> <input type="hidden" id="oldDisplayName" name="oldDisplayName" value="<?php p($_['displayName'])?>" />

4
settings/templates/users.php
View File

@ -85,7 +85,7 @@ $_['subadmingroups'] = array_flip($items);
<th id='headerAvatar'></th> <th id='headerAvatar'></th>
<?php endif; ?> <?php endif; ?>
<th id='headerName'><?php p($l->t('Username'))?></th> <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="headerPassword"><?php p($l->t( 'Password' )); ?></th>
<th id="headerGroups"><?php p($l->t( 'Groups' )); ?></th> <th id="headerGroups"><?php p($l->t( 'Groups' )); ?></th>
<?php if(is_array($_['subadmins']) || $_['subadmins']): ?> <?php if(is_array($_['subadmins']) || $_['subadmins']): ?>
@ -105,7 +105,7 @@ $_['subadmingroups'] = array_flip($items);
<td class="name"><?php p($user["name"]); ?></td> <td class="name"><?php p($user["name"]); ?></td>
<td class="displayName"><span><?php p($user["displayName"]); ?></span> <img class="svg action" <td class="displayName"><span><?php p($user["displayName"]); ?></span> <img class="svg action"
src="<?php p(image_path('core', 'actions/rename.svg'))?>" 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>
<td class="password"><span>●●●●●●●</span> <img class="svg action" <td class="password"><span>●●●●●●●</span> <img class="svg action"
src="<?php print_unescaped(image_path('core', 'actions/rename.svg'))?>" src="<?php print_unescaped(image_path('core', 'actions/rename.svg'))?>"