X-Git-Url: http://www2.svjatoslav.eu/gitweb/?p=svjatoslav_commons.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fcommons%2Fnetwork%2Fnavigation%2FNavigation.java;h=5e605ab56b1157d70ef178f159c9b62f3b18dae1;hp=8b049bbcd4d984286a3496b50cbdf6ba74e3d7a8;hb=869bf9eeef97f5364d46b76f64c94cec67846c28;hpb=aa03fa52face6f13f8da2e9b89e798671653a074

diff --git a/src/main/java/eu/svjatoslav/commons/network/navigation/Navigation.java b/src/main/java/eu/svjatoslav/commons/network/navigation/Navigation.java
index 8b049bb..5e605ab 100755
--- a/src/main/java/eu/svjatoslav/commons/network/navigation/Navigation.java
+++ b/src/main/java/eu/svjatoslav/commons/network/navigation/Navigation.java
@@ -15,7 +15,7 @@ import java.net.URL;
 import javax.servlet.http.HttpServletRequest;
 
 import eu.svjatoslav.commons.network.Locale;
-import eu.svjatoslav.commons.network.LocaleHelper;
+import eu.svjatoslav.commons.network.LocaleConfiguration;
 
 public class Navigation {
 
@@ -23,6 +23,12 @@ public class Navigation {
 
 	private NavigationItem defaultNavigationItem;
 
+	private final LocaleConfiguration localeConfiguration;
+
+	public Navigation(final LocaleConfiguration localeConfiguration) {
+		this.localeConfiguration = localeConfiguration;
+	}
+
 	public NavigationItem getDefaultNavigationItem() {
 		return defaultNavigationItem;
 	}
@@ -34,6 +40,10 @@ public class Navigation {
 		return "";
 	}
 
+	public LocaleConfiguration getLocaleConfiguration() {
+		return localeConfiguration;
+	}
+
 	public NavigationItem getRootNavigationItem() {
 		return rootNavigationItem;
 	}
@@ -59,7 +69,8 @@ public class Navigation {
 
 	public String getTopMenu(final HttpServletRequest request) {
 
-		final Locale currentLocale = LocaleHelper.detectLocale(request);
+		final Locale currentLocale = localeConfiguration
+				.detectCurrentLocale(request);
 
 		final NavigationItem selectedItem = getSelectedItem(request);
 		final StringBuffer result = new StringBuffer();