update activesupport/vendor i18n gem

2 files changed, 20 insertions, 3 deletions

diff --git a/activesupport/lib/active_support/vendor/i18n-0.0.1/i18n.rb b/activesupport/lib/active_support/vendor/i18n-0.0.1/i18n.rb
index 86005553c0..5c6c4eb783 100755
--- a/activesupport/lib/active_support/vendor/i18n-0.0.1/i18n.rb
+++ b/activesupport/lib/active_support/vendor/i18n-0.0.1/i18n.rb
@@ -56,8 +56,14 @@ module I18n
       backend.populate(&block)
     end
     
-    def load_translations(filename)
-      backend.load_translations filename
+    # Allows client libraries to pass arguments that specify a source for 
+    # translation data to be loaded by the backend. The backend defines
+    # acceptable sources. 
+    # E.g. the provided SimpleBackend accepts a list of paths to translation
+    # files which are either named *.rb and contain plain Ruby Hashes or are
+    # named *.yml and contain YAML data.)
+    def load_translations(*args)
+      backend.load_translations *args
     end
     
     # Stores translations for the given locale in the backend. 
diff --git a/activesupport/lib/active_support/vendor/i18n-0.0.1/i18n/backend/simple.rb b/activesupport/lib/active_support/vendor/i18n-0.0.1/i18n/backend/simple.rb
index 98c7964b21..ba7e11210a 100644
--- a/activesupport/lib/active_support/vendor/i18n-0.0.1/i18n/backend/simple.rb
+++ b/activesupport/lib/active_support/vendor/i18n-0.0.1/i18n/backend/simple.rb
@@ -12,7 +12,10 @@ module I18n
         def populate(&block)
           yield
         end
-    
+      
+        # Accepts a list of paths to translation files. Loads translations from 
+        # plain Ruby (*.rb) or YAML files (*.yml). See #load_rb and #load_yml
+        # for details.
         def load_translations(*filenames)
           filenames.each {|filename| load_file filename }
         end
@@ -135,6 +138,10 @@ module I18n
             s.string
           end
           
+          # Loads a single translations file by delegating to #load_rb or 
+          # #load_yml depending on the file extension and directly merges the
+          # data to the existing translations. Raises I18n::UnknownFileType
+          # for all other file extensions.
           def load_file(filename)
             type = File.extname(filename).tr('.', '').downcase
             raise UnknownFileType.new(type, filename) unless respond_to? :"load_#{type}"
@@ -144,10 +151,14 @@ module I18n
             end            
           end
           
+          # Loads a plain Ruby translations file. eval'ing the file must yield
+          # a Hash containing translation data with locales as toplevel keys.
           def load_rb(filename)
             eval IO.read(filename), binding, filename
           end
           
+          # Loads a YAML translations file. The data must have locales as 
+          # toplevel keys.
           def load_yml(filename)
             YAML::load IO.read(filename)
           end