diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-08-15 09:19:12 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-08-15 09:19:12 +0000 |
| commit | 5fffbdc0162c5454c4e2f3f9cb877a83b4de4483 (patch) | |
| tree | 6d1287da2f4fa7d5685bff9f441583877c2e2ae1 /lib/redmine/i18n.rb | |
| parent | f820ccce3b02416c3b8ab5744eb262684040045d (diff) | |
| download | redmine-5fffbdc0162c5454c4e2f3f9cb877a83b4de4483.tar.gz redmine-5fffbdc0162c5454c4e2f3f9cb877a83b4de4483.zip | |
CSV importer raises I18n::InvalidLocale exception if current user's language is "(auto)" (#905, #20535).
git-svn-id: http://svn.redmine.org/redmine/trunk@14504 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib/redmine/i18n.rb')
| -rw-r--r-- | lib/redmine/i18n.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/redmine/i18n.rb b/lib/redmine/i18n.rb index b028e3e30..7fa88230f 100644 --- a/lib/redmine/i18n.rb +++ b/lib/redmine/i18n.rb @@ -60,7 +60,7 @@ module Redmine # Localizes the given args with user's language def lu(user, *args) - lang = user.try(:language) || Setting.default_language + lang = user.try(:language).presence || Setting.default_language ll(lang, *args) end |