Skip to content

Commit c51a633

Browse files
Camelia-OrcidCamelia-Orcid
authored
${PD-3178} Changed notification text (#7381)
* ${PD-3178} Changed notification text * Removed debugging lines
1 parent fa65b35 commit c51a633

File tree

6 files changed

+34
-8
lines changed

6 files changed

+34
-8
lines changed

‎orcid-core/src/main/resources/i18n/notification_mvp_en.properties‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
notification.mvp.youCanBenefit=You can benefit from automatic updates to your record.
2-
notification.mvp.basedOnYourVerifiedEmail=Based on your verified email domains we have found an ORCID integration for
3-
notification.mvp.connectingWithThisIntegration=Connecting with this integration will allow
2+
notification.mvp.basedOnYourVerifiedEmail=Based on your verified email domain, we have found an ORCID integration for
3+
notification.mvp.ifYouAreAnActiveFaculty=If you are an active faculty or staff member at
4+
notification.mvp.connectingWithThisIntegration=connecting with this integration will allow
45
notification.mvp.toAutomaticallyAdd=to automatically add validated information to your ORCID record. This will save you time and effort when maintaining your record, and help make sure it stays up-to-date.
6+
notification.mvp.ifYouAreNoLongerAffiliated=If you are no longer affiliated with
7+
notification.mvp.pleaseRemove=please remove
8+
notification.mvp.emailAddressFrom=email address from your verified email addresses.
9+
510
notification.mvp.connectWith=Connect with
6-
notification.mvp.connectWithOrcidIntegration=Connect with {0}''s ORCID Integration
11+
notification.mvp.connectWithOrcidIntegration=Connect with {0}''s ORCID Integration

‎orcid-core/src/main/resources/i18n/notification_mvp_lr.properties‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
notification.mvp.youCanBenefit=LR
22
notification.mvp.basedOnYourVerifiedEmail=LR
3+
notification.mvp.ifYouAreAnActiveFaculty=LR
34
notification.mvp.connectingWithThisIntegration=LR
45
notification.mvp.toAutomaticallyAdd=LR
6+
notification.mvp.ifYouAreNoLongerAffiliated=LR
7+
notification.mvp.pleaseRemove=LR
8+
notification.mvp.emailAddressFrom=LR
9+
510
notification.mvp.connectWith=LR
611
notification.mvp.connectWithOrcidIntegration=LR

‎orcid-core/src/main/resources/i18n/notification_mvp_rl.properties‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
notification.mvp.youCanBenefit=RL
22
notification.mvp.basedOnYourVerifiedEmail=RL
3+
notification.mvp.ifYouAreAnActiveFaculty=RL
34
notification.mvp.connectingWithThisIntegration=RL
45
notification.mvp.toAutomaticallyAdd=RL
6+
notification.mvp.ifYouAreNoLongerAffiliated=RL
7+
notification.mvp.pleaseRemove=RL
8+
notification.mvp.emailAddressFrom=RL
9+
510
notification.mvp.connectWith=RL
611
notification.mvp.connectWithOrcidIntegration=RL

‎orcid-core/src/main/resources/i18n/notification_mvp_xx.properties‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
notification.mvp.youCanBenefit=XX
22
notification.mvp.basedOnYourVerifiedEmail=XX
3+
notification.mvp.ifYouAreAnActiveFaculty=XX
34
notification.mvp.connectingWithThisIntegration=XX
45
notification.mvp.toAutomaticallyAdd=XX
6+
notification.mvp.ifYouAreNoLongerAffiliated=XX
7+
notification.mvp.pleaseRemove=XX
8+
notification.mvp.emailAddressFrom=XX
9+
510
notification.mvp.connectWith=XX
611
notification.mvp.connectWithOrcidIntegration=XX

‎orcid-core/src/main/resources/org/orcid/core/template/digest_notification.ftl‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,12 @@ ${'\n'}${emailName}<@emailMacros.space /><@emailMacros.msg "notification.digest.
2929
${notification.notificationSubject}
3030

3131
<@emailMacros.msg "notification.mvp.youCanBenefit" />
32-
<@emailMacros.msg "notification.mvp.basedOnYourVerifiedEmail" /><@emailMacros.space />${memberName}.<@emailMacros.space /><@emailMacros.msg "notification.mvp.connectingWithThisIntegration" /><@emailMacros.space />${memberName}<@emailMacros.space /><@emailMacros.msg "notification.mvp.toAutomaticallyAdd" />
32+
33+
<@emailMacros.msg "notification.mvp.basedOnYourVerifiedEmail" /><@emailMacros.space />${memberName}.<@emailMacros.space /><@emailMacros.msg "notification.mvp.ifYouAreAnActiveFaculty" />${memberName},<@emailMacros.space /><@emailMacros.msg "notification.mvp.connectingWithThisIntegration" /><@emailMacros.space />${memberName}<@emailMacros.space /><@emailMacros.msg "notification.mvp.toAutomaticallyAdd" />
3334
<@emailMacros.msg "notification.mvp.connectWith" /><@emailMacros.space />${memberName}: <@emailMacros.space /> ${memberWebUrl}
35+
36+
<@emailMacros.msg "notification.mvp.ifYouAreNoLongerAffiliated" /><@emailMacros.space />${memberName}<@emailMacros.space /><@emailMacros.msg "notification.mvp.pleaseRemove" /><@emailMacros.space />${memberName}<@emailMacros.space /><@emailMacros.msg "notification.mvp.emailAddressFrom" />
37+
3438
<#else>
3539
<#if notification.notificationIntro??>${notification.notificationIntro}</#if>
3640
${(digestEmail.notificationsBySourceId[sourceId].source.sourceName.content)!sourceId}: <#if notification.notificationSubject??>${notification.notificationSubject} <#if notification.createdDate??>(${notification.createdDate.year?c}-<#if notification.createdDate.month?string?length == 1>0${notification.createdDate.month?c}<#else>${notification.createdDate.month?c}</#if>-<#if notification.createdDate.day?string?length == 1>0${notification.createdDate.day?c}<#else>${notification.createdDate.day?c}</#if>)</#if><#else><@emailMacros.msg "email.digest.requesttoadd" /> <#if notification.createdDate??>(${notification.createdDate.year?c}-<#if notification.createdDate.month?string?length == 1>0${notification.createdDate.month?c}<#else>${notification.createdDate.month?c}</#if>-<#if notification.createdDate.day?string?length == 1>0${notification.createdDate.day?c}<#else>${notification.createdDate.day?c}</#if>)</#if></#if>

‎orcid-core/src/main/resources/org/orcid/core/template/digest_notification_html.ftl‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@
6565
<#assign memberWebUrl = splitValues[1] />
6666
<p><b>${notification.notificationSubject}</b></p>
6767
<p><@emailMacros.msg "notification.mvp.youCanBenefit" /></p>
68-
<p><@emailMacros.msg "notification.mvp.basedOnYourVerifiedEmail" /><@emailMacros.space /><b>${memberName}</b>.<@emailMacros.space /><@emailMacros.msg "notification.mvp.connectingWithThisIntegration" /><@emailMacros.space />${memberName}<@emailMacros.space /><@emailMacros.msg "notification.mvp.toAutomaticallyAdd" />
68+
<p>
69+
<@emailMacros.msg "notification.mvp.basedOnYourVerifiedEmail" /><@emailMacros.space /><b>${memberName}</b>.<@emailMacros.space /><@emailMacros.msg "notification.mvp.ifYouAreAnActiveFaculty" /><b>${memberName}</b>,<@emailMacros.space /><@emailMacros.msg "notification.mvp.connectingWithThisIntegration" /><@emailMacros.space /><b>${memberName}</b><@emailMacros.space /><@emailMacros.msg "notification.mvp.toAutomaticallyAdd" />
6970
</p>
7071
<p>
7172
<a href="${memberWebUrl}"
@@ -92,19 +93,20 @@
9293
user-select: none;
9394
border: transparent;">
9495
<span style="text-transform: uppercase;">
95-
<@emailMacros.msg "notification.mvp.connectWith" /><@emailMacros.space />${memberName}
96+
<@emailMacros.msg "notification.mvp.connectWith" /><@emailMacros.space /><b>${memberName}</b>
9697
</span>
9798
</button>
9899
</a>
99-
<p/>
100-
<br>
100+
</p>
101101
<p style="word-break: break-word">
102102
<@emailMacros.msg "notification.digest.cantClick" />
103103
<a href="${memberWebUrl}"
104104
target="orcid.blank"
105105
style="text-decoration: underline;color: #085c77;display: inline-block;"
106106
>${memberWebUrl}</a>
107107
</p>
108+
109+
<p><@emailMacros.msg "notification.mvp.ifYouAreNoLongerAffiliated" /><@emailMacros.space /><b>${memberName}</b><@emailMacros.space /><@emailMacros.msg "notification.mvp.pleaseRemove" /><@emailMacros.space /><b>${memberName}</b><@emailMacros.space /><@emailMacros.msg "notification.mvp.emailAddressFrom" /></p>
108110
<#else>
109111
<#if notification.notificationIntro??><p>${notification.notificationIntro}</p></#if>
110112
<p><#if notification.notificationSubject??>${notification.notificationSubject} <#if notification.createdDate??>(${notification.createdDate.year?c}-<#if notification.createdDate.month?string?length == 1>0${notification.createdDate.month?c}<#else>${notification.createdDate.month?c}</#if>-<#if notification.createdDate.day?string?length == 1>0${notification.createdDate.day?c}<#else>${notification.createdDate.day?c}</#if>)</#if><#else><@emailMacros.msg "email.digest.requesttoadd" /> <#if notification.createdDate??>(${notification.createdDate.year?c}-<#if notification.createdDate.month?string?length == 1>0${notification.createdDate.month?c}<#else>${notification.createdDate.month?c}</#if>-<#if notification.createdDate.day?string?length == 1>0${notification.createdDate.day?c}<#else>${notification.createdDate.day?c}</#if>)</#if></#if></p>

0 commit comments

Comments
 (0)