DOI / Notification / More friendly message.

Author: fxprunayre

doi/src/main/java/org/fao/geonet/doi/client/DoiManager.java

@@ -606,11 +606,18 @@ private void notifyByMail(ServiceContext context, AbstractMetadata metadata, Str
                                         feedbackLocale,
                                         new LocalizedEmailParameter(LocalizedEmailParameter.ParameterType.RAW_VALUE, 1, sm.getSiteName())
                                     );
-
                                     emailMessageComponent.addParameters(
                                         feedbackLocale,
                                         new LocalizedEmailParameter(LocalizedEmailParameter.ParameterType.RAW_VALUE, 1, doiUrl)
                                     );
+                                    emailMessageComponent.addParameters(
+                                        feedbackLocale,
+                                        new LocalizedEmailParameter(LocalizedEmailParameter.ParameterType.RAW_VALUE, 2, doiUrl)
+                                    );
+                                    emailMessageComponent.addParameters(
+                                        feedbackLocale,
+                                        new LocalizedEmailParameter(LocalizedEmailParameter.ParameterType.RAW_VALUE, 3, sm.getSiteName())
+                                    );
                                 }
 
                                 LocalizedEmail localizedEmail = new LocalizedEmail(true);

web/src/main/webapp/WEB-INF/classes/org/fao/geonet/api/Messages.properties

@@ -263,4 +263,7 @@ audit.revision.field.set=- Field '%s' set to '%s'
 audit.revision.field.unset=- Field '%s' unset
 audit.revision.field.updated=- Field '%s' changed from '%s' to '%s'
 doi_publication_subject=%s / DOI publication for the metadata record '{{index:resourceTitleObject}}'
-doi_publication_message=The following metadata record <a href="{{link}}">{{index:resourceTitleObject}}</a> has been published with the DOI: %s
+doi_publication_message=Dear User,\n\
+The following metadata record {{index:resourceTitleObject}} has been published with the DOI: <a href="%s">%s</a>.\n\
+Yours sincerely,\n\
+The %s team.

web/src/main/webapp/WEB-INF/classes/org/fao/geonet/api/Messages_dut.properties

@@ -263,5 +263,7 @@ audit.revision.field.set=- Veld '%s' ingesteld op '%s'
 audit.revision.field.unset=- Veld '%s' gewist
 audit.revision.field.updated=- Veld '%s' gewijzigd van '%s' naar '%s'
 doi_publication_subject=%s / DOI publication for the metadata record '{{index:resourceTitleObject}}'
-doi_publication_message=The following metadata record <a href="{{link}}">{{index:resourceTitleObject}}</a> has been published with the DOI: %s
-
+doi_publication_message=Dear User,\n\
+The following metadata record {{index:resourceTitleObject}} has been published with the DOI: <a href="%s">%s</a>.\n\
+Yours sincerely,\n\
+The %s team.

web/src/main/webapp/WEB-INF/classes/org/fao/geonet/api/Messages_fre.properties

@@ -256,5 +256,8 @@ audit.revision.field.set=- Champ '%s' d\u00E9fini \u00E0 '%s'
 audit.revision.field.unset=- Champ '%s' d\u00E9sactiv\u00E9
 audit.revision.field.updated=- Champ '%s' modifi\u00E9 de '%s' \u00E0 '%s'
 doi_publication_subject=%s / Publication du DOI pour '{{index:resourceTitleObject}}'
-doi_publication_message=La fiche <a href="{{link}}">{{index:resourceTitleObject}}</a> a \u00E9t\u00E9 publi\u00E9e avec le DOI : %s
-
+doi_publication_message=Cher utilisateur,\n\
+La fiche {{index:resourceTitleObject}} a \u00E9t\u00E9 publi\u00E9e avec le DOI : %s\n\
+\n\
+Salutations,\n\
+L'\u00E9quipe %s.