--- a/Lib/IMPL/Resources/Strings.pm	Thu May 09 04:10:00 2013 +0400
+++ b/Lib/IMPL/Resources/Strings.pm	Tue May 14 03:38:47 2013 +0400
@@ -1,13 +1,13 @@
+package IMPL::Resources::Strings;
 use strict;
-use warnings;
-
-package IMPL::Resources::Strings;
 
 use File::Spec;
 use List::Util qw(first);
 use IMPL::Resources::Format qw(FormatMessage);
+use IMPL::require {
+    Resources => 'IMPL::Resources'
+};
 
-our $Locale ||= 'default';
 our $Encoding ||= 'utf-8';
 our @Locations;
 my %maps;
@@ -29,7 +29,7 @@
                 shift if $methods;
                 my $args = @_ == 1 ? shift : { @_ };
                 
-                return _FormatMapMessage($class,$name,$map,$Locale,$args);
+                return _FormatMapMessage($class,$name,$map,Resources->currentLocale,$args);
             }
         }
     }    
@@ -61,9 +61,9 @@
     
     my @ways = map {
         my @path = ($_);
-        push @path,$Locale;
+        push @path,Resources->currentLocale;
         
-        File::Spec->catfile($_,$Locale,@classNamespace,$classShortName);
+        File::Spec->catfile($_,Resources->currentLocale,@classNamespace,$classShortName);
     } @Locations;
     
     
@@ -74,7 +74,7 @@
         my $baseDir = File::Spec->catpath($vol,$dir,'');
 
         # '/full/path/to/Foo' -> '/full/path/to/Foo/locale/En_US/Bar' 
-        push @ways, File::Spec->catfile($baseDir,'locale',$Locale,$classShortName);
+        push @ways, File::Spec->catfile($baseDir,'locale',Resources->currentLocale,$classShortName);
     }
     
     my $mapFile = first { -f } @ways;