r18n-core 0.2.1 → 0.2.2

data/lib/r18n-core.rb

@@ -32,22 +32,22 @@ require dir + 'i18n'
 
 module R18n
   class << self
-    # Set <tt>i18n</tt> object to current thread
+    # Set I18n object to current thread.
     def set(i18n)
       Thread.current['i18n'] = i18n
     end
     
-    # Get I18n object for current thread
+    # Get I18n object for current thread.
     def get
       Thread.current['i18n']
     end
   end
   
   module Utils
-    # Recursively hash merge
+    # Recursively hash merge.
     def self.deep_merge!(a, b)
       b.each_pair do |name, value|
-        if Hash == a[name].class
+        if a[name].is_a? Hash
           self.deep_merge!(a[name], value)
         else
           a[name] = value

data/lib/r18n-core/i18n.rb

@@ -104,7 +104,7 @@ module R18n
     # +Locales+ must be a locale code (RFC 3066) or array, ordered by priority.
     # +Translations_dirs+ must be a string with path or array.
     def initialize(locales, translations_dirs = nil)
-      locales = [locales] if String == locales.class
+      locales = [locales] if locales.is_a? String
       
       @locales = locales.map do |locale|
         if Locale.exists? locale
@@ -160,14 +160,14 @@ module R18n
     # <tt>:short_datetime</tt> or <tt>:long_datetime</tt>). Without format it
     # use <tt>:datetime</tt> for Time and DateTime and <tt>:date</tt> for Date.
     def localize(object, format = nil)
-      if Fixnum == object.class or Bignum == object.class
-        locale.format_number(object)
-      elsif Float == object.class
+      if object.is_a? Integer
+        locale.format_integer(object)
+      elsif object.is_a? Float
         locale.format_float(object)
-      elsif Time == object.class or DateTime == object.class
+      elsif object.is_a? Time or object.is_a? DateTime
         format = :datetime if format.nil?
         locale.strftime(object, format)
-      elsif Date == object.class
+      elsif object.is_a? Date
         format = :date if format.nil?
         locale.strftime(object, format)
       end
@@ -181,7 +181,7 @@ module R18n
     # Translation can contain variable part. Just set is as <tt>%1</tt>,
     # <tt>%2</tt>, etc in translations file and set values as methods params.
     def method_missing(name, *params)
-      self[name.to_s, *params]
+      @translation[name.to_s, *params]
     end
     
     # Return translation with special +name+.

data/lib/r18n-core/locale.rb

@@ -102,7 +102,7 @@ module R18n
     # This is internal a constructor. To load translation use
     # <tt>R18n::Translation.load(locales, translations_dir)</tt>.
     def initialize(locale)
-      p 1 if String == locale.class
+      p 1 if locale.is_a? String
       @locale = locale
     end
 
@@ -123,9 +123,9 @@ module R18n
     
     # Returns the integer in String form, according to the rules of the locale.
     # It will also put real typographic minus.
-    def format_number(number)
-      str = number.to_s
-      str[0] = '−' if 0 > number # Real typographic minus
+    def format_integer(integer)
+      str = integer.to_s
+      str[0] = '−' if 0 > integer # Real typographic minus
       group = @locale['numbers']['group_delimiter']
       
       str.gsub(/(\d)(?=(\d\d\d)+(?!\d))/) do |match|
@@ -137,7 +137,7 @@ module R18n
     # It will also put real typographic minus.
     def format_float(float)
       decimal = @locale['numbers']['decimal_separator']
-      self.format_number(float.to_i) + decimal + float.to_s.split('.').last
+      self.format_integer(float.to_i) + decimal + float.to_s.split('.').last
     end
     
     # Same that <tt>Time.strftime</tt>, but translate months and week days
@@ -148,7 +148,7 @@ module R18n
     # <tt>:long_data</tt>, <tt>:datetime</tt>, <tt>:short_datetime</tt> or
     # <tt>:long_datetime</tt>).
     def strftime(time, format)
-      if Symbol == format.class
+      if format.is_a? Symbol
         if :month == format
           return @locale['months']['standalone'][time.month - 1]
         end

data/lib/r18n-core/translation.rb

@@ -108,7 +108,7 @@ module R18n
     
     # Return available translations in +dirs+
     def self.available(dirs)
-      if Array == dirs.class
+      if dirs.is_a? Array
         return dirs.inject([]) do |available, i|
           available |= self.available(i)
         end
@@ -186,7 +186,7 @@ module R18n
         result = translation[name]
         next if result.nil?
         
-        if YAML::PrivateType == result.class
+        if result.is_a? YAML::PrivateType
           case result.type_id
           when 'proc'
             if @@call_proc
@@ -197,10 +197,16 @@ module R18n
           when 'pl'
             locale = @locales[i]
             
-            type = if Locale == locale.class
-              locale.pluralize(params.first)
+            if locale.is_a? Locale
+              type = locale.pluralize(params.first)
+              
+              if params.first.is_a? Float
+                params[0] = locale.format_float(params.first)
+              elsif params.first.is_a? Integer
+                params[0] = locale.format_integer(params.first)
+              end
             else
-              Locale.default_pluralize(params.first)
+              type = Locale.default_pluralize(params.first)
             end
             
             type = 'n' if not result.value.include? type
