From 06392e0bfa62b2a24911bc661523a39c745543c2 Mon Sep 17 00:00:00 2001 From: quasi Date: Mon, 1 Mar 2010 18:15:44 +0000 Subject: [PATCH] Navigation ObjectList MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Filter geändert, so daß er bei einer nicht unterstützten Sprache die Standardsprache verwendet. Eingestellt wird das über waf.categorization.supported_languages git-svn-id: https://svn.libreccm.org/ccm/trunk@360 8810af33-2d31-482b-a856-94f89814c4df --- .../london/navigation/ui/AbstractObjectList.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/AbstractObjectList.java b/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/AbstractObjectList.java index e4a33956b..c6319ca9c 100755 --- a/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/AbstractObjectList.java +++ b/ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/AbstractObjectList.java @@ -19,6 +19,7 @@ package com.arsdigita.london.navigation.ui; +import com.arsdigita.categorization.Category; import com.arsdigita.london.navigation.DataCollectionDefinition; import com.arsdigita.london.navigation.DataCollectionRenderer; @@ -96,6 +97,14 @@ public abstract class AbstractObjectList // Limit list to objects in the negotiated language if (objects != null && objects.size() > 0) { String locale = com.arsdigita.dispatcher.DispatcherHelper.getRequestContext().getLocale().getLanguage(); + + // if supported lang doesn't contain locale + if(!Category.getConfig().hasLanguage(locale)) { + + // use default language instead + locale = Category.getConfig().getDefaultLanguage(); + } + objects.addEqualsFilter("language", locale); } // Quasimodo: End