sinatra-r18n 0.3.1 → 0.3.2

data/README.rdoc

@@ -38,6 +38,12 @@ information.
    
      require 'sinatra/r18n'
    
+   If your application inherits from <tt>Sinatra::Base</tt> also add:
+   
+     class YourApp < Sinatra::Base
+       register Sinatra::R18n
+       set :root, File.dirname(__FILE__)
+   
 4. Add locale to your URLs. For example:
    
      get '/:locale/posts/:id' do

data/lib/sinatra/r18n.rb

@@ -54,9 +54,13 @@ module Sinatra #::nodoc::
       app.set :default_locale, 'en'
       app.set :translations, Proc.new { File.join(app.root, 'i18n/') }
       
-      ::R18n.untranslated = '%2<span style="color: red">%3</span>'
+      ::R18n::Filters.off(:untranslated)
+      ::R18n::Filters.add(::R18n::Untranslated, :untranslated_html) do
+        |content, config, translated_path, untranslated_path, path|
+        "#{translated_path}<span style='color: red'>#{untranslated_path}</span>"
+      end
       app.configure :production do
-        ::R18n.untranslated = ''
+        ::R18n::Filters.add(::R18n::Untranslated, :hide_untranslated) { '' }
       end
     end
   end

data/spec/app/app.rb

@@ -26,3 +26,7 @@ end
 get '/warning' do
   i18n.warning
 end
+
+get '/untranslated' do
+  "#{i18n.post.no}"
+end

data/spec/sinatra-r18n_spec.rb

@@ -4,6 +4,7 @@ require File.join(File.dirname(__FILE__), 'spec_helper')
 describe Sinatra::R18n do
   after do
     set :default_locale, 'en'
+    set :environment, :test
   end
   
   it "should translate messages" do
@@ -43,4 +44,18 @@ describe Sinatra::R18n do
     last_response.body.should == 'en: English; ru: Русский'
   end
   
+  it "should format untranslated string" do
+    get '/untranslated'
+    last_response.should be_ok
+    last_response.body.should == "post.<span style='color: red'>no</span>"
+  end
+  
+  it "should hide untranslated string in production" do
+    set :environment, :production
+    
+    get '/untranslated'
+    last_response.should be_ok
+    last_response.body.should == "post.<span style='color: red'>no</span>"
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-r18n
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - Andrey "A.I." Sitnik
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-10 00:00:00 +04:00
+date: 2009-11-29 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,9 +20,9 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.3.1
+        version: 0.3.2
     version: 
-description: A Sinatra extension that provides i18n support to  translate your web application. It is just a wrap for R18n core library. It can format numbers and time to the rules of the user locale, has translation for common words, storage translation in YAML format with pluralization, procedures and user filters and has special support for countries with two official languages.
+description: "    A Sinatra extension that provides i18n support to  translate your web\n    application. It is just a wrap for R18n core library.\n    It can format numbers and time to the rules of the user locale,\n    has translation for common words, storage translation in YAML format with\n    pluralization, procedures and user filters and has special support for\n    countries with two official languages.\n"
 email: andrey@sitnik.ru
 executables: []
 
@@ -32,12 +32,13 @@ extra_rdoc_files:
 - README.rdoc
 - LICENSE
 files: 
-- lib/sinatra
 - lib/sinatra/r18n.rb
 - LICENSE
 - README.rdoc
 has_rdoc: true
 homepage: http://r18n.rubyforge.org/
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -58,17 +59,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: sinatra-r18n
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: A Sinatra extension that provides i18n support to translate your web application.
 test_files: 
-- spec/spec_helper.rb
 - spec/sinatra-r18n_spec.rb
-- spec/app
-- spec/app/i18n
+- spec/spec_helper.rb
+- spec/app/views/post.erb
+- spec/app/app.rb
 - spec/app/i18n/ru.yml
 - spec/app/i18n/en.yml
-- spec/app/app.rb
-- spec/app/views
-- spec/app/views/post.erb