i18n 0.6.9 → 0.6.11

data/{README.textile → README.md}

@@ -1,6 +1,6 @@
-h1. Ruby I18n
+# Ruby I18n
 
-!https://secure.travis-ci.org/svenfuchs/i18n.png?branch=master(Build Status)!:http://travis-ci.org/svenfuchs/i18n
+[![Build Status](https://api.travis-ci.org/svenfuchs/i18n.svg?branch=master)](https://travis-ci.org/svenfuchs/i18n)
 
 Ruby Internationalization and localization solution.
 
@@ -31,37 +31,37 @@ Alternative backends:
 * ActiveRecord (optionally: ActiveRecord::Missing and ActiveRecord::StoreProcs)
 * KeyValue (uses active_support/json and cannot store procs)
 
-For more information and lots of resources see: "http://ruby-i18n.org/wiki":http://ruby-i18n.org/wiki
+For more information and lots of resources see: [http://ruby-i18n.org/wiki](http://ruby-i18n.org/wiki)
 
-h2. Installation
+## Installation
 
 gem install i18n
 
-h4. Rails version warning
+#### Rails version warning
 
-On Rails < 2.3.6 the method I18n.localize will fail with MissingInterpolationArgument (issue "20":http://github.com/svenfuchs/i18n/issues/issue/20). Upgrade to Rails 2.3.6 or higher (2.3.8 preferably) is recommended.
+On Rails < 2.3.6 the method I18n.localize will fail with MissingInterpolationArgument (issue [20](http://github.com/svenfuchs/i18n/issues/issue/20). Upgrade to Rails 2.3.6 or higher (2.3.8 preferably) is recommended.
 
-h3. Installation on Rails < 2.3.5 (deprecated)
+### Installation on Rails < 2.3.5 (deprecated)
 
 Up to version 2.3.4 Rails will not accept i18n gems > 0.1.3. There is an unpacked
-gem inside of active_support/lib/vendor which gets loaded unless gem 'i18n', '~> 0.1.3'.
-This requirement is relaxed in "6da03653":http://github.com/rails/rails/commit/6da03653
+gem inside of active_support/lib/vendor which gets loaded unless `gem 'i18n', '~> 0.1.3'`.
+This requirement is relaxed in [6da03653](http://github.com/rails/rails/commit/6da03653)
 
 The new i18n gem can be loaded from vendor/plugins like this:
 
-<pre>
-  def reload_i18n!
-    raise "Move to i18n version 0.2.0 or greater" if Rails.version > "2.3.4"
+```
+def reload_i18n!
+  raise "Move to i18n version 0.2.0 or greater" if Rails.version > "2.3.4"
 
-    $:.grep(/i18n/).each { |path| $:.delete(path) }
-    I18n::Backend.send :remove_const, "Simple"
-    $: << Rails.root.join('vendor', 'plugins', 'i18n', 'lib').to_s
-  end
-</pre>
+  $:.grep(/i18n/).each { |path| $:.delete(path) }
+  I18n::Backend.send :remove_const, "Simple"
+  $: << Rails.root.join('vendor', 'plugins', 'i18n', 'lib').to_s
+end
+```
 
 Then you can `reload_i18n!` inside an i18n initializer.
 
-h2. Tests
+## Tests
 
 You can run tests both with
 
@@ -85,21 +85,21 @@ as test methods) in test cases with different setups.
 You can find the test cases that enforce the API in test/api. And you can find
 the API definition test methods in test/api/tests.
 
-All other test cases (e.g. as defined in test/backend, test/core\_ext) etc.
+All other test cases (e.g. as defined in test/backend, test/core_ext) etc.
 follow the usual test setup and should be easy to grok.
 
-h2. Authors
+## Authors
 
-* "Sven Fuchs":http://www.artweb-design.de
-* "Joshua Harvey":http://www.workingwithrails.com/person/759-joshua-harvey
-* "Stephan Soller":http://www.arkanis-development.de
-* "Saimon Moore":http://saimonmoore.net
-* "Matt Aimonetti":http://railsontherun.com
+* [Sven Fuchs](http://www.artweb-design.de)
+* [Joshua Harvey](http://www.workingwithrails.com/person/759-joshua-harvey)
+* [Stephan Soller](http://www.arkanis-development.de)
+* [Saimon Moore](http://saimonmoore.net)
+* [Matt Aimonetti](http://railsontherun.com)
 
-h2. Contributors
+## Contributors
 
 http://github.com/svenfuchs/i18n/contributors
 
-h2. License
+## License
 
 MIT License. See the included MIT-LICENSE file.

data/{ci → gemfiles}/Gemfile.rails-2.3.x

@@ -1,9 +1,11 @@
 source 'https://rubygems.org'
 
+gemspec :path => '..'
+
 gem 'activesupport', '~> 2.3'
-gem 'sqlite3-ruby'
 gem 'mocha'
 gem 'test_declarative'
 gem 'rufus-tokyo'
 gem 'ffi'
-
+gem 'rake'
+gem 'yajl-ruby'

data/gemfiles/Gemfile.rails-2.3.x.lock

@@ -0,0 +1,30 @@
+PATH
+  remote: ..
+  specs:
+    i18n (0.6.11)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (2.3.18)
+    ffi (1.9.3)
+    metaclass (0.0.4)
+    mocha (1.0.0)
+      metaclass (~> 0.0.1)
+    rake (10.3.1)
+    rufus-tokyo (1.0.7)
+    test_declarative (0.0.5)
+    yajl-ruby (1.2.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport (~> 2.3)
+  ffi
+  i18n!
+  mocha
+  rake
+  rufus-tokyo
+  test_declarative
+  yajl-ruby

data/{ci/Gemfile.rails-3.x → gemfiles/Gemfile.rails-3.0.x}

@@ -1,9 +1,11 @@
 source 'https://rubygems.org'
 
+gemspec :path => '..'
+
 gem 'activesupport', '~> 3.0.0'
-gem 'sqlite3-ruby'
 gem 'mocha'
 gem 'test_declarative'
 gem 'rufus-tokyo'
 gem 'ffi'
-
+gem 'rake'
+gem 'yajl-ruby'

data/gemfiles/Gemfile.rails-3.0.x.lock

@@ -0,0 +1,30 @@
+PATH
+  remote: ..
+  specs:
+    i18n (0.6.11)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (3.0.20)
+    ffi (1.9.3)
+    metaclass (0.0.4)
+    mocha (1.0.0)
+      metaclass (~> 0.0.1)
+    rake (10.3.1)
+    rufus-tokyo (1.0.7)
+    test_declarative (0.0.5)
+    yajl-ruby (1.2.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport (~> 3.0.0)
+  ffi
+  i18n!
+  mocha
+  rake
+  rufus-tokyo
+  test_declarative
+  yajl-ruby

data/gemfiles/Gemfile.rails-3.1.x

@@ -0,0 +1,10 @@
+source 'https://rubygems.org'
+
+gemspec :path => '..'
+
+gem 'activesupport', '~> 3.1.0'
+gem 'mocha'
+gem 'test_declarative'
+gem 'rufus-tokyo'
+gem 'ffi'
+gem 'rake'

data/gemfiles/Gemfile.rails-3.1.x.lock

@@ -0,0 +1,30 @@
+PATH
+  remote: ..
+  specs:
+    i18n (0.6.11)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (3.1.12)
+      multi_json (~> 1.0)
+    ffi (1.9.3)
+    metaclass (0.0.4)
+    mocha (1.0.0)
+      metaclass (~> 0.0.1)
+    multi_json (1.10.0)
+    rake (10.3.1)
+    rufus-tokyo (1.0.7)
+    test_declarative (0.0.5)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport (~> 3.1.0)
+  ffi
+  i18n!
+  mocha
+  rake
+  rufus-tokyo
+  test_declarative

data/gemfiles/Gemfile.rails-3.2.x

@@ -0,0 +1,10 @@
+source 'https://rubygems.org'
+
+gemspec :path => '..'
+
+gem 'activesupport', '~> 3.2.0'
+gem 'mocha'
+gem 'test_declarative'
+gem 'rufus-tokyo'
+gem 'ffi'
+gem 'rake'

data/gemfiles/Gemfile.rails-3.2.x.lock

@@ -0,0 +1,31 @@
+PATH
+  remote: ..
+  specs:
+    i18n (0.6.11)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (3.2.18)
+      i18n (~> 0.6, >= 0.6.4)
+      multi_json (~> 1.0)
+    ffi (1.9.3)
+    metaclass (0.0.4)
+    mocha (1.0.0)
+      metaclass (~> 0.0.1)
+    multi_json (1.10.0)
+    rake (10.3.1)
+    rufus-tokyo (1.0.7)
+    test_declarative (0.0.5)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport (~> 3.2.0)
+  ffi
+  i18n!
+  mocha
+  rake
+  rufus-tokyo
+  test_declarative

data/gemfiles/Gemfile.rails-4.0.x

@@ -0,0 +1,10 @@
+source 'https://rubygems.org'
+
+gemspec :path => '..'
+
+gem 'activesupport', '~> 4.0.0'
+gem 'mocha'
+gem 'test_declarative'
+gem 'rufus-tokyo'
+gem 'ffi'
+gem 'rake'

data/gemfiles/Gemfile.rails-4.0.x.lock

@@ -0,0 +1,37 @@
+PATH
+  remote: ..
+  specs:
+    i18n (0.6.11)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (4.0.5)
+      i18n (~> 0.6, >= 0.6.9)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    ffi (1.9.3)
+    metaclass (0.0.4)
+    minitest (4.7.5)
+    mocha (1.0.0)
+      metaclass (~> 0.0.1)
+    multi_json (1.10.0)
+    rake (10.3.1)
+    rufus-tokyo (1.0.7)
+    test_declarative (0.0.5)
+    thread_safe (0.3.3)
+    tzinfo (0.3.39)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport (~> 4.0.0)
+  ffi
+  i18n!
+  mocha
+  rake
+  rufus-tokyo
+  test_declarative

data/gemfiles/Gemfile.rails-4.1.x

@@ -0,0 +1,10 @@
+source 'https://rubygems.org'
+
+gemspec :path => '..'
+
+gem 'activesupport', '~> 4.1.0'
+gem 'mocha'
+gem 'test_declarative'
+gem 'rufus-tokyo'
+gem 'ffi'
+gem 'rake'

data/gemfiles/Gemfile.rails-4.1.x.lock

@@ -0,0 +1,38 @@
+PATH
+  remote: ..
+  specs:
+    i18n (0.6.11)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (4.1.1)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    ffi (1.9.3)
+    json (1.8.1)
+    metaclass (0.0.4)
+    minitest (5.3.3)
+    mocha (1.0.0)
+      metaclass (~> 0.0.1)
+    rake (10.3.1)
+    rufus-tokyo (1.0.7)
+    test_declarative (0.0.5)
+    thread_safe (0.3.3)
+    tzinfo (1.1.0)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport (~> 4.1.0)
+  ffi
+  i18n!
+  mocha
+  rake
+  rufus-tokyo
+  test_declarative

data/lib/i18n.rb

@@ -271,16 +271,13 @@ module I18n
       keys
     end
 
-    # Returns true when the passed locale is in I18.available_locales.
-    # Returns false otherwise.
-    # Compare with Strings as `locale` may be coming from user input
+    # Returns true when the passed locale, which can be either a String or a
+    # Symbol, is in the list of available locales. Returns false otherwise.
     def locale_available?(locale)
-      I18n.available_locales.map(&:to_s).include?(locale.to_s)
+      I18n.config.available_locales_set.include?(locale)
     end
 
-    # Raises an InvalidLocale exception when the passed locale is not
-    # included in I18n.available_locales.
-    # Returns false otherwise
+    # Raises an InvalidLocale exception when the passed locale is not available.
     def enforce_available_locales!(locale)
       handle_enforce_available_locales_deprecation
 
@@ -358,8 +355,8 @@ module I18n
     end
 
     def handle_enforce_available_locales_deprecation
-      if config.enforce_available_locales.nil? && !@unenforced_available_locales_deprecation
-        $stderr.puts "[deprecated] I18n.enforce_available_locales will default to true in the future. If you really want to skip validation of your locale you can set I18n.enforce_available_locales = false to avoid this message." 
+      if config.enforce_available_locales.nil? && !defined?(@unenforced_available_locales_deprecation)
+        $stderr.puts "[deprecated] I18n.enforce_available_locales will default to true in the future. If you really want to skip validation of your locale you can set I18n.enforce_available_locales = false to avoid this message."
         @unenforced_available_locales_deprecation = true
       end
     end

data/lib/i18n/backend/base.rb

@@ -1,6 +1,6 @@
 require 'yaml'
 require 'i18n/core_ext/hash'
-require 'i18n/core_ext/kernel/surpress_warnings'
+require 'i18n/core_ext/kernel/suppress_warnings'
 
 module I18n
   module Backend

data/lib/i18n/backend/fallbacks.rb

@@ -40,9 +40,13 @@ module I18n
 
         options[:fallback] = true
         I18n.fallbacks[locale].each do |fallback|
-          catch(:exception) do
-            result = super(fallback, key, options)
-            return result unless result.nil?
+          begin
+            catch(:exception) do
+              result = super(fallback, key, options)
+              return result unless result.nil?
+            end
+          rescue I18n::InvalidLocale
+            # we do nothing when the locale is invalid, as this is a fallback anyways.
           end
         end
         options.delete(:fallback)

data/lib/i18n/config.rb

@@ -41,10 +41,19 @@ module I18n
       @@available_locales || backend.available_locales
     end
 
+    # Caches the available locales list as both strings and symbols in a Set, so
+    # that we can have faster lookups to do the available locales enforce check.
+    def available_locales_set #:nodoc:
+      @@available_locales_set ||= available_locales.inject(Set.new) do |set, locale|
+        set << locale.to_s << locale.to_sym
+      end
+    end
+
     # Sets the available locales.
     def available_locales=(locales)
       @@available_locales = Array(locales).map { |locale| locale.to_sym }
       @@available_locales = nil if @@available_locales.empty?
+      @@available_locales_set = nil
     end
 
     # Returns the current default scope separator. Defaults to '.'