diff --git a/build.gradle b/build.gradle
index 82d533f186..c3e85b766d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -195,7 +195,7 @@ subprojects {
rename { String filename -> warFile }
}
- task explodeDeps(dependsOn: fetchWarFile) << {
+ task explodeDeps << {
explodedDir = file(explodedDepsDir)
explodedLibDir = file(explodedLibsDir)
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/rm-system.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/rm-system.properties
index f50c8d5eab..5c50a61ea6 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/rm-system.properties
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/messages/rm-system.properties
@@ -11,4 +11,18 @@ rm.role.powerUser=Records Management Power User
rm.role.securityOfficer=Records Management Security Officer
rm.role.recordsManager=Records Management Records Manager
rm.role.administrator=Records Management Administrator
-rm.role.all=All Records Management Roles
\ No newline at end of file
+rm.role.all=All Records Management Roles
+
+## Default searches
+rm.savedsearch.vitalRecordsName=Vital Records Due For Review
+rm.savedsearch.vitalRecordsDesc=All records currently due for review.
+rm.savedsearch.incompleteRecordsName=Incomplete Records
+rm.savedsearch.incompleteRecordsDesc=All incomplete records.
+rm.savedsearch.cutoffRecordsName=Records Eligible For Cutoff
+rm.savedsearch.cutoffRecordsDesc=All records currently eligible for cutoff.
+rm.savedsearch.transferRecordsName=Records Eligible For Transfer
+rm.savedsearch.transferRecordsDesc=All records currently eligible for transfer.
+rm.savedsearch.destructionRecordsName=Records Eligible For Destruction
+rm.savedsearch.destructionRecordsDesc=All records currently eligible for destruction.
+rm.savedsearch.frozenRecordsName=Frozen Records
+rm.savedsearch.frozenRecordsDesc=All frozen records.
\ No newline at end of file
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
index fd35db69d6..048cc35f4b 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
@@ -1125,6 +1125,7 @@
+
diff --git a/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/custompropdefinitions.get.json.ftl b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/custompropdefinitions.get.json.ftl
index 083a4cc902..d568de7683 100644
--- a/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/custompropdefinitions.get.json.ftl
+++ b/rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/custompropdefinitions.get.json.ftl
@@ -20,7 +20,7 @@
<#list prop.constraints as con>
{
"name": "${con.constraint.shortName!""}",
- "title": "${con.constraint.title!""}",
+ "title": "${msg(con.constraint.title)!""}",
"type": "${con.constraint.type!""}",
"parameters":
{
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/search/RecordsManagementSearchServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/search/RecordsManagementSearchServiceImpl.java
index 914f387f76..19c07b248f 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/search/RecordsManagementSearchServiceImpl.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/search/RecordsManagementSearchServiceImpl.java
@@ -45,6 +45,7 @@ import org.alfresco.util.ParameterCheck;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
+import org.springframework.extensions.surf.util.I18NUtil;
/**
* Records management search service implementation
@@ -125,6 +126,11 @@ public class RecordsManagementSearchServiceImpl implements RecordsManagementSear
throw new AlfrescoRuntimeException("Unable to load report details because name has not been specified. \n" + reportsJSON);
}
String name = report.getString(SavedSearchDetails.NAME);
+ String translatedName = I18NUtil.getMessage(name);
+ if (translatedName != null)
+ {
+ name = translatedName;
+ }
// Get the query
if (report.has(SavedSearchDetails.SEARCH) == false)
@@ -138,6 +144,11 @@ public class RecordsManagementSearchServiceImpl implements RecordsManagementSear
if (report.has(SavedSearchDetails.DESCRIPTION) == true)
{
description = report.getString(SavedSearchDetails.DESCRIPTION);
+ String translatedDescription = I18NUtil.getMessage(description);
+ if (translatedDescription != null)
+ {
+ description = translatedDescription;
+ }
}
RecordsManagementSearchParameters searchParameters = new RecordsManagementSearchParameters();