Fix i18n spec

superewald · Nov 24, 2017 · 0c44f7b · 0c44f7b
1 parent 4a12a66
commit 0c44f7b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/lib/redmine/i18n.rb b/lib/redmine/i18n.rb
@@ -157,8 +157,13 @@ def all_languages
     ##
     # Returns the given language if it is valid or nil otherwise.
     def find_language(lang)
-      return nil unless lang =~ /[a-z-]+/i
-      valid_languages.detect { |l| l =~ /#{lang}/i } if lang.present?
+      return nil unless (lang.present? && lang =~ /[a-z-]+/i)
+
+      # Direct match
+      direct_match = valid_languages.detect { |l| l =~ /^#{lang}$/i }
+      parent_match = valid_languages.detect { |l| l =~ /#{lang}/i }
+
+      direct_match || parent_match
     end
 
     def set_language_if_valid(lang)

diff --git a/spec/lib/redmine/i18n_spec.rb b/spec/lib/redmine/i18n_spec.rb
@@ -85,7 +85,7 @@ module OpenProject
 
       # it is OK if more languages exist
       it 'has a language for every language file' do
-        lang_files_count = Dir.glob(Rails.root.join('config/locales/*.yml'))
+        lang_files_count = Dir.glob(Rails.root.join('config/locales/**/*.yml'))
                            .map { |f| File.basename(f) }
                            .reject { |b| b.starts_with? 'js' }
                            .size