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
Sort displayed languages by CLDR name, not code
Alexander Brandon Coles52ea0a77e901
diff --git a/app/forms/my/locale_form.rb b/app/forms/my/locale_form.rbindex cf93184faa0..35068d92e72 100644--- a/app/forms/my/locale_form.rb+++ b/app/forms/my/locale_form.rb@@ -60,6 +60,6 @@ class My::LocaleForm < ApplicationFormdef available_languages@available_languages ||= valid_languages.map { translate_language(it) }- .sort_by(&:last)+ .sort_by(&:first)endenddiff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rbindex a0d176357ec..daa31632dbd 100644--- a/app/helpers/application_helper.rb+++ b/app/helpers/application_helper.rb@@ -273,7 +273,7 @@ module ApplicationHelperdef lang_options_for_select(blank = true)options = valid_languages.map { |lang| [*translate_language(lang), { lang: }] }- options.sort_by!(&:second)+ options.sort_by!(&:first)if blank && valid_languages.to_set == all_languages.to_setoptions.unshift([I18n.t(:label_auto_option), ""])@@ -285,7 +285,7 @@ module ApplicationHelperdef all_lang_options_for_selectall_languages.map { |lang| translate_language(lang) }- .sort_by(&:last)+ .sort_by(&:first)enddef theme_options_for_selectdiff --git a/spec/forms/my/locale_form_spec.rb b/spec/forms/my/locale_form_spec.rbindex e936dd15014..d0850eb8c76 100644--- a/spec/forms/my/locale_form_spec.rb+++ b/spec/forms/my/locale_form_spec.rb@@ -34,7 +34,7 @@ RSpec.describe My::LocaleForm, type: :forms dobefore doallow(Redmine::I18n).to receive(:all_languages)- .and_return %w[en de es ja zh-CN]+ .and_return %w[en de es ja nl zh-CN]endinclude_context "with rendered form"@@ -49,10 +49,18 @@ RSpec.describe My::LocaleForm, type: :forms doexpect(select).to have_element :option, value: "de", text: "Deutsch", lang: "de"expect(select).to have_element :option, value: "es", text: "Español", lang: "es"expect(select).to have_element :option, value: "ja", text: "日本語", lang: "ja"+ expect(select).to have_element :option, value: "nl", text: "Nederlands", lang: "nl"expect(select).to have_element :option, value: "zh-CN", text: "简体中文", lang: "zh-CN"endend+ it "renders options sorted by CLDR name" do+ options_text = page.find(:select, "Language").all("option").map(&:text) # Capy :options filter ignores order+ expect(options_text).to eq [+ "(auto)", "Deutsch", "English", "Español", "Nederlands", "日本語", "简体中文"+ ]+ end+it "renders options for available languages, if set", with_settings: { available_languages: %w[en es ja] } doexpect(page).to have_select "Language", options: ["English",@@ -61,7 +69,7 @@ RSpec.describe My::LocaleForm, type: :forms do]end- it "renders auto option if all languages available", with_settings: { available_languages: %w[en de es ja zh-CN] } do+ it "renders auto option if all languages available", with_settings: { available_languages: %w[en de es ja nl zh-CN] } doexpect(page).to have_select "Language", with_options: ["(auto)"]end