mirror of
https://github.com/meineerde/redmine.git
synced 2026-01-02 21:59:39 +00:00
code cleanup: rubocop: fix Layout/ElseAlignment in lib/redmine/i18n.rb
git-svn-id: http://svn.redmine.org/redmine/trunk@18704 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
caefd6d115
commit
186329ef04
@ -109,7 +109,6 @@ Layout/ElseAlignment:
|
||||
- 'app/helpers/queries_helper.rb'
|
||||
- 'app/models/issue_query.rb'
|
||||
- 'lib/redmine/export/pdf/issues_pdf_helper.rb'
|
||||
- 'lib/redmine/i18n.rb'
|
||||
|
||||
# Cop supports --auto-correct.
|
||||
Layout/EmptyLineAfterGuardClause:
|
||||
|
||||
@ -117,17 +117,18 @@ module Redmine
|
||||
# The result is cached to prevent from loading all translations files
|
||||
# unless :cache => false option is given
|
||||
def languages_options(options={})
|
||||
options = if options[:cache] == false
|
||||
available_locales = ::I18n.backend.available_locales
|
||||
valid_languages.
|
||||
select {|locale| available_locales.include?(locale)}.
|
||||
map {|lang| [ll(lang.to_s, :general_lang_name), lang.to_s]}.
|
||||
sort_by(&:first)
|
||||
else
|
||||
ActionController::Base.cache_store.fetch "i18n/languages_options/#{Redmine::VERSION}" do
|
||||
languages_options :cache => false
|
||||
options =
|
||||
if options[:cache] == false
|
||||
available_locales = ::I18n.backend.available_locales
|
||||
valid_languages.
|
||||
select {|locale| available_locales.include?(locale)}.
|
||||
map {|lang| [ll(lang.to_s, :general_lang_name), lang.to_s]}.
|
||||
sort_by(&:first)
|
||||
else
|
||||
ActionController::Base.cache_store.fetch "i18n/languages_options/#{Redmine::VERSION}" do
|
||||
languages_options :cache => false
|
||||
end
|
||||
end
|
||||
end
|
||||
options.map {|name, lang| [name.force_encoding("UTF-8"), lang.force_encoding("UTF-8")]}
|
||||
end
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user