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.

Ensure that Stores locale is set

Damian Legawiec1c420aaaf7c2
diff --git a/backend/app/views/spree/admin/stores/_form.html.erb b/backend/app/views/spree/admin/stores/_form.html.erb
index bfc707b049..c2d92ffc45 100644
--- a/backend/app/views/spree/admin/stores/_form.html.erb
+++ b/backend/app/views/spree/admin/stores/_form.html.erb
@@ -151,7 +151,7 @@
<% end %>
<%= f.field_container :default_locale, class: ['form-group'] do %>
<%= f.label :default_locale, Spree.t('i18n.language') %>
- <%= f.select :default_locale, options_from_collection_for_select(all_locales_options, :last, :first, @store.default_locale), {}, { class: 'select2' } %>
+ <%= f.select :default_locale, options_from_collection_for_select(all_locales_options, :last, :first, @store.default_locale || I18n.locale), {}, { class: 'select2' } %>
<%= f.error_message_on :default_locale %>
<% unless defined?(SpreeI18n) %>
<small class="form-text text-muted">
diff --git a/core/db/default/spree/stores.rb b/core/db/default/spree/stores.rb
index 4c2d29d1ff..5b8417e406 100644
--- a/core/db/default/spree/stores.rb
+++ b/core/db/default/spree/stores.rb
@@ -11,6 +11,7 @@ else
s.customer_support_email = '[email protected]'
s.default_currency = 'USD'
s.default_country_id = Spree::Config[:default_country_id]
+ s.default_locale = I18n.locale
s.seo_title = 'Spree Commerce Demo Shop'
s.meta_description = 'This is the new Spree UX DEMO | OVERVIEW: http://bit.ly/new-spree-ux | DOCS: http://bit.ly/spree-ux-customization-docs | CONTACT: https://spreecommerce.org/contact/'
s.facebook = 'spreecommerce'
diff --git a/core/db/migrate/20210120142527_ensure_default_locale_in_spree_stores.rb b/core/db/migrate/20210120142527_ensure_default_locale_in_spree_stores.rb
new file mode 100644
index 0000000000..73277f23bd
--- /dev/null
+++ b/core/db/migrate/20210120142527_ensure_default_locale_in_spree_stores.rb
@@ -0,0 +1,5 @@
+class EnsureDefaultLocaleInSpreeStores < ActiveRecord::Migration[6.0]
+ def change
+ Spree::Store.where(default_locale: nil).update_all(default_locale: I18n.locale)
+ end
+end