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

Fix for AR-1871 - ML ui trying to set locale as a String rather than a Locale

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7387 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2007-11-14 20:09:23 +00:00
parent 245c9fda77
commit aeef0dd363
1 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/java/org/alfresco/repo/model/ml/MultilingualDocumentAspect.java
View File

@@ -39,6 +39,7 @@ import org.alfresco.service.cmr.ml.MultilingualContentService;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QName;
import org.alfresco.service.namespace.RegexQNamePattern; import org.alfresco.service.namespace.RegexQNamePattern;
@@ -152,20 +153,13 @@ public class MultilingualDocumentAspect implements
/* /*
* TODO: Move this into MultilingualContentService#setTranslationLocale * TODO: Move this into MultilingualContentService#setTranslationLocale
*/ */
Locale localeBefore = (Locale)before.get(ContentModel.PROP_LOCALE); Locale localeBefore = (Locale)before.get(ContentModel.PROP_LOCALE);
Locale localeAfter;
// the after local property type can be either Locale or String Locale localeAfter = null;
Serializable objLocaleAfter = after.get(ContentModel.PROP_LOCALE); Serializable objLocaleAfter = after.get(ContentModel.PROP_LOCALE);
if (objLocaleAfter != null)
if (objLocaleAfter instanceof Locale )
{ {
localeAfter = (Locale) objLocaleAfter; localeAfter = DefaultTypeConverter.INSTANCE.convert(Locale.class, objLocaleAfter);
}
else
{
localeAfter = I18NUtil.parseLocale(objLocaleAfter.toString());
} }
// if the local has been modified // if the local has been modified