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.

Setup a fallback for Select2 not having a local.

Matthew Kennedy8f0a0f36142a
diff --git a/backend/app/helpers/spree/admin/base_helper.rb b/backend/app/helpers/spree/admin/base_helper.rb
index 5633f90d08..5cef1f97d4 100644
--- a/backend/app/helpers/spree/admin/base_helper.rb
+++ b/backend/app/helpers/spree/admin/base_helper.rb
@@ -201,6 +201,21 @@ module Spree
class: 'btn-outline-secondary', icon: 'view.svg', id: 'admin_preview_taxon', target: :blank
)
end
+
+ def select2_local_fallback
+ stripped_locale = I18n.locale.to_s.split('-').first
+ all_select_2_locals = %w[af ar az bg bn bs ca cs da de dsb el en eo es et eu fa fi fr gl he
+ hi hr hsb hu hy id is it ja ka km ko lt lv mk ms nb ne nl pa pl ps
+ pt pt-BR ro ru sk sl sq sr sr-Cyrl sv th tk tr uk vi zh-CN zh-TW]
+
+ if ['zh-CN', 'zh-TW', 'sr-Cyrl', 'pt-BR'].include?(I18n.locale.to_s)
+ I18n.locale
+ elsif all_select_2_locals.include? stripped_locale
+ stripped_locale
+ else
+ 'en'
+ end
+ end
end
end
end
diff --git a/backend/app/views/spree/admin/shared/_translations.html.erb b/backend/app/views/spree/admin/shared/_translations.html.erb
index 4b4579791b..0411b58103 100644
--- a/backend/app/views/spree/admin/shared/_translations.html.erb
+++ b/backend/app/views/spree/admin/shared/_translations.html.erb
@@ -73,13 +73,7 @@
tracking: Spree.t(:tracking),
variant_placeholder: Spree.t(:variant_placeholder),
value: Spree.t(:value)
- }.to_json
-%>
+ }.to_json %>
</script>
-<% stripped_locale = I18n.locale.to_s.split('-').first %>
-<% if ['zh-CN', 'zh-TW', 'sr-Cyrl', 'pt-BR'].include?(I18n.locale.to_s) %>
- <%= javascript_include_tag "select2_locale_#{I18n.locale}" %>
-<% else %>
- <%= javascript_include_tag "select2_locale_#{stripped_locale}" %>
-<% end %>
+<%= javascript_include_tag "select2_locale_#{select2_local_fallback}" %>