diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-01-24 10:28:12 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-01-24 10:28:12 +0000 |
| commit | e391be40866f720ddc47398bb51e63e551935de3 (patch) | |
| tree | d0bf0d5efd8e020e0bf9b03a2e07f3bbc0a2eb25 /app/models/user.rb | |
| parent | 6e6c6fac5caf92103a54e0c8f76a06f5f1b3b4f4 (diff) | |
| download | redmine-e391be40866f720ddc47398bb51e63e551935de3.tar.gz redmine-e391be40866f720ddc47398bb51e63e551935de3.zip | |
Adds settings for disabling browser language detection and language preference (#2691).
git-svn-id: http://svn.redmine.org/redmine/trunk@12691 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index d04369277..7aac01235 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -314,6 +314,18 @@ class User < Principal @time_zone ||= (self.pref.time_zone.blank? ? nil : ActiveSupport::TimeZone[self.pref.time_zone]) end + def force_default_language? + Setting.force_default_language_for_loggedin? + end + + def language + if force_default_language? + Setting.default_language + else + super + end + end + def wants_comments_in_reverse_order? self.pref[:comments_sorting] == 'desc' end |