everythingbehind-i18n 0.1.1 → 0.1.1.1

data/i18n.gemspec

@@ -1,13 +1,13 @@
 Gem::Specification.new do |s|
   s.name = "i18n"
-  s.version = "0.1.1"
-  s.date = "2008-10-26"
+  s.version = "0.1.1.1"
+  s.date = "2008-12-16"
   s.summary = "Internationalization support for Ruby"
   s.email = "rails-i18n@googlegroups.com"
   s.homepage = "http://rails-i18n.org"
   s.description = "Add Internationalization support to your Ruby application."
   s.has_rdoc = false
-  s.authors = ['Sven Fuchs', 'Joshua Harvey', 'Matt Aimonetti', 'Stephan Soller', 'Saimon Moore']
+  s.authors = ['Sven Fuchs', 'Joshua Harvey', 'Matt Aimonetti', 'Stephan Soller', 'Saimon Moore', 'Ben Sales', 'Tom Lea']
   s.files = [
     'i18n.gemspec',
     'lib/i18n/backend/simple.rb',

data/lib/i18n/backend/simple.rb

@@ -74,7 +74,7 @@ module I18n
         @translations = nil
       end
 
-      def locales
+      def available_locales
         translations.keys
       end
 
@@ -223,14 +223,19 @@ module I18n
         # Walks a given tree of hashes, returning an array of possible walks through the tree.
         #   flatten_hash_tree_keys({:a => { :b => 3, :c => 4 } }) # => [ [:a, :b], [:a, :c] ]
         def flatten_hash_tree_keys(tree)
-          tree.map{|key, value|
-            case value
-            when Hash
-              flatten_hash_tree_keys(value).map{|normalised_subtree| [key] + [normalised_subtree] }
-            else
-              [key]
-            end
-          }
+          if tree.is_a? Hash
+            result = []
+              tree.each{|key, value|
+                if flattened_subtree = flatten_hash_tree_keys(value)
+                  flattened_subtree.each do |set|
+                    result.push([key, *set])
+                  end
+                else
+                  result.push([key])
+                end
+              }
+            result
+          end
         end
     end
   end

data/lib/i18n/test_helper.rb

@@ -2,7 +2,7 @@ module I18n
   module TestHelper
     def assert_all_locales_have_translations_available_to_the_default_locale(message = "All translations should be available in all locales")
       default_locale = I18n.default_locale.to_sym
-      locales_to_check = I18n.locales - [default_locale]
+      locales_to_check = I18n.available_locales - [default_locale]
 
       required_translations = I18n.available_translations(default_locale)
 
@@ -11,7 +11,7 @@ module I18n
         missing_translations = required_translations - defined_translations
                 
         if missing_translations.any?
-          missing_translations_for_output = [*missing_translations.map{|a| " * #{a.join('.')}" }].join("\n")
+          missing_translations_for_output = missing_translations.map{|parts| " * #{parts.join('.')}" }.join("\n")
           raise Test::Unit::AssertionFailedError.new("#{message} - Missing translations for #{target_locale.inspect}:\n#{missing_translations_for_output}")
         end
       end

data/lib/i18n.rb

@@ -47,8 +47,8 @@ module I18n
     end
 
     # Returns an array of availiable locales
-    def locales
-      backend.locales
+    def available_locales
+      backend.available_locales
     end
 
     # Lists all available translation keys (including scopes) for a given locale

data/test/i18n_test.rb

@@ -62,8 +62,8 @@ class I18nTest < Test::Unit::TestCase
   end
   
   def test_delegates_locales_to_backend
-    I18n.backend.expects(:locales)
-    I18n.locales
+    I18n.backend.expects(:available_locales)
+    I18n.available_locales
   end
 
   def test_delegates_translate_to_backend
@@ -127,4 +127,10 @@ class I18nTest < Test::Unit::TestCase
   def test_localize_object_raises_argument_error
     assert_raises(I18n::ArgumentError) { I18n.l Object.new }
   end
+  
+  def test_should_return_nested_scopes_as_arrays_of_keys_when_looking_for_available_translations
+    elements = I18n.available_translations(:'en')
+    assert elements.any?{|v| v == [:currency, :format, :separator] }, "Expected #{elements.inspect} to contain [:currency, :format, :separator]"
+    assert elements.any?{|v| v == [:currency, :format, :delimiter] }, "Expected #{elements.inspect} to contain [:currency, :format, :delimiter]"
+  end
 end

data/test/i18n_test_helper_test.rb

@@ -1,10 +1,19 @@
+# encoding: utf-8
+$:.unshift "lib"
+
+require 'rubygems'
+require 'test/unit'
+require 'mocha'
+require 'i18n'
+require 'time'
+require 'yaml'
 
 class EqualLocalesTestHelperTest < Test::Unit::TestCase
   include I18n::TestHelper
-  
+
   def setup
     I18n.reload!
-    
+
     I18n.backend.store_translations :'en', {
       :foo => "Bar",
       :nested => {
@@ -23,16 +32,31 @@ class EqualLocalesTestHelperTest < Test::Unit::TestCase
       :foo => "Barrrr!"
     }
   end
-  
+
   def test_should_not_raise_a_test_failure
     assert_nothing_raised() { assert_all_locales_have_translations_available_to_the_default_locale }
   end
+
+  def test_should_show_deeply_nested_translation_keys_correctly
+    I18n.backend.store_translations :'en', {
+      :nested => {
+        :translations => {
+          :should => {
+            :work => "Well"
+          }
+        }
+      }
+    }
+
+    e = assert_raise(Test::Unit::AssertionFailedError) { assert_all_locales_have_translations_available_to_the_default_locale }
+    assert_match %r/ * nested.translations.should.work$/, e.message
+  end
 end
 
 
 class UnequalLocalesTestHelperTest < Test::Unit::TestCase
   include I18n::TestHelper
-  
+
   def setup
     I18n.reload!
 
@@ -47,7 +71,7 @@ class UnequalLocalesTestHelperTest < Test::Unit::TestCase
       }
     }
   end
-  
+
   def test_should_raise_a_test_failure_for_none_matching_nested_keys
     e = assert_raise(Test::Unit::AssertionFailedError) { assert_all_locales_have_translations_available_to_the_default_locale }
     assert_match %r/Missing translations for :pirate/, e.message

data/test/simple_backend_test.rb

@@ -109,9 +109,9 @@ class I18nSimpleBackendTranslationsTest < Test::Unit::TestCase
   def test_list_of_locales
     @backend.store_translations :'en', :foo => {:bar => 'bar'}
     @backend.store_translations :'fr', :foo => {:bar => 'baz'}
-    assert_equal 2, @backend.locales.length
-    assert @backend.locales.include?(:en)
-    assert @backend.locales.include?(:fr)
+    assert_equal 2, @backend.available_locales.length
+    assert @backend.available_locales.include?(:en)
+    assert @backend.available_locales.include?(:fr)
   end
 
   def test_store_translations_deep_merges_translations

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: everythingbehind-i18n
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.1.1
 platform: ruby
 authors: 
 - Sven Fuchs
@@ -9,11 +9,13 @@ authors:
 - Matt Aimonetti
 - Stephan Soller
 - Saimon Moore
+- Ben Sales
+- Tom Lea
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-10-26 00:00:00 -07:00
+date: 2008-12-16 00:00:00 -08:00
 default_executable: 
 dependencies: []