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

Plugged in the correct mlTranslationInterceptor for FileFolderService and removed the NodeService interceptor.

Browse Source 
Removed some unecessary interceptor work.
Fixed content filtering to default to the pivot translation if there is no translation for a required language.
Fixed content filtering when switching back to ALL LANGUAGES.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5802 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2007-05-29 15:55:28 +00:00
parent 7fbc59a0a9
commit 7b5349005c
12 changed files with 129 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/java/org/alfresco/service/cmr/ml/MultilingualContentService.java
View File

@@ -123,13 +123,13 @@ public interface MultilingualContentService
/**
* Given a <b>cm:mlDocument</b>, this method attempts to find the best translation for the given
* locale. If there is not even a
* {@link org.alfresco.i18n.I18NUtil#getNearestLocale(Locale, Set) partial match}, then <tt>null</tt>
* is returned.
* {@link org.alfresco.i18n.I18NUtil#getNearestLocale(Locale, Set) partial match}, then the
* {@link #getPivotTranslation(NodeRef) pivot translation} is used. If that also gives no results
* then the translation itself is returned.
*
* @param translationNodeRef the <b>cm:mlDocument</b>
* @param locale the target locale
* @return Returns Returns the best match for the locale, or <tt>null</tt> if there
* is no near match.
* @return Returns the best match for the locale (never <tt>null</tt>)
*
* @see #getTranslations(NodeRef)
* @see org.alfresco.i18n.I18NUtil#getNearestLocale(Locale, Set)
@@ -157,7 +157,8 @@ public interface MultilingualContentService
*
* @param nodeRef a <b>cm:mlDocument</b>
* @return Returns a corresponding <b>cm:mlDocument</b> that matches the locale of
* of the <b>cm:mlContainer</b>.
* of the <b>cm:mlContainer</b>. <tt>null</tt> is returned if there is no
* pivot translation.
*/
@Auditable(key = Auditable.Key.ARG_0, parameters = {"nodeRef"})
NodeRef getPivotTranslation(NodeRef nodeRef);

9
source/java/org/alfresco/service/cmr/model/FileInfo.java
View File

@@ -62,15 +62,6 @@ public interface FileInfo
*/
public NodeRef getLinkNodeRef();
/**
* Get all translated versions of the file info. The map will always be empty if this
* instance references {@link #isFolder() a folder}. The map may also be empty if the
* file represented is not multilingual.
*
* @return Returns a map of transalations keyed on locale
*/
public Map<Locale, FileInfo> getTranslations();
/**
* @return Returns the name of the file or folder within the parent folder
*/