i18n 0.3.6 → 0.3.7

data/lib/i18n.rb

@@ -256,10 +256,10 @@ module I18n
     # Splits keys that contain dots into multiple keys. Makes sure all
     # keys are Symbols.
     def normalize_keys(locale, key, scope, separator = nil)
-      keys = [locale] + Array(scope) + Array(key)
-      keys = keys.map { |k| k.to_s.split(separator || I18n.default_separator) }
-      keys = keys.flatten - ['']
-      keys.map { |k| k.to_sym }
+      separator ||= I18n.default_separator
+      normalize_key(locale, separator) +
+        normalize_key(scope, separator) +
+        normalize_key(key, separator)
     end
 
   # making these private until Ruby 1.9.2 can send to protected methods again
@@ -306,5 +306,30 @@ module I18n
     def normalize_translation_keys(locale, key, scope, separator = nil)
       normalize_keys(locale, key, scope, separator)
     end
+
+    def normalize_key(key, separator)
+      normalized_key_cache(separator)[key] ||=
+        case key
+        when Array
+          key.map { |k| normalize_key(k, separator) }.flatten
+        when nil
+          []
+        else
+          key = key.to_s
+          if key == ''
+            []
+          elsif key.include?(separator)
+            keys = key.split(separator) - ['']
+            keys.map { |k| k.to_sym }
+          else
+            [key.to_sym]
+          end
+        end
+    end
+
+    def normalized_key_cache(separator)
+      @normalized_key_cache ||= Hash.new { |h,k| h[k] = {} }
+      @normalized_key_cache[separator]
+    end
   end
 end

data/lib/i18n/backend/active_record/translation.rb

@@ -48,15 +48,17 @@ module I18n
       class Translation < ::ActiveRecord::Base
         set_table_name 'translations'
         attr_protected :is_proc, :interpolations
-        
+
         serialize :value
         serialize :interpolations, Array
 
