-
Notifications
You must be signed in to change notification settings - Fork 452
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.
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
pkp/pkp-lib#10792 update ORCiD branding #10829
Conversation
fd6e838
to
8a4d04a
Compare
8a4d04a
to
efc7e5a
Compare
@@ -24,8 +24,8 @@ | |||
<span class="date_start">{translate key="common.fromUntil" from=$mastheadUser['dateStart'] until=""}</span> | |||
<span class="name"> | |||
{$mastheadUser['user']->getFullName()|escape} | |||
{if $mastheadUser['user']->getData('orcid') && $mastheadUser['user']->getData('orcidAccessToken')} | |||
<span class="orcid"> | |||
{if $mastheadUser['user']->getData('orcid') && $mastheadUser['user']->getData('orcidAccessToken') && $mastheadUser['user']->hasVerifiedOrcid()} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we should remove the check for the orcidAccessToken
as the addition of hasVerifiedOrcid
covers this better.
@@ -30,7 +30,7 @@ | |||
</span> | |||
<span class="name"> | |||
{$mastheadUser['user']->getFullName()|escape} | |||
{if $mastheadUser['user']->getData('orcid') && $mastheadUser['user']->getData('orcidAccessToken')} | |||
{if $mastheadUser['user']->getData('orcid') && $mastheadUser['user']->getData('orcidAccessToken') && $mastheadUser['user']->hasVerifiedOrcid()} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we should remove the check for the orcidAccessToken
as the addition of hasVerifiedOrcid
covers this better.
classes/identity/Identity.php
Outdated
return null; | ||
} | ||
|
||
return $this->hasVerifiedOrcid() ? $this->getOrcid() : $this->getOrcid() . ' (' . __('orcid.unauthenticated') . ')'; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't really have a strong opinion on it, but did you consider having the parenthesis as part of the locale string instead of direct formatting here? I don't know if there would be any circumstances where other languages would have issues with this formatting, but just wanted to throw it out there.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Don't quite remember why I decided to format it in PHP, but I've found existing strings with parenthesis in the locale files so I've moved these to the locale string.
b27797f
to
e28dd00
Compare
e28dd00
to
696128d
Compare
For #10792