Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix/batch-fixes-dec-28 #2126

Merged
merged 4 commits into from
Dec 28, 2023
Merged

fix/batch-fixes-dec-28 #2126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0d72105
fix/batch-fixes-dec-28
Dec 28, 2023
3801f29
Merge branch 'main' into fix/batch-fixes-dec-28
leomendoza123 Dec 28, 2023
0ea16c1
Improve UI, use 7 days default
Dec 28, 2023
8454a21
Merge branch 'fix/batch-fixes-dec-28' of github.com:ORCID/orcid-angul…
Dec 28, 2023
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
7 changes: 6 additions & 1 deletion src/app/core/title-service/title.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,12 @@ export class TitleService {
}

setTitle(title: string) {
if (title) this._titleService.setTitle(title.replace(/-'/g, '−'))
// Use a replacement of the score for arabic titles to avoid the ORCID to be show in reverse
const arabic = /[\u0600-\u06FF]/
if (arabic.test(title)) {
title = title.replace(/-/g, '᭸')
}
this._titleService.setTitle(title)
}

setDisplayName(displayedNameWithId: string) {
Expand Down
2 changes: 0 additions & 2 deletions src/app/layout/user-menu/user-menu.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@
width: 199px;
overflow: hidden;
text-overflow: ellipsis;
text-align: left;
text-align: left;
white-space: initial;
word-break: break-word;
}
Expand Down
11 changes: 10 additions & 1 deletion src/app/link-account/pages/link-account/link-account.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,16 @@
You are signed into
</ng-container>
<b>{{ entityDisplayName }}</b>
<ng-container i18n="@@linking.as"> as </ng-container>
<ng-container
i18n="@@linking.as"
*ngIf="
!signInData.email &&
!signInData.firstName &&
!signInData.lastName
"
>
as
</ng-container>
<b>
{{
signInData.email
Expand Down