Skip to content

Commit 32e643b

Browse files
authored
Merge branch 'main' into lmendoza/PD-0000-oauth-breaks-when-affiliationgroups-endpoint-has-issues
2 parents ef0102e + a1422b8 commit 32e643b

7 files changed

Lines changed: 4725 additions & 729 deletions

File tree

CHANGELOG.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
## v2.136.2 - 2026-06-24
2+
3+
[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.136.1...v2.136.2)
4+
5+
## v2.136.1 - 2026-06-24
6+
7+
[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.136.0...v2.136.1)
8+
9+
## v2.136.0 - 2026-06-23
10+
11+
[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.135.14...v2.136.0)
12+
13+
## v2.135.14 - 2026-06-23
14+
15+
[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.135.13...v2.135.14)
16+
17+
- [#2853](https://github.com/ORCID/orcid-angular/pull/2853): Transifex: update translations
18+
119
## v2.135.13 - 2026-06-18
220

321
[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.135.12...v2.135.13)

src/assets/print-view/fetch-orcid.js

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ function renderPersonalInfoFromJson(recordJson, container) {
388388

389389
const countries = jsonList(person?.addresses?.address)
390390
.map((a) => {
391-
return jsonText(a?.country)
391+
return localizedCountryName(jsonText(a?.country))
392392
})
393393
.filter(Boolean)
394394

@@ -445,9 +445,10 @@ function otherIdsTextNode(label, value, url) {
445445
wrapper.appendChild(prefix)
446446
}
447447

448+
const safeUrl = sanitizeUrl(url)
448449
const valueAsUrl = sanitizeUrl(value)
449-
if (valueAsUrl) {
450-
// If the value itself is a URL, render it as a link and ignore the `url` parameter
450+
if (safeUrl && valueAsUrl) {
451+
// If both are provided and value is a URL, render value as the link
451452
wrapper.appendChild(document.createTextNode(' ('))
452453
const a = document.createElement('a')
453454
a.href = valueAsUrl
@@ -457,10 +458,10 @@ function otherIdsTextNode(label, value, url) {
457458
wrapper.appendChild(a)
458459
wrapper.appendChild(document.createTextNode(')'))
459460
} else {
460-
// Otherwise, keep the existing behavior: render value as text,
461+
// Otherwise, render value as text,
462+
if (value) wrapper.appendChild(document.createTextNode(value))
463+
461464
// and optionally append a (url) link if provided and safe
462-
wrapper.appendChild(document.createTextNode(value))
463-
const safeUrl = sanitizeUrl(url)
464465
if (safeUrl) {
465466
wrapper.appendChild(document.createTextNode(' ('))
466467
const a = document.createElement('a')
@@ -574,9 +575,7 @@ function composeActivityEntryFromJson(entry, opts = {}) {
574575
idRel && idRel.toLowerCase() !== 'self'
575576
? `${localizedRel} ${idType}`.trim()
576577
: idType || STRINGS.identifier
577-
wrapper.appendChild(
578-
otherIdsTextNode(label, idValue || idUrl || '', idUrl)
579-
)
578+
wrapper.appendChild(otherIdsTextNode(label, idValue, idUrl))
580579
})
581580
}
582581

0 commit comments

Comments
 (0)