-
Notifications
You must be signed in to change notification settings - Fork 183
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into feat/ui-docker-container-builds
- Loading branch information
Showing
17 changed files
with
184 additions
and
47 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 13 additions & 0 deletions
13
orcid-core/src/main/resources/i18n/papi_rate_limit_email_en.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| papi.rate.limit.subject=[ORCID-API] WARNING! You have exceeded the daily Public API Usage Limit - ({0}) | ||
| papi.rate.limit.important.msg=This is an important message to let you know that you have exceeded your | ||
| papi.rate.limit.daily.usage.limit=daily Public API usage limit | ||
| papi.rate.limit.your.integration=with your integration: | ||
| papi.rate.limit.client.name=Client Name: | ||
| papi.rate.limit.client.id=Client ID: | ||
| papi.rate.limit.please.remember=Please remember that the ORCID Public API is free for non-commercial use by individuals as stated in the | ||
| papi.rate.limit.public.api.terms=Public APIs Terms of Service | ||
| papi.rate.limit.by.non.commercial=By "non-commercial" we mean that you may not charge any re-use fees for the Public API, and you may not make use of the Public API in connection with any revenue-generating product or service. | ||
| papi.rate.limit.based.on.your=Based on your API usage, we highly recommend you consider becoming an ORCID member for access to our | ||
| papi.rate.limit.member.api=Member API | ||
| papi.rate.limit.not.only=Not only will it allow you to access a higher Rate Limits and an unrestricted Usage Quota, but you will be able to access Trusted Party data in ORCID records and contribute data to ORCID records from your institutional systems | ||
| papi.rate.limit.to.minimize=To minimize any disruption to your ORCID integration in the future, we would recommend that you reach out to our Engagement Team by replying to this email to discuss our ORCID membership options. |
13 changes: 13 additions & 0 deletions
13
orcid-core/src/main/resources/i18n/papi_rate_limit_email_lr.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| papi.rate.limit.subject=LR | ||
| papi.rate.limit.important.msg=LR | ||
| papi.rate.limit.daily.usage.limit=LR | ||
| papi.rate.limit.your.integration=LR | ||
| papi.rate.limit.client.name=LR | ||
| papi.rate.limit.client.id=LR | ||
| papi.rate.limit.please.remember=LR | ||
| papi.rate.limit.public.api.terms=LR | ||
| papi.rate.limit.by.non.commercial=LR | ||
| papi.rate.limit.based.on.your=LR | ||
| papi.rate.limit.member.api=LR | ||
| papi.rate.limit.not.only=LR | ||
| papi.rate.limit.to.minimize=LR |
13 changes: 13 additions & 0 deletions
13
orcid-core/src/main/resources/i18n/papi_rate_limit_email_rl.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| papi.rate.limit.subject=RL | ||
| papi.rate.limit.important.msg=RL | ||
| papi.rate.limit.daily.usage.limit=RL | ||
| papi.rate.limit.your.integration=RL | ||
| papi.rate.limit.client.name=RL | ||
| papi.rate.limit.client.id=RL | ||
| papi.rate.limit.please.remember=RL | ||
| papi.rate.limit.public.api.terms=RL | ||
| papi.rate.limit.by.non.commercial=RL | ||
| papi.rate.limit.based.on.your=RL | ||
| papi.rate.limit.member.api=RL | ||
| papi.rate.limit.not.only=RL | ||
| papi.rate.limit.to.minimize=RL |
13 changes: 13 additions & 0 deletions
13
orcid-core/src/main/resources/i18n/papi_rate_limit_email_xx.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| papi.rate.limit.subject=XX | ||
| papi.rate.limit.important.msg=XX | ||
| papi.rate.limit.daily.usage.limit=XX | ||
| papi.rate.limit.your.integration=XX | ||
| papi.rate.limit.client.name=XX | ||
| papi.rate.limit.client.id=XX | ||
| papi.rate.limit.please.remember=XX | ||
| papi.rate.limit.public.api.terms=XX | ||
| papi.rate.limit.by.non.commercial=XX | ||
| papi.rate.limit.based.on.your=XX | ||
| papi.rate.limit.member.api=XX | ||
| papi.rate.limit.not.only=XX | ||
| papi.rate.limit.to.minimize=XX |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
14 changes: 7 additions & 7 deletions
14
orcid-core/src/main/resources/org/orcid/core/template/papi_rate_limit_email.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,15 @@ | ||
| <#import "email_macros.ftl" as emailMacros /> | ||
| Dear ${emailName}, | ||
| <@emailMacros.msg "email.common.dear" /><@emailMacros.space />${emailName}, | ||
|
|
||
| This is an important message to let you know that you have exceeded your daily Public API usage limit with your integration (https://info.orcid.org/ufaqs/what-are-the-api-limits/): | ||
| <@emailMacros.msg "papi.rate.limit.important.msg" /><@emailMacros.space /><@emailMacros.msg "papi.rate.limit.daily.usage.limit" /><@emailMacros.space /><@emailMacros.msg "papi.rate.limit.your.integration" /><@emailMacros.space />(https://info.orcid.org/ufaqs/what-are-the-api-limits/): | ||
|
|
||
| Client Name: ${clientName} | ||
| Client ID: ${clientId} | ||
| <@emailMacros.msg "papi.rate.limit.client.name" /><@emailMacros.space />${clientName} | ||
| <@emailMacros.msg "papi.rate.limit.client.id" /><@emailMacros.space />${clientId} | ||
|
|
||
| Please remember that the ORCID Public API is free for non-commercial use by individuals as stated in the Public APIs Terms of Service (https://info.orcid.org/public-client-terms-of-service). By "non-commercial" we mean that you may not charge any re-use fees for the Public API, and you may not make use of the Public API in connection with any revenue-generating product or service. | ||
| <@emailMacros.msg "papi.rate.limit.please.remember" /><@emailMacros.space /><@emailMacros.msg "papi.rate.limit.public.api.terms" /><@emailMacros.space />(https://info.orcid.org/public-client-terms-of-service).<@emailMacros.space /><@emailMacros.msg "papi.rate.limit.by.non.commercial" /> | ||
|
|
||
| Based on your API usage, we highly recommend you consider becoming an ORCID member for access to our Member API (https://info.orcid.org/what-is-orcid/services/member-api/). Not only will it allow you to access a higher Rate Limits and an unrestricted Usage Quota, but you will be able to access Trusted Party data in ORCID records and contribute data to ORCID records from your institutional systems. | ||
| <@emailMacros.msg "papi.rate.limit.based.on.your" /><@emailMacros.space /><@emailMacros.msg "papi.rate.limit.member.api" /><@emailMacros.space />(https://info.orcid.org/what-is-orcid/services/member-api/).<@emailMacros.space /><@emailMacros.msg "papi.rate.limit.not.only" /> | ||
|
|
||
| To minimize any disruption to your ORCID integration in the future, we would recommend that you reach out to our Engagement Team by replying to this email to discuss our ORCID membership options. | ||
| <@emailMacros.msg "papi.rate.limit.to.minimize" /> | ||
|
|
||
| <#include "email_footer.ftl"/> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.