kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Makes GLoc language global. 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@1957 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2008-10-27 12:34:01 +00:00
parent d143019dbb
commit 6cd4f0c07e
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
vendor/plugins/gloc-1.1.0/lib/gloc.rb vendored
View File

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