localize 0.1 → 0.2

data/README.rdoc

@@ -4,6 +4,7 @@ Example:
 
   puts t.hello # => Hola
   puts t.hello.world # => Hola, mundo
+  puts t.hello('world', 'space') # => Hello world and space
   puts f 380441234567 # => +380 (44) 123-45-67
   puts l Time.utc(2000, "jan"), :short # => Sat 01-Jan-00
   puts l 1200.05 # => 1.200,05
@@ -58,6 +59,19 @@ Text section contains translations and can have an unlimited nesting:
     foo:
         bar: 'baz' # t.foo.bar
 
+You may interpolate you translations:
+
+  text:
+    hello: 'Hello ${1} and ${2}!'
+    foo: 'Foo ${2}, ${1} or ${1}, ${3}'
+
+…in translation, and…
+
+  t.hello('world', 'space')
+  t.foo('bar', 'baz', 'fee')
+
+…in view produce 'Hello world and space!' and 'Foo baz, bar or bar, fee'
+
 Formats section contains different localization rules and formats:
 
   formats:

data/lib/localize.rb

@@ -120,7 +120,14 @@ module Localize
         key = key.to_s
         instance_variable_set("@#{key}", value)
         self.class.class_eval do
-          define_method("#{key}") { instance_variable_get("@#{key}") }
+          define_method("#{key}") do |*args|
+            str = instance_variable_get("@#{key}")
+            if args.length > 0
+              _interpolate(str, args)
+            else
+              str
+            end
+          end
         end
       end
     end
@@ -128,6 +135,14 @@ module Localize
     def method_missing(name, *params)
       MissString.new('Translation missing: '+name.to_s)
     end
+
+    private
+      def _interpolate(string, args)
+        args.length.times do |i|
+          string.gsub!(/\$\{#{i+1}\}/, args[i])
+        end
+        string
+      end
   end
 
   class MissString < String

data/localize.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name          = "localize"
-  s.version       = "0.1"
-  s.date          = "2010-05-06"
+  s.version       = "0.2"
+  s.date          = "2010-09-03"
 
   s.summary       = "Lightweight localization library"
   s.description   = "Lightweight, ruby-way localization solution"
@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
     test/formats_test.rb
     test/translate_test.rb
     test/stores/en.yml
+    test/interpolation_test.rb
   ]
   s.require_paths = %w[lib]
 

data/test/interpolation_test.rb

@@ -0,0 +1,32 @@
+require File.join(File.dirname(__FILE__), '../lib/localize')
+
+describe Localize do
+  before do
+    Localize.location = 'stores'
+    @t = Localize.translate
+  end
+
+  it "Interpolate one param" do
+    @t.interp_test.one('one').should == 'It interpolate one param'
+  end
+
+  it "Interpolate many params" do
+    @t.interp_test.many('one', 'two', 'three').should == 'It interpolate one, two, three and more params'
+  end
+
+  it "Interpolate many params with shuffle" do
+    @t.interp_test.shuffle('one', 'two', 'three').should == 'It shuffle two, three, one'
+  end
+
+  it "Repeat params" do
+    @t.interp_test.repeat('one', 'two').should == 'It repeat one, two, one'
+  end
+
+  it "Ignore more params" do
+    @t.interp_test.ignore('one', 'two', 'three', 'four').should == 'It print one, two, and not print other'
+  end
+
+  it "Ignore more interpolations" do
+    @t.interp_test.ignore_more('one', 'two').should == 'It print one, two, but not ${3}'
+  end
+end

data/test/stores/en.yml

@@ -2,6 +2,14 @@ text:
     hello: 'world'
     foo:
         bar: 'baz'
+    interp_test:
+        one: 'It interpolate ${1} param'
+        many: 'It interpolate ${1}, ${2}, ${3} and more params'
+        shuffle: 'It shuffle ${2}, ${3}, ${1}'
+        repeat: 'It repeat ${1}, ${2}, ${1}'
+        ignore: 'It print ${1}, ${2}, and not print other'
+        ignore_more: 'It print ${1}, ${2}, but not ${3}'
+
 formats:
     phone:
         :full: '+### (##) ###-##-##'

metadata

@@ -1,11 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: localize
 version: !ruby/object:Gem::Version 
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 1
-  version: "0.1"
+  - 2
+  version: "0.2"
 platform: ruby
 authors: 
 - Andrey Savchenko
@@ -13,16 +14,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-06 00:00:00 +03:00
+date: 2010-09-03 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -48,6 +51,7 @@ files:
 - test/formats_test.rb
 - test/translate_test.rb
 - test/stores/en.yml
+- test/interpolation_test.rb
 has_rdoc: true
 homepage: http://aejis.eu/tools/localize
 licenses: []
@@ -58,26 +62,31 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Lightweight localization library
 test_files: 
 - test/formats_test.rb
 - test/translate_test.rb
+- test/interpolation_test.rb