jro_apps/redmine Commit - r13426:8238e66fb1b3

Merged r13807....

Jean-Philippe Lang -

r13426:8238e66fb1b3

parent child

Context file:

r13426:8238e66fb1b3

lib/redmine/i18n.rb +2 -1

                 # 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
+                  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]}.
                       languages_options :cache => false
                     end
                   end
+                  options.map {|name, lang| [name.force_encoding("UTF-8"), lang.force_encoding("UTF-8")]}
                 end
                 def find_language(lang)

test/unit/lib/redmine/i18n_test.rb +5 0

                 assert_include [ja, "ja"], options
               end
+              def test_languages_options_should_return_strings_with_utf8_encoding
+                strings = languages_options.flatten
+                assert_equal ["UTF-8"], strings.map(&:encoding).uniq.map(&:name).sort
+              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)

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	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