LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

GreetingItem Sprachverarbeitung angepasst. 

git-svn-id: https://svn.libreccm.org/ccm/trunk@628 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2010-11-19 16:16:27 +00:00
parent b829c26dab
commit 94b108bd21
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ccm-ldn-navigation/src/com/arsdigita/london/navigation/ui/GreetingItem.java
View File

@ -28,6 +28,7 @@ import com.arsdigita.cms.ContentItem;
import com.arsdigita.cms.ContentItemXMLRenderer; import com.arsdigita.cms.ContentItemXMLRenderer;
import com.arsdigita.cms.SecurityManager; import com.arsdigita.cms.SecurityManager;
import com.arsdigita.cms.dispatcher.SimpleXMLGenerator; import com.arsdigita.cms.dispatcher.SimpleXMLGenerator;
import com.arsdigita.dispatcher.DispatcherHelper;
import com.arsdigita.kernel.Kernel; import com.arsdigita.kernel.Kernel;
import com.arsdigita.kernel.Party; import com.arsdigita.kernel.Party;
import com.arsdigita.kernel.permissions.PermissionDescriptor; import com.arsdigita.kernel.permissions.PermissionDescriptor;
@ -99,7 +100,8 @@ public class GreetingItem extends AbstractComponent {
* language version. * language version.
*/ */
//ContentItem baseItem = bundle.getPrimaryInstance(); //ContentItem baseItem = bundle.getPrimaryInstance();
ContentItem baseItem = bundle.negotiate(request.getLocales()); ContentItem baseItem = bundle.getInstance(DispatcherHelper.
getNegotiatedLocale().getLanguage());
// If there is no matching language version for this content item // If there is no matching language version for this content item
if (baseItem == null) { if (baseItem == null) {
// get the primary instance instead (fallback) // get the primary instance instead (fallback)
@ -111,7 +113,7 @@ public class GreetingItem extends AbstractComponent {
//Moved to seperate method generateGreetingItemXml to make to //Moved to seperate method generateGreetingItemXml to make to
//XML generation extendable (use another renderer etc.) //XML generation extendable (use another renderer etc.)
/*ContentItemXMLRenderer renderer = /*ContentItemXMLRenderer renderer =
new ContentItemXMLRenderer(itemEl); new ContentItemXMLRenderer(itemEl);
renderer.setWrapAttributes(true); renderer.setWrapAttributes(true);
renderer.setWrapRoot(false); renderer.setWrapRoot(false);
@ -136,7 +138,6 @@ public class GreetingItem extends AbstractComponent {
renderer.setWrapRoot(false); renderer.setWrapRoot(false);
renderer.setWrapObjects(false); renderer.setWrapObjects(false);
renderer.walk(item, SimpleXMLGenerator.ADAPTER_CONTEXT); renderer.walk(item, SimpleXMLGenerator.ADAPTER_CONTEXT);
} }
} }