-        named_scope :locale, lambda { |locale|
+        scope_method = ::ActiveRecord::VERSION::MAJOR == 2 ? :named_scope : :scope
+
+        send scope_method, :locale, lambda { |locale|
           { :conditions => { :locale => locale.to_s } }
         }
 
-        named_scope :lookup, lambda { |keys, *separator|
+        send scope_method, :lookup, lambda { |keys, *separator|
           column_name = connection.quote_column_name('key')
           keys        = Array(keys).map! { |key| key.to_s }
           separator   = separator.first || I18n.default_separator
@@ -67,7 +69,7 @@ module I18n
         def self.available_locales
           Translation.find(:all, :select => 'DISTINCT locale').map { |t| t.locale.to_sym }
         end
-        
+
         def interpolates?(key)
           self.interpolations.include?(key) if self.interpolations
         end

data/lib/i18n/backend/base.rb

@@ -117,7 +117,7 @@ module I18n
             return nil unless result.is_a?(Hash) && result.has_key?(key)
             result = result[key]
             result = resolve(locale, key, result, options) if result.is_a?(Symbol)
-            result
+            String === result ? result.dup : result
           end
         end
 

data/lib/i18n/locale/fallbacks.rb

@@ -28,7 +28,7 @@
 #
 #   I18n.default_locale = :"en-US"
 #   I18n.fallbacks = I18n::Fallbacks.new(:"de-AT" => :"de-DE")
-#   I18n.fallbacks[:"de-AT"] # => [:"de-AT", :"de-DE", :de, :"en-US", :en]
+#   I18n.fallbacks[:"de-AT"] # => [:"de-AT", :"de-DE", :de, :"en-US", :en] # TODO does not seem to work this way?
 #
 #   # using a custom locale as default fallback locale
 #
@@ -55,10 +55,10 @@
 module I18n
   module Locale
     class Fallbacks < Hash
-      def initialize(*mappings)
+      def initialize(*args)
         @map = {}
-        map(mappings.pop) if mappings.last.is_a?(Hash)
-        self.defaults = mappings.empty? ? [I18n.default_locale.to_sym] : mappings
+        map(args.pop) if args.last.is_a?(Hash) # TODO allow mappings anywhere in the args array
+        self.defaults = args.empty? ? [I18n.default_locale.to_sym] : args
       end
 
       def defaults=(defaults)

data/lib/i18n/version.rb

@@ -1,3 +1,3 @@
 module I18n
-  VERSION = "0.3.6"
+  VERSION = "0.3.7"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 6
-  version: 0.3.6
+  - 7
+  version: 0.3.7
 platform: ruby
 authors: 
 - Sven Fuchs
@@ -18,23 +18,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-23 00:00:00 +01:00
+date: 2010-04-17 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
-description: Add Internationalization support to your Ruby application.
+description: New wave Internationalization support for Ruby.
 email: rails-i18n@googlegroups.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README.textile
+extra_rdoc_files: []
+
 files: 
-- CHANGELOG.textile
-- MIT-LICENSE
-- README.textile
-- Rakefile
 - lib/i18n.rb
 - lib/i18n/backend.rb
 - lib/i18n/backend/active_record.rb
@@ -71,65 +67,13 @@ files:
 - lib/i18n/locale/tag/rfc4646.rb
 - lib/i18n/locale/tag/simple.rb
 - lib/i18n/version.rb
-- test/all.rb
-- test/api.rb
-- test/api/active_record_test.rb
-- test/api/all_features_test.rb
-- test/api/cascade_test.rb
-- test/api/chain_test.rb
-- test/api/fallbacks_test.rb
-- test/api/fast_test.rb
-- test/api/pluralization_test.rb
-- test/api/simple_test.rb
-- test/api/tests/basics.rb
-- test/api/tests/defaults.rb
-- test/api/tests/interpolation.rb
-- test/api/tests/link.rb
-- test/api/tests/localization/date.rb
-- test/api/tests/localization/date_time.rb
-- test/api/tests/localization/procs.rb
-- test/api/tests/localization/time.rb
-- test/api/tests/lookup.rb
-- test/api/tests/pluralization.rb
-- test/api/tests/procs.rb
-- test/backend/active_record/missing_test.rb
-- test/backend/active_record_test.rb
-- test/backend/cache_test.rb
-- test/backend/cascade_test.rb
-- test/backend/chain_test.rb
-- test/backend/cldr_test.rb
-- test/backend/exceptions_test.rb
-- test/backend/fallbacks_test.rb
-- test/backend/fast_test.rb
-- test/backend/helpers_test.rb
-- test/backend/interpolation_compiler_test.rb
-- test/backend/metadata_test.rb
-- test/backend/pluralization_test.rb
-- test/backend/simple_test.rb
-- test/core_ext/string/interpolate_test.rb
-- test/gettext/api_test.rb
-- test/gettext/backend_test.rb
-- test/i18n_exceptions_test.rb
-- test/i18n_load_path_test.rb
-- test/i18n_test.rb
-- test/locale/fallbacks_test.rb
-- test/locale/tag/rfc4646_test.rb
-- test/locale/tag/simple_test.rb
-- test/test_data/locales/cldr/de/calendars.yml
-- test/test_data/locales/cldr/de/currencies.yml
-- test/test_data/locales/cldr/de/numbers.yml
-- test/test_data/locales/de.po
-- test/test_data/locales/en.rb
-- test/test_data/locales/en.yml
-- test/test_data/locales/plurals.rb
-- test/test_helper.rb
 has_rdoc: true
-homepage: http://rails-i18n.org
+homepage: http://github.com/svenfuchs/i18n
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -144,60 +88,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 6
+      version: 1.3.6
 requirements: []
 
-rubyforge_project: i18n
+rubyforge_project: "[none]"
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: New wave Internationalization support for Ruby
-test_files: 
-- test/all.rb
-- test/api/active_record_test.rb
-- test/api/all_features_test.rb
-- test/api/cascade_test.rb
-- test/api/chain_test.rb
-- test/api/fallbacks_test.rb
-- test/api/fast_test.rb
-- test/api/pluralization_test.rb
-- test/api/simple_test.rb
-- test/api/tests/basics.rb
-- test/api/tests/defaults.rb
-- test/api/tests/interpolation.rb
-- test/api/tests/link.rb
-- test/api/tests/localization/date.rb
-- test/api/tests/localization/date_time.rb
-- test/api/tests/localization/procs.rb
-- test/api/tests/localization/time.rb
-- test/api/tests/lookup.rb
-- test/api/tests/pluralization.rb
-- test/api/tests/procs.rb
-- test/api.rb
-- test/backend/active_record/missing_test.rb
-- test/backend/active_record_test.rb
-- test/backend/cache_test.rb
-- test/backend/cascade_test.rb
-- test/backend/chain_test.rb
-- test/backend/cldr_test.rb
-- test/backend/exceptions_test.rb
-- test/backend/fallbacks_test.rb
-- test/backend/fast_test.rb
-- test/backend/helpers_test.rb
-- test/backend/interpolation_compiler_test.rb
-- test/backend/metadata_test.rb
-- test/backend/pluralization_test.rb
-- test/backend/simple_test.rb
-- test/core_ext/string/interpolate_test.rb
-- test/gettext/api_test.rb
-- test/gettext/backend_test.rb
-- test/i18n_exceptions_test.rb
-- test/i18n_load_path_test.rb
-- test/i18n_test.rb
-- test/locale/fallbacks_test.rb
-- test/locale/tag/rfc4646_test.rb
-- test/locale/tag/simple_test.rb
-- test/test_data/locales/en.rb
-- test/test_data/locales/plurals.rb
-- test/test_helper.rb
+test_files: []
+

data/CHANGELOG.textile

@@ -1,76 +0,0 @@
-h1. Changelog
-
-h2. master
-
-* (no changes)
-
-h2. 0.3.1 (2009-12-11)
-
-* "Add PoParser to gemspec":http://github.com/svenfuchs/i18n/commit/d6b2763f39c932f66adb039b96882a472f883c51
-* "Enable custom separators for ActiveRecord backend":http://github.com/svenfuchs/i18n/commit/9341d3fcfc951cc31807ba672d2b5d90909ef3e5
-* "Pass interpolation values to interpolation procs":http://github.com/svenfuchs/i18n/commit/39c2ed8fbad645671cd5520ce7ad0aeefe2b0cca
-* "Fix that ngettext supports keys with dots":http://github.com/svenfuchs/i18n/commit/7362a43c34364d500de8899cfcca6bf1a5e6d1c8
-
-h2. 0.3.0 (2009-11-30)
-
-* "Gettext backend and helpers":http://github.com/svenfuchs/i18n/commit/35a1740d2f10b808548af352006950da4017e374
-* "Metadata module":http://github.com/svenfuchs/i18n/commit/2677208555179b36fcbe958c0e8bc642cf5bc020
-* "Basic ActiveRecord backend":http://github.com/svenfuchs/i18n/commit/786632d0b42de423ecf0969622efc87f1691e2a2
-* "Set encoding to UTF8 for all files":http://github.com/svenfuchs/i18n/commit/9be3d4a311b5bf583eec5d39986176cc40c112f2
-* "Chain backend":http://github.com/svenfuchs/i18n/commit/08259ffb88b3005403648d77bc1cbca0b92f3cf5
-* "Backend/cache implementation":http://github.com/svenfuchs/i18n/commit/e7bf15351cd2e27f5972eb40e65a5dd6f4a0feed
-* "Pluralization module":http://github.com/svenfuchs/i18n/commit/9ca4c9ed52d4706566a6abeb2d78722dcc5d4764
-* "add and adapt Globalize2 fallback implementation":http://github.com/svenfuchs/i18n/commit/1b37a303b27d6222b17162804b06323e5628768f
-* "move Simple backend implementation to a Base backend class and extend Simple from Base.":http://github.com/svenfuchs/i18n/commit/32ddc80a04e6aa247f6d6613bde7f78c73396cb4
-
-h2. 0.2.0 (2009-07-12)
-
-* "Allow using Ruby 1.9 syntax for string interpolation (API addition)":http://github.com/svenfuchs/i18n/commit/c6e0b06d512f2af57199a843a1d8a40241b32861
-* "Allow configuring the default scope separator, allow to pass a custom scope separator(API addition)":http://github.com/svenfuchs/i18n/commit/5b75bfbc348061adc11e3790187a187275bfd471 (e.g. I18n.t(:'foo|bar', :separator => '|') 
-* "Pass :format option to #translate for #localize more useful lambda support":http://github.com/svenfuchs/i18n/commit/e277711b3c844fe7589b8d3f9af0f7d1b969a273
-* "Refactor Simple backend #resolve to #default and #resolve for more consistency. Now allows to pass lambdas as defaults and re-resolve Symbols":http://github.com/svenfuchs/i18n/commit/8c4ce3d923ce5fa73e973fe28217e18165549aba
-* "Add lambda support to #translate (API addition)":http://github.com/svenfuchs/i18n/commit/c90e62d8f7d3d5b78f34cfe328d871b58884f115
-* "Add lambda support to #localize (API addition)":http://github.com/svenfuchs/i18n/commit/9d390afcf33f3f469bb95e6888147152f6cc7442
-
-h2. 0.1.3 (2009-02-27)
-
-* "Remove unnecessary string encoding handling in the i18n simple backend which made the backend break on Ruby 1.9":http://github.com/svenfuchs/i18n/commit/4c3a970783861a94f2e89f46714fb3434e4f4f8d
-
-h2. 0.1.2 (2009-01-09)
-
-* "added #available_locales (returns an array of locales for which translations are available)":http://github.com/svenfuchs/i18n/commit/411f8fe7c8f3f89e9b6b921fa62ed66cb92f3af4
-* "flatten load_path before using it so that a nested array of paths won't throw up":http://github.com/svenfuchs/i18n/commit/d473a068a2b90aba98135deb225d6eb6d8104d70
-
-h2. 0.1.1 (2008-11-20)
-
-* "Use :'en' as a default locale (in favor of :'en-US')":http://github.com/svenfuchs/i18n/commit/c4b10b246aecf7da78cb2568dd0d2ab7e6b8a230
-* "Add #reload! to Simple backend":http://github.com/svenfuchs/i18n/commit/36dd2bd9973b9e1559728749a9daafa44693e964
-
-h2. 0.1.0 (2008-10-25)
-
-* "Fix Simple backend to distinguish false from nil values":http://github.com/svenfuchs/i18n/commit/39d9a47da14b5f3ba126af48923af8c30e135166
-* "Add #load_path to public api, add initialize to simple backend and remove #load_translations from public api":http://github.com/svenfuchs/i18n/commit/c4c5649e6bc8f020f1aaf5a5470bde048e22c82d
-* "Speed up Backend::Simple#interpolate":http://github.com/svenfuchs/i18n/commit/9e1ac6bf8833304e036323ec9932b9f33c468a35
-* "Remove #populate and #store_translations from public API":http://github.com/svenfuchs/i18n/commit/f4e514a80be7feb509f66824ee311905e2940900
-* "Use :other instead of :many as a plural key":http://github.com/svenfuchs/i18n/commit/0f8f20a2552bf6a2aa758d8fdd62a7154e4a1bf6
-* "Use a class instead of a module for Simple backend":http://github.com/svenfuchs/i18n/commit/08f051aa61320c17debde24a83268bc74e33b995
-* "Make Simple backend #interpolate deal with non-ASCII string encodings":http://github.com/svenfuchs/i18n/commit/d84a3f3f55543c084d5dc5d1fed613b8df148789
-* "Fix default arrays of non-existant keys returning the default array":http://github.com/svenfuchs/i18n/commit/6c04ca86c87f97dc78f07c2a4023644e5ba8b839
-
-h2. Initial implementation (June/July 2008)
-
-Initial implementation by "Sven Fuchs":http://www.workingwithrails.com/person/9963-sven-fuchs based on previous discussion/consensus of the rails-i18n team (alphabetical order) and many others:
-
-* "Matt Aimonetti":http://railsontherun.com
-* "Sven Fuchs":http://www.workingwithrails.com/person/9963-sven-fuchs
-* "Joshua Harvey":http://www.workingwithrails.com/person/759-joshua-harvey
-* "Saimon Moore":http://saimonmoore.net
-* "Stephan Soller":http://www.arkanis-development.de
-
-h2. More information
-
-* "Homepage":http://rails-i18n.org
-* "Wiki":http://rails-i18n.org/wiki
-* "Mailinglist":http://groups.google.com/group/rails-i18n
-* "About the project/history":http://www.artweb-design.de/2008/7/18/finally-ruby-on-rails-gets-internationalized
-* "Initial API Intro":http://www.artweb-design.de/2008/7/18/the-ruby-on-rails-i18n-core-api

data/MIT-LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2008 The Ruby I18n team
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.textile

@@ -1,104 +0,0 @@
-h1. Ruby I18n
-
-Ruby Internationalization and localization solution.
-
-Features:
-
-* translation and localization
-* interpolation of values to translations (Ruby 1.9 compatible syntax)
-* pluralization (CLDR compatible)
-* flexible defaults
-* bulk lookup
-* lambdas as translation data
-* custom key/scope separator
-* custom exception handlers
-* extensible architecture with a swappable backend
-
-Pluggable features:
-
-* Cache
-* Pluralization: lambda pluralizers stored as translation data
-* Locale fallbacks, RFC4647 compliant (optionally: RFC4646 locale validation)
-* Gettext support
-* Translation metadata
-
-Alternative backends:
-
-* Chain
-* ActiveRecord (optionally: ActiveRecordMissing)
-
-For more information and lots of resources see: "http://rails-i18n.org/wiki":http://rails-i18n.org/wiki
-
-h2. Installation
-
-gem install i18n
-
-h3. 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
-
-The new i18n gem can be loaded from vendor/plugins like this:
-
-  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
-
-Then you can `reload_i18n!` inside an i18n initializer. 
-
-h2. Tests
-
-You can run tests both with 
-
-* `rake test` or just `rake`
-* run any test file directly, e.g. `ruby test/api/simple_test.rb`
-* run all tests with `ruby test/all.rb`
-
-The structure of the test suite is a bit unusual as it uses modules to reuse
-particular tests in different test cases.
-
-The reason for this is that we need to enforce the I18n API across various 
-combinations of extensions. E.g. the Simple backend alone needs to support
-the same API as any combination of feature and/or optimization modules included
-to the Simple backend. We test this by reusing the same API defition (implemented
-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. 
-follow the usual test setup and should be easy to grok.
-
-h2. 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
-
-h2. Contributors
-
-* Akira Matsuda
-* Andrew Briening
-* Clemens Kofler
-* Frederick Cheung
-* Jeremy Kemper
-* José Valim
-* Lawrence Pit
-* Luca Guidi
-* M4SSIVE
-* Marko Seppae
-* Mathias Meyer
-* Michael Lang
-* Theo Cushion
-* Yaroslav Markin
-
-h2. License
-
-MIT License. See the included MIT-LICENSE file.