Skip to content

armgit / spree

Public Imported from GitHub
0

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.

Integrate with the new Spree I18n

Damian Legawiec454dc7f0e451
diff --git a/backend/app/controllers/spree/admin/stores_controller.rb b/backend/app/controllers/spree/admin/stores_controller.rb
index d0597761a7..9c20e6880a 100644
--- a/backend/app/controllers/spree/admin/stores_controller.rb
+++ b/backend/app/controllers/spree/admin/stores_controller.rb
@@ -9,10 +9,6 @@ module Spree
before_action :load_all_countries, only: [:new, :edit, :update, :create]
before_action :load_all_zones, only: %i[new edit]
- if defined?(SpreeI18n)
- include SpreeI18n::LocaleHelper
- end
-
helper_method :all_locales_options
def index
@@ -137,13 +133,17 @@ module Spree
@store.default_country_id = Spree::Config[:default_country_id]
end
- # this method is overriten by spree_i18n to add support for more locales
- # in https://github.com/spree-contrib/spree_i18n/blob/master/app/helpers/spree_i18n/locale_helper.rb#L17
- unless defined?(SpreeI18n)
- def all_locales_options
+ 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]
+ end
end
end
end