--- a/Lib/IMPL/Web/Handler/LocaleHandler.pm	Tue Nov 26 03:22:44 2013 +0400
+++ b/Lib/IMPL/Web/Handler/LocaleHandler.pm	Wed Nov 27 17:12:38 2013 +0400
@@ -13,43 +13,51 @@
 	],
 	props => [
 		locales => PROP_RO | PROP_LIST,
-		default => PROP_RO
+		default => PROP_RO,
+		cookie  => PROP_RO
 	]
 };
 
 sub Invoke {
     my ($this,$action,$nextHandler) = @_;
     
-    my @matches;
-    
-    my $best = [$this->default,0];
+    my $locale;
     
-    if(my $header = $action->header('Accept-Language')) {
-    	foreach my $part (split(/\s*,\s*/, $header)) {
-    		my ($lang,$quality) = ($part =~ /([a-z]+(?:\-[a-z]+)*)(?:\s*;\s*q=(0\.[\d]+|1))?/i );
-    		
-    		$quality ||=1;
-    		
-    		foreach my $tag ($this->locales) {
-    			if ( $tag =~ m/^$lang/i ) {
-    				push @matches, [$tag,$quality];
-    			}
-    		}
-    	}
-    	
-    	foreach my $match (@matches) {
-    		if ($match->[1] > $best->[1]) {
-    			$best = $match;
-    		}
-    	}
-    	
-    	
+    if ($this->cookie and my $cookie = $action->cookie($this->cookie)) {
+    	($locale) = grep /^$cookie/i, $this->locales;
     }
     
-    if (my $locale = $best->[0]) {
-    	Resources->SetLocale($locale);
+    unless($locale) {
+	    my @matches;
+	    
+	    my $best = [$this->default,0];
+	    
+	    if(my $header = $action->header('Accept-Language')) {
+	    	foreach my $part (split(/\s*,\s*/, $header)) {
+	    		my ($lang,$quality) = ($part =~ /([a-z]+(?:\-[a-z]+)*)(?:\s*;\s*q=(0\.[\d]+|1))?/i );
+	    		
+	    		$quality ||=1;
+	    		
+	    		foreach my $tag ($this->locales) {
+	    			if ( $tag =~ m/^$lang/i ) {
+	    				push @matches, [$tag,$quality];
+	    			}
+	    		}
+	    	}
+	    	
+	    	foreach my $match (@matches) {
+	    		if ($match->[1] > $best->[1]) {
+	    			$best = $match;
+	    		}
+	    	}
+	    	
+	    }
+	    
+	    $locale = $best->[0];
     }
     
+    Resources->SetLocale($locale) if $locale;
+    
     return $nextHandler->($action);
 }
 
@@ -68,7 +76,14 @@
 =begin code xml
 
 	<handlers type="ARRAY">
-		<item type="IMPL::Web::Handler::LocationHandler"/>
+		<item type="IMPL::Web::Handler::LocaleHandler">
+			<locales type="ARRAY">
+				<item>en-US</item>
+				<item>ru-RU</item>
+			</locales>
+			<default>en-US</default>
+			<cookie>lang</cookie>
+		</item>
 	</handlers>
 
 =end code xml