From b3e03884b74be46ef9e03816972869e588088749 Mon Sep 17 00:00:00 2001
From: quasi <quasi@8810af33-2d31-482b-a856-94f89814c4df>
Date: Thu, 13 Oct 2011 09:24:01 +0000
Subject: [PATCH] DispatcherHelper#getNegotiatedLocale() durch
 GlobalizationHelper#getNegotiatedLocale() ersetzt

git-svn-id: https://svn.libreccm.org/ccm/trunk@1163 8810af33-2d31-482b-a856-94f89814c4df
---
 .../PublicPersonalProfileExtraXmlGenerator.java             | 3 ++-
 .../cms/contenttypes/PublicPersonalProfileXmlUtil.java      | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileExtraXmlGenerator.java b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileExtraXmlGenerator.java
index ef5aac036..a888816d9 100644
--- a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileExtraXmlGenerator.java
+++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileExtraXmlGenerator.java
@@ -10,6 +10,7 @@ import com.arsdigita.cms.publicpersonalprofile.PublicPersonalProfileConfig;
 import com.arsdigita.cms.publicpersonalprofile.PublicPersonalProfileXmlGenerator;
 import com.arsdigita.dispatcher.DispatcherHelper;
 import com.arsdigita.domain.DomainObjectFactory;
+import com.arsdigita.globalization.GlobalizationHelper;
 import com.arsdigita.persistence.DataCollection;
 import com.arsdigita.util.UncheckedWrapperException;
 import com.arsdigita.xml.Element;
@@ -69,7 +70,7 @@ public class PublicPersonalProfileExtraXmlGenerator implements ExtraXMLGenerator
             } else {
                 PublicPersonalProfileNavItemCollection navItems =
                                                        new PublicPersonalProfileNavItemCollection();
-                navItems.addLanguageFilter(DispatcherHelper.getNegotiatedLocale().
+                navItems.addLanguageFilter(GlobalizationHelper.getNegotiatedLocale().
                         getLanguage());
                 navItems.addKeyFilter(showItem);
                 navItems.next();
diff --git a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileXmlUtil.java b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileXmlUtil.java
index 1e3f6efd9..66dd73bc1 100644
--- a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileXmlUtil.java
+++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileXmlUtil.java
@@ -2,8 +2,8 @@ package com.arsdigita.cms.contenttypes;
 
 import com.arsdigita.cms.contentassets.RelatedLink;
 import com.arsdigita.cms.publicpersonalprofile.PublicPersonalProfileConfig;
-import com.arsdigita.dispatcher.DispatcherHelper;
 import com.arsdigita.domain.DomainObjectFactory;
+import com.arsdigita.globalization.GlobalizationHelper;
 import com.arsdigita.persistence.DataCollection;
 import com.arsdigita.xml.Element;
 import java.util.HashMap;
@@ -85,7 +85,7 @@ public class PublicPersonalProfileXmlUtil {
                 navHome.addAttribute("isSelected", "false");
             }
             navHome.addAttribute("sortKey", "");
-            String homeLabel = homeLabels.get(DispatcherHelper.
+            String homeLabel = homeLabels.get(GlobalizationHelper.
                     getNegotiatedLocale().
                     getLanguage());
             if (homeLabel == null) {
@@ -101,7 +101,7 @@ public class PublicPersonalProfileXmlUtil {
         //Get the available Navigation items
         PublicPersonalProfileNavItemCollection navItems =
                                                new PublicPersonalProfileNavItemCollection();
-        navItems.addLanguageFilter(DispatcherHelper.getNegotiatedLocale().
+        navItems.addLanguageFilter(GlobalizationHelper.getNegotiatedLocale().
                 getLanguage());
         final Map<String, PublicPersonalProfileNavItem> navItemMap =
                                                         new HashMap<String, PublicPersonalProfileNavItem>();