sinatra-r18n 1.0.0 → 1.0.1

data/README.md

@@ -94,15 +94,8 @@ information.
 You can change default locale and translations dir:
 
 ```ruby
-set :default_locale, 'ru'
-set :translations,   './translations'
-```
-
-You can also provide an Array of translations directories, which may be
-useful, for instance, in a plugin-based architecture:
-
-```ruby
-set :translations, Dir.glob('./myplugins/*/i18n')
+R18n::I18n.default = 'ru'
+R18n.default_places { './translations' }
 ```
 
 # License

data/lib/sinatra/r18n.rb

@@ -25,14 +25,18 @@ module Sinatra
   module R18n
     def self.registered(app)
       app.helpers ::R18n::Helpers
-      app.set :default_locale, 'en'
-      app.set :translations, Proc.new { File.join(app.root, 'i18n/') }
+      app.set :default_locale, Proc.new { ::R18n::I18n.default }
+      app.set :translations,   Proc.new { ::R18n.default_places }
 
-      ::R18n.default_places { settings.translations }
+      ::R18n.default_places { File.join(app.root, 'i18n/') }
 
       app.before do
+        ::R18n.clear_cache! if self.class.development?
+
         ::R18n.set do
-          ::R18n::I18n.default = settings.default_locale
+          if settings.default_locale
+            ::R18n::I18n.default = settings.default_locale
+          end
 
           locales = ::R18n::I18n.parse_http(request.env['HTTP_ACCEPT_LANGUAGE'])
           if params[:locale]

data/spec/sinatra-r18n_spec.rb

@@ -37,7 +37,7 @@ describe Sinatra::R18n do
   end
 
   it "should use locale from session" do
-    get '/locale', {}, { 'rack.session' => { :locale => 'ru' } }
+    get '/locale', { }, { 'rack.session' => { :locale => 'ru' } }
     last_response.should be_ok
     last_response.body.should == 'Русский'
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-r18n
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-24 00:00:00.000000000 Z
+date: 2012-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -217,7 +217,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4184599958665730813
+      hash: -1494427918030029459
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -226,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4184599958665730813
+      hash: -1494427918030029459
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23