sinatra-r18n 0.4.3 → 0.4.4

data/lib/sinatra/r18n.rb

@@ -27,11 +27,13 @@ require 'r18n-core'
 
 module Sinatra #::nodoc::
   module R18n #::nodoc::
-    module Helpers
-      # Return tool for i18n support. It will be R18n::I18n object, see it
-      # documentation for more information.
-      def r18n
-        unless @i18n
+    def self.registered(app) #::nodoc::
+      app.helpers ::R18n::Helpers
+      app.set :default_locale, 'en'
+      app.set :translations, Proc.new { File.join(app.root, 'i18n/') }
+      
+      app.before do
+        ::R18n.set do
           ::R18n::I18n.default = options.default_locale
           
           locales = ::R18n::I18n.parse_http(request.env['HTTP_ACCEPT_LANGUAGE'])
@@ -41,30 +43,9 @@ module Sinatra #::nodoc::
             locales.insert(0, session[:locale])
           end
           
-          @i18n = ::R18n::I18n.new(locales, options.translations)
-          ::R18n.set(@i18n)
-        else
-          @i18n
+          ::R18n::I18n.new(locales, options.translations)
         end
       end
-      alias i18n r18n
-      
-      
-      # Translate message. Alias for <tt>r18n.t</tt>.
-      def t(*params)
-        i18n.t(*params)
-      end
-      
-      # Localize object. Alias for <tt>r18n.l</tt>.
-      def l(*params)
-        i18n.l(*params)
-      end
-    end
-  
-    def self.registered(app) #::nodoc::
-      app.helpers Helpers
-      app.set :default_locale, 'en'
-      app.set :translations, Proc.new { File.join(app.root, 'i18n/') }
       
       ::R18n::Filters.off(:untranslated)
       ::R18n::Filters.add(::R18n::Untranslated, :untranslated_html) do

data/spec/sinatra-r18n_spec.rb

@@ -8,9 +8,9 @@ describe Sinatra::R18n do
   end
   
   it "should translate messages" do
-    get '/ru/posts/1'
+    get '/en/posts/1'
     last_response.should be_ok
-    last_response.body.should == "<h1>Запись 1</h1>\n"
+    last_response.body.should == "<h1>Post 1</h1>\n"
   end
   
   it "should use translations from default locale" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-r18n
 version: !ruby/object:Gem::Version 
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors: 
 - Andrey "A.I." Sitnik
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-26 00:00:00 +03:00
+date: 2010-03-29 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.4.3
+        version: 0.4.4
     version: 
 description: "    A Sinatra extension that provides i18n support to translate your web\n    application. It is just a wrapper for R18n core library.\n    It has nice Ruby-style syntax, filters, flexible locales, custom loaders,\n    translation support for any classes, time and number localization, several\n    user language support, agnostic core package with out-of-box support for\n    Rails, Sinatra, Merb and desktop applications.\n"
 email: andrey@sitnik.ru