From 7d03c9c6ed83d87e81da6d4a92d603261b7e78e5 Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Tue, 19 Feb 2019 10:29:20 +0000 Subject: Update i18n gem to 1.5.3 (#29946). Patch by Marius BALTEANU. git-svn-id: http://svn.redmine.org/redmine/trunk@17888 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/i18n.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/redmine/i18n.rb b/lib/redmine/i18n.rb index 300fb8b06..cdac4ea77 100644 --- a/lib/redmine/i18n.rb +++ b/lib/redmine/i18n.rb @@ -61,7 +61,7 @@ module Redmine # Localizes the given args with user's language def lu(user, *args) lang = user.try(:language).presence || Setting.default_language - ll(lang, *args) + ll(lang, *args) end def format_date(date) @@ -117,8 +117,9 @@ module Redmine # 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| ::I18n.exists?(:general_lang_name, locale)}. + select {|locale| available_locales.include?(locale)}. map {|lang| [ll(lang.to_s, :general_lang_name), lang.to_s]}. sort_by(&:first) else -- cgit v1.2.3