Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/settings/js/vue-settings-personal-info.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion apps/settings/js/vue-settings-personal-info.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion apps/settings/src/constants/AccountPropertyConstants.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export const ACCOUNT_PROPERTY_ENUM = Object.freeze({
export const ACCOUNT_PROPERTY_READABLE_ENUM = Object.freeze({
ADDRESS: t('settings', 'Address'),
AVATAR: t('settings', 'Avatar'),
BIOGRAPHY: t('settings', 'About'),
BIOGRAPHY: t('settings', 'Biography'),
DISPLAYNAME: t('settings', 'Full name'),
EMAIL_COLLECTION: t('settings', 'Additional email'),
EMAIL: t('settings', 'Email'),
Expand Down
4 changes: 2 additions & 2 deletions core/js/dist/profile.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion core/js/dist/profile.js.map

Large diffs are not rendered by default.

14 changes: 10 additions & 4 deletions core/src/views/Profile.vue
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,8 @@
title=""
fill-color="var(--color-text-maxcontrast)"
:size="60" />
<h3>{{ emptyProfileMessage }}</h3>
<p>{{ t('core', 'The headline and about sections will show up here') }}</p>
<h3>{{ emptyProfileHeading }}</h3>
<p>{{ emptyProfileMessage }}</p>
</div>
</template>
</div>
Expand Down Expand Up @@ -256,10 +256,16 @@ export default {
return getComputedStyle(document.body).getPropertyValue('--color-main-background').trim()
},

emptyProfileHeading() {
return this.isCurrentUser
? t('core', 'You haven\'t added a headline or biography yet')
: t('core', '{user} hasn\'t added a headline or biography yet', { user: (this.displayname || this.userId) })
},

emptyProfileMessage() {
return this.isCurrentUser
? t('core', 'You haven\'t added any info yet')
: t('core', '{user} hasn\'t added any info yet', { user: (this.displayname || this.userId) })
? t('core', 'Your added info will show up here')
: t('core', 'Added info of {user} will show up here', { user: (this.displayname || this.userId) })
},
},

Expand Down
2 changes: 1 addition & 1 deletion lib/private/Profile/ProfileManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ public function getProfileConfigWithMetadata(IUser $targetUser, ?IUser $visiting
],
IAccountManager::PROPERTY_BIOGRAPHY => [
'appId' => self::CORE_APP_ID,
'displayId' => $this->l10nFactory->get('lib')->t('About'),
'displayId' => $this->l10nFactory->get('lib')->t('Biography'),
],
IAccountManager::PROPERTY_DISPLAYNAME => [
'appId' => self::CORE_APP_ID,
Expand Down