Changeset 470

Timestamp:

07/24/07 10:05:04 (1 year ago)

Author:

seancribbs

Message:

jargon: Updated Gibberish to latest revision. Removed extension_languages extension (no longer necessary). Added default language load paths to environment.rb.

Files:

• branches/jargon/radiant/config/environment.rb (modified) (1 diff)
• branches/jargon/radiant/vendor/extensions/extension_languages (deleted)
• branches/jargon/radiant/vendor/plugins/gibberish (modified) (2 props)
• branches/jargon/radiant/vendor/plugins/gibberish/lib/gibberish/localize.rb (modified) (2 diffs)
• branches/jargon/radiant/vendor/plugins/gibberish/test/gibberish_test.rb (modified) (2 diffs)
• branches/jargon/radiant/vendor/plugins/gibberish/test/lang (added)
• branches/jargon/radiant/vendor/plugins/gibberish/test/lang/es.yml (added)
• branches/jargon/radiant/vendor/plugins/gibberish/test/lang/fr.yml (added)

branches/jargon/radiant/config/environment.rb

@@ -71 +71 @@
-require "status"
-
+# Gibberish - add gem/edge and extension paths to search path for language files
+Radiant::ExtensionLoader.configuration.extension_paths.each do |path|
+  Gibberish.language_paths.unshift File.join(path, "*")
+end
+Gibberish.language_paths.unshift RADIANT_ROOT
+
-# Gibberish - set the current language here, using :xx for xx.yml default is english(en)
-Gibberish.current_language = :en

branches/jargon/radiant/vendor/plugins/gibberish/lib/gibberish/localize.rb

@@ -53 +53 @@
-      language_files.each do |file| 
-        key = File.basename(file, '.*').to_sym
-
+
+
-      end
-      languages
-    end
-
+    @@language_paths = [RAILS_ROOT]
+    def language_paths
+      @@language_paths ||= []
+    end
-  private
-    def interpolate_string(string, *args)
@@ -76 +81 @@
-      string.gsub(/\{\w+\}/) { strings.shift }
-    end
-
+
-    def language_files
-Dir[File.join(RAILS_ROOT, 'lang', '*.{yml,yaml}')]
+@@language_paths.map {|path| Dir[File.join(path, 'lang', '*.{yml,yaml}')]}.flatten
-    end
-  end

branches/jargon/radiant/vendor/plugins/gibberish/test/gibberish_test.rb

@@ -8 +8 @@
-
-$:.unshift File.dirname(__FILE__) + '/../lib'
+RAILS_ROOT = File.dirname(__FILE__) + '/..'
+
-require 'active_support'
-require 'gibberish'
-
-RAILS_ROOT = File.dirname(__FILE__) + '/..'
-Gibberish.load_languages!
-
@@ -89 +90 @@
-    Gibberish.add_reserved_key key
-    Gibberish.reserved_keys.size.should.equal 2
+  end
+  
+  specify "should have loaded language files from directories other than the default" do
+    Gibberish.language_paths << File.dirname(__FILE__)
+    Gibberish.load_languages!
+    string = "I don't speak Babble."
+    Gibberish.use_language :es do
+      string[:no_babble].should.equal "No hablo Bable."
+    end
+    Gibberish.use_language :fr do
+      string[:no_babble].should.equal "Je ne parle pas Babble."
+    end
-  end
-end