r18n-rails-api 0.4.5 → 0.4.6

data/README.rdoc

@@ -9,13 +9,13 @@ Rails I18n compatibility for R18n:
 
 === Variables
 
-After require <tt>r18n-rails-api</tt> you can use named variables in any
+After require-ing <tt>r18n-rails-api</tt> you can use named variables in all
 translations:
 
-  greeting: "Hi, {{name}}"
+  greeting: "Hi, %{name}"
   users: !!pl
     1: One user
-    n: {{count}} users
+    n: %{count} users
 
   require 'r18n-rails-api'
 
@@ -31,7 +31,7 @@ i18n/en.yml:
   en:
     posts:
       one: One post
-      many: {{count}} posts
+      many: %{count} posts
 
 example.rb:
   require 'r18n-rails-api'
@@ -43,7 +43,7 @@ example.rb:
 
 === Backend
 
-You can use R18n as backend for Rails I18n:
+You can use R18n as a backend for Rails I18n:
 
   require 'r18n-rails-api'
 
@@ -62,7 +62,7 @@ You can use R18n as backend for Rails I18n:
 * Custom translations loaders.
 * Translation support for any classes.
 * Time and number localization.
-* Several user language support.
+* Several user languages support.
 
 == License
 

data/lib/r18n-rails-api/filters.rb

@@ -19,20 +19,22 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Filter to use Rails named variables:
 # 
-#   name: "My name is {{name}}"
+#   name: "My name is %{name}"
 # 
 #   i18n.name(name: 'Ivan') #=> "My name is Ivan"
 R18n::Filters.add(String, :named_variables) do |content, config, params|
   if params.is_a? Hash
     content = content.clone
     params.each_pair do |name, value|
-      content.gsub! "{{#{name}}}", config[:locale].localize(value)
+      v = config[:locale].localize(value)
+      content.gsub! "%{#{name}}", v
+      content.gsub! "{{#{name}}}", v
     end
   end
   content
 end
 
-# Pluralization by named variable <tt>{{count}}</tt>.
+# Pluralization by named variable <tt>%{count}</tt>.
 R18n::Filters.add('pl', :named_pluralization) do |content, config, param|
   if param.is_a? Hash and param.has_key? :count
     type = config[:locale].pluralize(param[:count])

data/spec/data/general/en.yml

@@ -18,4 +18,4 @@ en:
 
   users:
     one: 1 user
-    many: "{{count}} users"
+    many: "%{count} users"

data/spec/filters_spec.rb

@@ -7,17 +7,22 @@ describe 'Rails filters' do
   end
   
   it "should use named variables" do
-    i18n = R18n::Translation.new(@en, '', @en, {'echo' => 'Value is {{value}}'})
+    i18n = R18n::Translation.new(@en, '', @en, {'echo' => 'Value is %{value}'})
     
     i18n.echo(:value => 'R18n').should == 'Value is R18n'
     i18n.echo(:value => -5.5).should == 'Value is −5.5'
     i18n.echo(:value => 5000).should == 'Value is 5,000'
-    i18n.echo.should == 'Value is {{value}}'
+    i18n.echo.should == 'Value is %{value}'
   end
   
-  it "should pluralize by variable {{count}}" do
+  it "should use old variables syntax" do
+    i18n = R18n::Translation.new(@en, '', @en, {'echo' => 'Value is {{value}}',})
+    i18n.echo(:value => 'Old').should == 'Value is Old'
+  end
+  
+  it "should pluralize by variable %{count}" do
     i18n = R18n::Translation.new(@en, '', @en, {'users' => R18n::Typed.new('pl',
-      { 0 => 'no users', 1 => '1 user', 'n' => '{{count}} users' }
+      { 0 => 'no users', 1 => '1 user', 'n' => '%{count} users' }
     ) })
     
     i18n.users(:count => 0).should == 'no users'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 5
-  version: 0.4.5
+  - 6
+  version: 0.4.6
 platform: ruby
 authors: 
 - Andrey "A.I." Sitnik
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-19 00:00:00 +04:00
+date: 2010-06-22 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,8 +27,8 @@ dependencies:
         segments: 
         - 0
         - 4
-        - 5
-        version: 0.4.5
+        - 6
+        version: 0.4.6
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -54,9 +54,9 @@ extra_rdoc_files:
 - LICENSE
 files: 
 - lib/r18n-rails-api.rb
-- lib/r18n-rails-api/filters.rb
 - lib/r18n-rails-api/loader.rb
 - lib/r18n-rails-api/backend.rb
+- lib/r18n-rails-api/filters.rb
 - LICENSE
 - README.rdoc
 has_rdoc: true
@@ -90,13 +90,13 @@ signing_key:
 specification_version: 3
 summary: Rails I18n compatibility for R18n
 test_files: 
-- spec/spec_helper.rb
-- spec/backend_spec.rb
-- spec/filters_spec.rb
-- spec/loader_spec.rb
-- spec/data/other/ru.yml
-- spec/data/other/en.yml
 - spec/data/general/en.yml
 - spec/data/simple/russian.yml
-- spec/data/simple/ru.rb
 - spec/data/simple/en.yml
+- spec/data/simple/ru.rb
+- spec/data/other/en.yml
+- spec/data/other/ru.yml
+- spec/spec_helper.rb
+- spec/backend_spec.rb
+- spec/loader_spec.rb
+- spec/filters_spec.rb