Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
`Spree.available_locales` should only return locales with translation… (#12171)
Damian Legawiec1ba1d2fb174e
diff --git a/core/lib/spree/i18n.rb b/core/lib/spree/i18n.rbindex 680628baf7..61f43f91c8 100644--- a/core/lib/spree/i18n.rb+++ b/core/lib/spree/i18n.rb@@ -17,15 +17,12 @@ module Spreeenddef available_locales- locales_from_i18n = I18n.available_locales- locales =- if defined?(SpreeI18n)- (SpreeI18n::Locale.all << :en).map(&:to_sym)- else- [Rails.application.config.i18n.default_locale, I18n.locale, :en]- end+ locales = defined?(SpreeI18n) ? SpreeI18n::Locale.all.map(&:to_sym) : []+ locales << :en+ locales << I18n.locale+ locales << Rails.application.config.i18n.default_locale- (locales + locales_from_i18n).uniq.compact+ locales.uniq.compactendalias t translatediff --git a/core/spec/lib/i18n_spec.rb b/core/spec/lib/i18n_spec.rbindex 44c675c9ab..5ad7a59ae6 100644--- a/core/spec/lib/i18n_spec.rb+++ b/core/spec/lib/i18n_spec.rb@@ -28,9 +28,8 @@ describe 'i18n' doit 'returns all locales from the SpreeI18n' dolocales = Spree.available_locales- expected_locales = [:en, :de, :nl, :ar, :az, :bg, :ca, :cs, :da, :el, :es, :fa, :fi, :fr, :hu, :id, :it, :ja, :"pt-BR", :ro, :ru, :sk, :sv, :tr, :"zh-CN", :"zh-TW", :pl, :uk, :vi]- expect(locales).to match_array(expected_locales)+ expect(locales).to contain_exactly(:en, :de, :nl)endit 'returns an array with the string "en" removed' do@@ -41,12 +40,10 @@ describe 'i18n' doendcontext 'when SpreeI18n is not defined' do- it 'returns just default locales' do+ it 'returns just default locale' dolocales = Spree.available_locales- expected_locales = [:en, :ar, :az, :bg, :ca, :cs, :da, :de, :el, :es, :fa, :fi, :fr, :hu, :id, :it, :ja, :nl, :"pt-BR", :ro, :ru, :sv, :sk, :tr, :"zh-CN", :"zh-TW", :pl, :uk, :vi]-- expect(locales).to match_array(expected_locales)+ expect(locales).to contain_exactly(:en)endendend