<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>lib/locale/root.yml</filename>
    </added>
    <added>
      <filename>spec/spec/fixtures/locale/root.yml</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -5,5 +5,6 @@ ActiveRecord::Base.send :include, Globalize::Model::ActiveRecord::Translated
 I18n.backend = Globalize::Backend::Static.new
 
 I18n.load_path = Globalize::LoadPath.new I18n.load_path
+I18n.load_path &lt;&lt; &quot;#{File.dirname(__FILE__)}/lib/locale&quot;
 I18n.load_path &lt;&lt; &quot;#{RAILS_ROOT}/lib/locale&quot;
 </diff>
      <filename>init.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,10 +1,10 @@
 require File.dirname(__FILE__) + '/spec/helper.rb'
 require 'globalize/load_path'
 
-# I18n.load_path = Globalize::LoadPath.new
-
 describe Globalize::LoadPath, &quot;#patterns&quot; do
   before :each do
+    @plugin_dir = &quot;#{File.dirname(__FILE__)}/..&quot;
+    @locale_dir = &quot;#{File.dirname(__FILE__)}/spec/fixtures/locale&quot;
     @load_path = Globalize::LoadPath.new
   end
   
@@ -20,83 +20,29 @@ describe Globalize::LoadPath, &quot;#patterns&quot; do
   
   it &quot;returns the glob patterns for registered locales and extensions&quot; do
     @load_path.locales = [:en, :de]
-    @load_path.extensions = [:yml]
-    patterns = %w(locales/all.yml
-                  locales/en.yml
-                  locales/en/**/*.yml 
-                  locales/de.yml
-                  locales/de/**/*.yml)
+    @load_path.extensions = [:sql]
+    patterns = %w(locales/all.sql
+                  locales/en.sql
+                  locales/en/**/*.sql 
+                  locales/de.sql
+                  locales/de/**/*.sql)
     @load_path.send(:patterns, 'locales').should == patterns
   end
-end
 
-# describe Globalize::LoadPath do
-#   before :each do
-#     @locale_dir = &quot;#{File.dirname(__FILE__)}/spec/fixtures/locale&quot;
-#     @load_path = I18n.load_path
-#     @load_path &lt;&lt; @locale_dir if @load_path.empty?
-#   end
-#
-#   it &quot;returns an instance of Globalize::LoadPath from I18n.load_path&quot; do
-#     @load_path.should be_instance_of(Globalize::LoadPath)
-#   end
-#
-#   it &quot;allows to add paths (using yml as a default file extension)&quot; do
-#     @load_path.should == [[@locale_dir, ['yml']]]
-#   end
-#
-#   it &quot;allows to specify a single file extension while adding a path&quot; do
-#     load_path = Globalize::LoadPath.new
-#     load_path.add(@locale_dir, 'rb')
-#     load_path.should == [[@locale_dir, ['rb']]]
-#   end
-#
-#   it &quot;allows to specify an array of file extensions while adding a path&quot; do
-#     load_path = Globalize::LoadPath.new
-#     load_path.add(@locale_dir, 'rb', 'yml')
-#     load_path.should == [[@locale_dir, ['rb', 'yml']]]
-#   end
-#
-#   it &quot;creates glob patterns which enforce the default directory structure&quot; do
-#     load_path = Globalize::LoadPath.new
-#     load_path.add(@locale_dir, 'rb', 'yml')
-#     locale = 'en-US'
-#     patterns = %W( #{@locale_dir}/#{locale}/**/*.rb 
-#                    #{@locale_dir}/#{locale}.rb 
-#                    #{@locale_dir}/all.rb
-#                    #{@locale_dir}/#{locale}/**/*.yml 
-#                    #{@locale_dir}/#{locale}.yml 
-#                    #{@locale_dir}/all.yml )
-#     load_path.send(:patterns, locale).should == patterns
-#   end
-#
-#   it &quot;finds all locale files for a given locale including the all file and files in the locale-specific subdirectory&quot; do
-#     @load_path.filenames('fi-FI').should == [&quot;#{@locale_dir}/all.yml&quot;, &quot;#{@locale_dir}/fi-FI/module.yml&quot;]
-#   end
-#
-#   it &quot;finds all locale files for a given locale including the all file and locale-specific files&quot; do
-#     @load_path.filenames('de-DE').should == [&quot;#{@locale_dir}/all.yml&quot;, &quot;#{@locale_dir}/de-DE.yml&quot;]
-#   end
-# end
-# 
-# describe I18n, &quot;#load_locales&quot; do
-#   before :each do
-#     @locale_dir = &quot;#{File.dirname(__FILE__)}/spec/fixtures/locale&quot;
-#     @load_path = I18n.load_path
-#     @load_path &lt;&lt; @locale_dir if @load_path.empty?
-#   end
-# 
-#   it &quot;loading locale data for the given locales from all files in the current load_path&quot; do
-#     I18n.should_receive(:load_locale).with('en-US').once.ordered
-#     I18n.should_receive(:load_locale).with('de-DE').once.ordered
-#     I18n.load_locales('en-US', 'de-DE')
-#   end
-# 
-#   it &quot;loading locale data for the given locale from all files in the current load_path&quot; do
-#     I18n.load_locale('en-US')
-#     I18n.locale = 'en-US'
-#     keys = [:&quot;from-all-file&quot;, :&quot;from-locale-file&quot;, :&quot;from-locale-dir&quot;]
-#     translations = ['From the &quot;all&quot; file.', 'From the locale file.', 'From the locale directory.']
-#     I18n.t(keys).should == translations
-#   end
-# end
\ No newline at end of file
+  it &quot;expands paths using yml as a default file extension&quot; do
+    @load_path &lt;&lt; @locale_dir
+    expected = %w(all.yml de-DE.yml en-US.yml en-US/module.yml fi-FI/module.yml root.yml)
+    @load_path.map{|path| path.sub(&quot;#{@locale_dir}\/&quot;, '')}.should == expected
+  end
+
+  it &quot;appends new paths to the collection so earlier collected paths preceed later collected ones&quot; do
+    @load_path.locales = [:root]
+    @load_path &lt;&lt; &quot;#{@plugin_dir}/lib/locale&quot;
+    @load_path &lt;&lt; @locale_dir
+    
+    expected = %W(#{@plugin_dir}/lib/locale/root.yml 
+                  #{@locale_dir}/all.yml
+                  #{@locale_dir}/root.yml)
+    @load_path.should == expected
+  end
+end
\ No newline at end of file</diff>
      <filename>spec/load_path_spec.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>e794b7b68115e54d24cfb7f25d0cea487249eeec</id>
    </parent>
  </parents>
  <author>
    <name>Sven Fuchs</name>
    <email>svenfuchs@artweb-design.de</email>
  </author>
  <url>http://github.com/hchoroomi/globalize2/commit/29f296156d632b3136d58bd421e257eada609e82</url>
  <id>29f296156d632b3136d58bd421e257eada609e82</id>
  <committed-date>2008-09-19T03:38:32-07:00</committed-date>
  <authored-date>2008-09-19T03:38:32-07:00</authored-date>
  <message>ship a default root.yml with Globalize2</message>
  <tree>4b94a89ca15c2660764dd7bdb2684178d2d48bd5</tree>
  <committer>
    <name>Sven Fuchs</name>
    <email>svenfuchs@artweb-design.de</email>
  </committer>
</commit>