@@ -210,17 +216,18 @@ module R18n
           end
         end
         
-        if String == result.class
+        if result.is_a? String
+          result = result.clone
           params.each_with_index do |param, i|
             result.gsub! "%#{i+1}", param.to_s
           end
           return TranslatedString.new(result, @locales[i])
-        elsif Hash == result.class
+        elsif result.is_a? Hash
           return self.class.new(@locales, @translations.map { |i|
             i[name] or {}
           })
         else
-          return result
+          return result.clone
         end
       end
       

data/lib/r18n-core/version.rb

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

data/spec/i18n_spec.rb

@@ -31,6 +31,7 @@ describe R18n::I18n do
   it "should load translations" do
     i18n = R18n::I18n.new(['ru', 'en'], DIR)
     i18n.one.should == 'Один'
+    i18n['one'].should == 'Один'
     i18n.only.english.should == 'Only in English'
   end
 
@@ -68,7 +69,7 @@ describe R18n::I18n do
     i18n.l(-12345.67).should == '−12 345,67'
     
     time = Time.at(0).utc
-    i18n.l(time).should == 'Чтв, 01 янв 1970, 00:00:00 UTC'
+    i18n.l(time).should =~ /^Чтв, 01 янв 1970, 00:00:00 (GMT|UTC)$/
     i18n.l(time, :time).should == '00:00'
     i18n.l(time, '%A').should == 'Четверг'
     

data/spec/locale_spec.rb

@@ -68,7 +68,7 @@ describe R18n::Locale do
 
   it "should format number in local traditions" do
     locale = R18n::Locale.load('en')
-    locale.format_number(-123456789).should == "−123,456,789"
+    locale.format_integer(-123456789).should == "−123,456,789"
   end
 
   it "should format float in local traditions" do
@@ -85,7 +85,7 @@ describe R18n::Locale do
     locale.strftime(time, '%H:%M%p').should == '00:00 утра'
     
     locale.strftime(time, :month).should == 'Январь'
-    locale.strftime(time, :datetime).should == 'Чтв, 01 янв 1970, 00:00:00 UTC'
+    locale.strftime(time, :datetime).should =~ /^Чтв, 01 янв 1970, 00:00:00 (GMT|UTC)$/
   end
 
   it "should delete slashed from locale for security reasons" do

data/spec/translation_spec.rb

@@ -87,6 +87,8 @@ describe R18n::Translation do
     translation.comments(5, 'article').should == '5 comments for article'
     
     translation.files(0).should == '0 files'
+    translation.files(-5.5).should == '−5.5 files'
+    translation.files(5000).should == '5,000 files'
   end
 
   it "should return unknown YAML type" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: r18n-core
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Andrey "A.I." Sitnik
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-18 00:00:00 +03:00
+date: 2009-06-25 00:00:00 +04:00
 default_executable: 
 dependencies: []
 
@@ -23,28 +23,28 @@ extra_rdoc_files:
 - README.rdoc
 - LICENSE
 files: 
-- base/de.yml
-- base/kk.yml
 - base/ru.yml
-- base/eo.yml
-- base/en.yml
+- base/kk.yml
 - base/fr.yml
-- lib/r18n-core.rb
+- base/en.yml
+- base/de.yml
+- base/eo.yml
 - lib/r18n-core
-- lib/r18n-core/translation.rb
-- lib/r18n-core/translated_string.rb
+- lib/r18n-core/untranslated.rb
+- lib/r18n-core/i18n.rb
 - lib/r18n-core/locale.rb
 - lib/r18n-core/version.rb
-- lib/r18n-core/i18n.rb
-- lib/r18n-core/untranslated.rb
+- lib/r18n-core/translation.rb
+- lib/r18n-core/translated_string.rb
+- lib/r18n-core.rb
+- locales/ru.rb
+- locales/ru.yml
+- locales/kk.yml
+- locales/fr.yml
 - locales/en_US.yml
+- locales/en.yml
 - locales/de.yml
-- locales/kk.yml
-- locales/ru.yml
-- locales/ru.rb
 - locales/eo.yml
-- locales/en.yml
-- locales/fr.yml
 - LICENSE
 - README.rdoc
 has_rdoc: true
@@ -74,21 +74,21 @@ signing_key:
 specification_version: 2
 summary: I18n tool to translate your Ruby application.
 test_files: 
-- spec/spec_helper.rb
-- spec/translation_spec.rb
-- spec/i18n_spec.rb
 - spec/locales
 - spec/locales/ru_spec.rb
+- spec/spec_helper.rb
 - spec/translations
+- spec/translations/two
+- spec/translations/two/fr.yml
+- spec/translations/two/en.yml
 - spec/translations/general
 - spec/translations/general/ru.yml
-- spec/translations/general/en.yml
 - spec/translations/general/no_LC.yml
+- spec/translations/general/en.yml
 - spec/translations/extension
 - spec/translations/extension/no_TR.yml
 - spec/translations/extension/en.yml
-- spec/translations/two
-- spec/translations/two/en.yml
-- spec/translations/two/fr.yml
+- spec/translation_spec.rb
 - spec/r18n_spec.rb
 - spec/locale_spec.rb
+- spec/i18n_spec.rb