r18n-core 0.4.2 → 0.4.3

data/ChangeLog

@@ -1,3 +1,10 @@
+== 0.4.3 (Flange)
+* Add R18n style methods to Rails controllers.
+* Fix for non-string translations in Rails I18n.
+* Use default locale from Rails I18n config.
+* Load translations recursively.
+* Add Slovak locale (by Ahmed Al Hafoudh)
+
 == 0.4.2 (EMS)
 * Fixes for Ruby 1.8.6 (by Akzhan Abdulin).
 * Add method to get translation keys.

data/README.rdoc

@@ -39,7 +39,7 @@ Filters are cascade and can communicate with each other.
 
 R18n already has filters for HTML escaping, lambdas, Textile and Markdown:
 
-  hi: !!markdown
+  hi: !!markdown |
     **Hi**, people!
   greater: !!escape
     1 < 2 is true

data/base/sk.yml

@@ -0,0 +1,34 @@
+ok: OK
+save: Uložiť
+cancel: Zrušiť
+'yes': Áno
+'no': Nie
+exit: Koniec
+delete: Zmazať
+
+human_time:
+  after_days: !!pl
+    1: o %1 deň
+    2: o %1 dni
+    n: o %1 dní
+  tomorrow: zajtra
+  after_hours: !!pl
+    1: o %1 hodinu
+    2: o %1 hodiny
+    n: o %1 hodín
+  after_minutes: !!pl
+    1: o %1 minútu
+    2: o %1 minúty
+    n: o %1 minút
+  now: teraz
+  today: dnes
+  minutes_ago: !!pl
+    1: pred %1 minútou
+    n: pred %1 minútami
+  hours_ago: !!pl
+    1: pred %1 hodinou
+    n: pred %1 hodinami
+  yesterday: včera
+  days_ago: !!pl
+    1: pred %1 dňom
+    n: pred %1 dňami

data/lib/r18n-core/i18n.rb

@@ -163,43 +163,60 @@ module R18n
       @locales_codes = locales
       @locales = locales.map { |i| Locale.load(i) }
       
-      @locale = @locales.first
-      unless @locale.supported?
-        @locales.each do |locale|
-          if locale.supported?
-            @locale.base = locale
-            break
-          end
-        end
-      end
-      
       if translation_places
         @original_places = translation_places
       else
         @original_places = R18n.extension_places
+        @locale = @locales.first
       end
       
       @translation_places = self.class.convert_places(@original_places)
       
-      reload! unless @translation = R18n.cache[translation_cache_key]
+      key = translation_cache_key
+      if R18n.cache.has_key? key
+        @locale, @translation = *R18n.cache[key]
+      else
+        reload!
+      end
     end
     
-    
     # Return unique key for current locales in translation and places.
     def translation_cache_key
