0
@@ -52,11 +52,16 @@ module Gibberish
0
     def load_languages!
0
       language_files.each do |file| 
0
         key = File.basename(file, '.*').to_sym
0
-        @@languages[key] = YAML.load_file(file).symbolize_keys
0
+        @@languages[key] ||= {}
0
+        @@languages[key].merge! YAML.load_file(file).symbolize_keys
0
       end
0
       languages
0
     end
0
 
0
+    @@language_paths = [RAILS_ROOT]
0
+    def language_paths
0
+      @@language_paths ||= []
0
+    end
0
   private
0
     def interpolate_string(string, *args)
0
       if args.last.is_a? Hash
0
@@ -75,9 +80,9 @@ module Gibberish
0
     def interpolate_with_strings(string, strings)
0
       string.gsub(/\{\w+\}/) { strings.shift }
0
     end
0
-
0
+    
0
     def language_files
0
-      Dir[File.join(RAILS_ROOT, 'lang', '*.{yml,yaml}')]
0
+      @@language_paths.map {|path| Dir[File.join(path, 'lang', '*.{yml,yaml}')]}.flatten
0
     end
0
   end
0
 end

0
@@ -7,10 +7,11 @@ rescue LoadError
0
 end
0
 
0
 $:.unshift File.dirname(__FILE__) + '/../lib'
0
+RAILS_ROOT = File.dirname(__FILE__) + '/..'
0
+
0
 require 'active_support'
0
 require 'gibberish'
0
 
0
-RAILS_ROOT = File.dirname(__FILE__) + '/..'
0
 Gibberish.load_languages!
0
 
0
 context "After loading languages, Gibberish" do
0
@@ -89,6 +90,18 @@ context "After loading languages, Gibberish" do
0
     Gibberish.add_reserved_key key
0
     Gibberish.reserved_keys.size.should.equal 2
0
   end
0
+  
0
+  specify "should have loaded language files from directories other than the default" do
0
+    Gibberish.language_paths << File.dirname(__FILE__)
0
+    Gibberish.load_languages!
0
+    string = "I don't speak Babble."
0
+    Gibberish.use_language :es do
0
+      string[:no_babble].should.equal "No hablo Bable."
0
+    end
0
+    Gibberish.use_language :fr do
0
+      string[:no_babble].should.equal "Je ne parle pas Babble."
0
+    end
0
+  end
0
 end
0
 
0
 context "When no language is set" do