jro_apps/redmine Commit - r1955:6cd4f0c07ec7

52

# Sets the current language for this instance/class.

52

# Sets the current language for this instance/class.

53

# Setting the language of a class effects all instances unless the instance has its own language defined.

53

# Setting the language of a class effects all instances unless the instance has its own language defined.

54

def set_language(language)

54

def set_language(language)

55

@gloc_language= language.nil? ? nil : language.to_sym

55

GLoc.current_language = language

56

end

56

end

57

58

# Sets the current language if the language passed is a valid language.

58

# Sets the current language if the language passed is a valid language.

75

include ::GLoc::InstanceMethods

75

include ::GLoc::InstanceMethods

76

# Returns the instance-level current language, or if not set, returns the class-level current language.

76

# Returns the instance-level current language, or if not set, returns the class-level current language.

77

def current_language

77

def current_language

78

~~@gloc_language~~ || ~~self~~.~~class~~.current_language

78

GLoc.current_language

79

end

79

end

80

81

#---------------------------------------------------------------------------

81

#---------------------------------------------------------------------------

87

include ::GLoc::InstanceMethods

87

include ::GLoc::InstanceMethods

88

# Returns the current language, or if not set, returns the GLoc current language.

88

# Returns the current language, or if not set, returns the GLoc current language.

89

def current_language

89

def current_language

90

~~@gloc_language~~ || GLoc.current_language

90

GLoc.current_language

91

end

91

end

92

end

92

end

93

103

104

class << self

104

class << self

105

include ::GLoc::InstanceMethods

105

include ::GLoc::InstanceMethods

106

107

@@current_language = nil

106

108

107

# Returns the ~~defaul~~t language

109

# Returns the current language

108

def current_language

110

def current_language

109

GLoc::CONFIG[:default_language]

111

@@current_language || GLoc::CONFIG[:default_language]

112

end

113

114

def current_language=(lang)

115

@@current_language = lang.blank? ? nil : lang.to_sym

110

end

116

end

111

117

112

# Adds a collection of localized strings to the in-memory string store.

118

# Adds a collection of localized strings to the in-memory string store.

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

                 # 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.
                 def set_language(language)
-                  @gloc_language= language.nil? ? nil : language.to_sym
+                  GLoc.current_language = language
                 end
                 # Sets the current language if the language passed is a valid language.
               include ::GLoc::InstanceMethods
               # Returns the instance-level current language, or if not set, returns the class-level current language.
               def current_language
-                @gloc_language || self.class.current_language
+                GLoc.current_language
               end
               #---------------------------------------------------------------------------
                 include ::GLoc::InstanceMethods
                 # Returns the current language, or if not set, returns the GLoc current language.
                 def current_language
-                  @gloc_language || GLoc.current_language
+                  GLoc.current_language
                 end
               end
               class << self
                 include ::GLoc::InstanceMethods
+                @@current_language = nil
-                # Returns the default language
+                # Returns the 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
                 # Adds a collection of localized strings to the in-memory string store.