Skip to content
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.

Sign up for GitHub

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

UFAL/Fixed interpolation of dspace.name.short in the email template #828

Merged
merged 1 commit into from
Dec 5, 2024
Merged

UFAL/Fixed interpolation of dspace.name.short in the email template #828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dspace-server-webapp/src/main/java/org/dspace/app/rest/ClarinAutoRegistrationController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public ResponseEntity sendEmail(HttpServletRequest request, HttpServletResponse
String helpDeskEmail = configurationService.getProperty("lr.help.mail", "");
String helpDeskPhoneNum = configurationService.getProperty("lr.help.phone", "");
String dspaceName = configurationService.getProperty("dspace.name", "");
String dspaceNameShort = configurationService.getProperty("dspace.name.short", "");
String dspaceNameShort = configurationService.getProperty("dspace.shortname", "");

if (StringUtils.isEmpty(uiUrl)) {
log.error("Cannot load the `dspace.ui.url` property from the cfg.");
Expand Down
2 changes: 1 addition & 1 deletion ...webapp/src/main/java/org/dspace/app/rest/repository/ClarinUserMetadataRestController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ private void sendEmailWithDownloadLink(Context context, DSpaceObject dso,
String helpDeskEmail = configurationService.getProperty("lr.help.mail", "");
String helpDeskPhoneNum = configurationService.getProperty("lr.help.phone", "");
String dspaceName = configurationService.getProperty("dspace.name", "");
String dspaceNameShort = configurationService.getProperty("dspace.name.short", "");
String dspaceNameShort = configurationService.getProperty("dspace.shortname", "");

if (StringUtils.isEmpty(uiUrl)) {
log.error("Cannot load the `dspace.ui.url` property from the cfg.");
Expand Down
2 changes: 1 addition & 1 deletion dspace/config/clarin-dspace.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#------------------------------------------------------------------#
#---------------------------DSpace---------------------------------#
#------------------------------------------------------------------#
dspace.name.short = DSpace
dspace.shortname = DSpace
dspace.name = CLARIN DSpace

#------------------------------------------------------------------#
Expand Down
4 changes: 2 additions & 2 deletions dspace/config/emails/clarin_download_link_admin
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
##
## See org.dspace.core.Email for information on the format of this file.
##
#set($subject = "${config.get('dspace.name.short')}: New File Download Request (CC)")
#set($subject = "${config.get('dspace.shortname')}: New File Download Request (CC)")

This is an information for administrators and other configured people about a new download request.

Expand All @@ -26,7 +26,7 @@ The file is distributed under specific license:
Extra information filled by the user:
${params[5]}

${config.get('dspace.name.short')} Team
${config.get('dspace.shortname')} Team

_____________________________________
${config.get('dspace.name')},
Expand Down
2 changes: 1 addition & 1 deletion dspace/config/emails/share_submission
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ If you have trouble please contact
${config.get('lr.help.mail')} or call us at ${config.get('lr.help.phone')}


${config.get('dspace.name.short')} Team
${config.get('dspace.shortname')} Team

_____________________________________
${config.get('dspace.name')},
Expand Down
Loading