From: Go MAEDA <maeda@farend.jp>
Date: Wed, 10 May 2023 00:27:32 +0000 (+0000)
Subject: Restrict available locales to those defined by Redmine itself (#38529).
X-Git-Tag: 5.1.0~132
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3a75a7ecc511a8573e2a11f4c3536082471f8d67;p=redmine.git

Restrict available locales to those defined by Redmine itself (#38529).

Patch by  Holger Just.


git-svn-id: https://svn.redmine.org/redmine/trunk@22237 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/lib/redmine/i18n.rb b/lib/redmine/i18n.rb
index 805e3c61c..7010437fd 100644
--- a/lib/redmine/i18n.rb
+++ b/lib/redmine/i18n.rb
@@ -161,7 +161,10 @@ module Redmine
       module Implementation
         # Get available locales from the translations filenames
         def available_locales
-          @available_locales ||= ::I18n.load_path.map {|path| File.basename(path, '.*')}.uniq.sort.map(&:to_sym)
+          @available_locales ||= begin
+            redmine_locales = Dir[Rails.root / 'config' / 'locales' / '*.yml'].map { |f| File.basename(f, '.yml').to_sym }
+            super & redmine_locales
+          end
         end
       end