inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

RM-988: I18N id's not being looked up

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@56008 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Roy Wetherall
2013-09-26 02:44:15 +00:00
parent 9b49cc4aa2
commit fb24c0a9a8
5 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -195,7 +195,7 @@ subprojects {
rename { String filename -> warFile }
}
task explodeDeps(dependsOn: fetchWarFile) << {
task explodeDeps << {
explodedDir = file(explodedDepsDir)
explodedLibDir = file(explodedLibsDir)

16
rm-server/config/alfresco/module/org_alfresco_module_rm/messages/rm-system.properties
View File

@@ -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
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.

1
rm-server/config/alfresco/module/org_alfresco_module_rm/rm-service-context.xml
View File

@@ -1125,6 +1125,7 @@
<property name="nodeService" ref="NodeService"/>
<property name="policyComponent" ref="policyComponent" />
<property name="dispositionService" ref="DispositionService" />
<property name="dictionaryService" ref="DictionaryService" />
</bean>
<!-- Record Service -->

2
rm-server/config/alfresco/templates/webscripts/org/alfresco/rma/custompropdefinitions.get.json.ftl
View File

@@ -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":
{

11
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/search/RecordsManagementSearchServiceImpl.java
View File

@@ -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();