+ <#if args.workflowPooled == true>
+ Nieuwe gepoolde taak
+ <#else>
+ Er is een taak aan u toegewezen
+
+
+
+ ${date?datetime?string.full}
+
+
+
+
+
+
Hi,
+
+
+ <#if args.workflowPooled == true>
+ De volgende gepoolde taak is beschikbaar om te worden opgehaald:
+ <#else>
+ De volgende taak is aan u toegewezen:
+
+
+
+
\ No newline at end of file
diff --git a/config/alfresco/templates/invite-email-templates.xml b/config/alfresco/templates/invite-email-templates.xml
index 3c9355d587..89c8719290 100644
--- a/config/alfresco/templates/invite-email-templates.xml
+++ b/config/alfresco/templates/invite-email-templates.xml
@@ -31,7 +31,7 @@
invite-email_fr.html.ftlinvite-email_fr.html.ftl${spaces.templates.email.generate_the_invite_email.description} - ${version.french}
- contentUrl=classpath:alfresco/templates/invite-email-templates/invite-email_fr.html.ftl|mimetype=text/plain|size=1601|encoding=UTF-8
+ contentUrl=classpath:alfresco/templates/invite-email-templates/invite-email.html_fr.ftl|mimetype=text/plain|size=1601|encoding=UTF-8
@@ -47,7 +47,7 @@
invite-email_es.html.ftlinvite-email_es.html.ftl${spaces.templates.email.generate_the_invite_email.description} - ${version.spanish}
- contentUrl=classpath:alfresco/templates/invite-email-templates/invite-email_es.html.ftl|mimetype=text/plain|size=1584|encoding=UTF-8
+ contentUrl=classpath:alfresco/templates/invite-email-templates/invite-email.html_es.ftl|mimetype=text/plain|size=1584|encoding=UTF-8
@@ -63,7 +63,7 @@
invite-email_de.html.ftlinvite-email_de.html.ftl${spaces.templates.email.generate_the_invite_email.description} - ${version.german}
- contentUrl=classpath:alfresco/templates/invite-email-templates/invite-email_de.html.ftl|mimetype=text/plain|size=1583|encoding=UTF-8
+ contentUrl=classpath:alfresco/templates/invite-email-templates/invite-email.html_de.ftl|mimetype=text/plain|size=1583|encoding=UTF-8
@@ -79,7 +79,7 @@
invite-email_it.html.ftlinvite-email_it.html.ftl${spaces.templates.email.generate_the_invite_email.description} - ${version.italian}
- contentUrl=classpath:alfresco/templates/invite-email-templates/invite-email_it.html.ftl|mimetype=text/plain|size=1565|encoding=UTF-8
+ contentUrl=classpath:alfresco/templates/invite-email-templates/invite-email.html_it.ftl|mimetype=text/plain|size=1565|encoding=UTF-8
@@ -95,7 +95,23 @@
invite-email_ja.html.ftlinvite-email_ja.html.ftl${spaces.templates.email.generate_the_invite_email.description} - ${version.japanese}
- contentUrl=classpath:alfresco/templates/invite-email-templates/invite-email_ja.html.ftl|mimetype=text/plain|size=1807|encoding=UTF-8
+ contentUrl=classpath:alfresco/templates/invite-email-templates/invite-email.html_ja.ftl|mimetype=text/plain|size=1807|encoding=UTF-8
+
+
+
+
+
+
+
+
+
+
+
+ true
+ invite-email_nl.html.ftl
+ invite-email_nl.html.ftl
+ ${spaces.templates.email.generate_the_invite_email.description} - ${version.dutch}
+ contentUrl=classpath:alfresco/templates/invite-email-templates/invite-email.html_nl.ftl|mimetype=text/plain|size=1807|encoding=UTF-8
diff --git a/config/alfresco/templates/invite-email-templates/invite-email_de.html.ftl b/config/alfresco/templates/invite-email-templates/invite-email.html_de.ftl
similarity index 100%
rename from config/alfresco/templates/invite-email-templates/invite-email_de.html.ftl
rename to config/alfresco/templates/invite-email-templates/invite-email.html_de.ftl
diff --git a/config/alfresco/templates/invite-email-templates/invite-email_es.html.ftl b/config/alfresco/templates/invite-email-templates/invite-email.html_es.ftl
similarity index 100%
rename from config/alfresco/templates/invite-email-templates/invite-email_es.html.ftl
rename to config/alfresco/templates/invite-email-templates/invite-email.html_es.ftl
diff --git a/config/alfresco/templates/invite-email-templates/invite-email_fr.html.ftl b/config/alfresco/templates/invite-email-templates/invite-email.html_fr.ftl
similarity index 100%
rename from config/alfresco/templates/invite-email-templates/invite-email_fr.html.ftl
rename to config/alfresco/templates/invite-email-templates/invite-email.html_fr.ftl
diff --git a/config/alfresco/templates/invite-email-templates/invite-email_it.html.ftl b/config/alfresco/templates/invite-email-templates/invite-email.html_it.ftl
similarity index 100%
rename from config/alfresco/templates/invite-email-templates/invite-email_it.html.ftl
rename to config/alfresco/templates/invite-email-templates/invite-email.html_it.ftl
diff --git a/config/alfresco/templates/invite-email-templates/invite-email_ja.html.ftl b/config/alfresco/templates/invite-email-templates/invite-email.html_ja.ftl
similarity index 100%
rename from config/alfresco/templates/invite-email-templates/invite-email_ja.html.ftl
rename to config/alfresco/templates/invite-email-templates/invite-email.html_ja.ftl
diff --git a/config/alfresco/templates/invite-email-templates/invite-email.html_nl.ftl b/config/alfresco/templates/invite-email-templates/invite-email.html_nl.ftl
new file mode 100644
index 0000000000..79a755505b
--- /dev/null
+++ b/config/alfresco/templates/invite-email-templates/invite-email.html_nl.ftl
@@ -0,0 +1,109 @@
+
+ <#assign inviterPersonRef=args["inviterPersonRef"]/>
+ <#assign inviterPerson=companyhome.nodeByReference[inviterPersonRef]/>
+ <#assign inviteePersonRef=args["inviteePersonRef"]/>
+ <#assign inviteePerson=companyhome.nodeByReference[inviteePersonRef]/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ U bent uitgenodigd voor de site '${args["siteName"]}'
+
+
+ ${date?datetime?string.full}
+
+
+
+
+
+
Hi ${inviteePerson.properties["cm:firstName"]!""},
+
+
${inviterPerson.properties["cm:firstName"]!""} ${inviterPerson.properties["cm:lastName"]!""}
+ heeft u uitgenodigd voor de site ${args["siteName"]} met de rol van ${args["inviteeSiteRole"]}.
+
+
Klik op deze koppeling om de uitnodiging van ${inviterPerson.properties["cm:firstName"]!""} te accepteren:
+ ${args["acceptLink"]}
+
+ <#if args["inviteeGenPassword"]?exists>
+
Er is een account voor u gemaakt met deze aanmeldingsgegevens:
+ Gebruikersnaam: ${args["inviteeUserName"]}
+ Wachtwoord: ${args["inviteeGenPassword"]}
+
+
+
U wordt geadviseerd het wachtwoord te wijzigen wanneer u zich voor de eerste keer aanmeldt.
+ U kunt dit doen door naar Mijn profiel te gaan en Wachtwoord wijzigen te selecteren.
+
+
+
Klik op deze koppeling als u de uitnodiging van ${inviterPerson.properties["cm:firstName"]!""}, wilt afwijzen:
+ ${args["rejectLink"]}
U wordt geadviseerd het wachtwoord te wijzigen wanneer u zich voor de eerste keer aanmeldt.
+ U kunt dit doen door naar Mijn profiel te gaan en Wachtwoord wijzigen te selecteren.
${person.properties.firstName} <#if person.properties.lastName?exists> ${person.properties.lastName} heeft een nieuw contentobject, ${document.name}, toegevoegd op de ${document.siteShortName!""}-site
+
+
${date?datetime?string.full}
+
+
+
+
+
+
Hallo,
+
+
${person.properties.firstName}
+ <#if person.properties.lastName?exists> ${person.properties.lastName}
+ heeft een nieuw contentobject, ${document.name}, toegevoegd op de ${document.siteShortName!""}-site.
+
+
Klik op deze koppeling om het object te bekijken:
+ ${document.shareUrl}
+
+
Hoogachtend,
+ Alfresco
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/config/alfresco/version.properties b/config/alfresco/version.properties
index 31914a944c..cae3dcda32 100644
--- a/config/alfresco/version.properties
+++ b/config/alfresco/version.properties
@@ -19,4 +19,4 @@ version.build=@build-number@
# Schema number
-version.schema=5023
+version.schema=5024
diff --git a/source/java/org/alfresco/repo/admin/patch/impl/AddDutchEmailTemplatesPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/AddDutchEmailTemplatesPatch.java
new file mode 100644
index 0000000000..c10a49d293
--- /dev/null
+++ b/source/java/org/alfresco/repo/admin/patch/impl/AddDutchEmailTemplatesPatch.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright (C) 2005-2011 Alfresco Software Limited.
+ *
+ * This file is part of Alfresco
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see .
+ */
+package org.alfresco.repo.admin.patch.impl;
+
+import java.util.List;
+
+import org.alfresco.error.AlfrescoRuntimeException;
+import org.alfresco.repo.model.Repository;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.springframework.extensions.surf.util.I18NUtil;
+
+/**
+ * Update workflow notification templates patch
+ *
+ * @author Roy Wetherall
+ */
+public class AddDutchEmailTemplatesPatch extends GenericEMailTemplateUpdatePatch
+{
+ private static final String[] LOCALES = new String[] {"nl"};
+ private static final String[] PATHS = new String[]
+ {
+ "alfresco/templates/activities-email-templates/",
+ "alfresco/bootstrap/notification/",
+ "alfresco/templates/notify_email_templates/",
+ "alfresco/templates/new-user-templates/",
+ "alfresco/templates/invite-email-templates/",
+ "alfresco/templates/following-email-templates/"
+ };
+ private static final String[] BASE_FILES = new String[]
+ {
+ "activities-email.ftl",
+ "wf-email.html.ftl",
+ "notify.htm",
+ "new-user-email.html",
+ "invite-email.html.ftl",
+ "following-email.html.ftl"
+ };
+ private static final String[] XPATHS = new String[]
+ {
+ "/app:company_home/app:dictionary/app:email_templates/cm:activities/cm:activities-email.ftl",
+ "/app:company_home/app:dictionary/app:email_templates/cm:workflownotification/cm:invite-email.html.ftl",
+ "/app:company_home/app:dictionary/app:email_templates/app:notify_email_templates/cm:notify_user_email.html.ftl",
+ "/app:company_home/app:dictionary/app:email_templates/cm:invite/cm:new-user-email.html.ftl",
+ "/app:company_home/app:dictionary/app:email_templates/cm:invite/cm:invite-email.html.ftl",
+ "/app:company_home/app:dictionary/app:email_templates/app:following/cm:following-email.html.ftl"
+ };
+
+ private int currentIndex = 0;
+
+ private Repository repository;
+
+ public void setRepository(Repository repository)
+ {
+ this.repository = repository;
+ }
+
+ @Override
+ protected String getPath()
+ {
+ return PATHS[currentIndex];
+ }
+
+ @Override
+ protected String getBaseFileName()
+ {
+ return BASE_FILES[currentIndex];
+ }
+
+ @Override
+ protected String[] getLocales()
+ {
+ return LOCALES;
+ }
+
+ @Override
+ protected NodeRef getBaseTemplate()
+ {
+ List refs = searchService.selectNodes(
+ repository.getRootHome(),
+ XPATHS[currentIndex],
+ null,
+ namespaceService,
+ false);
+ if (refs.size() != 1)
+ {
+ throw new AlfrescoRuntimeException(I18NUtil.getMessage("patch.addDutchEmailTemplatesPatch.error"));
+ }
+ return refs.get(0);
+ }
+
+ /**
+ * @see org.alfresco.repo.admin.patch.AbstractPatch#applyInternal()
+ */
+ @Override
+ protected String applyInternal() throws Exception
+ {
+ while (currentIndex < BASE_FILES.length)
+ {
+ updateTemplates();
+ currentIndex ++;
+ }
+
+ return I18NUtil.getMessage("patch.addDutchEmailTemplatesPatch.result");
+ }
+}
diff --git a/source/java/org/alfresco/repo/admin/patch/impl/GenericEMailTemplateUpdatePatch.java b/source/java/org/alfresco/repo/admin/patch/impl/GenericEMailTemplateUpdatePatch.java
index 5e54adfd3a..df1e593137 100644
--- a/source/java/org/alfresco/repo/admin/patch/impl/GenericEMailTemplateUpdatePatch.java
+++ b/source/java/org/alfresco/repo/admin/patch/impl/GenericEMailTemplateUpdatePatch.java
@@ -24,45 +24,76 @@ import java.util.List;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.admin.patch.AbstractPatch;
+import org.alfresco.repo.content.MimetypeMap;
import org.alfresco.service.cmr.model.FileFolderService;
import org.alfresco.service.cmr.repository.ContentService;
import org.alfresco.service.cmr.repository.ContentWriter;
import org.alfresco.service.cmr.repository.NodeRef;
/**
+ * Helper generic patch useful when updating email templates.
+ *
* @author Roy Wetherall
*/
public abstract class GenericEMailTemplateUpdatePatch extends AbstractPatch
{
- protected static final String[] LOCALES = new String[] {"de", "es", "fr", "it", "ja"};
-
- protected ContentService contentService;
+ /** Content service */
+ protected ContentService contentService;
+ /** File folder service */
protected FileFolderService fileFolderService;
+ /** Indicates whether to update the base file or not */
+ private boolean updateBaseFile = true;
+
+ /** Indicates whether to create a sibling if it's missing (rather than just update) */
private boolean createSiblingIfMissing = true;
+ /**
+ * @param contentService content service
+ */
public void setContentService(ContentService contentService)
{
this.contentService = contentService;
}
+ /**
+ * @param fileFolderService file folder service
+ */
public void setFileFolderService(FileFolderService fileFolderService)
{
this.fileFolderService = fileFolderService;
}
+ /**
+ * @param createSiblingIfMissing
+ */
public void setCreateSiblingIfMissing(boolean createSiblingIfMissing)
{
this.createSiblingIfMissing = createSiblingIfMissing;
}
+
+ /**
+ * @param updateBaseFile
+ */
+ public void setUpdateBaseFile(boolean updateBaseFile)
+ {
+ this.updateBaseFile = updateBaseFile;
+ }
+ /**
+ *
+ * @throws Exception
+ */
protected void updateTemplates() throws Exception
{
NodeRef baseTemplate = getBaseTemplate();
if (nodeService.exists(baseTemplate) == true)
{
- updateContent(baseTemplate, getPath(), getBaseFileName());
+ if (updateBaseFile == true)
+ {
+ updateContent(baseTemplate, getPath(), getBaseFileName(), false);
+ }
for (String siblingFile : getSiblingFiles())
{
@@ -77,15 +108,12 @@ public abstract class GenericEMailTemplateUpdatePatch extends AbstractPatch
protected abstract String getBaseFileName();
- protected String[] getLocales()
- {
- return LOCALES;
- }
+ protected abstract String[] getLocales();
protected List getSiblingFiles()
{
- List siblingFiles = new ArrayList(LOCALES.length);
- for (String locale : LOCALES)
+ List siblingFiles = new ArrayList(getLocales().length);
+ for (String locale : getLocales())
{
siblingFiles.add(makeSiblingFileName(getBaseFileName(), locale));
}
@@ -111,17 +139,17 @@ public abstract class GenericEMailTemplateUpdatePatch extends AbstractPatch
NodeRef sibling = fileFolderService.searchSimple(parent, fileName);
if (sibling != null)
{
- updateContent(sibling, path, fileName);
+ updateContent(sibling, path, fileName, false);
}
else if (createSiblingIfMissing == true)
{
sibling = fileFolderService.create(parent, fileName, ContentModel.TYPE_CONTENT).getNodeRef();
- updateContent(sibling, path, fileName);
+ updateContent(sibling, path, fileName, true);
}
}
}
- private void updateContent(NodeRef nodeRef, String path, String fileName)
+ private void updateContent(NodeRef nodeRef, String path, String fileName, boolean newFile)
{
// Make versionable
nodeService.addAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE, null);
@@ -131,6 +159,11 @@ public abstract class GenericEMailTemplateUpdatePatch extends AbstractPatch
if (is != null)
{
ContentWriter contentWriter = contentService.getWriter(nodeRef, ContentModel.PROP_CONTENT, true);
+ if (newFile == true)
+ {
+ contentWriter.setMimetype(MimetypeMap.MIMETYPE_TEXT_PLAIN);
+ contentWriter.setEncoding("UTF-8");
+ }
contentWriter.putContent(is);
}
}
diff --git a/source/java/org/alfresco/repo/admin/patch/impl/UpdateFollowingEmailTemplatesPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/UpdateFollowingEmailTemplatesPatch.java
index c6ac0166ec..e47e6614dd 100644
--- a/source/java/org/alfresco/repo/admin/patch/impl/UpdateFollowingEmailTemplatesPatch.java
+++ b/source/java/org/alfresco/repo/admin/patch/impl/UpdateFollowingEmailTemplatesPatch.java
@@ -34,6 +34,8 @@ public class UpdateFollowingEmailTemplatesPatch extends GenericEMailTemplateUpda
{
private Repository repository;
+ protected static final String[] LOCALES = new String[] {"de", "es", "fr", "it", "ja"};
+
private static final String PATH = "alfresco/templates/following-email-templates/";
private static final String BASE_FILE = "following-email.html.ftl";
private static final String XPATH = "/app:company_home/app:dictionary/app:email_templates/app:following/cm:following-email.html.ftl";
@@ -55,6 +57,12 @@ public class UpdateFollowingEmailTemplatesPatch extends GenericEMailTemplateUpda
return BASE_FILE;
}
+ @Override
+ protected String[] getLocales()
+ {
+ return LOCALES;
+ }
+
@Override
protected NodeRef getBaseTemplate()
{
diff --git a/source/java/org/alfresco/repo/admin/patch/impl/UpdateWorkflowNotificationTemplatesPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/UpdateWorkflowNotificationTemplatesPatch.java
index d0a4a42e62..afef4fe681 100644
--- a/source/java/org/alfresco/repo/admin/patch/impl/UpdateWorkflowNotificationTemplatesPatch.java
+++ b/source/java/org/alfresco/repo/admin/patch/impl/UpdateWorkflowNotificationTemplatesPatch.java
@@ -29,6 +29,7 @@ import org.springframework.extensions.surf.util.I18NUtil;
*/
public class UpdateWorkflowNotificationTemplatesPatch extends GenericEMailTemplateUpdatePatch
{
+ private static final String[] LOCALES = new String[] {"de", "es", "fr", "it", "ja"};
private static final String PATH = "alfresco/bootstrap/notification/";
private static final String BASE_FILE = "wf-email.html.ftl";
@@ -44,6 +45,12 @@ public class UpdateWorkflowNotificationTemplatesPatch extends GenericEMailTempla
return BASE_FILE;
}
+ @Override
+ protected String[] getLocales()
+ {
+ return LOCALES;
+ }
+
@Override
protected NodeRef getBaseTemplate()
{
+ 
+ 
+ 
+ 
+ 
+ 
+