Commit 062637f6 authored by jplang's avatar jplang

Ignore locales without :general_lang_name key (#18110).

git-svn-id: https://svn.redmine.org/redmine/trunk@13450 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent c0760f84
......@@ -90,11 +90,19 @@ module Redmine
# Returns an array of languages names and code sorted by names, example:
# [["Deutsch", "de"], ["English", "en"] ...]
#
# The result is cached to prevent from loading all translations files.
def languages_options
ActionController::Base.cache_store.fetch "i18n/languages_options" do
valid_languages.map {|lang| [ll(lang.to_s, :general_lang_name), lang.to_s]}.sort {|x,y| x.first <=> y.first }
end
# The result is cached to prevent from loading all translations files
# unless :cache => false option is given
def languages_options(options={})
if options[:cache] == false
valid_languages.
select {|locale| ::I18n.exists?(:general_lang_name, locale)}.
map {|lang| [ll(lang.to_s, :general_lang_name), lang.to_s]}.
sort {|x,y| x.first <=> y.first }
else
ActionController::Base.cache_store.fetch "i18n/languages_options" do
languages_options :cache => false
end
end
end
def find_language(lang)
......
......@@ -198,6 +198,11 @@ class Redmine::I18nTest < ActiveSupport::TestCase
assert_include [ja, "ja"], options
end
def test_languages_options_should_ignore_locales_without_general_lang_name_key
stubs(:valid_languages).returns([:en, :foo])
assert_equal [["English", "en"]], languages_options(:cache => false)
end
def test_locales_validness
lang_files_count = Dir["#{Rails.root}/config/locales/*.yml"].size
assert_equal lang_files_count, valid_languages.size
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment