Navigation ObjectList
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-94f89814c4dfmaster
parent
2ac8f56d93
commit
06392e0bfa
|
|
@ -19,6 +19,7 @@
|
||||||
|
|
||||||
package com.arsdigita.london.navigation.ui;
|
package com.arsdigita.london.navigation.ui;
|
||||||
|
|
||||||
|
import com.arsdigita.categorization.Category;
|
||||||
import com.arsdigita.london.navigation.DataCollectionDefinition;
|
import com.arsdigita.london.navigation.DataCollectionDefinition;
|
||||||
import com.arsdigita.london.navigation.DataCollectionRenderer;
|
import com.arsdigita.london.navigation.DataCollectionRenderer;
|
||||||
|
|
||||||
|
|
@ -96,6 +97,14 @@ public abstract class AbstractObjectList
|
||||||
// Limit list to objects in the negotiated language
|
// Limit list to objects in the negotiated language
|
||||||
if (objects != null && objects.size() > 0) {
|
if (objects != null && objects.size() > 0) {
|
||||||
String locale = com.arsdigita.dispatcher.DispatcherHelper.getRequestContext().getLocale().getLanguage();
|
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);
|
objects.addEqualsFilter("language", locale);
|
||||||
}
|
}
|
||||||
// Quasimodo: End
|
// Quasimodo: End
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue