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
Add Spree::LocaleHelper
Damian Legawiecaea8ee6ee685
diff --git a/backend/app/controllers/spree/admin/base_controller.rb b/backend/app/controllers/spree/admin/base_controller.rbindex 9991bbc4be..4d711a91ae 100644--- a/backend/app/controllers/spree/admin/base_controller.rb+++ b/backend/app/controllers/spree/admin/base_controller.rb@@ -2,6 +2,7 @@ module Spreemodule Adminclass BaseController < Spree::BaseControllerhelper 'spree/admin/navigation'+ helper 'spree/locale'layout 'spree/layouts/admin'before_action :authorize_admindiff --git a/backend/app/controllers/spree/admin/stores_controller.rb b/backend/app/controllers/spree/admin/stores_controller.rbindex 9c20e6880a..2d1bc754c0 100644--- a/backend/app/controllers/spree/admin/stores_controller.rb+++ b/backend/app/controllers/spree/admin/stores_controller.rb@@ -9,8 +9,6 @@ module Spreebefore_action :load_all_countries, only: [:new, :edit, :update, :create]before_action :load_all_zones, only: %i[new edit]- helper_method :all_locales_options-def indexif params[:ids]load_stores_by_ids@@ -132,18 +130,6 @@ module Spreedef set_default_country_id@store.default_country_id = Spree::Config[:default_country_id]end-- def all_locales_options- if defined?(SpreeI18n)- SpreeI18n::Locale.all.map { |locale| locale_presentation(locale) }.push(['English (EN)', :en])- else- [['English (EN)', :en]]- end- end-- def locale_presentation(locale)- [Spree.t('i18n.this_file_language', locale: locale), locale]- endendendenddiff --git a/core/app/helpers/spree/locale_helper.rb b/core/app/helpers/spree/locale_helper.rbnew file mode 100644index 0000000000..d90c7a42ee--- /dev/null+++ b/core/app/helpers/spree/locale_helper.rb@@ -0,0 +1,15 @@+module Spree+ module LocaleHelper+ def all_locales_options+ supported_locales_for_all_stores.map { |locale| locale_presentation(locale) }+ end++ def locale_presentation(locale)+ if defined?(SpreeI18n)+ [Spree.t('i18n.this_file_language', locale: locale), locale]+ else+ locale.to_s == 'en' ? ['English (US)', :en] : [locale, locale]+ end+ end+ end+enddiff --git a/core/lib/spree/core/controller_helpers/locale.rb b/core/lib/spree/core/controller_helpers/locale.rbindex 40e10971d9..461df1784f 100644--- a/core/lib/spree/core/controller_helpers/locale.rb+++ b/core/lib/spree/core/controller_helpers/locale.rb@@ -40,11 +40,11 @@ module Spreeenddef supported_locales_for_all_stores- if defined?(SpreeI18n)- (SpreeI18n::Locale.all << :en).map(&:to_s)- else- [Rails.application.config.i18n.default_locale, I18n.locale, :en].uniq.compact- end+ @supported_locales_for_all_stores ||= (if defined?(SpreeI18n)+ (SpreeI18n::Locale.all << :en).map(&:to_s)+ else+ [Rails.application.config.i18n.default_locale, I18n.locale, :en]+ end).uniq.compactendendend