-      available = @translation_places.inject([]) { |all, i|
+      @available_codes ||= @translation_places.inject([]) { |all, i|
         all + i.available }.uniq.map { |i| i.code }
-      (@locales_codes & available).join(',') + '@' +
+      (@locales_codes & @available_codes).join(',') + '@' +
         R18n.default_loader.hash.to_s +
         @translation_places.hash.to_s + R18n.extension_places.hash.to_s
     end
     
     # Reload translations.
     def reload!
+      @available = @available_codes = nil
       @translation_places = self.class.convert_places(@original_places)
       
       available_in_places = @translation_places.map { |i| [i, i.available] }
-      available_in_extensions = R18n.extension_places.map { |i| [i, i.available] }
+      available_in_extensions = R18n.extension_places.map {|i| [i, i.available]}
+      
+      unless @locale
+        available_in_places.each do |place, available|
+          @locales.each do |locale|
+            if available.include? locale
+              @locale = locale
+              break
+            end
+          end
+          break if @locale
+        end
+      end
+      @locale ||= @locales.first
+      unless @locale.supported?
+        @locales.each do |locale|
+          if locale.supported?
+            @locale.base = locale
+            break
+          end
+        end
+      end
       
       @translation = Translation.new @locale
       @locales.each do |locale|
@@ -218,7 +235,8 @@ module R18n
           end
         end
       end
-      R18n.cache[translation_cache_key] = @translation
+      
+      R18n.cache[translation_cache_key] = [@locale, @translation]
     end
     
     # Return Array of locales with available translations.

data/lib/r18n-core/locale.rb

@@ -73,8 +73,8 @@ module R18n
 
     # Load locale by RFC 3066 +code+.
     def self.load(code)
-      original = code.to_s.gsub(/[^-a-zA-Z]/, '')
-      code = original.downcase
+      original = code.to_s.gsub(/[^-_a-zA-Z]/, '')
+      code = original.gsub('_', '-').downcase
       
       @@loaded[code] ||= begin
         if exists? code

data/lib/r18n-core/utils.rb

@@ -27,20 +27,35 @@ module R18n
       Date.new!(Date.send(:jd_to_ajd, jd, 0, 0), 0, Date::ITALY)
     end
     
-    HTML_ENTRIES = { '&'=>'&amp;', '<'=>'&lt;', '>'=>'&gt;' }
+    HTML_ENTRIES = { '&' => '&amp;', '<' => '&lt;', '>' => '&gt;' }
     
     # Escape HTML entries (<, >, &). Copy from HAML helper.
     def self.escape_html(content)
       content.to_s.gsub(/[><&]/) { |s| HTML_ENTRIES[s] }
     end
 
-    def self.hash_map(hash)
+    # Invokes +block+ once for each key and value of +hash+. Creates a new hash
+    # with the keys and values returned by the +block+.
+    def self.hash_map(hash, &block)
       result = {}
       hash.each_pair do |key, val|
-        new_key, new_value = yield key, val
+        new_key, new_value = block.call(key, val)
         result[new_key] = new_value
       end
      result
     end
+  
+    # Recursively hash merge.
+    def self.deep_merge!(a, b)
+      b.each_pair do |key, value|
+        another = a[key]
+        if another.nil?
+          a[key] = value
+        elsif another.is_a?(Hash) and value.is_a?(Hash)
+          a[key] = deep_merge!(another, value)
+        end
+      end
+      a
+    end
   end
 end

data/lib/r18n-core/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module R18n
-  VERSION = '0.4.2' unless defined? R18n::VERSION
+  VERSION = '0.4.3' unless defined? R18n::VERSION
 end

data/lib/r18n-core/yaml_loader.rb

@@ -43,15 +43,18 @@ module R18n
       
       # Array of locales, which has translations in +dir+.
       def available
-        Dir.glob(File.join(@dir, '*.yml')).map do |i|
-          R18n::Locale.load(File.basename(i, '.yml'))
-        end
+        Dir.glob(File.join(@dir, '**/*.yml')).
+          map { |i| File.basename(i, '.yml') }.uniq.
+          map { |i| R18n::Locale.load(i) }
       end
       
       # Return Hash with translations for +locale+.
       def load(locale)
-        file = File.join(@dir, "#{locale.code.downcase}.yml")
-        transform(::YAML::load(IO.read(file)))
+        translations = {}
+        Dir.glob(File.join(@dir, "**/#{locale.code.downcase}.yml")).each do |i|
+          Utils.deep_merge!(translations, ::YAML::load_file(i))
+        end
+        transform(translations)
       end
       
       # YAML loader with same +dir+ will be have same +hash+.

data/locales/cs.rb

@@ -7,15 +7,16 @@ module R18n
         :wday_names => %w{Neděle Pondělí Úterý Středa Čtvrtek Pátek Sobota},
         :wday_abbrs => %w{Ne Po Út St Čt Pá So},
         
-        :month_names => %w{Ledna Února Března Dubna Května Června Července Srpna
-                           Září Října Listopadu Prosince},
-        :month_abbrs => %w{Led Úno Bře Dub Kvě Čer Čvc Srp Zář Říj Lis Pro},
+        :month_names => %w{ledna února března dubna května června července srpna
+                           září října listopadu prosince},
+        :month_abbrs => %w{led úno bře dub kvě čer čvc srp zář říj lis pro},
         :month_standalone => %w{Leden Únor Březen Duben Květen Červen Červenec
                                 Srpen Září Říjen Listopad Prosinec},
         
         :time_am => 'dop.',
         :time_pm => 'odp.',
-        :date_format => '%d.%m.%Y',
+        :date_format => '%e. %m. %Y',
+        :full_format => '%e. %B',
         
         :number_decimal => ",",
         :number_group   => " "

data/locales/sk.rb

@@ -0,0 +1,38 @@
+# encoding: utf-8
+module R18n
+  class Locales::Sk < Locale
+    set :title => 'Slovenský',
+        :sublocales => %w{cs cz en},
+        
+        :wday_names => %w{Nedeľa Pondelok Utorok Streda Štvrtok Piatok Sobota},
+        :wday_abbrs => %w{Ne Po Ut St Št Pi So},
+        
+        :month_names => %w{januára februára marca apríla mája júna júla augusta
+                          septembra októbra novembra decembra},
+        :month_abbrs => %w{jan feb mar apr máj jún júl aug sep okt nov dec},
+        :month_standalone => %w{Január Február Marec Apríl Máj Jún Júl August
+                                September Október November December},
+        
+        :time_am => 'dop.',
+        :time_pm => 'odp.',
+        :date_format => '%d.%m.%Y',
+        :full_format => '%e. %B',
+        
+        :number_decimal => ",",
+        :number_group   => " "
+    
+    def pluralize(n)
+      case n
+      when 0
+        0
+      when 1
+        1
+      when 2..4
+        2
+      else
+        'n'
+      end
+    end
+  end
+end
+

data/spec/i18n_spec.rb

@@ -4,7 +4,6 @@ require File.join(File.dirname(__FILE__), 'spec_helper')
 describe R18n::I18n do
   before do
     @extension_places = R18n.extension_places.clone
-    R18n.cache.clear
   end
   
   after do
@@ -194,7 +193,7 @@ describe R18n::I18n do
   end
 
   it "should return first locale with locale file" do
-    i18n = R18n::I18n.new(['no-LC', 'ru', 'en'], DIR)
+    i18n = R18n::I18n.new(['no-TR', 'no-LC', 'ru', 'en'], DIR)
     i18n.locale.should == R18n::Locale.load('no-LC')
     i18n.locale.base.should == R18n::Locale.load('ru')
   end

data/spec/locale_spec.rb

@@ -154,5 +154,9 @@ describe R18n::Locale do
     upcase.code.should == 'no-lc'
     downcase.code.should == 'no-lc'
   end
+  
+  it "should load locale with underscore" do
+    R18n::Locale.load('no_LC').code.should == 'no-lc'
+  end
 
 end

data/spec/locales/cs_spec.rb

@@ -3,22 +3,22 @@ require File.join(File.dirname(__FILE__), '..', '..', 'locales', 'cs')
 
 describe R18n::Locales::Cs do
   it "should use Czech pluralization" do
-    ru = R18n::Locale.load('cs')
-    ru.pluralize(0).should == 0
-    ru.pluralize(1).should == 1
+    cs = R18n::Locale.load('cs')
+    cs.pluralize(0).should == 0
+    cs.pluralize(1).should == 1
     
-    ru.pluralize(2).should == 2
-    ru.pluralize(3).should == 2
-    ru.pluralize(4).should == 2
+    cs.pluralize(2).should == 2
+    cs.pluralize(3).should == 2
+    cs.pluralize(4).should == 2
     
-    ru.pluralize(5).should   == 'n'
-    ru.pluralize(21).should  == 'n'
-    ru.pluralize(11).should  == 'n'
-    ru.pluralize(12).should  == 'n'
-    ru.pluralize(22).should  == 'n'
-    ru.pluralize(57).should  == 'n'
-    ru.pluralize(101).should == 'n'
-    ru.pluralize(102).should == 'n'
-    ru.pluralize(111).should == 'n'
+    cs.pluralize(5).should   == 'n'
+    cs.pluralize(21).should  == 'n'
+    cs.pluralize(11).should  == 'n'
+    cs.pluralize(12).should  == 'n'
+    cs.pluralize(22).should  == 'n'
+    cs.pluralize(57).should  == 'n'
+    cs.pluralize(101).should == 'n'
+    cs.pluralize(102).should == 'n'
+    cs.pluralize(111).should == 'n'
   end
 end

data/spec/locales/sk_spec.rb

@@ -0,0 +1,24 @@
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+require File.join(File.dirname(__FILE__), '..', '..', 'locales', 'sk')
+
+describe R18n::Locales::Sk do
+  it "should use Slovak pluralization" do
+    sk = R18n::Locale.load('Sk')
+    sk.pluralize(0).should == 0
+    sk.pluralize(1).should == 1
+    
+    sk.pluralize(2).should == 2
+    sk.pluralize(3).should == 2
+    sk.pluralize(4).should == 2
+    
+    sk.pluralize(5).should   == 'n'
+    sk.pluralize(21).should  == 'n'
+    sk.pluralize(11).should  == 'n'
+    sk.pluralize(12).should  == 'n'
+    sk.pluralize(22).should  == 'n'
+    sk.pluralize(57).should  == 'n'
+    sk.pluralize(101).should == 'n'
+    sk.pluralize(102).should == 'n'
+    sk.pluralize(111).should == 'n'
+  end
+end

data/spec/r18n_spec.rb

@@ -44,5 +44,23 @@ describe R18n do
   it "should convert Time to Date" do
       R18n::Utils.to_date(Time.now).should == Date.today
   end
+  
+  it "should map hash" do
+    R18n::Utils.hash_map({'a' => 1, 'b' => 2}) { |k, v| [k + 'a', v + 1] }.
+      should == { 'aa' => 2, 'ba' => 3 }
+  end
+  
+  it "should merge hash recursively" do
+    a = { :a => 1,
+          :b => {:ba => 1, :bb => 1},
+          :c => 1 }
+    b = { :b => {:bb => 2, :bc => 2},
+          :c => 2 }
+    
+    R18n::Utils.deep_merge!(a, b)
+    a.should == { :a => 1,
+                  :b => { :ba => 1, :bb => 1, :bc => 2 },
+                  :c => 1 }
+  end
 
 end

data/spec/spec_helper.rb

@@ -6,9 +6,14 @@ dir = Pathname(__FILE__).dirname
 
 require dir + '../lib/r18n-core'
 
-DIR = dir + 'translations/general' unless defined? DIR
-TWO = dir + 'translations/two' unless defined? TWO
-EXT = R18n::Loader::YAML.new(dir + 'translations/extension') unless defined? EXT
+TRANSALTIONS = dir + 'translations'
+DIR = TRANSALTIONS + 'general' unless defined? DIR
+TWO = TRANSALTIONS + 'two' unless defined? TWO
+EXT = R18n::Loader::YAML.new(TRANSALTIONS + 'extension') unless defined? EXT
+
+Spec::Runner.configure do |config|
+  config.before { R18n.cache.clear }
+end
 
 gem 'maruku'
 gem 'RedCloth'

data/spec/yaml_loader_spec.rb

@@ -31,4 +31,18 @@ describe R18n::Loader::YAML do
     @loader.hash.should == R18n::Loader::YAML.new(DIR).hash
   end
   
+  it "should load in dir recursively" do
+    loader = R18n::Loader::YAML.new(TRANSALTIONS)
+    loader.available.should =~ [R18n::Locale.load('ru'),
+                                R18n::Locale.load('en'),
+                                R18n::Locale.load('fr'),
+                                R18n::Locale.load('no-tr'),
+                                R18n::Locale.load('no-lc')]
+    
+    translation = loader.load(R18n::Locale.load('en'))
+    translation['one'].should       == 'One'
+    translation['in']['two'].should == 'Two'
+    translation['ext'].should       == 'Extension'
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: r18n-core
 version: !ruby/object:Gem::Version 
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors: 
 - Andrey "A.I." Sitnik
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-19 00:00:00 +03:00
+date: 2010-02-26 00:00:00 +03:00
 default_executable: 
 dependencies: []
 
@@ -28,6 +28,7 @@ files:
 - base/it.yml
 - base/ru.yml
 - base/pl.yml
+- base/sk.yml
 - base/de.yml
 - base/eo.yml
 - base/cs.yml
@@ -58,6 +59,7 @@ files:
 - locales/zh.rb
 - locales/fr.rb
 - locales/ru.rb
+- locales/sk.rb
 - locales/pt-br.rb
 - locales/de.rb
 - locales/eo.rb
@@ -96,6 +98,7 @@ test_files:
 - spec/translated_spec.rb
 - spec/locales/it_spec.rb
 - spec/locales/fr_spec.rb
+- spec/locales/sk_spec.rb
 - spec/locales/pl_spec.rb
 - spec/locales/cs_spec.rb
 - spec/locales/ru_spec.rb