OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub
Ruby agile-developmentangularbcfboardsbug-trackerganttgantt-chartifcissue-trackerjira-alternativekanbanopenprojectproduct-managementproject-managementproject-planningroadmaprubyscrumtimelineworkflows
Also refactor #lang_options_for_select
Alexander Brandon Coles66da672b7de5
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rbindex 00c8eaa4f95..ca101a351f3 100644--- a/app/helpers/application_helper.rb+++ b/app/helpers/application_helper.rb@@ -272,16 +272,14 @@ module ApplicationHelperenddef lang_options_for_select(blank = true)- auto =- if blank && (valid_languages - all_languages) == (all_languages - valid_languages)- [["(auto)", ""]]- else- []- end+ options = valid_languages.map { |lang| [*translate_language(lang), { lang: }] }+ options.sort_by!(&:second)- mapped_languages = valid_languages.map { |lang| translate_language(lang) }+ if blank && valid_languages.to_set == all_languages.to_set+ options.unshift(["(auto)", ""])+ end- auto + mapped_languages.sort_by(&:last)+ optionsenddef all_lang_options_for_selectdiff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rbindex 1b13a2bd482..5cb0035971b 100644--- a/spec/helpers/application_helper_spec.rb+++ b/spec/helpers/application_helper_spec.rb@@ -193,7 +193,54 @@ RSpec.describe ApplicationHelper doendend- describe ".all_lang_options_for_select" do+ describe "#lang_options_for_select" do+ before do+ allow(Redmine::I18n)+ .to receive(:all_languages)+ .and_return %w[en de es ja zh-CN]+ end++ context "with all available languages" do+ it "returns options for all languages" do+ expect(lang_options_for_select).to eq [+ ["(auto)", ""],+ ["Deutsch", "de", { lang: "de" }],+ ["English", "en", { lang: "en" }],+ ["Español", "es", { lang: "es" }],+ ["日本語", "ja", { lang: "ja" }],+ ["简体中文", "zh-CN", { lang: "zh-CN" }]+ ]+ end+ end++ context "with some available languages", with_settings: { available_languages: %w[en es ja] } do+ it "returns options for available languages" do+ expect(lang_options_for_select).to eq [+ ["English", "en", { lang: "en" }],+ ["Español", "es", { lang: "es" }],+ ["日本語", "ja", { lang: "ja" }]+ ]+ end+ end++ context "when blank is true (default)" do+ it "returns auto option if all languages available" do+ expect(lang_options_for_select).to start_with ["(auto)", ""]+ end++ it "does not return auto option if some languages available", with_settings: { available_languages: %w[en] } do+ expect(lang_options_for_select).not_to start_with ["(auto)", ""]+ end+ end++ context "when blank is false" do+ it "does not return auto option" do+ expect(lang_options_for_select(false)).not_to start_with ["(auto)", ""]+ end+ end+ end++ describe "#all_lang_options_for_select" doit 'has all languages translated ("English" should appear only once)' doimpostor_locales =all_lang_options_for_select