Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-20 18:30:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Replace references to profile.name by user.username

Browse source
This commit is contained in:
Hypolite Petovan 2023-08-11 01:05:02 +02:00
parent 7e971a2ec6
commit e31d90eadb
7 changed files with 19 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Module/Settings/Account.php
View file

@ -573,7 +573,7 @@ class Account extends BaseSettings
'$delete_openid' => ['delete_openid', DI::l10n()->t('Delete OpenID URL'), false, ''],
'$h_basic' => DI::l10n()->t('Basic Settings'),
'$username' => ['username', DI::l10n()->t('Full Name:'), $username, '', false, 'autocomplete="off"'],
'$username' => ['username', DI::l10n()->t('Display name:'), $username, '', false, 'autocomplete="off"'],
'$email' => ['email', DI::l10n()->t('Email Address:'), $email, '', '', 'autocomplete="off"', 'email'],
'$timezone' => ['timezone_select', DI::l10n()->t('Your Timezone:'), Temporal::getTimezoneSelect($timezone), ''],
'$language' => ['language', DI::l10n()->t('Your Language:'), $language, DI::l10n()->t('Set the language we use to show you friendica interface and to send you emails'), $lang_choices],

9
src/Module/Settings/Profile/Index.php
View file

@ -111,8 +111,8 @@ class Index extends BaseSettings
}
}
$name = trim($request['name'] ?? '');
if (!$name) {
$username = trim($request['username'] ?? '');
if (!$username) {
$this->systemMessages->addNotice($this->t('Display Name is required.'));
return;
}
@ -141,9 +141,10 @@ class Index extends BaseSettings
$this->profileFieldRepo->saveCollectionForUser($this->session->getLocalUserId(), $profileFieldsNew);
User::update(['username' => $username], $this->session->getLocalUserId());
$result = Profile::update(
[
'name' => $name,
'about' => $about,
'dob' => $dob,
'address' => $address,
@ -279,7 +280,7 @@ class Index extends BaseSettings
'$profpiclink' => '/profile/' . $owner['nickname'] . '/photos',
'$nickname' => $owner['nickname'],
'$name' => ['name', $this->t('Display name:'), $owner['name']],
'$username' => ['username', $this->t('Display name:'), $owner['name']],
'$about' => ['about', $this->t('Description:'), $owner['about']],
'$dob' => Temporal::getDateofBirthField($owner['dob'], $owner['timezone']),
'$address' => ['address', $this->t('Street Address:'), $owner['address']],