Makes GLoc language global.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@1957 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/vendor/plugins/gloc-1.1.0/lib/gloc.rb b/vendor/plugins/gloc-1.1.0/lib/gloc.rb
index bcad0ed..8123785 100644 (file)
--- a/vendor/plugins/gloc-1.1.0/lib/gloc.rb
+++ b/vendor/plugins/gloc-1.1.0/lib/gloc.rb
@@ -52,7 +52,7 @@ module GLoc
     # Sets the current language for this instance/class.\r
     # Setting the language of a class effects all instances unless the instance has its own language defined.\r
     def set_language(language)\r
-      @gloc_language= language.nil? ? nil : language.to_sym\r
+      GLoc.current_language = language\r
     end\r
 \r
     # Sets the current language if the language passed is a valid language.\r
@@ -75,7 +75,7 @@ module GLoc
   include ::GLoc::InstanceMethods\r
   # Returns the instance-level current language, or if not set, returns the class-level current language.\r
   def current_language\r
-    @gloc_language || self.class.current_language\r
+    GLoc.current_language\r
   end\r
   \r
   #---------------------------------------------------------------------------\r
@@ -87,7 +87,7 @@ module GLoc
     include ::GLoc::InstanceMethods\r
     # Returns the current language, or if not set, returns the GLoc current language.\r
     def current_language\r
-      @gloc_language || GLoc.current_language\r
+      GLoc.current_language\r
     end\r
   end\r
   \r
@@ -103,10 +103,16 @@ module GLoc
   \r
   class << self\r
     include ::GLoc::InstanceMethods\r
+\r
+    @@current_language = nil\r
     \r
-    # Returns the default language\r
+    # Returns the current language\r
     def current_language\r
-      GLoc::CONFIG[:default_language]\r
+      @@current_language || GLoc::CONFIG[:default_language]\r
+    end\r
+    \r
+    def current_language=(lang)\r
+      @@current_language = lang.blank? ? nil : lang.to_sym\r
     end\r
     \r
     # Adds a collection of localized strings to the in-memory string store.\r