russian 0.1.3 → 0.2.0

data/CHANGELOG

@@ -1,3 +1,13 @@
+=== 0.2.0 - 16.03.2009
+
+* number_to_human_size() translations: using edge format (Rails 2.3)
+* i18n gem updated (0.1.3)
+* Rails 2.3 compat
+
+* Перевод для number_to_human_size(): испольуется форматирование из edge (Rails 2.3)
+* Обновлен gem i18n до версии 0.1.3
+* Совместимость с Rails 2.3
+
 === 0.1.3 - 27.12.2008
 
 * Add support.array.words_connector/two_words_connector/last_word_connector (Array#to_sentence) (Rails Edge)

data/Rakefile

@@ -5,7 +5,7 @@ require 'rubygems/specification'
 require 'date'
 
 GEM = "russian"
-GEM_VERSION = "0.1.3"
+GEM_VERSION = "0.2.0"
 AUTHOR = "Yaroslav Markin"
 EMAIL = "yaroslav@markin.net"
 HOMEPAGE = "http://github.com/yaroslav/russian/"
@@ -52,4 +52,4 @@ task :make_spec do
   File.open("#{GEM}.gemspec", "w") do |file|
     file.puts spec.to_ruby
   end
-end
+end

data/TODO

@@ -4,8 +4,6 @@ TODO
 * check Unicode CLDR to ensure all datetime formats are correct
 * refactor Advanced backend localize method (looks ugly)
 * refactor DateTimeSelector#translated_month_names
-* stuff from english gem
-* Countries list (not in Rails I18n)
 
 Questionable
 ============

data/lib/russian.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*- 
+
 $KCODE='u'
 
 $:.push File.join(File.dirname(__FILE__), 'russian')
@@ -24,8 +26,8 @@ module Russian
   
   module VERSION
     MAJOR = 0
-    MINOR = 1
-    TINY  = 3
+    MINOR = 2
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
@@ -48,10 +50,9 @@ module Russian
   # Init Russian i18n: set custom backend, set default locale to Russian locale, load all translations
   # shipped with library.
   def init_i18n
-    old_load_path = I18n.load_path
     I18n.backend = Russian.i18n_backend_class.new
     I18n.default_locale = LOCALE
-    I18n.load_path = locale_files + old_load_path
+    I18n.load_path.unshift(*locale_files)
   end
 
   # See I18n::translate

data/lib/russian/action_view_ext/helpers/date_helper.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*- 
+
 # Заменяет хелпер Rails <tt>select_month</tt> и метод <tt>translated_month_names</tt> 
 # для поддержки функционала "отдельностоящих имен месяцев".
 #

data/lib/russian/active_record_ext/custom_error_message.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*- 
+
 # The following is taken from custom_error_message plugin by David Easley
 # (http://rubyforge.org/projects/custom-err-msg/)
 module ActiveRecord

data/lib/russian/active_support_ext/parameterize.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*- 
+
 module ActiveSupport
   module Inflector
     # Replaces special characters in a string so that it may be used as part of a 'pretty' URL.

data/lib/russian/backend/advanced.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*- 
+
 module I18n
   module Backend
     # "Продвинутый" бекэнд для I18n.

data/lib/russian/locale/actionview.yml

@@ -49,7 +49,25 @@ ru:
         # separator: 
         delimiter: ""
         precision: 1
-      storage_units: [байт, КБ, МБ, ГБ, ТБ]
+      
+      # Rails 2.2
+      # storage_units: [байт, КБ, МБ, ГБ, ТБ]
+      
+      # Rails 2.3
+      storage_units:
+        # Storage units output formatting.
+        # %u is the storage unit, %n is the number (default: 2 MB)
+        format: "%n %u"
+        units:
+          byte:
+            one:   "байт"
+            few:   "байта"
+            many:  "байт"
+            other: "байта"
+          kb: "КБ"
+          mb: "МБ"
+          gb: "ГБ"
+          tb: "ТБ"
 
   # Используется в хелперах distance_of_time_in_words(), distance_of_time_in_words_to_now(), time_ago_in_words()
   #

data/lib/russian/locale/pluralize.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*- 
+
 {
   :'ru' => {
     :pluralize => lambda { |n| 

data/lib/russian/transliteration.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*- 
+
 module Russian
   # Russian transliteration 
   #

data/lib/vendor/i18n/i18n.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = "i18n"
-  s.version = "0.1.1"
-  s.date = "2008-10-26"
+  s.version = "0.1.3"
+  s.date = "2009-01-09"
   s.summary = "Internationalization support for Ruby"
   s.email = "rails-i18n@googlegroups.com"
   s.homepage = "http://rails-i18n.org"

data/lib/vendor/i18n/lib/i18n.rb

@@ -45,6 +45,11 @@ module I18n
       Thread.current[:locale] = locale
     end
 
+    # Returns an array of locales for which translations are available
+    def available_locales
+      backend.available_locales
+    end
+
     # Sets the exception handler.
     def exception_handler=(exception_handler)
       @@exception_handler = exception_handler

data/lib/vendor/i18n/lib/i18n/backend/simple.rb

@@ -69,6 +69,12 @@ module I18n
         @initialized ||= false
       end
 
+      # Returns an array of locales for which translations are available
+      def available_locales
+        init_translations unless initialized?
+        translations.keys
+      end
+
       def reload!
         @initialized = false
         @translations = nil
@@ -76,7 +82,7 @@ module I18n
 
       protected
         def init_translations
-          load_translations(*I18n.load_path)
+          load_translations(*I18n.load_path.flatten)
           @initialized = true
         end
 
@@ -145,12 +151,7 @@ module I18n
         def interpolate(locale, string, values = {})
           return string unless string.is_a?(String)
 
-          if string.respond_to?(:force_encoding)
-            original_encoding = string.encoding
-            string.force_encoding(Encoding::BINARY)
-          end
-
-          result = string.gsub(MATCH) do
+          string.gsub(MATCH) do
             escaped, pattern, key = $1, $2, $2.to_sym
 
             if escaped
@@ -163,9 +164,6 @@ module I18n
               values[key].to_s
             end
           end
-
-          result.force_encoding(original_encoding) if original_encoding
-          result
         end
 
         # Loads a single translations file by delegating to #load_rb or

data/lib/vendor/i18n/test/simple_backend_test.rb

@@ -124,6 +124,16 @@ class I18nSimpleBackendTranslationsTest < Test::Unit::TestCase
   end
 end
 
+class I18nSimpleBackendAvailableLocalesTest < Test::Unit::TestCase
+  def test_available_locales
+    @backend = I18n::Backend::Simple.new
+    @backend.store_translations 'de', :foo => 'bar'
+    @backend.store_translations 'en', :foo => 'foo'
+
+    assert_equal ['de', 'en'], @backend.available_locales.map{|locale| locale.to_s }.sort
+  end
+end
+
 class I18nSimpleBackendTranslateTest < Test::Unit::TestCase
   include I18nSimpleBackendTestSetup
 
@@ -243,6 +253,32 @@ class I18nSimpleBackendInterpolateTest < Test::Unit::TestCase
     assert_equal 'Häi David!', @backend.send(:interpolate, nil, 'Häi {{name}}!', :name => 'David')
   end
 
+  def test_interpolate_given_an_unicode_value_hash_interpolates_to_the_string
+    assert_equal 'Hi ゆきひろ!', @backend.send(:interpolate, nil, 'Hi {{name}}!', :name => 'ゆきひろ')
+  end
+
+  def test_interpolate_given_an_unicode_value_hash_interpolates_into_unicode_string
+    assert_equal 'こんにちは、ゆきひろさん!', @backend.send(:interpolate, nil, 'こんにちは、{{name}}さん!', :name => 'ゆきひろ')
+  end
+
+  if Kernel.const_defined?(:Encoding)
+    def test_interpolate_given_a_non_unicode_multibyte_value_hash_interpolates_into_a_string_with_the_same_encoding
+      assert_equal euc_jp('Hi ゆきひろ!'), @backend.send(:interpolate, nil, 'Hi {{name}}!', :name => euc_jp('ゆきひろ'))
+    end
+
+    def test_interpolate_given_an_unicode_value_hash_into_a_non_unicode_multibyte_string_raises_encoding_compatibility_error
+      assert_raises(Encoding::CompatibilityError) do
+        @backend.send(:interpolate, nil, euc_jp('こんにちは、{{name}}さん!'), :name => 'ゆきひろ')
+      end
+    end
+
+    def test_interpolate_given_a_non_unicode_multibyte_value_hash_into_an_unicode_string_raises_encoding_compatibility_error
+      assert_raises(Encoding::CompatibilityError) do
+        @backend.send(:interpolate, nil, 'こんにちは、{{name}}さん!', :name => euc_jp('ゆきひろ'))
+      end
+    end
+  end
+
   def test_interpolate_given_nil_as_a_string_returns_nil
     assert_nil @backend.send(:interpolate, nil, nil, :name => 'David')
   end
@@ -262,6 +298,12 @@ class I18nSimpleBackendInterpolateTest < Test::Unit::TestCase
   def test_interpolate_given_a_string_containing_a_reserved_key_raises_reserved_interpolation_key
     assert_raises(I18n::ReservedInterpolationKey) { @backend.send(:interpolate, nil, '{{default}}', {:default => nil}) }
   end
+  
+  private
+  
+  def euc_jp(string)
+    string.encode!(Encoding::EUC_JP)
+  end
 end
 
 class I18nSimpleBackendLocalizeDateTest < Test::Unit::TestCase
@@ -472,6 +514,30 @@ class I18nSimpleBackendLoadTranslationsTest < Test::Unit::TestCase
   end
 end
 
+class I18nSimpleBackendLoadPathTest < Test::Unit::TestCase
+  include I18nSimpleBackendTestSetup
+
+  def teardown
+    I18n.load_path = []
+  end
+
+  def test_nested_load_paths_do_not_break_locale_loading
+    @backend = I18n::Backend::Simple.new
+    I18n.load_path = [[File.dirname(__FILE__) + '/locale/en.yml']]
+    assert_nil backend_get_translations
+    assert_nothing_raised { @backend.send :init_translations }
+    assert_not_nil backend_get_translations
+  end
+
+  def test_adding_arrays_of_filenames_to_load_path_do_not_break_locale_loading
+    @backend = I18n::Backend::Simple.new
+    I18n.load_path << Dir[File.dirname(__FILE__) + '/locale/*.{rb,yml}']
+    assert_nil backend_get_translations
+    assert_nothing_raised { @backend.send :init_translations }
+    assert_not_nil backend_get_translations
+  end
+end
+
 class I18nSimpleBackendReloadTranslationsTest < Test::Unit::TestCase
   include I18nSimpleBackendTestSetup
   
@@ -499,4 +565,4 @@ class I18nSimpleBackendReloadTranslationsTest < Test::Unit::TestCase
     @backend.reload!
     assert_equal @backend.initialized?, false
   end
-end
+end

data/spec/i18n/locale/datetime_spec.rb

@@ -1,7 +1,9 @@
+# -*- encoding: utf-8 -*- 
+
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe I18n, "Russian Date/Time localization" do
-  before(:each) do
+  before(:all) do
     @date = Date.parse("1985-12-01")
     @time = Time.local(1985, 12, 01, 16, 05)
   end
@@ -88,4 +90,4 @@ describe I18n, "Russian Date/Time localization" do
     def l(object, options = {})
       I18n.l(object, options.merge( { :locale => Russian.locale }))
     end
-end
+end

data/spec/i18n/locale/pluralization_spec.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*- 
+
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe I18n, "Russian pluralization" do

data/spec/locale_spec.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*- 
+
 require File.dirname(__FILE__) + '/spec_helper'
 
 describe Russian, "loading locales" do

data/spec/russian_spec.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*- 
+
 require File.dirname(__FILE__) + '/spec_helper'
 
 describe Russian, "VERSION" do
@@ -26,6 +28,11 @@ describe Russian do
   end
   
   describe "during i18n initialization" do
+    after(:each) do
+      I18n.load_path = []
+      Russian.init_i18n
+    end
+
     it "should set I18n backend to an instance of a custom backend" do
       Russian.init_i18n
       I18n.backend.class.should == Russian.i18n_backend_class
@@ -126,4 +133,4 @@ describe Russian do
       end
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*- 
+
 $TESTING=true
 $:.push File.join(File.dirname(__FILE__), '..', 'lib')
 

data/spec/transliteration_spec.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*- 
+
 require File.dirname(__FILE__) + '/spec_helper'
 
 describe Russian do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: russian
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors: 
 - Yaroslav Markin
@@ -9,7 +9,7 @@ autorequire: russian
 bindir: bin
 cert_chain: []
 
-date: 2008-12-27 00:00:00 +03:00
+date: 2009-03-16 00:00:00 +03:00
 default_executable: 
 dependencies: []
 
@@ -32,67 +32,66 @@ files:
 - TODO
 - init.rb
 - lib/russian
-- lib/russian/action_view_ext
-- lib/russian/action_view_ext/helpers
-- lib/russian/action_view_ext/helpers/date_helper.rb
 - lib/russian/active_record_ext
 - lib/russian/active_record_ext/custom_error_message.rb
 - lib/russian/active_support_ext
 - lib/russian/active_support_ext/parameterize.rb
-- lib/russian/backend
-- lib/russian/backend/advanced.rb
-- lib/russian/core_ext
 - lib/russian/locale
 - lib/russian/locale/actionview.yml
+- lib/russian/locale/pluralize.rb
+- lib/russian/locale/datetime.yml
 - lib/russian/locale/activerecord.yml
 - lib/russian/locale/activesupport.yml
-- lib/russian/locale/datetime.yml
-- lib/russian/locale/pluralize.rb
+- lib/russian/action_view_ext
+- lib/russian/action_view_ext/helpers
+- lib/russian/action_view_ext/helpers/date_helper.rb
 - lib/russian/transliteration.rb
-- lib/russian.rb
+- lib/russian/backend
+- lib/russian/backend/advanced.rb
 - lib/vendor
 - lib/vendor/i18n
+- lib/vendor/i18n/test
+- lib/vendor/i18n/test/i18n_exceptions_test.rb
+- lib/vendor/i18n/test/simple_backend_test.rb
+- lib/vendor/i18n/test/all.rb
+- lib/vendor/i18n/test/i18n_test.rb
+- lib/vendor/i18n/test/locale
+- lib/vendor/i18n/test/locale/en.yml
+- lib/vendor/i18n/test/locale/en.rb
 - lib/vendor/i18n/i18n.gemspec
 - lib/vendor/i18n/lib
+- lib/vendor/i18n/lib/i18n.rb
 - lib/vendor/i18n/lib/i18n
+- lib/vendor/i18n/lib/i18n/exceptions.rb
 - lib/vendor/i18n/lib/i18n/backend
 - lib/vendor/i18n/lib/i18n/backend/simple.rb
-- lib/vendor/i18n/lib/i18n/exceptions.rb
-- lib/vendor/i18n/lib/i18n.rb
 - lib/vendor/i18n/MIT-LICENSE
-- lib/vendor/i18n/Rakefile
 - lib/vendor/i18n/README.textile
-- lib/vendor/i18n/test
-- lib/vendor/i18n/test/all.rb
-- lib/vendor/i18n/test/i18n_exceptions_test.rb
-- lib/vendor/i18n/test/i18n_test.rb
-- lib/vendor/i18n/test/locale
-- lib/vendor/i18n/test/locale/en.rb
-- lib/vendor/i18n/test/locale/en.yml
-- lib/vendor/i18n/test/simple_backend_test.rb
+- lib/vendor/i18n/Rakefile
 - lib/vendor/i18n_label
+- lib/vendor/i18n_label/spec
+- lib/vendor/i18n_label/spec/spec_helper.rb
+- lib/vendor/i18n_label/spec/i18n_label_spec.rb
 - lib/vendor/i18n_label/init.rb
 - lib/vendor/i18n_label/install.rb
+- lib/vendor/i18n_label/uninstall.rb
 - lib/vendor/i18n_label/lib
 - lib/vendor/i18n_label/lib/i18n_label.rb
-- lib/vendor/i18n_label/Rakefile
 - lib/vendor/i18n_label/README.textile
-- lib/vendor/i18n_label/spec
-- lib/vendor/i18n_label/spec/i18n_label_spec.rb
-- lib/vendor/i18n_label/spec/spec_helper.rb
 - lib/vendor/i18n_label/tasks
 - lib/vendor/i18n_label/tasks/i18n_label_tasks.rake
-- lib/vendor/i18n_label/uninstall.rb
-- spec/fixtures
-- spec/fixtures/en.yml
-- spec/fixtures/ru.yml
+- lib/vendor/i18n_label/Rakefile
+- lib/russian.rb
+- spec/russian_spec.rb
+- spec/spec_helper.rb
+- spec/locale_spec.rb
 - spec/i18n
 - spec/i18n/locale
-- spec/i18n/locale/datetime_spec.rb
 - spec/i18n/locale/pluralization_spec.rb
-- spec/locale_spec.rb
-- spec/russian_spec.rb
-- spec/spec_helper.rb
+- spec/i18n/locale/datetime_spec.rb
+- spec/fixtures
+- spec/fixtures/ru.yml
+- spec/fixtures/en.yml
 - spec/transliteration_spec.rb
 has_rdoc: true
 homepage: http://github.com/yaroslav/russian/