Skip to content

Commit 7d4be69

Browse files
authored
Merge branch 'main' into lmendoza/PD-3704
2 parents c740fee + 20f3500 commit 7d4be69

8 files changed

Lines changed: 28 additions & 14 deletions

File tree

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
## v2.126.2 - 2025-12-02
2+
3+
[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.126.1...v2.126.2)
4+
5+
## v2.126.1 - 2025-12-02
6+
7+
[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.126.0...v2.126.1)
8+
19
## v2.126.0 - 2025-12-02
210

311
[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.125.27...v2.126.0)

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ yarn
3636
3- Serve the front-end locally
3737

3838
```
39-
yarn start
39+
yarn start-local
4040
```
4141

4242
## Serve the frond-end locally using other languages

src/app/constants.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ export const ApplicationRoutes = {
101101
register: 'register',
102102
thirdPartySignIn: 'third-party-signin-completed',
103103
account: 'account',
104+
deactivate: 'account/deactivate',
104105
trustedParties: 'trusted-parties',
105106
resetPasswordEmail: 'reset-password-email',
106107
selfService: 'self-service',
@@ -125,6 +126,7 @@ export const ApplicationRoutesLabels = {
125126
[ApplicationRoutes.register]: $localize`:@@share.register:Register - ORCID`,
126127
[ApplicationRoutes.thirdPartySignIn]: $localize`:@@share.signin:Sign in - ORCID`,
127128
[ApplicationRoutes.account]: $localize`:@@share.account:Account settings - ORCID`,
129+
[ApplicationRoutes.deactivate]: $localize`:@@share.deactivateAccount:Deactivate account - ORCID`,
128130
[ApplicationRoutes.trustedParties]: $localize`:@@share.trustedParties:Trusted parties - ORCID `,
129131
[ApplicationRoutes.resetPasswordEmail]: $localize`:@@share.resetPasswordEmail:Reset password - ORCID`,
130132
[ApplicationRoutes.selfService]: $localize`:@@share.selfService:Self Service - ORCID`,

src/app/core/title-service/title.service.ts

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -35,19 +35,19 @@ export class TitleService {
3535
`${dynamicTitle} ${ApplicationDynamicRoutesLabels.orcidPageTitle}`
3636
)
3737
} else {
38-
Object.keys(ApplicationRoutesLabels).forEach((route) => {
39-
if (event.url.startsWith('/' + route)) {
40-
// MY ORCID
41-
if (dynamicTitle) {
42-
this.setTitle(
43-
`${dynamicTitle} ${ApplicationDynamicRoutesLabels.orcidMyPageTitle}`
44-
)
45-
} else {
46-
// OTHER PAGES
47-
this.setTitle(ApplicationRoutesLabels[route])
48-
}
49-
}
50-
})
38+
const route = Object.keys(ApplicationRoutesLabels).find(
39+
(route) => event.url?.split('?')[0] == '/' + route
40+
)
41+
// MY ORCID
42+
if (dynamicTitle) {
43+
this.setTitle(
44+
`${dynamicTitle} ${ApplicationDynamicRoutesLabels.orcidMyPageTitle}`
45+
)
46+
}
47+
if (route !== null && route !== undefined) {
48+
// OTHER PAGES
49+
this.setTitle(ApplicationRoutesLabels[route])
50+
}
5151
}
5252
})
5353
}

src/locale/properties/shared/shared.en.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -625,6 +625,7 @@ share.account=Account settings - ORCID
625625
share.trustedParties=Trusted parties - ORCID
626626
share.resetPasswordEmail=Reset password - ORCID
627627
share.selfService=Self Service - ORCID
628+
share.deactivateAccount=Deactivate account - ORCID
628629
share.orcidTitle=- ORCID
629630
share.myOrcidTitle=- My ORCID
630631
share.developerTools=Developer tools - ORCID

src/locale/properties/shared/shared.lr.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -710,3 +710,4 @@ shared.searchTermTooLongDesc=LR
710710
shared.issn=LR
711711
shared.issnDescription=LR
712712
shared.invalidIssn=LR
713+
share.deactivateAccount=LR

src/locale/properties/shared/shared.rl.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -706,3 +706,4 @@ shared.searchTermTooLongDesc=RL
706706
shared.issn=RL
707707
shared.issnDescription=RL
708708
shared.invalidIssn=RL
709+
share.deactivateAccount=RL

src/locale/properties/shared/shared.xx.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -706,3 +706,4 @@ shared.searchTermTooLongDesc=X
706706
shared.issn=X
707707
shared.issnDescription=X
708708
shared.invalidIssn=X
709+
share.deactivateAccount=X

0 commit comments

Comments
 (0)